openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1546803 [10/14] - in /openoffice/branches/l10n40: ./ main/ main/accessibility/inc/accessibility/extended/ main/accessibility/inc/accessibility/standard/ main/accessibility/source/extended/ main/accessibility/source/helper/ main/accessibili...
Date Sun, 01 Dec 2013 11:40:35 GMT
Modified: openoffice/branches/l10n40/main/svx/source/accessibility/ChildrenManagerImpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/accessibility/ChildrenManagerImpl.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/accessibility/ChildrenManagerImpl.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/accessibility/ChildrenManagerImpl.cxx Sun Dec  1 11:40:24 2013
@@ -37,7 +37,6 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
-//IAccessibility2 Implementation 2009-----
 #ifndef _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX
 #include <svx/SvxShapeTypes.hxx>
 #endif
@@ -48,7 +47,6 @@
 #ifndef _SV_WINDOW_HXX
 #include <vcl/window.hxx>
 #endif
-//-----IAccessibility2 Implementation 2009
 using namespace ::com::sun::star;
 using namespace	::com::sun::star::accessibility;
 using ::com::sun::star::uno::Reference;
@@ -128,7 +126,6 @@ long ChildrenManagerImpl::GetChildCount 
 }
 
 
-//IAccessibility2 Implementation 2009-----
 ::com::sun::star::uno::Reference<
         ::com::sun::star::drawing::XShape> ChildrenManagerImpl::GetChildShape(long nIndex)
     throw (::com::sun::star::uno::RuntimeException)
@@ -142,7 +139,6 @@ long ChildrenManagerImpl::GetChildCount 
     }
 	return uno::Reference< drawing::XShape > ();
 }
-//-----IAccessibility2 Implementation 2009
 
 /** Return the requested accessible child object.  Create it if it is not
     yet in the cache.
@@ -155,8 +151,8 @@ uno::Reference<XAccessible>
     // Check wether the given index is valid.
     if (nIndex < 0 || (unsigned long)nIndex >= maVisibleChildren.size())
         throw lang::IndexOutOfBoundsException (
-            ::rtl::OUString::createFromAscii(
-				"no accessible child with index ") + nIndex,
+            ::rtl::OUString::createFromAscii( "no accessible child with index ")
+                + ::rtl::OUString::valueOf( nIndex, 10),
             mxParent);
 
     return GetChild (maVisibleChildren[nIndex],nIndex);
@@ -896,7 +892,6 @@ sal_Bool ChildrenManagerImpl::ReplaceChi
 
     return bResult;
 }
-//IAccessibility2 Implementation 2009-----
 // Add the impl method for IAccessibleParent interface
 AccessibleControlShape * ChildrenManagerImpl::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet* pSet) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -925,7 +920,6 @@ uno::Reference<XAccessible>
     }
     return uno::Reference<XAccessible> ();
 }
-//-----IAccessibility2 Implementation 2009
 
 /** Update the <const>SELECTED</const> and the <const>FOCUSED</const> state
     of all visible children.  Maybe this should be changed to all children.
@@ -958,21 +952,18 @@ void ChildrenManagerImpl::UpdateSelectio
     // Remember the current and new focused shape.
     AccessibleShape* pCurrentlyFocusedShape = NULL;
     AccessibleShape* pNewFocusedShape = NULL;
-//IAccessibility2 Implementation 2009-----
 	typedef std::pair< AccessibleShape* , sal_Bool > PAIR_SHAPE;//sal_Bool Selected,UnSelected.
 	typedef std::vector< PAIR_SHAPE > VEC_SHAPE;
 	VEC_SHAPE vecSelect;
 	int nAddSelect=0;
 	int nRemoveSelect=0;
 	sal_Bool bHasSelectedShape=sal_False;
-//-----IAccessibility2 Implementation 2009
     ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
     for (I=maVisibleChildren.begin(); I != aEnd; ++I)
     {
         AccessibleShape* pAccessibleShape = I->GetAccessibleShape();
         if (I->mxAccessibleShape.is() && I->mxShape.is() && pAccessibleShape!=NULL)
         {
-	//IAccessibility2 Implementation 2009-----
 			short nRole = pAccessibleShape->getAccessibleRole();
 			bool bDrawShape = (
 				nRole == AccessibleRole::GRAPHIC || 
@@ -981,7 +972,6 @@ void ChildrenManagerImpl::UpdateSelectio
 				nRole == AccessibleRole::IMAGE_MAP || 
 				nRole == AccessibleRole::TABLE_CELL || 
 				nRole == AccessibleRole::TABLE );
-//-----IAccessibility2 Implementation 2009
             bool bShapeIsSelected = false;
 
             // Look up the shape in the (single or multi-) selection.
@@ -1008,8 +998,6 @@ void ChildrenManagerImpl::UpdateSelectio
 
             // Set or reset the SELECTED state.
             if (bShapeIsSelected)
-	    //IAccessibility2 Implementation 2009-----
-                //pAccessibleShape->SetState (AccessibleStateType::SELECTED);
 			{
 				if (pAccessibleShape->SetState (AccessibleStateType::SELECTED))
 				{
@@ -1025,7 +1013,6 @@ void ChildrenManagerImpl::UpdateSelectio
 				}
 			}
             else
-                //pAccessibleShape->ResetState (AccessibleStateType::SELECTED);
 			{
                 if(pAccessibleShape->ResetState (AccessibleStateType::SELECTED))
 				{
@@ -1036,13 +1023,11 @@ void ChildrenManagerImpl::UpdateSelectio
 					}
 				}
 			}
-//-----IAccessibility2 Implementation 2009
             // Does the shape have the current selection?
             if (pAccessibleShape->GetState (AccessibleStateType::FOCUSED))
                 pCurrentlyFocusedShape = pAccessibleShape;
         }
     }
-//IAccessibility2 Implementation 2009-----
     /*
     // Check if the frame we are in is currently active.  If not then make
     // sure to not send a FOCUSED state change.
@@ -1062,19 +1047,14 @@ void ChildrenManagerImpl::UpdateSelectio
 	{
 		bShapeActive =true;
 	}
-//-----IAccessibility2 Implementation 2009
     // Move focus from current to newly focused shape.
     if (pCurrentlyFocusedShape != pNewFocusedShape)
     {
         if (pCurrentlyFocusedShape != NULL)
             pCurrentlyFocusedShape->ResetState (AccessibleStateType::FOCUSED);
-	    //IAccessibility2 Implementation 2009-----
-        //if (pNewFocusedShape != NULL)
-	//-----IAccessibility2 Implementation 2009
 	if (pNewFocusedShape != NULL && bShapeActive)
             pNewFocusedShape->SetState (AccessibleStateType::FOCUSED);
 	}
-//IAccessibility2 Implementation 2009-----
 
 	if (nAddSelect >= 10 )//fire selection  within 
 	{
@@ -1119,7 +1099,6 @@ void ChildrenManagerImpl::UpdateSelectio
 			mrContext.CommitChange(AccessibleEventId::SELECTION_CHANGED_REMOVE,anyShape,uno::Any());
 		}
 	}
-//-----IAccessibility2 Implementation 2009
 
     // Remember whether there is a shape that now has the focus.
     mpFocusedShape = pNewFocusedShape;

Modified: openoffice/branches/l10n40/main/svx/source/accessibility/ChildrenManagerImpl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/accessibility/ChildrenManagerImpl.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/accessibility/ChildrenManagerImpl.hxx (original)
+++ openoffice/branches/l10n40/main/svx/source/accessibility/ChildrenManagerImpl.hxx Sun Dec  1 11:40:24 2013
@@ -126,11 +126,9 @@ public:
     */
     long GetChildCount (void) const throw ();
 
-//IAccessibility2 Implementation 2009-----
 	::com::sun::star::uno::Reference<
         ::com::sun::star::drawing::XShape> GetChildShape(long nIndex)
 		throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
     /**	Return the requested accessible child or throw and
         IndexOutOfBoundsException if the given index is invalid.
         @param nIndex
@@ -303,7 +301,6 @@ public:
 		const long _nIndex,
 		const AccessibleShapeTreeInfo& _rShapeTreeInfo
 	)	throw (::com::sun::star::uno::RuntimeException);
-	//IAccessibility2 Implementation 2009-----
     // Add the impl method for IAccessibleParent interface
     virtual AccessibleControlShape* GetAccControlShapeFromModel
 		(::com::sun::star::beans::XPropertySet* pSet) 
@@ -313,7 +310,6 @@ public:
         GetAccessibleCaption (const ::com::sun::star::uno::Reference<
             ::com::sun::star::drawing::XShape>& xShape)
         throw (::com::sun::star::uno::RuntimeException);
-	//-----IAccessibility2 Implementation 2009
 protected:
     /** This list holds the descriptors of all currently visible shapes and
         associated accessible object.

Modified: openoffice/branches/l10n40/main/svx/source/accessibility/ShapeTypeHandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/accessibility/ShapeTypeHandler.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/accessibility/ShapeTypeHandler.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/accessibility/ShapeTypeHandler.cxx Sun Dec  1 11:40:24 2013
@@ -32,11 +32,9 @@
 #include <vcl/svapp.hxx>
 #include <svx/dialmgr.hxx>
 
-//IAccessibility2 Implementation 2009-----
 #include <svx/unoshape.hxx>
 #include <svx/svdoashp.hxx>
 #include "svx/unoapi.hxx"
-//-----IAccessibility2 Implementation 2009
 
 #include "svx/svdstr.hrc"
 
@@ -315,7 +313,6 @@ long ShapeTypeHandler::GetSlotId (const 
         case DRAWING_RECTANGLE:
             nResourceId = STR_ObjNameSingulRECT;
             break;
-		//IAccessibility2 Implementation 2009-----
         case DRAWING_CUSTOM:
 			{
 				nResourceId = STR_ObjNameSingulCUSTOMSHAPE;
@@ -345,7 +342,6 @@ long ShapeTypeHandler::GetSlotId (const 
 				}
                 break;
 			}
-		//-----IAccessibility2 Implementation 2009
         case DRAWING_TEXT:
             nResourceId = STR_ObjNameSingulTEXT;
             break;

Modified: openoffice/branches/l10n40/main/svx/source/accessibility/charmapacc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/accessibility/charmapacc.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/accessibility/charmapacc.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/accessibility/charmapacc.cxx Sun Dec  1 11:40:24 2013
@@ -166,25 +166,6 @@ Reference< XAccessible > SAL_CALL SvxSho
 // -----------------------------------------------------------------------------
 ::com::sun::star::awt::Rectangle SAL_CALL SvxShowCharSetVirtualAcc::implGetBounds(  ) throw (RuntimeException)
 {
-//IAccessibility2 Implementation 2009-----
-/*	const Point   aOutPos( mpParent->GetPosPixel() );
-    Size          aOutSize( mpParent->GetOutputSizePixel() );
-	if ( mpParent->getScrollBar()->IsVisible() )
-	{
-		const Size aScrollBar = mpParent->getScrollBar()->GetOutputSizePixel();
-		aOutSize.Width() -= aScrollBar.Width();
-		aOutSize.Height() -= aScrollBar.Height();
-	}
-
-    awt::Rectangle aRet;
-
-    aRet.X = aOutPos.X();
-    aRet.Y = aOutPos.Y();
-    aRet.Width = aOutSize.Width();
-    aRet.Height = aOutSize.Height();
-
-    return aRet;
-*/ 
 	::com::sun::star::awt::Rectangle aBounds ( 0, 0, 0, 0 );
 	Window* pWindow = mpParent;
 	if ( pWindow )
@@ -201,7 +182,6 @@ Reference< XAccessible > SAL_CALL SvxSho
 		}
 	}
 	return aBounds;
-	//-----IAccessibility2 Implementation 2009
 }
 // -----------------------------------------------------------------------------
 sal_Int16 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRole(  ) throw (RuntimeException)
@@ -365,7 +345,6 @@ void SvxShowCharSetAcc::implSelect( sal_
 // -----------------------------------------------------------------------------
 ::com::sun::star::awt::Rectangle SAL_CALL SvxShowCharSetAcc::implGetBounds(  ) throw (RuntimeException)
 {
-//IAccessibility2 Implementation 2009-----
 	const Point   aOutPos;//( m_pParent->getCharSetControl()->GetPosPixel() ); 
     Size          aOutSize( m_pParent->getCharSetControl()->GetOutputSizePixel());
 	if ( m_pParent->getCharSetControl()->getScrollBar()->IsVisible() )
@@ -373,7 +352,6 @@ void SvxShowCharSetAcc::implSelect( sal_
 		const Size aScrollBar = m_pParent->getCharSetControl()->getScrollBar()->GetOutputSizePixel();
 		aOutSize.Width() -= aScrollBar.Width();
 		//aOutSize.Height() -= aScrollBar.Height(); 
-		//-----IAccessibility2 Implementation 2009
 	}
 
     awt::Rectangle aRet;
@@ -715,10 +693,7 @@ uno::Reference< accessibility::XAccessib
 sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole()
     throw (uno::RuntimeException)
 {
-    //return accessibility::AccessibleRole::LABEL;
-//IAccessibility2 Implementation 2009-----
     return accessibility::AccessibleRole::TABLE_CELL;
-//-----IAccessibility2 Implementation 2009
 }
 
 // -----------------------------------------------------------------------------
@@ -733,30 +708,17 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc
 	sal_Unicode c = mpParent->maText.GetChar(0);
 	char buf[16] = "0x0000";
     sal_Unicode c_Shifted = c;
-//IAccessibility2 Implementation 2009-----
-/*
-    for( int i = 0; i < 4; ++i )
-    {
-        char h = (char)(c_Shifted & 0x0F);
-        buf[5-i] = (h > 9) ? (h - 10 + 'A') : (h + '0');
-        c_Shifted >>= 4;
-    }
-*/
 	int tmp_len = 4;
 	if(c_Shifted>0xFFFF) tmp_len = 8;
     for( int i = 0; i < tmp_len; ++i )
     {
         char h = c_Shifted & 0x0F;
-        //buf[9-i] = (h > 9) ? (h - 10 + 'A') : (h + '0');
 		buf[tmp_len+1-i] = (h > 9) ? (h - 10 + 'A') : (h + '0');
         c_Shifted >>= 4;
     }
-//-----IAccessibility2 Implementation 2009
     if( c < 256 )
         snprintf( buf+6, 10, " (%d)", c );
-	//IAccessibility2 Implementation 2009-----
 	sDescription.AppendAscii(" ");
-	//-----IAccessibility2 Implementation 2009
 	sDescription.AppendAscii(buf);
 
     return sDescription;
@@ -802,7 +764,6 @@ uno::Reference< accessibility::XAccessib
 
     if( mpParent )
     {
-    //IAccessibility2 Implementation 2009-----
 		if(mpParent->mrParent.IsEnabled())
 		{
 			pStateSet->AddState( accessibility::AccessibleStateType::ENABLED );
@@ -810,7 +771,6 @@ uno::Reference< accessibility::XAccessib
 			pStateSet->AddState( accessibility::AccessibleStateType::SELECTABLE );
 			pStateSet->AddState( accessibility::AccessibleStateType::FOCUSABLE );
 		}
-		//-----IAccessibility2 Implementation 2009
 
 	    // SELECTED
         if( mpParent->mrParent.GetSelectIndexId() == mpParent->mnId )
@@ -819,12 +779,10 @@ uno::Reference< accessibility::XAccessib
        	    pStateSet->AddState( accessibility::AccessibleStateType::FOCUSED );
         }
 		if ( mpParent->mnId >= mpParent->mrParent.FirstInView() && mpParent->mnId <= mpParent->mrParent.LastInView() )
-		//IAccessibility2 Implementation 2009-----
 		{
 			pStateSet->AddState( AccessibleStateType::VISIBLE );
 			pStateSet->AddState( AccessibleStateType::SHOWING );
 		}
-		//-----IAccessibility2 Implementation 2009
 		pStateSet->AddState( AccessibleStateType::TRANSIENT );
     }
 

Modified: openoffice/branches/l10n40/main/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx Sun Dec  1 11:40:24 2013
@@ -1123,9 +1123,7 @@ uno::Reference< XAccessibleStateSet > SA
 			{
 				pStateSetHelper->AddState( AccessibleStateType::SELECTED );
 			}
-			//IAccessibility2 Implementation 2009-----
 			if (mrParentWindow->GetBitmapPixel(sal_uInt16(mnIndexInParent)))
-			//-----IAccessibility2 Implementation 2009
 			{
 				pStateSetHelper->AddState( AccessibleStateType::CHECKED );
 			}

Modified: openoffice/branches/l10n40/main/svx/source/accessibility/svxrectctaccessiblecontext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/accessibility/svxrectctaccessiblecontext.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/accessibility/svxrectctaccessiblecontext.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/accessibility/svxrectctaccessiblecontext.cxx Sun Dec  1 11:40:24 2013
@@ -46,14 +46,12 @@
 #include <svx/dlgctrl.hxx>
 #include <svx/dialmgr.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
-//IAccessibility2 Implementation 2009-----
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLERELATIONTYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #endif
 #ifndef _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
 #include <unotools/accessiblerelationsethelper.hxx>
 #endif
-//-----IAccessibility2 Implementation 2009
 
 using namespace ::cppu;
 using namespace ::osl;
@@ -61,9 +59,7 @@ using namespace	::com::sun::star;
 using namespace	::com::sun::star::uno;
 using namespace	::com::sun::star::accessibility;
 
-//IAccessibility2 Implementation 2009-----
 using namespace ::com::sun::star::lang;
-//-----IAccessibility2 Implementation 2009
 
 #define MAX_NUM_OF_CHILDS	9
 #define NOCHILDSELECTED		-1
@@ -364,19 +360,14 @@ sal_Int32 SAL_CALL SvxRectCtlAccessibleC
 
 sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole( void ) throw( RuntimeException )
 {
-//IAccessibility2 Implementation 2009-----
 	//return AccessibleRole::GROUP_BOX;
 	return AccessibleRole::PANEL;
-//-----IAccessibility2 Implementation 2009
 }
 
 ::rtl::OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException )
 {
 	::osl::MutexGuard	aGuard( m_aMutex );
-	//IAccessibility2 Implementation 2009-----
-	//return msDescription;
 	return msDescription +::rtl::OUString::createFromAscii(" Please use arrow key to selection.");
-	//-----IAccessibility2 Implementation 2009
 }
 
 ::rtl::OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName( void ) throw( RuntimeException )
@@ -390,8 +381,6 @@ sal_Int16 SAL_CALL SvxRectCtlAccessibleC
 */
 Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException )
 {
-//IAccessibility2 Implementation 2009-----
-	//return Reference< XAccessibleRelationSet >();
 	utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
 	uno::Reference< accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper;
 	Window* pWindow = mpRepr;
@@ -414,16 +403,13 @@ Reference< XAccessibleRelationSet > SAL_
 		}
 	}
 	return xSet;
-	//-----IAccessibility2 Implementation 2009
 }
-//IAccessibility2 Implementation 2009-----
 //Solution:Add the event handling method
 void SvxRectCtlAccessibleContext::FireAccessibleEvent (short nEventId, const ::com::sun::star::uno::Any& rOld, const ::com::sun::star::uno::Any& rNew)
 {
 	const Reference< XInterface >	xSource( *this );
 	CommitChange( AccessibleEventObject( xSource, nEventId, rNew,rOld ) );
 }
-//-----IAccessibility2 Implementation 2009	
 Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException )
 {
 	::osl::MutexGuard						aGuard( m_aMutex );
@@ -431,10 +417,8 @@ Reference< XAccessibleStateSet > SAL_CAL
 
 	if( IsAlive() )
 	{
-//IAccessibility2 Implementation 2009-----
 		pStateSetHelper->AddState( AccessibleStateType::ENABLED );
         // pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
-//-----IAccessibility2 Implementation 2009
 		pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE );
 		if( mpRepr->HasFocus() )
 			pStateSetHelper->AddState( AccessibleStateType::FOCUSED );
@@ -683,7 +667,6 @@ void SvxRectCtlAccessibleContext::checkC
 		// in our case only for the first (0) _selected_ child this is a valid request
 		throw lang::IndexOutOfBoundsException();
 }
-// IAccessibility2 implementation 2009.  ------
 void SvxRectCtlAccessibleContext::FireChildFocus( RECT_POINT eButton )
 {
 	::osl::MutexGuard	aGuard( m_aMutex );
@@ -750,7 +733,6 @@ void SvxRectCtlAccessibleContext::select
 	// no guard -> is done in next selectChild
 	selectChild( PointToIndex( eButton, mbAngleMode ) , bFireFocus);
 }
-// ------ IAccessibility2 implementation 2009.
 void SvxRectCtlAccessibleContext::setName( const ::rtl::OUString& rName )
 {
 	Any						aPreVal, aPostVal;
@@ -1056,7 +1038,6 @@ sal_Int16 SAL_CALL SvxRectCtlChildAccess
 Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException )
 {
 	//return Reference< XAccessibleRelationSet >();
-	//IAccessibility2 Implementation 2009-----
 	utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
 	uno::Reference< accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper;	
 	if( mxParent.is() )
@@ -1068,7 +1049,6 @@ Reference<XAccessibleRelationSet> SAL_CA
 	}
 	
 	return xSet;
-	//-----IAccessibility2 Implementation 2009
 }
 
 Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException )
@@ -1177,7 +1157,6 @@ Any SAL_CALL SvxRectCtlChildAccessibleCo
 	return aRet;
 }
 
-//IAccessibility2 Implementation 2009-----
 // -----------------------------------------------------------------------------
 // XAccessibleAction
 // -----------------------------------------------------------------------------
@@ -1228,7 +1207,6 @@ Reference< XAccessibleKeyBinding > SvxRe
     return Reference< XAccessibleKeyBinding >();
 }
 
-//-----IAccessibility2 Implementation 2009
 
 //=====  XServiceInfo  ========================================================
 
@@ -1326,7 +1304,6 @@ Rectangle SvxRectCtlChildAccessibleConte
 
 	return *mpBoundingBox;
 }
-// IAccessibility2 implementation 2009. ------
 void SvxRectCtlChildAccessibleContext::setStateChecked( sal_Bool bChecked, sal_Bool bFireFocus )
 {
 	if( mbIsChecked != bChecked )
@@ -1358,4 +1335,3 @@ void SvxRectCtlChildAccessibleContext::F
 	aNew <<= AccessibleStateType::FOCUSED;
 	CommitChange( AccessibleEventObject( xSource, AccessibleEventId::STATE_CHANGED, aNew, aOld ) );
 }
-// ------ IAccessibility2 implementation 2009.

Modified: openoffice/branches/l10n40/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx Sun Dec  1 11:40:24 2013
@@ -314,7 +314,6 @@ rtl::OUString EnhancedCustomShapeTypeNam
 		? rtl::OUString::createFromAscii( pNameTypeTableArray[ eShapeType ].pS )
 		: rtl::OUString();
 }
-//IAccessibility2 Implementation 2009-----
 typedef std::hash_map< const char*, const char*, std::hash<const char*>, TCheck> TypeACCNameHashMap;
 static TypeACCNameHashMap* pACCHashMap = NULL;
 struct ACCNameTypeTable
@@ -560,4 +559,3 @@ rtl::OUString EnhancedCustomShapeTypeNam
 		sRetValue = rtl::OUString::createFromAscii( (*aHashIter).second );
 	return sRetValue;
 }
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/l10n40/main/svx/source/dialog/_bmpmask.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/dialog/_bmpmask.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/dialog/_bmpmask.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/dialog/_bmpmask.cxx Sun Dec  1 11:40:24 2013
@@ -137,9 +137,7 @@ void MaskSet::Select()
 
 void MaskSet::GetFocus()
 {
-	//IAccessibility2 Implementation 2009-----
 	ValueSet::GetFocus();
-	//-----IAccessibility2 Implementation 2009
 	SelectItem( 1 );
 	pSvxBmpMask->onSelect( this );
 }
@@ -330,13 +328,11 @@ IMPL_LINK( MaskData, CbxTransHdl, CheckB
 
 IMPL_LINK( MaskData, FocusLbHdl, ColorLB*, pLb )
 {
-	//IAccessibility2 Implementation 2009-----
 	// MT: bFireFox as API parameter is ugly, find better solution????
 	pMask->pQSet1->SelectItem( pLb == &( pMask->aLbColor1 ) ? 1 : 0 /* , false */ );
 	pMask->pQSet2->SelectItem( pLb == &( pMask->aLbColor2 ) ? 1 : 0 /* , false */ );
 	pMask->pQSet3->SelectItem( pLb == &( pMask->aLbColor3 ) ? 1 : 0 /* , false */ );
 	pMask->pQSet4->SelectItem( pLb == &( pMask->aLbColor4 ) ? 1 : 0 /* , false */ );
-	//-----IAccessibility2 Implementation 2009
 
 	return 0;
 }
@@ -483,57 +479,48 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBi
 	pQSet1->SetColCount( 1 );
 	pQSet1->SetLineCount( 1 );
 //	pQSet1->SetExtraSpacing( 1 );
-	//-----IAccessibility2 Implementation 2009
 	String sColorPalette (BMP_RESID( RID_SVXDLG_BMPMASK_STR_PALETTE));
     String sColorPaletteN;
     sColorPaletteN = sColorPalette;
     sColorPaletteN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 1"));
 	//pQSet1->InsertItem( 1, aPipetteColor );
 	pQSet1->InsertItem( 1, aPipetteColor, sColorPaletteN);
-	//IAccessibility2 Implementation 2009-----
 	pQSet1->SelectItem( 1 );
 
 	pQSet2->SetStyle( pQSet2->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER );
 	pQSet2->SetColCount( 1 );
 	pQSet2->SetLineCount( 1 );
 //	pQSet2->SetExtraSpacing( 1 );
-	//IAccessibility2 Implementation 2009-----
 	sColorPaletteN = sColorPalette;
     sColorPaletteN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 2"));
 	//pQSet2->InsertItem( 1, aPipetteColor );
 	pQSet2->InsertItem( 1, aPipetteColor, sColorPaletteN);
-	//-----IAccessibility2 Implementation 2009
 	pQSet2->SelectItem( 0 );
 
 	pQSet3->SetStyle( pQSet3->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER );
 	pQSet3->SetColCount( 1 );
 	pQSet3->SetLineCount( 1 );
 //	pQSet3->SetExtraSpacing( 1 );
-	//IAccessibility2 Implementation 2009-----
 	sColorPaletteN = sColorPalette;
  	sColorPaletteN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 3"));
 	pQSet3->InsertItem( 1, aPipetteColor, sColorPaletteN);
 	//pQSet3->InsertItem( 1, aPipetteColor );
-	//-----IAccessibility2 Implementation 2009
 	pQSet3->SelectItem( 0 );
 
 	pQSet4->SetStyle( pQSet4->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER );
 	pQSet4->SetColCount( 1 );
 	pQSet4->SetLineCount( 1 );
 //	pQSet4->SetExtraSpacing( 1 );
-	//IAccessibility2 Implementation 2009-----
 	sColorPaletteN = sColorPalette;
     sColorPaletteN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 4"));
 	pQSet4->InsertItem( 1, aPipetteColor, sColorPaletteN);
 	//pQSet4->InsertItem( 1, aPipetteColor );
-	//-----IAccessibility2 Implementation 2009
 	pQSet4->SelectItem( 0 );
 
 	pQSet1->Show();
 	pQSet2->Show();
 	pQSet3->Show();
 	pQSet4->Show();
-	//IAccessibility2 Implementation 2009-----
 	aCbx1.SetAccessibleRelationMemberOf( &aGrpQ );
 	pQSet1->SetAccessibleRelationMemberOf( &aGrpQ );
 	aSp1.SetAccessibleRelationMemberOf( &aGrpQ );
@@ -569,7 +556,6 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBi
 	aLbColorTrans.SetAccessibleRelationLabeledBy( &aCbxTrans );
 	aLbColorTrans.SetAccessibleRelationMemberOf( &aGrpQ );
 	aCbxTrans.SetAccessibleRelationMemberOf( &aGrpQ );
-	//-----IAccessibility2 Implementation 2009
 }
 
 //-------------------------------------------------------------------------
@@ -1300,7 +1286,6 @@ void SvxBmpMask::SetAccessibleNames (voi
     sSourceColorN = sSourceColor;
     sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 4"));
     aCbx4.SetAccessibleName (sSourceColorN);
-	//IAccessibility2 Implementation 2009-----
 	// set the accessible name for valueset
 	String sColorPalette (BMP_RESID( RID_SVXDLG_BMPMASK_STR_PALETTE));
     String sColorPaletteN;
@@ -1346,5 +1331,4 @@ void SvxBmpMask::SetAccessibleNames (voi
     sReplaceWithN = sReplaceWith;
     sReplaceWithN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 4"));
     aLbColor4.SetAccessibleName (sReplaceWithN); 
-	//-----IAccessibility2 Implementation 2009
 }

Modified: openoffice/branches/l10n40/main/svx/source/dialog/bmpmask.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/dialog/bmpmask.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/dialog/bmpmask.hrc (original)
+++ openoffice/branches/l10n40/main/svx/source/dialog/bmpmask.hrc Sun Dec  1 11:40:24 2013
@@ -23,11 +23,9 @@
 #define RID_SVXDLG_BMPMASK				(RID_SVX_BMPMASK_START)
 #define RID_SVXDLG_BMPMASK_STR_TRANSP	(RID_SVX_BMPMASK_START + 1)
 #define RID_SVXDLG_BMPMASK_STR_SOURCECOLOR	(RID_SVX_BMPMASK_START + 2)
-/*IAccessibility2 Implementation 2009-----*/
 #define RID_SVXDLG_BMPMASK_STR_PALETTE (RID_SVX_BMPMASK_START + 3)
 #define RID_SVXDLG_BMPMASK_STR_TOLERANCE (RID_SVX_BMPMASK_START + 4)
 #define RID_SVXDLG_BMPMASK_STR_REPLACEWITH (RID_SVX_BMPMASK_START + 5)
-/*-----IAccessibility2 Implementation 2009*/
 #define GRP_Q 1
 #define CTR_PIPETTE 1
 #define CBX_1 1

Modified: openoffice/branches/l10n40/main/svx/source/dialog/ctredlin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/dialog/ctredlin.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/dialog/ctredlin.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/dialog/ctredlin.cxx Sun Dec  1 11:40:24 2013
@@ -1345,7 +1345,6 @@ void SvxTPFilter::Disable( bool bChild)
 	Enable( false, bChild );
 }
 
-//IAccessibility2 Implementation 2009-----
 void SvxTPFilter::SetAccessibleRelationMemberOf( Window* pWin )
 {
 	aCbDate.SetAccessibleRelationMemberOf(pWin);
@@ -1366,7 +1365,6 @@ void SvxTPFilter::SetAccessibleRelationM
 	aCbComment.SetAccessibleRelationMemberOf(pWin);
 	aEdComment.SetAccessibleRelationMemberOf(pWin);
 }
-//-----IAccessibility2 Implementation 2009
 
 IMPL_LINK( SvxTPFilter, ModifyDate, void*,pTF)
 {

Modified: openoffice/branches/l10n40/main/svx/source/dialog/ctredlin.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/dialog/ctredlin.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/dialog/ctredlin.hrc (original)
+++ openoffice/branches/l10n40/main/svx/source/dialog/ctredlin.hrc Sun Dec  1 11:40:24 2013
@@ -63,11 +63,9 @@
 #define	STR_TITLE4		4
 #define	STR_TITLE5		5
 
-//IAccessibility2 Implementation 2009-----
 #define STR_DATE_COMBOX 6
 #define STR_DATE_SPIN   7
 #define STR_DATE_SPIN1  8
 #define STR_DATE_TIME_SPIN 9
 #define STR_DATE_TIME_SPIN1 10
 #define STR_TREE     		11
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/l10n40/main/svx/source/dialog/ctredlin.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/dialog/ctredlin.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/dialog/ctredlin.src (original)
+++ openoffice/branches/l10n40/main/svx/source/dialog/ctredlin.src Sun Dec  1 11:40:24 2013
@@ -110,10 +110,8 @@ TabPage SID_REDLIN_FILTER_PAGE
 			ImageBitmap = Bitmap { File = "time.bmp" ; };
 			MASKCOLOR
 		};
-		// IAccessibility2 implementation 2009. ------
 		//QuickHelpText [ en-US ] = "Set Date/Time" ;
 		QuickHelpText [ en-US ] = "Set Start Date/Time" ;
-		// ------ IAccessibility2 implementation 2009.
 	};
 	FixedText FT_DATE2
 	{
@@ -169,10 +167,8 @@ TabPage SID_REDLIN_FILTER_PAGE
 			ImageBitmap = Bitmap { File = "time.bmp" ; };
 			MASKCOLOR
 		};
-		// IAccessibility2 implementation 2009. ------
 		//QuickHelpText [ en-US ] = "Set Date/Time" ;
 		QuickHelpText [ en-US ] = "Set End Date/Time" ;
-		// ------ IAccessibility2 implementation 2009.
 	};
 	CheckBox CB_AUTOR
 	{
@@ -256,7 +252,6 @@ TabPage SID_REDLIN_FILTER_PAGE
         ImageBitmap = Bitmap { File = "time_h.bmp" ; };
         MASKCOLOR
     };
-    	/*IAccessibility2 Implementation 2009-----*/
 	String STR_DATE_COMBOX
 	{
 		Text [ en-US ] = "Date Condition" ;
@@ -281,7 +276,6 @@ TabPage SID_REDLIN_FILTER_PAGE
 	{
 		Text [ en-US ] = "Changes" ;
 	};
-	/*-----IAccessibility2 Implementation 2009*/
 };
 TabPage SID_REDLIN_VIEW_PAGE
 {

Modified: openoffice/branches/l10n40/main/svx/source/dialog/dlgctrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/dialog/dlgctrl.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/dialog/dlgctrl.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/dialog/dlgctrl.cxx Sun Dec  1 11:40:24 2013
@@ -37,7 +37,6 @@
 #include <vcl/region.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/hatch.hxx>
-// IAccessibility2 implementation 2009. ------
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEEVENTOBJECT_HPP_
 #include <com/sun/star/accessibility/AccessibleEventObject.hpp>
 #endif
@@ -48,7 +47,6 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #endif
 #include "svxpixelctlaccessiblecontext.hxx"
-// ------ IAccessibility2 implementation 2009.
 #include <svtools/colorcfg.hxx>
 #include <svxrectctaccessiblecontext.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -575,7 +573,6 @@ Point SvxRectCtl::SetActualRPWithoutInva
 void SvxRectCtl::GetFocus()
 {
 	SetFocusRect();
-	// IAccessibility2 implementation 2009. ------
 	//Solution: Send the accessible focused event
 	Control::GetFocus();
 	// Send accessibility event.
@@ -583,7 +580,6 @@ void SvxRectCtl::GetFocus()
 	{
 		pAccContext->FireChildFocus(GetActualRP());		
 	}
-	// ------ IAccessibility2 implementation 2009.
 }
 
 
@@ -677,7 +673,6 @@ RECT_POINT SvxRectCtl::GetActualRP() con
 |*	Gibt den aktuell ausgewaehlten RECT_POINT zur�ck
 |*
 \************************************************************************/
-// IAccessibility2 implementation 2009. ------
 void SvxRectCtl::SetActualRP( RECT_POINT eNewRP /* MT: , sal_Bool bFireFocus */ )
 {
 	// MT: bFireFox as API parameter is ugly...
@@ -690,7 +685,6 @@ void SvxRectCtl::SetActualRP( RECT_POINT
 	if( pAccContext )
 		pAccContext->selectChild( eNewRP /* MT, bFireFocus */ );
 }
-// ------ IAccessibility2 implementation 2009.
 void SvxRectCtl::SetState( CTL_STATE nState )
 {
 	m_nState = nState;
@@ -885,7 +879,6 @@ void SvxAngleCtl::Paint( const Rectangle
 |*	Control zum Editieren von Bitmaps
 |*
 \************************************************************************/
-// IAccessibility2 implementation 2009. ------
 
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SvxPixelCtl::CreateAccessible()
 {
@@ -945,12 +938,10 @@ long SvxPixelCtl::ShowPosition( const Po
 	return GetFoucsPosIndex();
 
 }
-// ------ IAccessibility2 implementation 2009.
 SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, sal_uInt16 nNumber ) :
 						Control		( pParent, rResId ),
 						nLines		( nNumber ),
 						bPaintable	( sal_True )
-						// IAccessibility2 implementation 2009. ------
 						//Solution:Initialize it's value to Point(0,0)
 						,aFocusPosition(0,0)
 {
@@ -964,7 +955,6 @@ SvxPixelCtl::SvxPixelCtl( Window* pParen
 	nSquares = nLines * nLines;
 	pPixel = new sal_uInt16[ nSquares ];
 	rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16));
-	// IAccessibility2 implementation 2009. ------
 	m_pAccess=NULL;
 }
 
@@ -1001,7 +991,6 @@ void SvxPixelCtl::ChangePixel( sal_uInt1
 
 void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
 {
-	// IAccessibility2 implementation 2009. ------
 	//Point aPt = PixelToLogic( rMEvt.GetPosPixel() );
 	//Point aPtTl, aPtBr;
 	//sal_uInt16	nX, nY;
@@ -1031,7 +1020,6 @@ void SvxPixelCtl::MouseButtonDown( const
 	{
 		m_pAccess->NotifyChild(nIndex,sal_True,sal_True);
 	}
-	// ------ IAccessibility2 implementation 2009.
 }
 
 /*************************************************************************
@@ -1082,13 +1070,11 @@ void SvxPixelCtl::Paint( const Rectangle
 				DrawRect( Rectangle( aPtTl, aPtBr ) );
 			}
 		}
-		// IAccessibility2 implementation 2009. ------
 		//Solution:Draw visual focus when has focus
 		if( HasFocus() )
 		{
 			ShowFocus(implCalFocusRect(aFocusPosition));	
 		}
-		// ------ IAccessibility2 implementation 2009.
 	} // bPaintable
 	else
 	{
@@ -1098,7 +1084,6 @@ void SvxPixelCtl::Paint( const Rectangle
 		DrawLine( Point( 0, aRectSize.Height() ), Point( aRectSize.Width(), 0 ) );
 	}
 }
-// IAccessibility2 implementation 2009. ------
 //Solution:Caculate visual focus rectangle via focus position
 Rectangle SvxPixelCtl::implCalFocusRect( const Point& aPosition )
 {
@@ -1221,7 +1206,6 @@ void SvxPixelCtl::LoseFocus()
 	}
 	Control::LoseFocus();
 }
-// ------ IAccessibility2 implementation 2009.
 
 /*************************************************************************
 |*

Modified: openoffice/branches/l10n40/main/svx/source/dialog/dlgctrl.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/dialog/dlgctrl.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/dialog/dlgctrl.src (original)
+++ openoffice/branches/l10n40/main/svx/source/dialog/dlgctrl.src Sun Dec  1 11:40:24 2013
@@ -27,9 +27,7 @@ Bitmap RID_SVXCTRL_RECTBTNS
 {
 	File = "rectbtns.bmp" ;
 };
-/*IAccessibility2 Implementation 2009-----*/
 String STR_SWITCH
 {
 	Text [ en-US ] = "Switch" ;
 };
-/*-----IAccessibility2 Implementation 2009*/

Modified: openoffice/branches/l10n40/main/svx/source/dialog/frmsel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/dialog/frmsel.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/dialog/frmsel.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/dialog/frmsel.cxx Sun Dec  1 11:40:24 2013
@@ -30,12 +30,10 @@
 #include "frmselimpl.hxx"
 #include "AccessibleFrameSelector.hxx"
 #include <svx/dialmgr.hxx>
-//IAccessibility2 Implementation 2009-----
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLESTATETYPE_HDL_
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #endif
-//-----IAccessibility2 Implementation 2009
 
 #ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
@@ -49,11 +47,9 @@
 namespace svx {
 
 using ::com::sun::star::uno::Reference;
-//IAccessibility2 Implementation 2009-----
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::accessibility::XAccessible;
 using namespace ::com::sun::star::accessibility;
-//-----IAccessibility2 Implementation 2009
 // ============================================================================
 // global functions from framebordertype.hxx
 
@@ -705,7 +701,6 @@ void FrameSelectorImpl::DoInvalidate( bo
 void FrameSelectorImpl::SetBorderState( FrameBorder& rBorder, FrameBorderState eState )
 {
     DBG_ASSERT( rBorder.IsEnabled(), "svx::FrameSelectorImpl::SetBorderState - access to disabled border" );
-	//IAccessibility2 Implementation 2009-----
 	Any aOld;
 	Any aNew;
 	Any& rMod = eState == FRAMESTATE_SHOW ? aNew : aOld;
@@ -722,7 +717,6 @@ void FrameSelectorImpl::SetBorderState( 
         rBorder.SetState( eState );
 	if (pFrameSelector)
 			pFrameSelector->NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOld, aNew );
-	//-----IAccessibility2 Implementation 2009
     DoInvalidate( true );
 }
 
@@ -940,7 +934,6 @@ bool FrameSelector::IsBorderSelected( Fr
 void FrameSelector::SelectBorder( FrameBorderType eBorder, bool bSelect /*, bool bFocus */ )
 {
     mxImpl->SelectBorder( mxImpl->GetBorderAccess( eBorder ), bSelect );
-	//IAccessibility2 Implementation 2009-----
 	// MT: bFireFox as API parameter is ugly...
 	// if (bFocus)
 	{
@@ -953,7 +946,6 @@ void FrameSelector::SelectBorder( FrameB
 			pFrameSelector->NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
 		}
 	}
-	//-----IAccessibility2 Implementation 2009
 }
 
 bool FrameSelector::IsAnyBorderSelected() const
@@ -1100,10 +1092,8 @@ void FrameSelector::MouseButtonDown( con
                 if( !(*aIt)->IsSelected() )
                 {
                     bNewSelected = true;
-			//IAccessibility2 Implementation 2009-----
                     //mxImpl->SelectBorder( **aIt, true );
 			SelectBorder((**aIt).GetType(), true);
-			//-----IAccessibility2 Implementation 2009
                 }
             }
             else
@@ -1200,7 +1190,6 @@ void FrameSelector::GetFocus()
     mxImpl->DoInvalidate( false );
     if( mxImpl->mxAccess.is() )
         mxImpl->mpAccess->NotifyFocusListeners( sal_True );
-	//IAccessibility2 Implementation 2009-----
 	if (IsAnyBorderSelected())
 	{
 		FrameBorderType borderType = FRAMEBORDER_NONE;
@@ -1224,7 +1213,6 @@ void FrameSelector::GetFocus()
 	}
 	for( SelFrameBorderIter aIt( mxImpl->maEnabBorders ); aIt.Is(); ++aIt )
 			mxImpl->SetBorderState( **aIt, FRAMESTATE_SHOW );
-	//-----IAccessibility2 Implementation 2009
     Control::GetFocus();
 }
 

Modified: openoffice/branches/l10n40/main/svx/source/dialog/sdstring.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/dialog/sdstring.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/dialog/sdstring.src (original)
+++ openoffice/branches/l10n40/main/svx/source/dialog/sdstring.src Sun Dec  1 11:40:24 2013
@@ -1187,7 +1187,6 @@ String RID_SVXSTR_GALLERYPROPS_GALTHEME
 	Text [ en-US ] = "Gallery Theme" ;
 };
 
-//IAccessibility2 Implementation 2009-----
 String RID_SVXSTR_GALLERY_THEMEITEMS
 {
 	Text [ en-US ] = "Theme Items";
@@ -1204,4 +1203,3 @@ String RID_SVXSTR_GALLERY_PREVIEW
 {
 	Text [ en-US ] = "Preview";
 };
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/l10n40/main/svx/source/dialog/srchdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/dialog/srchdlg.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/dialog/srchdlg.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/dialog/srchdlg.cxx Sun Dec  1 11:40:24 2013
@@ -70,13 +70,11 @@
 #include <tools/resary.hxx>
 #include <svx/svxdlg.hxx> //CHINA001
 
-//IAccessibility2 Impplementaton 2009-----
 #ifndef _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
 #include <svx/AccessibleSvxFindReplaceDialog.hxx>
 #endif
 using namespace com::sun::star::uno;
 using namespace com::sun::star::accessibility;
-//-----IAccessibility2 Impplementaton 2009
 
 #include <sfx2/layout-pre.hxx>
 
@@ -2516,7 +2514,6 @@ void SvxSearchDialog::SaveToModule_Impl(
     rBindings.GetDispatcher()->Execute( SID_SEARCH_ITEM, SFX_CALLMODE_SLOT, ppArgs );
 }
 
-//IAccessible2 Implementation 2009-----
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > 
 		SvxSearchDialog::GetComponentInterface( sal_Bool bCreate )
 {
@@ -2531,7 +2528,6 @@ void SvxSearchDialog::SaveToModule_Impl(
 	else
 		return xPeer;
 }
-//-----IAccessible2 Implementation 2009
 
 // class SvxSearchDialogWrapper ------------------------------------------
 

Modified: openoffice/branches/l10n40/main/svx/source/fmcomp/fmgridcl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/fmcomp/fmgridcl.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/fmcomp/fmgridcl.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/fmcomp/fmgridcl.cxx Sun Dec  1 11:40:24 2013
@@ -1648,7 +1648,7 @@ void FmGridControl::InitColumnsByModels(
 		Reference< ::com::sun::star::beans::XPropertySet > xCol;
 		::cppu::extractInterface(xCol, xColumns->getByIndex(i));
 
-		aName  = (const sal_Unicode*)::comphelper::getString(xCol->getPropertyValue(FM_PROP_LABEL));
+		aName  = ::comphelper::getString( xCol->getPropertyValue(FM_PROP_LABEL)).getStr();
 
 		aWidth = xCol->getPropertyValue(FM_PROP_WIDTH);
 		sal_Int32 nWidth = 0;

Modified: openoffice/branches/l10n40/main/svx/source/fmcomp/gridcell.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/fmcomp/gridcell.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/fmcomp/gridcell.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/fmcomp/gridcell.cxx Sun Dec  1 11:40:24 2013
@@ -1539,7 +1539,7 @@ String DbFormattedField::GetFormatText(c
         {
             // Hier kann ich nicht mit einem double arbeiten, da das Feld mir keines liefern kann.
             // Also einfach den Text vom ::com::sun::star::util::NumberFormatter in die richtige ::com::sun::star::form::component::Form brinden lassen.
-            aText = (const sal_Unicode*)_rxField->getString();
+            aText = _rxField->getString().getStr();
             if (_rxField->wasNull())
                 return aText;
             ((FormattedField*)m_pPainter)->SetTextFormatted(aText);
@@ -2957,7 +2957,7 @@ sal_Bool DbFilterField::commitControl()
             {
                 sal_Int16 nPos = (sal_Int16)static_cast<ListBox*>(m_pWindow)->GetSelectEntryPos();
                 if ( ( nPos >= 0 ) && ( nPos < m_aValueList.getLength() ) )
-                    aText = (const sal_Unicode*)m_aValueList.getConstArray()[nPos];
+                    aText = m_aValueList.getConstArray()[nPos];
             }
 
             if (m_aText != aText)

Modified: openoffice/branches/l10n40/main/svx/source/form/filtnav.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/form/filtnav.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/form/filtnav.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/form/filtnav.cxx Sun Dec  1 11:40:24 2013
@@ -948,7 +948,7 @@ void FmFilterModel::SetTextForItem(FmFil
 
 	m_pAdapter->setText(nParentPos, pItem, rText);
 
-	if (!rText)
+	if( rText.isEmpty() )
 		Remove(pItem);
 	else
 	{

Modified: openoffice/branches/l10n40/main/svx/source/form/fmsrcimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/form/fmsrcimp.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/form/fmsrcimp.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/form/fmsrcimp.cxx Sun Dec  1 11:40:24 2013
@@ -254,7 +254,7 @@ sal_Bool FmSearchEngine::MoveCursor()
 #if OSL_DEBUG_LEVEL > 0
         String sDebugMessage;
         sDebugMessage.AssignAscii("FmSearchEngine::MoveCursor : catched a DatabaseException (");
-        sDebugMessage += (const sal_Unicode*)e.SQLState;
+        sDebugMessage += e.SQLState.getStr();
         sDebugMessage.AppendAscii(") !");
         DBG_ERROR(ByteString(sDebugMessage, RTL_TEXTENCODING_ASCII_US).GetBuffer());
 #endif
@@ -265,7 +265,7 @@ sal_Bool FmSearchEngine::MoveCursor()
 #if OSL_DEBUG_LEVEL > 0
         UniString sDebugMessage;
         sDebugMessage.AssignAscii("FmSearchEngine::MoveCursor : catched an Exception (");
-        sDebugMessage += (const sal_Unicode*)e.Message;
+        sDebugMessage += e.Message.getStr();
         sDebugMessage.AppendAscii(") !");
         DBG_ERROR(ByteString(sDebugMessage, RTL_TEXTENCODING_ASCII_US).GetBuffer());
 #endif

Modified: openoffice/branches/l10n40/main/svx/source/inc/svxrectctaccessiblecontext.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/inc/svxrectctaccessiblecontext.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/inc/svxrectctaccessiblecontext.hxx (original)
+++ openoffice/branches/l10n40/main/svx/source/inc/svxrectctaccessiblecontext.hxx Sun Dec  1 11:40:24 2013
@@ -43,14 +43,12 @@
 #include <vos/mutex.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/compbase6.hxx>
-//IAccessibility2 Implementation 2009-----
 #ifndef _CPPUHELPER_COMPBASE7_HXX_
 #include <cppuhelper/compbase7.hxx>
 #endif
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #endif
-//-----IAccessibility2 Implementation 2009
 #include <comphelper/broadcasthelper.hxx>
 #include <cppuhelper/implbase6.hxx>
 #include <comphelper/servicehelper.hxx>
@@ -255,10 +253,8 @@ protected:
         @param nIndexOfChild
             Index of the new child which should be selected.
     */
-	// IAccessibility2 implementation 2009. ------
 	//void selectChild( long nIndexOfChild );
 	void selectChild( long nIndexOfChild, sal_Bool bFireFocus = sal_True);
-	// ------ IAccessibility2 implementation 2009.
 
 public:
     /** Selects a new child by point.
@@ -270,12 +266,10 @@ public:
             Button which belongs to the child which should be selected.
     */
 	//void selectChild( RECT_POINT ePoint );
-	// IAccessibility2 implementation 2009. ------
 	void selectChild( RECT_POINT ePoint, sal_Bool bFireFocus = sal_True );
 	void FireChildFocus( RECT_POINT eButton );
 	//Solution: Add the event handling method
 	void FireAccessibleEvent (short nEventId, const ::com::sun::star::uno::Any& rOld, const ::com::sun::star::uno::Any& rNew);
-	// ------ IAccessibility2 implementation 2009.
 	/// Sets the name
 	void setName( const ::rtl::OUString& rName );
 
@@ -345,7 +339,6 @@ inline sal_Bool SvxRectCtlAccessibleCont
 	return rBHelper.bDisposed || rBHelper.bInDispose;
 }
 
-//IAccessibility2 Implementation 2009-----
 typedef ::cppu::WeakAggComponentImplHelper7<
 			::com::sun::star::accessibility::XAccessible,
 			::com::sun::star::accessibility::XAccessibleComponent,
@@ -355,7 +348,6 @@ typedef ::cppu::WeakAggComponentImplHelp
 			::com::sun::star::accessibility::XAccessibleAction,
 			::com::sun::star::lang::XServiceInfo >
 			SvxRectCtlChildAccessibleContext_Base;
-//-----IAccessibility2 Implementation 2009
 
 
 class SvxRectCtlChildAccessibleContext : public SvxRectCtlChildAccessibleContext_Base
@@ -487,13 +479,11 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL
 		getMinimumValue() throw( ::com::sun::star::uno::RuntimeException );
 
-//IAccessibility2 Implementation 2009-----
 	// XAccessibleAction
 	virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException);
 	virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
 	virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
 	//=====  XServiceInfo  ====================================================
 
 	virtual ::rtl::OUString SAL_CALL
@@ -515,10 +505,8 @@ public:
 
 	/// Sets the checked status
 	//void setStateChecked( sal_Bool bChecked );
-	// IAccessibility2 implementation 2009. ------
 	void setStateChecked( sal_Bool bChecked, sal_Bool bFireFocus = sal_True);
 	void FireFocusEvent();
-	// ------ IAccessibility2 implementation 2009.
 protected:
 	virtual Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException );
 

Modified: openoffice/branches/l10n40/main/svx/source/svdraw/svdoashp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/svdraw/svdoashp.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/svdraw/svdoashp.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/svdraw/svdoashp.cxx Sun Dec  1 11:40:24 2013
@@ -3538,7 +3538,6 @@ void SdrObjCustomShape::InvalidateRender
 	mpLastShadowGeometry = 0L;
 }
 
-//IAccessibility2 Implementation 2009-----
 ::rtl::OUString SdrObjCustomShape::GetCustomShapeName()
 {
 	rtl::OUString sShapeName;
@@ -3554,5 +3553,4 @@ void SdrObjCustomShape::InvalidateRender
 	}
 	return sShapeName;
 }
-//-----IAccessibility2 Implementation 2009
 // eof

Modified: openoffice/branches/l10n40/main/svx/source/svdraw/svdobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/svdraw/svdobj.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/svdraw/svdobj.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/svdraw/svdobj.cxx Sun Dec  1 11:40:24 2013
@@ -3185,12 +3185,6 @@ bool SdrObject::HasText() const
     return false;
 }
 
-//IAccessibility2 Implementation 2009-----
-const SdrObject* SdrObject::GetCaptionObj() const
-{
-	return pCaptionObj;
-}
-//-----IAccessibility2 Implementation 2009
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //
 //   @@@@  @@@@@  @@@@@@  @@@@@  @@@@   @@@@  @@@@@@  @@@@  @@@@@  @@  @@

Modified: openoffice/branches/l10n40/main/svx/source/svdraw/svdoole2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/svdraw/svdoole2.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/svdraw/svdoole2.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/svdraw/svdoole2.cxx Sun Dec  1 11:40:24 2013
@@ -844,7 +844,6 @@ void SdrOle2Obj::Init()
 }
 
 // -----------------------------------------------------------------------------
-//IAccessibility2 Implementation 2009-----
 String SdrOle2Obj::GetStyleString()
 {
 	String strStyle;
@@ -856,7 +855,6 @@ String SdrOle2Obj::GetStyleString()
 }
 
 // -----------------------------------------------------------------------------
-//-----IAccessibility2 Implementation 2009
 SdrOle2Obj::~SdrOle2Obj()
 {
     DBG_DTOR( SdrOle2Obj,NULL);

Modified: openoffice/branches/l10n40/main/svx/source/svdraw/svdstr.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/svdraw/svdstr.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/svdraw/svdstr.src (original)
+++ openoffice/branches/l10n40/main/svx/source/svdraw/svdstr.src Sun Dec  1 11:40:24 2013
@@ -2880,7 +2880,6 @@ Bitmap IMG_DIACONTROL_H
     File = "rotation_h.png";
 };
 
-//IAccessibility2 Implementation 2009-----
 String STR_ObjNameSingulFONTWORK
 {
 	Text [ en-US ] = "font work" ;
@@ -2889,5 +2888,4 @@ String STR_ObjNamePluralFONTWORK
 {
 	Text [ en-US ] = "font works" ;
 };
-//-----IAccessibility2 Implementation 2009
 

Modified: openoffice/branches/l10n40/main/svx/source/table/accessiblecell.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/table/accessiblecell.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/table/accessiblecell.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/table/accessiblecell.cxx Sun Dec  1 11:40:24 2013
@@ -251,7 +251,6 @@ Reference<XAccessibleStateSet> SAL_CALL 
 				pStateSet->AddState(AccessibleStateType::VISIBLE);
 
 
-			//IAccessibility2 Implementation 2009-----
 			//Solution:Just when the parent table is not read-only,set states EDITABLE,RESIZABLE,MOVEABLE
 		    ::com::sun::star::uno::Reference<XAccessible> xTempAcc = getAccessibleParent();
 		    if( xTempAcc.is() )
@@ -278,7 +277,6 @@ Reference<XAccessibleStateSet> SAL_CALL 
 					}
 				}
 		    }
-			//-----IAccessibility2 Implementation 2009
             // Create a copy of the state set that may be modified by the
             // caller without affecting the current state set.
             xStateSet = Reference<XAccessibleStateSet>(new ::utl::AccessibleStateSetHelper (*pStateSet));
@@ -602,7 +600,6 @@ sal_Int32 SAL_CALL AccessibleCell::getAc
     return mnIndexInParent;
 }
 
-//IAccessibility2 Implementation 2009-----
 sdr::table::CellRef AccessibleCell::getCellRef()
 {
 	return mxCell;
@@ -666,7 +663,6 @@ void AccessibleCell::UpdateChildren()
 	if (mpText)						
 		mpText->UpdateChildren();
 }
-//-----IAccessibility2 Implementation 2009
 
 /* MT: Above getAccessibleName was introduced with IA2 CWS, while below was introduce in 3.3 meanwhile. Check which one is correct
 If this is correct, we also don't need 	sdr::table::CellRef getCellRef(), UpdateChildren(), getCellName( sal_Int32 nCol, sal_Int32 nRow ) above

Modified: openoffice/branches/l10n40/main/svx/source/table/accessibletableshape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/table/accessibletableshape.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/table/accessibletableshape.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/table/accessibletableshape.cxx Sun Dec  1 11:40:24 2013
@@ -40,11 +40,9 @@
 #include <algorithm>
 
 #include <cppuhelper/implbase1.hxx>
-//IAccessibility2 Implementation 2009-----
 #include <svx/svdotable.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
-//-----IAccessibility2 Implementation 2009
 
 using ::rtl::OUString;
 
@@ -99,21 +97,17 @@ public:
 	Reference< XTable > mxTable;
 	AccessibleCellMap maChildMap;
 	Reference< XAccessible> mxAccessible;
-	//IAccessibility2 Implementation 2009-----
 	sal_Int32 mRowCount, mColCount;
 	//get the cached AccessibleCell from XCell
 	Reference< AccessibleCell > getAccessibleCell (Reference< XCell > xCell);
-	//-----IAccessibility2 Implementation 2009
 };
 
 //-----------------------------------------------------------------------------
 
 AccessibleTableShapeImpl::AccessibleTableShapeImpl( AccessibleShapeTreeInfo& rShapeTreeInfo )
 : mrShapeTreeInfo( rShapeTreeInfo )
-//IAccessibility2 Implementation 2009-----
 , mRowCount(0)
 , mColCount(0)
-//-----IAccessibility2 Implementation 2009
 {
 }
 
@@ -128,7 +122,6 @@ void AccessibleTableShapeImpl::init( con
 	{
 		Reference< XModifyListener > xListener( this );
 		mxTable->addModifyListener( xListener );
-		//IAccessibility2 Implementation 2009-----
 		//register the listener with table model
 		Reference< ::com::sun::star::view::XSelectionSupplier > xSelSupplier(xTable, UNO_QUERY);
 		Reference< ::com::sun::star::view::XSelectionChangeListener > xSelListener( xAccessible, UNO_QUERY );
@@ -150,7 +143,6 @@ void AccessibleTableShapeImpl::dispose()
 		{
 			(*iter).second->dispose();
 		}
-		//-----IAccessibility2 Implementation 2009
 		Reference< XModifyListener > xListener( this );
 		mxTable->removeModifyListener( xListener );
 		mxTable.clear();
@@ -173,7 +165,6 @@ Reference< AccessibleCell > AccessibleTa
 }
 
 //-----------------------------------------------------------------------------
-//-----IAccessibility2 Implementation 2009
 Reference< XAccessible > AccessibleTableShapeImpl::getAccessibleChild( sal_Int32 nChildIndex ) throw(IndexOutOfBoundsException)
 {
 	sal_Int32 nColumn = 0, nRow = 0;
@@ -193,9 +184,7 @@ Reference< XAccessible > AccessibleTable
 		
 		rtl::Reference< AccessibleCell > xAccessibleCell( new AccessibleCell( mxAccessible, xCellRef, nChildIndex, mrShapeTreeInfo ) );
 
-		//IAccessibility2 Implementation 2009-----
 		xAccessibleCell->Init();
-		//-----IAccessibility2 Implementation 2009
 		maChildMap[xCell] = xAccessibleCell;
 
         xAccessibleCell->Init();
@@ -242,7 +231,6 @@ void SAL_CALL AccessibleTableShapeImpl::
 		const sal_Int32 nRowCount = mxTable->getRowCount();
 		const sal_Int32 nColCount = mxTable->getColumnCount();
 
-		//IAccessibility2 Implementation 2009-----
 		sal_Bool bRowOrColumnChanged = sal_False;
 		if (mRowCount != nRowCount || mColCount != nColCount )
 		{
@@ -250,7 +238,6 @@ void SAL_CALL AccessibleTableShapeImpl::
 			mRowCount = nRowCount;
 			mColCount = nColCount;
 		}
-		//-----IAccessibility2 Implementation 2009
 		sal_Int32 nChildIndex = 0;
 
 		for( sal_Int32 nRow = 0; nRow < nRowCount; ++nRow )
@@ -290,7 +277,6 @@ void SAL_CALL AccessibleTableShapeImpl::
 						// xAccessibleCell->ResetState(AccessibleStateType::OFFSCREEN);
 						xAccessibleCell->SetState(AccessibleStateType::SHOWING);
 					}
-					//-----IAccessibility2 Implementation 2009
 
 					// move still existing cell from temporary child map to our child map
 					maChildMap[xCell] = xAccessibleCell;
@@ -306,7 +292,6 @@ void SAL_CALL AccessibleTableShapeImpl::
 					xAccessibleCell->Init();
 					maChildMap[xCell] = xAccessibleCell;
 				}
-				//-----IAccessibility2 Implementation 2009
 
 				++nChildIndex;
 			}
@@ -322,7 +307,6 @@ void SAL_CALL AccessibleTableShapeImpl::
 		//IAccessibility2 Implementation 2009-----, notify bridge to update the acc cache. 
 		AccessibleTableShape *pAccTable = dynamic_cast <AccessibleTableShape *> (mxAccessible.get());
 		pAccTable->CommitChange(AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(), Any());
-		//-----IAccessibility2 Implementation 2009
 	}
 	catch( Exception& )
 	{
@@ -390,7 +374,6 @@ SvxTableController* AccessibleTableShape
 
 Any SAL_CALL AccessibleTableShape::queryInterface( const Type& aType ) throw (RuntimeException)
 {
-	//IAccessibility2 Implementation 2009-----
 	if ( aType == ::getCppuType((Reference<XAccessibleTableSelection> *)0) )
     {
 		Reference<XAccessibleTableSelection> xThis( this );
@@ -399,7 +382,6 @@ Any SAL_CALL AccessibleTableShape::query
 		return aRet;
 	}
 	else
-	//-----IAccessibility2 Implementation 2009
 	return AccessibleTableShape_Base::queryInterface( aType );
 }
 
@@ -548,7 +530,6 @@ sal_Int32 SAL_CALL AccessibleTableShape:
 
 Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHeaders(  ) throw (RuntimeException)
 {
-	//IAccessibility2 Implementation 2009-----
 	//Reference< XAccessibleTable > xRet( this ); // todo
 	Reference< XAccessibleTable > xRet;
 	SvxTableController* pController = getTableController();
@@ -560,7 +541,6 @@ Reference< XAccessibleTable > SAL_CALL A
 			xRet.set( pTableHeader );
 		}
 	}
-	//-----IAccessibility2 Implementation 2009
 	return xRet;
 }
 
@@ -568,7 +548,6 @@ Reference< XAccessibleTable > SAL_CALL A
 
 Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumnHeaders(  ) throw (RuntimeException)
 {
-	//IAccessibility2 Implementation 2009-----
 	//Reference< XAccessibleTable > xRet( this ); // todo
 	Reference< XAccessibleTable > xRet;
 	SvxTableController* pController = getTableController();
@@ -580,7 +559,6 @@ Reference< XAccessibleTable > SAL_CALL A
 			xRet.set( pTableHeader );
 		}
 	}
-	//-----IAccessibility2 Implementation 2009
 	return xRet;
 }
 
@@ -588,7 +566,6 @@ Reference< XAccessibleTable > SAL_CALL A
 
 Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleRows(  ) throw (RuntimeException)
 {
-	//IAccessibility2 Implementation 2009-----
 	/*Sequence< sal_Int32 > aRet;*/
 	sal_Int32 nRow = getAccessibleRowCount();
 	::std::vector< sal_Bool > aSelected( nRow, sal_True );
@@ -621,14 +598,12 @@ Sequence< sal_Int32 > SAL_CALL Accessibl
 	}
 
 	return aRet;
-	//-----IAccessibility2 Implementation 2009
 }
 
 //--------------------------------------------------------------------
 
 Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumns(  ) throw (RuntimeException)
 {
-	//IAccessibility2 Implementation 2009-----
 	/*Sequence< sal_Int32 > aRet;*/
 	sal_Int32 nColumn = getAccessibleColumnCount();
 	::std::vector< sal_Bool > aSelected( nColumn, sal_True );
@@ -661,7 +636,6 @@ Sequence< sal_Int32 > SAL_CALL Accessibl
 	}
 
 	return aRet;
-	//-----IAccessibility2 Implementation 2009
 }
 
 //--------------------------------------------------------------------
@@ -670,13 +644,11 @@ sal_Bool SAL_CALL AccessibleTableShape::
 {
     ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
 	checkCellPosition( 0, nRow );
-	//IAccessibility2 Implementation 2009-----
 	SvxTableController* pController = getTableController();
 	if( pController )
 	{
 		return pController->isRowSelected( nRow );
 	}
-	//-----IAccessibility2 Implementation 2009
 	return sal_False;
 }
 
@@ -686,13 +658,11 @@ sal_Bool SAL_CALL AccessibleTableShape::
 {
     ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
 	checkCellPosition( nColumn, 0 );
-	//IAccessibility2 Implementation 2009-----
 	SvxTableController* pController = getTableController();
 	if( pController )
 	{
 		return pController->isColumnSelected( nColumn );
 	}
-	//-----IAccessibility2 Implementation 2009
 	return sal_False;
 }
 
@@ -771,10 +741,8 @@ sal_Int32 SAL_CALL AccessibleTableShape:
     ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
 	sal_Int32 nColumn = 0, nRow = 0;
 	mxImpl->getColumnAndRow( nChildIndex, nColumn, nRow );
-	//IAccessibility2 Implementation 2009-----
 	//return nChildIndex;
 	return nColumn;
-	//-----IAccessibility2 Implementation 2009
 }
 
 //--------------------------------------------------------------------
@@ -813,11 +781,9 @@ sal_Bool SAL_CALL AccessibleTableShape::
 	CellPos aPos;
 	mxImpl->getColumnAndRow( nChildIndex, aPos.mnCol, aPos.mnRow );
 
-	//IAccessibility2 Implementation 2009-----
 	// Para order is not correct
 	//return isAccessibleSelected(aPos.mnCol, aPos.mnRow);
 	return isAccessibleSelected(aPos.mnRow, aPos.mnCol);
-	//-----IAccessibility2 Implementation 2009
 }
 
 //--------------------------------------------------------------------
@@ -868,7 +834,6 @@ Reference< XAccessible > SAL_CALL Access
 {
     ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
 
-	//IAccessibility2 Implementation 2009-----
 	/*SvxTableController* pController = getTableController();
 	if( pController && pController->hasSelectedCells() )
 	{
@@ -905,7 +870,6 @@ Reference< XAccessible > SAL_CALL Access
     }
 
 	return getAccessibleChild( nChildIndex );
-	//-----IAccessibility2 Implementation 2009
 }
 
 //--------------------------------------------------------------------
@@ -938,7 +902,6 @@ void SAL_CALL AccessibleTableShape::dese
 }
 //--------------------------------------------------------------------
 
-//IAccessibility2 Implementation 2009-----
 //=====  XAccessibleTableSelection  ============================================
 sal_Bool SAL_CALL AccessibleTableShape::selectRow( sal_Int32 row ) 
 throw (IndexOutOfBoundsException, RuntimeException) 
@@ -1109,7 +1072,6 @@ sal_Bool AccessibleTableShape::ResetStat
 {
 	return AccessibleContextBase::ResetState (aState);
 }
-//-----IAccessibility2 Implementation 2009
 void AccessibleTableShape::checkCellPosition( sal_Int32 nCol, sal_Int32 nRow ) throw ( IndexOutOfBoundsException )
 {
 	if( (nCol >= 0) && (nRow >= 0) && mxImpl->mxTable.is() && (nCol < mxImpl->mxTable->getColumnCount()) && (nRow < mxImpl->mxTable->getRowCount()) )
@@ -1118,7 +1080,6 @@ void AccessibleTableShape::checkCellPosi
 	throw IndexOutOfBoundsException();
 }
 
-//IAccessibility2 Implementation 2009-----
 AccessibleTableHeaderShape::AccessibleTableHeaderShape( AccessibleTableShape* pTable, sal_Bool bRow )
 {
 	mpTable = pTable;
@@ -1446,5 +1407,4 @@ throw (IndexOutOfBoundsException, Runtim
 		return sal_True;
 	}
 }
-//-----IAccessibility2 Implementation 2009
 }

Modified: openoffice/branches/l10n40/main/svx/source/table/tablecontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/table/tablecontroller.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/table/tablecontroller.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/table/tablecontroller.cxx Sun Dec  1 11:40:24 2013
@@ -2612,7 +2612,6 @@ IMPL_LINK( SvxTableController, UpdateHdl
 	return 0;
 }
 
-//IAccessibility2 Implementation 2009-----
 sal_Bool SvxTableController::selectRow( sal_Int32 row )
 {
 	if( !mxTable.is() )
@@ -2697,5 +2696,4 @@ sal_Bool SvxTableController::isColumnHea
 
 	return aSettings.mbUseFirstColumn;
 }
-//-----IAccessibility2 Implementation 2009
 } }

Modified: openoffice/branches/l10n40/main/svx/source/tbxctrls/colrctrl.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/tbxctrls/colrctrl.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/tbxctrls/colrctrl.src (original)
+++ openoffice/branches/l10n40/main/svx/source/tbxctrls/colrctrl.src Sun Dec  1 11:40:24 2013
@@ -50,10 +50,8 @@ DockingWindow RID_SVXCTRL_COLOR
 	};
 };
 
-// IAccessibility2 implementation 2009. ------
 String STR_COLORTABLE
 {
 	Text [ en-US ] = "Color Palette" ;
 };
-// ------ IAccessibility2 implementation 2009.
 

Modified: openoffice/branches/l10n40/main/svx/source/tbxctrls/tbcontrl.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/tbxctrls/tbcontrl.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/tbxctrls/tbcontrl.src (original)
+++ openoffice/branches/l10n40/main/svx/source/tbxctrls/tbcontrl.src Sun Dec  1 11:40:24 2013
@@ -181,11 +181,9 @@ String RID_SVXSTR_MORE
 	Text [ en-US ] = "More...";
 };
 
-//IAccessibility2 Implementation 2009-----
 String RID_SVXSTR_TEXTCOLOR
 {
 	Text [ en-US ] = "Font color";
 };
-//-----IAccessibility2 Implementation 2009
 // ********************************************************************** EOF
 

Modified: openoffice/branches/l10n40/main/svx/source/unodraw/unoprov.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/unodraw/unoprov.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/unodraw/unoprov.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/unodraw/unoprov.cxx Sun Dec  1 11:40:24 2013
@@ -778,7 +778,6 @@ SfxItemPropertyMapEntry* ImplGetSvxTable
 	    { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT),	OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
 	    	//IAccessibility2 Implementation 2009-----, the name property of table should also be exported. 
 		{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_NAME), 		SDRATTR_OBJECTNAME				, &::getCppuType((const ::rtl::OUString*)0),	0,	0},
-		//-----IAccessibility2 Implementation 2009
 		{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE),		OWN_ATTR_MISC_OBJ_TITLE			, &::getCppuType((const ::rtl::OUString*)0),	0,	0},
 		{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION),	OWN_ATTR_MISC_OBJ_DESCRIPTION	, &::getCppuType((const ::rtl::OUString*)0),	0,	0},
 		{ MAP_CHAR_LEN("Model"),						OWN_ATTR_OLEMODEL				, &::com::sun::star::table::XTable::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},

Modified: openoffice/branches/l10n40/main/svx/source/unodraw/unoshtxt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/unodraw/unoshtxt.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/unodraw/unoshtxt.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/unodraw/unoshtxt.cxx Sun Dec  1 11:40:24 2013
@@ -52,10 +52,8 @@
 #include <comphelper/processfactory.hxx>
 #include <vos/mutex.hxx>
 
-//IAccessibility2 Implementation 2009-----
 #include <svx/svdotable.hxx>
 #include <../table/cell.hxx>
-//-----IAccessibility2 Implementation 2009
 
 #include <svx/sdrpaintwindow.hxx>
 
@@ -413,7 +411,6 @@ void SvxTextEditSourceImpl::Notify( SfxB
 							}
 						}
 					}
-					//-----IAccessibility2 Implementation 2009				
                     // invalidate old forwarder
                     if( !mbForwarderIsEditMode )
                     {

Modified: openoffice/branches/l10n40/main/sw/inc/PostItMgr.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/inc/PostItMgr.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/inc/PostItMgr.hxx (original)
+++ openoffice/branches/l10n40/main/sw/inc/PostItMgr.hxx Sun Dec  1 11:40:24 2013
@@ -282,10 +282,8 @@ class SwPostItMgr: public SfxListener
 			sal_uInt16 SearchReplace(const SwFmtFld &pFld, const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward);
 			sal_uInt16 FinishSearchReplace(const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward);
 
-			//IAccessibility2 Implementation 2009-----
 			// get the PostIt window by index
 			sal_Int32 GetPostItCount() {return mvPostItFlds.size();};
-			//-----IAccessibility2 Implementation 2009
             void AssureStdModeAtShell();
 
             void ConnectSidebarWinToFrm( const SwFrm& rFrm,

Modified: openoffice/branches/l10n40/main/sw/inc/access.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/inc/access.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/inc/access.hrc (original)
+++ openoffice/branches/l10n40/main/sw/inc/access.hrc Sun Dec  1 11:40:24 2013
@@ -48,7 +48,6 @@
 #define STR_ACCESS_ANNOTATION_BUTTON_NAME       (RC_ACCESS_BEGIN + 20)
 #define STR_ACCESS_ANNOTATION_BUTTON_DESC       (RC_ACCESS_BEGIN + 21)
 
-//IAccessibility2 Implementation 2009-----
 #define STR_ACCESS_PREVIEW_DOC_NAME				(RC_ACCESS_BEGIN + 22)
 //#define STR_ACCESS_PREVIEW_DOC_DESC			(RC_ACCESS_BEGIN + 23)
 #define STR_ACCESS_PREVIEW_DOC_SUFFIX			(RC_ACCESS_BEGIN + 24)
@@ -62,7 +61,6 @@
 #define STR_ACCESS_FORMULA_TYPE					(RC_ACCESS_BEGIN + 32)
 #define STR_ACCESS_FORMULA_TEXT					(RC_ACCESS_BEGIN + 33)
 #define STR_ACCESS_FORMULA_TOOLBAR				(RC_ACCESS_BEGIN + 34)
-//-----IAccessibility2 Implementation 2009
 
 #define ACCESS_ACT_END STR_ACCESS_FORMULA_TOOLBAR
 

Modified: openoffice/branches/l10n40/main/sw/inc/accmap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/inc/accmap.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/inc/accmap.hxx (original)
+++ openoffice/branches/l10n40/main/sw/inc/accmap.hxx Sun Dec  1 11:40:24 2013
@@ -32,14 +32,12 @@
 #include <tools/debug.hxx>
 #include <tools/fract.hxx>
 
-//IAccessibility2 Implementation 2009-----
 #include <svx/AccessibleControlShape.hxx>
 #include <svx/AccessibleShape.hxx>
 #include "fesh.hxx"
 #include <vector>
 #include <set>
 class SwAccessibleParagraph;
-//-----IAccessibility2 Implementation 2009
 
 class ViewShell;
 class Rectangle;
@@ -122,7 +120,6 @@ class SwAccessibleMap : public ::accessi
 	void InvalidateCursorPosition(
 		const ::com::sun::star::uno::Reference<
 			::com::sun::star::accessibility::XAccessible>& rAcc );
-	//IAccessibility2 Implementation 2009-----
 	void DoInvalidateShapeSelection(sal_Bool bInvalidateFocusMode = sal_False);
 	
 	//Replace by DoInvalidateShapeSelection
@@ -133,7 +130,6 @@ class SwAccessibleMap : public ::accessi
 	SwAccessibleContextMap_Impl *mpSeletedFrmMap;
 	//IvalidateShapeInParaSelection() method is reponsible for the updating the selected states of the objects.
 	void InvalidateShapeInParaSelection();
-	//-----IAccessibility2 Implementation 2009
 
     void _InvalidateRelationSet( const SwFrm* pFrm, sal_Bool bFrom );
 
@@ -190,7 +186,6 @@ public:
     {
         return mpVSh;
     }
-	//IAccessibility2 Implementation 2009-----
 	sal_Bool IsInSameLevel(const SdrObject* pObj, const SwFEShell* pFESh);
 	void AddShapeContext(const SdrObject *pObj,
 							 ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccShape);
@@ -198,7 +193,6 @@ public:
 	void AddGroupContext(const SdrObject *pParentObj,
 					::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccParent);
 	void RemoveGroupContext(const SdrObject *pParentObj, ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccParent);
-	//-----IAccessibility2 Implementation 2009
 
     const SwRect& GetVisArea() const;
 
@@ -239,11 +233,9 @@ public:
 
 	void InvalidateCursorPosition( const SwFrm *pFrm );
 	void InvalidateFocus();
-	//IAccessibility2 Implementation 2009-----
 	void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage);
 	void FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection);
 	void FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn);
-	//-----IAccessibility2 Implementation 2009
 	void SetCursorContext(
 		const ::vos::ORef < SwAccessibleContext >& rCursorContext );
 
@@ -321,14 +313,12 @@ public:
 		const long _nIndex,
 		const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo
 	)	throw (::com::sun::star::uno::RuntimeException);
-	//IAccessibility2 Implementation 2009-----
 	virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel
 		(::com::sun::star::beans::XPropertySet* pSet) 
 		throw (::com::sun::star::uno::RuntimeException);
 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >   GetAccessibleCaption (
 		const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape)
     throw (::com::sun::star::uno::RuntimeException);
-	//-----IAccessibility2 Implementation 2009
 
     // additional Core/Pixel conversions for internal use; also works
     // for preview
@@ -358,7 +348,6 @@ private:
     */
     void GetMapMode( const Point& _rPoint,
                      MapMode&     _orMapMode ) const;
-//IAccessibility2 Implementation 2009-----
 public:
 	virtual sal_Bool IsDocumentSelAll();
 
@@ -369,6 +358,5 @@ public:
     typedef std::set< SwAccessibleParagraph* >  SET_PARA;
     SET_PARA m_setParaAdd;
     SET_PARA m_setParaRemove;
-    //-----IAccessibility2 Implementation 2009
 };
 #endif

Modified: openoffice/branches/l10n40/main/sw/inc/crsrsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/inc/crsrsh.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/inc/crsrsh.hxx (original)
+++ openoffice/branches/l10n40/main/sw/inc/crsrsh.hxx Sun Dec  1 11:40:24 2013
@@ -868,13 +868,11 @@ public:
     // is cursor or the point in/over a right to left formatted text?
     sal_Bool IsInRightToLeftText( const Point* pPt = 0 ) const;
 
-    //IAccessibility2 Implementation 2009-----
     void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage);
 	SwFrm* oldColFrm;
 	bool   bColumnChange();
     void FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection);
     void FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn);
-    //-----IAccessibility2 Implementation 2009
     // If the current cursor position is inside a hidden range, the hidden range
     // is selected and true is returned:
     bool SelectHiddenRange();

Modified: openoffice/branches/l10n40/main/sw/inc/doc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/inc/doc.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/inc/doc.hxx (original)
+++ openoffice/branches/l10n40/main/sw/inc/doc.hxx Sun Dec  1 11:40:24 2013
@@ -481,9 +481,7 @@ private:
     bool mbClipBoard             : 1;    // true: this document represents the clipboard
     bool mbColumnSelection       : 1;    // true: this content has bee created by a column selection
                                          //       (clipboard docs only)
-	//IAccessibility2 Implementation 2009-----
 	sal_Bool	bIsPrepareSelAll		:1;
-	//-----IAccessibility2 Implementation 2009
 
 #ifdef DBG_UTIL
     bool mbXMLExport : 1;                // sal_True: during XML export
@@ -704,7 +702,6 @@ private:
      SwFmt *_MakeFrmFmt(const String &, SwFmt *, sal_Bool, sal_Bool );
      SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, sal_Bool, sal_Bool );
 
-//IAccessibility2 Implementation 2009-----
 private:
 	sal_Bool bReadOnly;
 	String msDocAccTitle;
@@ -722,7 +719,6 @@ public:
 	virtual sal_Bool getDocReadOnly() const { return bReadOnly; }
 	virtual void setDocAccTitle( const String& rTitle ) { msDocAccTitle = rTitle; }
 	virtual const String getDocAccTitle() const { return msDocAccTitle; }
-	//-----IAccessibility2 Implementation 2009
 
 	enum DocumentType {
 		DOCTYPE_NATIVE,
@@ -1063,14 +1059,12 @@ public:
     bool InXMLExport() const            { return mbXMLExport; }
     void SetXMLExport( bool bFlag )     { mbXMLExport = bFlag; }
 #endif
-	//-----IAccessibility2 Implementation 2009
 	void SetSelAll( sal_Bool bSel ) 
 	{
 		bIsPrepareSelAll = bSel;
 	}
 	sal_Bool IsPrepareSelAll()  { return bIsPrepareSelAll; }
 	void SetPrepareSelAll() { bIsPrepareSelAll = sal_True; }
-	//IAccessibility2 Implementation 2009-----
 
     void SetContainsAtPageObjWithContentAnchor( const bool bFlag )
     {

Modified: openoffice/branches/l10n40/main/sw/inc/docsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/inc/docsh.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/inc/docsh.hxx (original)
+++ openoffice/branches/l10n40/main/sw/inc/docsh.hxx Sun Dec  1 11:40:24 2013
@@ -304,13 +304,11 @@ public:
     // read by the binary filter:
     virtual void UpdateLinks();
     // <--
-	//IAccessibility2 Implementation 2009-----
 	virtual void setDocAccTitle( const String& rTitle );
 	virtual const String getDocAccTitle() const;
 
 	void setDocReadOnly( sal_Bool bReadOnly);
 	sal_Bool getDocReadOnly() const;
-	//-----IAccessibility2 Implementation 2009
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
                                 GetController();
 

Modified: openoffice/branches/l10n40/main/sw/inc/fesh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/inc/fesh.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/inc/fesh.hxx (original)
+++ openoffice/branches/l10n40/main/sw/inc/fesh.hxx Sun Dec  1 11:40:24 2013
@@ -482,10 +482,8 @@ public:
 	sal_uInt16 IsObjSelected() const;	//Liefert gleich die Anzahl der Objekte,
 									//zaehlt aber nicht die Objekte in Gruppen.
 	sal_Bool IsObjSelected( const SdrObject& rObj ) const;
-	//IAccessibility2 Implementation 2009-----
 	sal_Bool IsObjSameLevelWithMarked(const SdrObject* pObj) const;
     const SdrMarkList* GetMarkList() const{ return _GetMarkList(); };
-    //-----IAccessibility2 Implementation 2009
 
 	void EndTextEdit();				//Loescht ggf. das Objekt.
 

Modified: openoffice/branches/l10n40/main/sw/inc/fldbas.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/inc/fldbas.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/inc/fldbas.hxx (original)
+++ openoffice/branches/l10n40/main/sw/inc/fldbas.hxx Sun Dec  1 11:40:24 2013
@@ -138,7 +138,6 @@ enum SwFldTypesEnum
     TYP_DROPDOWN,
 	TYP_END
 };
-//IAccessibility2 Implementation 2009-----
 enum SwAttrFieldTYpe
 {
 	ATTR_NONE,
@@ -149,7 +148,6 @@ enum SwAttrFieldTYpe
 	ATTR_BOOKMARKFLD,
 	ATTR_SETREFATTRFLD
 };
-//-----IAccessibility2 Implementation 2009
 enum SwFileNameFormat
 {
 	FF_BEGIN,

Modified: openoffice/branches/l10n40/main/sw/inc/frmfmt.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/inc/frmfmt.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/inc/frmfmt.hxx (original)
+++ openoffice/branches/l10n40/main/sw/inc/frmfmt.hxx Sun Dec  1 11:40:24 2013
@@ -48,17 +48,13 @@ class SW_DLLPUBLIC SwFrmFmt: public SwFm
         ::com::sun::star::uno::XInterface> m_wXObject;
 
 protected:
-	//IAccessibility2 Implementation 2009-----
 	SwFrmFmt* pCaptionFmt;
-	//-----IAccessibility2 Implementation 2009
 	SwFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
 				SwFrmFmt *pDrvdFrm, sal_uInt16 nFmtWhich = RES_FRMFMT,
 				const sal_uInt16* pWhichRange = 0 )
 	  	: SwFmt( rPool, pFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange),
 				pDrvdFrm, nFmtWhich )
-				//IAccessibility2 Implementation 2009-----
 				,pCaptionFmt( NULL )
-				//-----IAccessibility2 Implementation 2009
 	{}
 
 	SwFrmFmt( SwAttrPool& rPool, const String &rFmtNm,
@@ -66,9 +62,7 @@ protected:
 				const sal_uInt16* pWhichRange = 0 )
 	  	: SwFmt( rPool, rFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange),
 				pDrvdFrm, nFmtWhich )
-				//IAccessibility2 Implementation 2009-----
 				,pCaptionFmt( NULL )
-				//-----IAccessibility2 Implementation 2009
 	{}
 
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue );
@@ -137,11 +131,9 @@ public:
     // <--
 
     virtual String GetDescription() const;
-	//IAccessibility2 Implementation 2009-----
 	sal_Bool HasCaption() const;
 	void SetCaptionFmt(SwFrmFmt* pFmt);
 	SwFrmFmt* GetCaptionFmt() const;
-	//-----IAccessibility2 Implementation 2009	
 
     SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
         ::com::sun::star::uno::XInterface> const& GetXObject() const
@@ -159,10 +151,8 @@ public:
 class SW_DLLPUBLIC SwFlyFrmFmt: public SwFrmFmt
 {
 	friend class SwDoc;
-	//IAccessibility2 Implementation 2009-----
 	String msTitle;
 	String msDesc;
-	//-----IAccessibility2 Implementation 2009
 
     // #i972:
     // it stores the previous position of Prt rectangle from RequestObjectResize

Modified: openoffice/branches/l10n40/main/sw/inc/ndole.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/inc/ndole.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/inc/ndole.hxx (original)
+++ openoffice/branches/l10n40/main/sw/inc/ndole.hxx Sun Dec  1 11:40:24 2013
@@ -66,9 +66,7 @@ public:
     const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetOleRef();
     svt::EmbeddedObjectRef& GetObject();
     const String& GetCurrentPersistName() const { return aName; }
-	//IAccessibility2 Implementation 2009-----
 	String GetStyleString();
-	//-----IAccessibility2 Implementation 2009
 	sal_Bool IsOleRef() const;	//Damit das Objekt nicht unnoetig geladen werden muss.
 #endif
 };

Modified: openoffice/branches/l10n40/main/sw/inc/node.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/inc/node.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/inc/node.hxx (original)
+++ openoffice/branches/l10n40/main/sw/inc/node.hxx Sun Dec  1 11:40:24 2013
@@ -442,12 +442,10 @@ public:
 	 * Dokument. Die Contentframes werden aus dem entsprechenden
 	 * Layout ausgehaengt.
 	 */
-	//IAccessibility2 Implementation 2009-----
 	//Solution:Add an input param to identify if acc table should be disposed
 	//void DelFrms();
 	void DelFrms( sal_Bool bNeedDel = sal_False, sal_Bool bIsAccTableDispose = sal_True );
 	//void DelFrms(sal_Bool bNeedDel = sal_False);//added by zlcdl for al
-	//-----IAccessibility2 Implementation 2009
 
 	/*
 	 * liefert die Anzahl der Elemente des Inhalts des Nodes;



Mime
View raw message