openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1546803 [9/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/accessibilit...
Date Sun, 01 Dec 2013 11:40:35 GMT
Modified: openoffice/branches/l10n40/main/svtools/source/contnr/imivctl1.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/contnr/imivctl1.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/contnr/imivctl1.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/contnr/imivctl1.cxx Sun Dec  1 11:40:24 2013
@@ -1180,9 +1180,7 @@ void SvxIconChoiceCtrl_Impl::SetCursor_I
 		{
 			SelectEntry( pCursor, sal_True, sal_True,  sal_False, bPaintSync );
 			aCurSelectionRect = GetEntryBoundRect( pCursor );
-			//IAccessibility2 Implementation 2009-----
 			CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor );
-			//-----IAccessibility2 Implementation 2009
 		}
 	}
 }

Modified: openoffice/branches/l10n40/main/svtools/source/contnr/svimpbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/contnr/svimpbox.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/contnr/svimpbox.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/contnr/svimpbox.cxx Sun Dec  1 11:40:24 2013
@@ -300,9 +300,7 @@ void SvImpLBox::Clear()
 	// #97680# ---------
 	aContextBmpWidthVector.clear();
 
-//IAccessibility2 Implementation 2009-----
 	CallEventListeners( VCLEVENT_LISTBOX_ITEMREMOVED, NULL );
-//-----IAccessibility2 Implementation 2009
 }
 
 // *********************************************************************
@@ -650,9 +648,7 @@ void SvImpLBox::SetCursor( SvLBoxEntry* 
 		if(!bForceNoSelect && bSimpleTravel && !(nFlags & F_DESEL_ALL) && GetUpdateMode())
 		{
 			pView->Select( pCursor, sal_True );
-			//IAccessibility2 Implementation 2009-----
 			CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pCursor );
-			//-----IAccessibility2 Implementation 2009
 		}
 		// Mehrfachselektion: Im Cursor-Move selektieren, wenn
 		// nicht im Add-Mode (Ctrl-F8)
@@ -662,19 +658,15 @@ void SvImpLBox::SetCursor( SvLBoxEntry* 
 				 !bForceNoSelect )
 		{
 			pView->Select( pCursor, sal_True );
-			//IAccessibility2 Implementation 2009-----
 			CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pCursor );
-			//-----IAccessibility2 Implementation 2009
 		}
 		else
 		{
 			ShowCursor( sal_True );
-			//IAccessibility2 Implementation 2009-----
 			if (bForceNoSelect && GetUpdateMode())
 			{
 				CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pCursor);
 			}
-			//-----IAccessibility2 Implementation 2009
 		}
 
 		if( pAnchor )
@@ -1716,9 +1708,7 @@ void SvImpLBox::EntrySelected( SvLBoxEnt
 
 void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry )
 {
-	//IAccessibility2 Implementation 2009-----
 	CallEventListeners( VCLEVENT_LISTBOX_ITEMREMOVED , pEntry );
-	//-----IAccessibility2 Implementation 2009
 
 	DestroyAnchor();
 
@@ -2379,10 +2369,8 @@ sal_Bool SvImpLBox::KeyInput( const KeyE
 
 		case KEY_LEFT:
 		{
-            //IAccessibility2 Implementation 2009-----
             // if ( bIsCellFocusEnabled )
             if ( bIsCellFocusEnabled && pCursor )
-			//-----IAccessibility2 Implementation 2009
             {
                 if ( nCurTabPos > FIRST_ENTRY_TAB )
                 {

Modified: openoffice/branches/l10n40/main/svtools/source/contnr/svtabbx.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/contnr/svtabbx.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/contnr/svtabbx.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/contnr/svtabbx.cxx Sun Dec  1 11:40:24 2013
@@ -1182,10 +1182,8 @@ void SvHeaderTabListBox::FillAccessibleS
 			sal_uInt16 nCurColumn = GetCurrColumn();
 			if ( IsCellVisible( nCurRow, nCurColumn ) )
 				_rStateSet.AddState( AccessibleStateType::VISIBLE );
-			//IAccessibility2 Implementation 2009-----
 			if ( IsEnabled() )
 				_rStateSet.AddState( AccessibleStateType::ENABLED );
-			//-----IAccessibility2 Implementation 2009
 			_rStateSet.AddState( AccessibleStateType::TRANSIENT );
 			break;
 		}
@@ -1196,10 +1194,8 @@ void SvHeaderTabListBox::FillAccessibleS
 			_rStateSet.AddState( AccessibleStateType::VISIBLE );
 			_rStateSet.AddState( AccessibleStateType::FOCUSABLE );
 			_rStateSet.AddState( AccessibleStateType::TRANSIENT );
-			//IAccessibility2 Implementation 2009-----
 			if ( IsEnabled() )
 				_rStateSet.AddState( AccessibleStateType::ENABLED );
-			//-----IAccessibility2 Implementation 2009
 			break;
 		}
         default:
@@ -1224,7 +1220,6 @@ void SvHeaderTabListBox::FillAccessibleS
 		_rStateSet.AddState( AccessibleStateType::ACTIVE );
 		_rStateSet.AddState( AccessibleStateType::SELECTED );
 	}
-	//IAccessibility2 Implementation 2009-----
 	if ( IsEnabled() )
 		_rStateSet.AddState( AccessibleStateType::ENABLED );
 }

Modified: openoffice/branches/l10n40/main/svtools/source/contnr/svtreebx.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/contnr/svtreebx.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/contnr/svtreebx.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/contnr/svtreebx.cxx Sun Dec  1 11:40:24 2013
@@ -346,7 +346,6 @@ String SvTreeListBox::GetEntryText(SvLBo
 	return pItem->GetText();
 }
 
-//IAccessibility2 Implementation 2009-----
 String  SvTreeListBox::GetEntryAltText( SvLBoxEntry* ) const
 {
 	String tmp;
@@ -428,7 +427,6 @@ String SvTreeListBox::SearchEntryTextWit
 		sRet = sRet.Erase(sRet.Len() - 1);
 	return sRet;
 }
-//-----IAccessibility2 Implementation 2009
 String SvTreeListBox::SearchEntryText( SvLBoxEntry* pEntry ) const
 {
 	DBG_CHKTHIS(SvTreeListBox,0);
@@ -890,18 +888,15 @@ void SvTreeListBox::RequestingChilds( Sv
 void SvTreeListBox::GetFocus()
 {
 	DBG_CHKTHIS(SvTreeListBox,0);
-	//IAccessibility2 Implementation 2009-----
 	//Solution:If there is no item in the tree,draw focus.
 	if( !SvLBox::First())
 	{
 		Invalidate();
 	}
-	//-----IAccessibility2 Implementation 2009
 	pImp->GetFocus();
 	SvLBox::GetFocus();
 
 	SvLBoxEntry* pEntry = FirstSelected();
-	//IAccessibility2 Implementation 2009-----
 	if ( !pEntry )
 	{
 		pEntry = pImp->GetCurrentEntry();
@@ -911,24 +906,19 @@ void SvTreeListBox::GetFocus()
 		if (pEntry != pImp->pCursor)
 			pEntry = pImp->pCursor;
 	}
-	//IAccessibility2 Implementation 2009-----
 	if ( pEntry )
-		//pImp->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pEntry );
 		pImp->CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pEntry );
-	//-----IAccessibility2 Implementation 2009
 
 }
 
 void SvTreeListBox::LoseFocus()
 {
 	DBG_CHKTHIS(SvTreeListBox,0);
-	//IAccessibility2 Implementation 2009-----
 	//Solution:If there is no item in the tree,delete visual focus.
 	if( !SvLBox::First())
 	{
 		Invalidate();
 	}
-	//-----IAccessibility2 Implementation 2009
 	pImp->LoseFocus();
 	SvLBox::LoseFocus();
 }
@@ -1175,7 +1165,6 @@ sal_Bool SvTreeListBox::Select( SvLBoxEn
 		if( bSelect )
 		{
 			SelectHdl();
-			// IA2 CWS
 			// pImp->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pEntry );
 			CallEventListeners( VCLEVENT_LISTBOX_TREESELECT, pEntry);			
 		}
@@ -1298,7 +1287,6 @@ void SvTreeListBox::Paint( const Rectang
 	if( nTreeFlags & TREEFLAG_RECALCTABS )
 		SetTabs();
 	pImp->Paint( rRect );
-	//IAccessibility2 Implementation 2009-----
 	//Solution:Add visual focus draw
 	if( !SvLBox::First() )
 	{
@@ -1315,7 +1303,6 @@ void SvTreeListBox::Paint( const Rectang
 			HideFocus();
 		}
 	}
-	//-----IAccessibility2 Implementation 2009
 }
 
 void SvTreeListBox::MouseButtonDown( const MouseEvent& rMEvt )
@@ -2775,14 +2762,6 @@ void SvTreeListBox::FillAccessibleEntryS
 		rStateSet.AddState( AccessibleStateType::EXPANDABLE );
 		if ( IsExpanded( pEntry ) )
 		    rStateSet.AddState( (sal_Int16)AccessibleStateType::EXPANDED );
-		// IA2 CWS
-		/*
-		else
-		{
-			// MT: COLLAPSE == EXPANDABLE & !EXPANDED
-			rStateSet.AddState( (sal_Int16)AccessibleStateType::COLLAPSE );
-		}
-		*/
 	}
 
 	if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
@@ -2791,7 +2770,6 @@ void SvTreeListBox::FillAccessibleEntryS
 		rStateSet.AddState( AccessibleStateType::VISIBLE );
 	if ( IsSelected( pEntry ) )
 		rStateSet.AddState( AccessibleStateType::SELECTED );
-	//IAccessibility2 Implementation 2009-----
 	if ( IsEnabled() )
 	{
 		rStateSet.AddState( AccessibleStateType::ENABLED );
@@ -2805,7 +2783,6 @@ void SvTreeListBox::FillAccessibleEntryS
 				rStateSet.AddState( AccessibleStateType::FOCUSED );
 		}
 	}
-	//-----IAccessibility2 Implementation 2009
 }
 
 Rectangle SvTreeListBox::GetBoundingRect( SvLBoxEntry* pEntry )

Modified: openoffice/branches/l10n40/main/svtools/source/control/accessibleruler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/control/accessibleruler.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/control/accessibleruler.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/control/accessibleruler.cxx Sun Dec  1 11:40:24 2013
@@ -494,11 +494,9 @@ Rectangle SvtRulerAccessible::GetBoundin
 	::osl::MutexGuard	aGuard( m_aMutex );
 
 	ThrowExceptionIfNotAlive();
-//IAccessibility2 Implementation 2009-----
 	//the absolute on screen pixel is wrong
 	//return Rectangle( mpRepr->GetParent()->OutputToScreenPixel( mpRepr->GetPosPixel() ), mpRepr->GetSizePixel() );
 	return Rectangle( mpRepr->GetParent()->OutputToAbsoluteScreenPixel( mpRepr->GetPosPixel() ), mpRepr->GetSizePixel() );
-//-----IAccessibility2 Implementation 2009
 }
 
 Rectangle SvtRulerAccessible::GetBoundingBox( void ) throw( RuntimeException )

Modified: openoffice/branches/l10n40/main/svtools/source/control/headbar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/control/headbar.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/control/headbar.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/control/headbar.cxx Sun Dec  1 11:40:24 2013
@@ -42,10 +42,8 @@
 #endif
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-//IAccessibility2 Implementation 2009-----
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <vclxaccessibleheaderbar.hxx>
-//-----IAccessibility2 Implementation 2009
 // =======================================================================
 
 struct ImplHeadItem
@@ -99,9 +97,7 @@ void HeaderBar::ImplInit( WinBits nWinSt
 	mbOutDrag		= sal_False;
 	mbItemMode		= sal_False;
 
-	//IAccessibility2 Implementation 2009-----
 	m_pVCLXHeaderBar = NULL;
-	//-----IAccessibility2 Implementation 2009
 	// StyleBits auswerten
 	if ( nWinStyle & WB_DRAG )
 		mbDragable = sal_True;
@@ -123,9 +119,7 @@ void HeaderBar::ImplInit( WinBits nWinSt
 	}
 
 	ImplInitSettings( sal_True, sal_True, sal_True );
-	//IAccessibility2 Implementation 2009-----
 	//SetAccessibleRole(com::sun::star::accessibility::AccessibleRole::COLUMN_HEADER);	
-	//-----IAccessibility2 Implementation 2009
 }
 
 // -----------------------------------------------------------------------
@@ -1655,7 +1649,6 @@ void HeaderBar::SetAccessible( ::com::su
     mxAccessible = _xAccessible;
 }
 
-//IAccessibility2 Implementation 2009-----
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > HeaderBar::GetComponentInterface( sal_Bool bCreate )
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer 
@@ -1670,5 +1663,4 @@ void HeaderBar::SetAccessible( ::com::su
 	else
 		return xPeer;
 }
-//-----IAccessibility2 Implementation 2009
 

Modified: openoffice/branches/l10n40/main/svtools/source/control/ruler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/control/ruler.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/control/ruler.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/control/ruler.cxx Sun Dec  1 11:40:24 2013
@@ -32,7 +32,6 @@
 
 #define _SV_RULER_CXX
 #include <svtools/ruler.hxx>
-//IAccessibility2 Implementation 2009-----
 #include <svtools/svtdata.hxx>
 #include <svtools/svtools.hrc>
 using namespace	::rtl;
@@ -40,7 +39,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::accessibility;
-//-----IAccessibility2 Implementation 2009
 // =======================================================================
 
 #define RULER_OFF           3
@@ -307,10 +305,8 @@ void Ruler::ImplInit( WinBits nWinBits )
     else
         aDefSize.Width() = nDefHeight;
     SetOutputSizePixel( aDefSize );
-	//IAccessibility2 Implementation 2009-----
 	SetType(WINDOW_RULER);
 	pAccContext = NULL; 
-	//-----IAccessibility2 Implementation 2009
 }
 
 // -----------------------------------------------------------------------
@@ -334,10 +330,8 @@ Ruler::~Ruler()
         Application::RemoveUserEvent( mnUpdateEvtId );
     delete mpSaveData;
     delete mpDragData;
-	//IAccessibility2 Implementation 2009-----
 	if( pAccContext )
 		pAccContext->release();
-	//-----IAccessibility2 Implementation 2009
 }
 
 // -----------------------------------------------------------------------
@@ -3194,7 +3188,6 @@ const RulerBorder*  Ruler::GetBorders() 
 sal_uInt16              Ruler::GetIndentCount() const { return mpData->nIndents; }
 const RulerIndent*  Ruler::GetIndents() const { return mpData->pIndents; }
 
-//IAccessibility2 Implementation 2009-----
 uno::Reference< XAccessible > Ruler::CreateAccessible()
 {
 	Window*						pParent = GetAccessibleParentWindow();
@@ -3221,4 +3214,3 @@ uno::Reference< XAccessible > Ruler::Cre
 	else
 		return uno::Reference< XAccessible >();
 }
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/l10n40/main/svtools/source/control/valueacc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/control/valueacc.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/control/valueacc.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/control/valueacc.cxx Sun Dec  1 11:40:24 2013
@@ -34,7 +34,6 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 
-//IAccessibility2 Implementation 2009-----
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLERELATIONTYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
@@ -42,7 +41,6 @@
 #ifndef _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
 #include <unotools/accessiblerelationsethelper.hxx>
 #endif
-//-----IAccessibility2 Implementation 2009
 using namespace ::com::sun::star;
 
 // ----------------
@@ -339,7 +337,6 @@ uno::Reference< accessibility::XAccessib
     throw (uno::RuntimeException)
 {
     ThrowIfDisposed();
-//IAccessibility2 Implementation 2009-----
 	uno::Reference< accessibility::XAccessibleRelationSet > xRelSet;
 	Window* pWindow = (Window*)mpParent;
 	if ( pWindow )
@@ -364,7 +361,6 @@ uno::Reference< accessibility::XAccessib
 		}
 	}
     return xRelSet;
-//-----IAccessibility2 Implementation 2009
 }
 
 // -----------------------------------------------------------------------------
@@ -792,10 +788,7 @@ ValueSetItem* ValueSetAcc::getItem (sal_
             nIndex -= 1;
     }
     if (pItem == NULL)
-//IAccessibility2 Implementation 2009-----
-        //pItem = mpParent->ImplGetVisibleItem (static_cast<sal_uInt16>(nIndex));
 	pItem = mpParent->ImplGetItem (static_cast<sal_uInt16>(nIndex));
-//-----IAccessibility2 Implementation 2009
 
     return pItem;
 }
@@ -979,10 +972,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getAcce
             // just in case the number of children changes in the mean time.
             try
             {
-//IAccessibility2 Implementation 2009-----
-                //pItem = mpParent->mrParent.ImplGetVisibleItem (i);
                 pItem = mpParent->mrParent.ImplGetItem(i);
-//-----IAccessibility2 Implementation 2009
             }
             catch (lang::IndexOutOfBoundsException aException)
             {
@@ -999,7 +989,6 @@ sal_Int32 SAL_CALL ValueItemAcc::getAcce
         }
     }
 
-//IAccessibility2 Implementation 2009-----
 	//if this valueset contain a none field(common value is default), then we should increase the real index and set the noitem index value equal 0.
 	if ( mpParent && ( (mpParent->mrParent.GetStyle() & WB_NONEFIELD) != 0 ) )
 	{
@@ -1009,7 +998,6 @@ sal_Int32 SAL_CALL ValueItemAcc::getAcce
 		else
 			nIndexInParent++;
 	}
-//-----IAccessibility2 Implementation 2009
     return nIndexInParent;
 }
 

Modified: openoffice/branches/l10n40/main/svtools/source/control/valueimp.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/control/valueimp.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/control/valueimp.hxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/control/valueimp.hxx Sun Dec  1 11:40:24 2013
@@ -87,9 +87,7 @@ struct ValueSetItem
 	XubString			maText;
 	void*				mpData;
 	Rectangle			maRect;
-	//IAccessibility2 Implementation 2009-----
 	sal_Bool				bSelected:1;
-	//-----IAccessibility2 Implementation 2009
 	::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >* mpxAcc;
 
     ValueSetItem( ValueSet& rParent );

Modified: openoffice/branches/l10n40/main/svtools/source/control/valueset.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/control/valueset.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/control/valueset.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/control/valueset.cxx Sun Dec  1 11:40:24 2013
@@ -1220,7 +1220,6 @@ sal_uInt16 ValueSet::ImplGetVisibleItemC
         ValueSetItem* pItem = mpImpl->mpItemList->GetObject( n );
 
 		//IAccessible2 implementation - also count empty rectangles as visible...
-        // if( pItem->meType != VALUESETITEM_SPACE && !pItem->maRect.IsEmpty() )
 		if( pItem->meType != VALUESETITEM_SPACE )
             nRet++;
     }
@@ -1907,7 +1906,6 @@ void ValueSet::InsertItem( sal_uInt16 nI
 		Invalidate();
 }
 
-//IAccessibility2 Implementation 2009-----
 //method to set accessible when the style is user draw.
 void ValueSet::InsertItem( sal_uInt16 nItemId, const XubString& rText, sal_uInt16 nPos	)
 {
@@ -1923,7 +1921,6 @@ void ValueSet::InsertItem( sal_uInt16 nI
 	if ( IsReallyVisible() && IsUpdateMode() )
 		Invalidate();
 }
-//-----IAccessibility2 Implementation 2009
 
 // -----------------------------------------------------------------------
 
@@ -2799,7 +2796,6 @@ void ValueSet::SetEdgeBlending(bool bNew
         }
     }
 }
-//IAccessibility2 Implementation 2009-----
 //For sending out the focused event on the first focused item when this valueset is first focused.
 // MT: Focus notifications changed in DEV300 meanwhile, so this is not used for now.
 // Just keeping it here for reference, in case something in out implementation doesn't work as expected...
@@ -2851,7 +2847,6 @@ void ValueSet::SetFocusedItem(sal_Bool b
 }
 */
 //end
-//-----IAccessibility2 Implementation 2009
 
 
 // -----------------------------------------------------------------------

Modified: openoffice/branches/l10n40/main/svtools/source/control/vclxaccessibleheaderbar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/control/vclxaccessibleheaderbar.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/control/vclxaccessibleheaderbar.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/control/vclxaccessibleheaderbar.cxx Sun Dec  1 11:40:24 2013
@@ -19,7 +19,6 @@
  * 
  *************************************************************/
 
-//IAccessibility2 Implementation 2009-----
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
@@ -190,4 +189,3 @@ void SAL_CALL VCLXAccessibleHeaderBar::d
 	}
     return xChild;
 }
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/l10n40/main/svtools/source/control/vclxaccessibleheaderbaritem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/control/vclxaccessibleheaderbaritem.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/control/vclxaccessibleheaderbaritem.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/control/vclxaccessibleheaderbaritem.cxx Sun Dec  1 11:40:24 2013
@@ -19,7 +19,6 @@
  * 
  *************************************************************/
 
-//IAccessibility2 Implementation 2009-----
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
@@ -400,4 +399,3 @@ Reference< awt::XFont > VCLXAccessibleHe
 
 	return sText;
 }
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/l10n40/main/svtools/source/edit/svmedit.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/edit/svmedit.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/edit/svmedit.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/edit/svmedit.cxx Sun Dec  1 11:40:24 2013
@@ -941,9 +941,7 @@ void TextWindow::Command( const CommandE
 
 void TextWindow::GetFocus()
 {
-//IAccessibility2 Implementation 2009-----
 	//Window::GetFocus();
-//-----IAccessibility2 Implementation 2009
 	if ( !mbActivePopup )
 	{
 		sal_Bool bGotoCursor = !mpExtTextView->IsReadOnly();
@@ -1250,10 +1248,8 @@ void MultiLineEdit::GetFocus()
 {
     if ( !pImpSvMEdit )  // might be called from within the dtor, when pImpSvMEdit == NULL is a valid state
         return;
-	//IAccessibility2 Implementation 2009-----
 	//Disable the focused event on scroll pane
 	//Edit::GetFocus();
-	//-----IAccessibility2 Implementation 2009
     pImpSvMEdit->GetFocus();
 }
 

Modified: openoffice/branches/l10n40/main/svtools/source/edit/texteng.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/edit/texteng.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/edit/texteng.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/edit/texteng.cxx Sun Dec  1 11:40:24 2013
@@ -803,7 +803,7 @@ TextPaM TextEngine::ImpInsertText( sal_U
                         ++nChgPos;
 
                     xub_StrLen nChgLen = static_cast< xub_StrLen >(nNewLen - nChgPos);
-                    String aChgText( aNewText.copy( nChgPos ), nChgLen );
+                    String aChgText( aNewText.copy( nChgPos ).getStr(), nChgLen );
 
                     // select text from first pos to be changed to current pos
                     TextSelection aSel( TextPaM( aPaM.GetPara(), (sal_uInt16) nChgPos ), aPaM );

Modified: openoffice/branches/l10n40/main/svtools/source/inc/filectrl.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/inc/filectrl.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/inc/filectrl.hrc (original)
+++ openoffice/branches/l10n40/main/svtools/source/inc/filectrl.hrc Sun Dec  1 11:40:24 2013
@@ -26,12 +26,10 @@
 
 #define STR_FILECTRL_BUTTONTEXT		333		// ID-Range?!
 
-//IAccessibility2 Implementation 2009-----
 #define  STR_TABBAR_PUSHBUTTON_MOVET0HOME  ( STR_FILECTRL_BUTTONTEXT+ 1)
 #define  STR_TABBAR_PUSHBUTTON_MOVELEFT       ( STR_FILECTRL_BUTTONTEXT+ 2)
 #define  STR_TABBAR_PUSHBUTTON_MOVERIGHT     ( STR_FILECTRL_BUTTONTEXT+ 3)
 #define  STR_TABBAR_PUSHBUTTON_MOVETOEND    ( STR_FILECTRL_BUTTONTEXT+ 4)
-//-----IAccessibility2 Implementation 2009
 
 #endif
 

Modified: openoffice/branches/l10n40/main/svtools/source/misc/acceleratorexecute.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/misc/acceleratorexecute.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/misc/acceleratorexecute.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/misc/acceleratorexecute.cxx Sun Dec  1 11:40:24 2013
@@ -72,9 +72,7 @@
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
-//IAccessibility2 Implementation 2009-----
 #include <comphelper/uieventslogger.hxx>
-//-----IAccessibility2 Implementation 2009
 
 //===============================================
 // namespace
@@ -252,7 +250,6 @@ sal_Bool AcceleratorExecute::execute(con
     sal_Bool bRet = xDispatch.is();
     if ( bRet )
     {
-//IAccessibility2 Implementation 2009-----
         if(::comphelper::UiEventsLogger::isEnabled() && m_xSMGR.is() && m_xDispatcher.is()) //#i88653#
         {
             try
@@ -269,7 +266,6 @@ sal_Bool AcceleratorExecute::execute(con
             catch(const css::uno::Exception&)
                 { }
         }
-//-----IAccessibility2 Implementation 2009
         // Note: Such instance can be used one times only and destroy itself afterwards .-)
         AsyncAccelExec* pExec = AsyncAccelExec::createOnShotInstance(xDispatch, aURL);
         pExec->execAsync();

Modified: openoffice/branches/l10n40/main/svtools/source/misc/embedhlp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/misc/embedhlp.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/misc/embedhlp.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/misc/embedhlp.cxx Sun Dec  1 11:40:24 2013
@@ -34,14 +34,12 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/streamwrap.hxx>
-//IAccessibility2 Implementation 2009-----
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XCoordinateSystem.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
 #include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XChartType.hpp>
-//-----IAccessibility2 Implementation 2009
 #include <tools/globname.hxx>
 #include <sot/clsids.hxx>
 #include <com/sun/star/util/XModifyListener.hpp>
@@ -944,7 +942,6 @@ sal_Bool EmbeddedObjectRef::IsChart() co
     return sal_False;
 }
 
-//IAccessibility2 Implementation 2009-----
 // MT: Only used for getting accessible attributes, which are not localized
 rtl::OUString EmbeddedObjectRef::GetChartType()
 {
@@ -1038,7 +1035,6 @@ rtl::OUString EmbeddedObjectRef::GetChar
 	}
 	return Style;	
 }
-//-----IAccessibility2 Implementation 2009
 
 // #i104867#
 sal_uInt32 EmbeddedObjectRef::getGraphicVersion() const

Modified: openoffice/branches/l10n40/main/svtools/source/table/cellvalueconversion.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/table/cellvalueconversion.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/table/cellvalueconversion.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/table/cellvalueconversion.cxx Sun Dec  1 11:40:24 2013
@@ -426,7 +426,7 @@ namespace svt
                     ::rtl::OStringBuffer message( "lcl_getValueNormalizer: unsupported type '" );
                     message.append( ::rtl::OUStringToOString( sTypeName, RTL_TEXTENCODING_ASCII_US ) );
                     message.append( "'!" );
-                    OSL_ENSURE( false, message.makeStringAndClear() );
+                    OSL_ENSURE( false, message.getStr() );
 #endif
                 }
                 io_data.aNormalizers[ sTypeName ] = o_formatter;

Modified: openoffice/branches/l10n40/main/svtools/source/uno/wizard/unowizard.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svtools/source/uno/wizard/unowizard.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svtools/source/uno/wizard/unowizard.cxx (original)
+++ openoffice/branches/l10n40/main/svtools/source/uno/wizard/unowizard.cxx Sun Dec  1 11:40:24 2013
@@ -217,7 +217,7 @@ namespace svt { namespace uno
     static ::rtl::OUString lcl_getHelpURL( const rtl::OString& sHelpId )
     {
         ::rtl::OUStringBuffer aBuffer;
-        ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+        ::rtl::OUString aTmp( OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ));
         INetURLObject aHID( aTmp );
         if ( aHID.GetProtocol() == INET_PROT_NOT_VALID )
             aBuffer.appendAscii( INET_HID_SCHEME );

Modified: openoffice/branches/l10n40/main/svx/inc/svx/AccessibleControlShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/AccessibleControlShape.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/AccessibleControlShape.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/AccessibleControlShape.hxx Sun Dec  1 11:40:24 2013
@@ -63,10 +63,8 @@ public:
         const AccessibleShapeTreeInfo& rShapeTreeInfo);
 	virtual ~AccessibleControlShape( );
 
-	//IAccessibility2 Implementation 2009-----
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL  GetControlModel( ) { return m_xControlModel;} ;
     AccessibleControlShape* SAL_CALL GetLabeledByControlShape();
-	//-----IAccessibility2 Implementation 2009
 protected:
 	//---  XAccessible  ----------------------------------------
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(::com::sun::star::uno::RuntimeException);

Modified: openoffice/branches/l10n40/main/svx/inc/svx/AccessibleGraphicShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/AccessibleGraphicShape.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/AccessibleGraphicShape.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/AccessibleGraphicShape.hxx Sun Dec  1 11:40:24 2013
@@ -91,7 +91,6 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 ///	Return this object's role.
 	virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
 protected:
     ///	Create a name string that contains the accessible name.
 	virtual ::rtl::OUString

Modified: openoffice/branches/l10n40/main/svx/inc/svx/AccessibleOLEShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/AccessibleOLEShape.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/AccessibleOLEShape.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/AccessibleOLEShape.hxx Sun Dec  1 11:40:24 2013
@@ -99,10 +99,8 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL
         getTypes (void)
         throw (::com::sun::star::uno::RuntimeException);
-//IAccessibility2 Implementation 2009-----
 // ====== XAccessibleExtendedAttributes =====================================
     virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
-//-----IAccessibility2 Implementation 2009
 protected:
     ///	Create a name string that contains the accessible name.
 	virtual ::rtl::OUString

Modified: openoffice/branches/l10n40/main/svx/inc/svx/AccessibleShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/AccessibleShape.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/AccessibleShape.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/AccessibleShape.hxx Sun Dec  1 11:40:24 2013
@@ -37,7 +37,6 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <svx/AccessibleTextHelper.hxx>
 #include "svx/svxdllapi.h"
-//IAccessibility2 Implementation 2009-----
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESELECTION_HPP_ 
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #endif
@@ -59,7 +58,6 @@
 #ifndef INCLUDED_COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEHYPERLINK_HPP
 #include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
 #endif
-//-----IAccessibility2 Implementation 2009
 
 #include "ChildrenManager.hxx"
 
@@ -98,12 +96,10 @@ class IAccessibleParent;
 class SVX_DLLPUBLIC AccessibleShape
     :	public AccessibleContextBase,
         public AccessibleComponentBase,
-		//IAccessibility2 Implementation 2009-----
         public ::com::sun::star::accessibility::XAccessibleSelection, 
         public ::com::sun::star::accessibility::XAccessibleExtendedAttributes,
         public ::com::sun::star::accessibility::XAccessibleGroupPosition,
         public com::sun::star::accessibility::XAccessibleHypertext,
-		//-----IAccessibility2 Implementation 2009
         public IAccessibleViewForwarderListener,
         public ::com::sun::star::document::XEventListener,
         public ::com::sun::star::lang::XUnoTunnel
@@ -129,7 +125,6 @@ public:
 	AccessibleShape (
         const AccessibleShapeInfo& rShapeInfo,
         const AccessibleShapeTreeInfo& rShapeTreeInfo);
-	//IAccessibility2 Implementation 2009-----
 	AccessibleShape (
         const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& rxShape, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, const AccessibleShapeTreeInfo& rShapeTreeInfo, sal_Int32 nIndex = -1);
 	 //Solution: Overwrite the object's current name.
@@ -178,7 +173,6 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 	virtual ::rtl::OUString SAL_CALL getObjectLink( const ::com::sun::star::uno::Any& accoject )
         throw (::com::sun::star::uno::RuntimeException);
-	//-----IAccessibility2 Implementation 2009
     /** The destructor releases its children manager and text engine if
         still existent.  These are responsible to send appropriate events.
     */
@@ -483,14 +477,12 @@ protected:
 	virtual ::rtl::OUString
     	CreateAccessibleDescription (void)
         throw (::com::sun::star::uno::RuntimeException);
-	//IAccessibility2 Implementation 2009-----
 	virtual ::rtl::OUString
        GetFullAccessibleName(AccessibleShape *shape) 
        throw (::com::sun::star::uno::RuntimeException);
     virtual::rtl::OUString GetStyle();
 	void UpdateDocumentAllSelState(::com::sun::star::uno::Reference< 
 		::com::sun::star::accessibility::XAccessibleStateSet > &xStateSet);
-	//-----IAccessibility2 Implementation 2009
     /** Update the <const>OPAQUE</const> and <const>SELECTED</const> state.
     */
     virtual void UpdateStates (void);
@@ -504,10 +496,8 @@ private:
     SVX_DLLPRIVATE explicit AccessibleShape (const AccessibleShape&);
     /// Don't use the assignment operator.  Do we need this?
     SVX_DLLPRIVATE AccessibleShape& operator= (const AccessibleShape&);
-	//IAccessibility2 Implementation 2009-----
     //Solution:Old accessible name
     ::rtl::OUString aAccName;
-	//-----IAccessibility2 Implementation 2009
 
     /** Call this method when the title, name, or description of the mxShape
         member (may) have been changed.

Modified: openoffice/branches/l10n40/main/svx/inc/svx/AccessibleTableShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/AccessibleTableShape.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/AccessibleTableShape.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/AccessibleTableShape.hxx Sun Dec  1 11:40:24 2013
@@ -34,11 +34,9 @@
 #include <cppuhelper/implbase2.hxx>
 
 #include <svx/AccessibleShape.hxx>
-//IAccessibility2 Implementation 2009-----
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <com/sun/star/accessibility/XAccessibleTableSelection.hpp>
 #include <cppuhelper/compbase5.hxx>
-//-----IAccessibility2 Implementation 2009
 
 #include <boost/noncopyable.hpp>
 
@@ -49,10 +47,8 @@ namespace sdr { namespace table {
 namespace accessibility
 {
 	class AccessibleTableShapeImpl;
-	//IAccessibility2 Implementation 2009
 	class AccessibleCell;
 
-	//IAccessibility2 Implementation 2009-----
 	/*typedef ::cppu::ImplInheritanceHelper2<	AccessibleShape,
 											::com::sun::star::accessibility::XAccessibleSelection,
 											::com::sun::star::accessibility::XAccessibleTable
@@ -61,7 +57,6 @@ namespace accessibility
 											::com::sun::star::accessibility::XAccessibleTable,
 											::com::sun::star::view::XSelectionChangeListener
 										  >	AccessibleTableShape_Base;
-	//-----IAccessibility2 Implementation 2009
 /**	@descr
 */
 class AccessibleTableShape : boost::noncopyable, public AccessibleTableShape_Base, public ::com::sun::star::accessibility::XAccessibleTableSelection
@@ -115,7 +110,6 @@ public:
     virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw ( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex )  throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException );
-	//IAccessibility2 Implementation 2009-----
 	//=====  XAccessibleTableSelection ============================================
 	virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) 
 		throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
@@ -125,7 +119,6 @@ public:
 		throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
 	virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) 
 		throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
-	//-----IAccessibility2 Implementation 2009
 
 	// XServiceInfo
 	virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
@@ -142,7 +135,6 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 	sal_Int32 mnPreviousSelectionCount;
 	using AccessibleShape::disposing;
-	//IAccessibility2 Implementation 2009-----
 	friend class AccessibleTableHeaderShape;
 	
 	void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException );
@@ -154,7 +146,6 @@ public:
 	sal_Bool ResetStateDirectly (sal_Int16 aState);
 	// Get the currently active cell which is text editing
 	AccessibleCell* GetActiveAccessibleCell();
-	//-----IAccessibility2 Implementation 2009
 
 protected:
 	virtual ::rtl::OUString CreateAccessibleBaseName(void) throw (::com::sun::star::uno::RuntimeException);
@@ -167,12 +158,9 @@ protected:
 
 private:
 	rtl::Reference< AccessibleTableShapeImpl > mxImpl;
-	//IAccessibility2 Implementation 2009-----
 	sal_Int32 GetIndexOfSelectedChild( sal_Int32 nSelectedChildIndex ) const;
-	//-----IAccessibility2 Implementation 2009
 };
 
-//IAccessibility2 Implementation 2009-----
 typedef ::cppu::WeakImplHelper5<
 			::com::sun::star::accessibility::XAccessible,
 			::com::sun::star::accessibility::XAccessibleComponent,
@@ -252,7 +240,6 @@ private:
 	sal_Bool mbRow;
 	rtl::Reference< AccessibleTableShape > mpTable;
 };
-//-----IAccessibility2 Implementation 2009
 
 } // end of namespace accessibility
 

Modified: openoffice/branches/l10n40/main/svx/inc/svx/ChildrenManager.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/ChildrenManager.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/ChildrenManager.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/ChildrenManager.hxx Sun Dec  1 11:40:24 2013
@@ -130,10 +130,8 @@ public:
     	GetChild (long nIndex)
         throw (::com::sun::star::uno::RuntimeException,
                ::com::sun::star::lang::IndexOutOfBoundsException);
-//IAccessibility2 Implementation 2009-----
         ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> GetChild (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& xShape) throw (::com::sun::star::uno::RuntimeException);
         ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> GetChildShape (long nIndex) throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
 
     /** Update the child manager.  Take care of a modified set of children
         and modified visible area.  This method can optimize the update

Modified: openoffice/branches/l10n40/main/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx Sun Dec  1 11:40:24 2013
@@ -31,7 +31,6 @@ namespace EnhancedCustomShapeTypeNames
 	SVX_DLLPUBLIC MSO_SPT Get( const rtl::OUString& );
 	SVX_DLLPUBLIC rtl::OUString Get( const MSO_SPT );
 
-	//IAccessibility2 Implementation 2009
 	rtl::OUString GetAccName( const rtl::OUString& );
 }
 

Modified: openoffice/branches/l10n40/main/svx/inc/svx/IAccessibleParent.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/IAccessibleParent.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/IAccessibleParent.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/IAccessibleParent.hxx Sun Dec  1 11:40:24 2013
@@ -27,11 +27,9 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <sal/types.h>
-//IAccessibility2 Implementation 2009-----
 #ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_MANAGER_HXX
 #include "AccessibleControlShape.hxx"
 #endif
-//-----IAccessibility2 Implementation 2009
 namespace accessibility {
 
 class AccessibleShape;
@@ -88,7 +86,6 @@ public:
 		const long _nIndex,
 		const AccessibleShapeTreeInfo& _rShapeTreeInfo
 	)	throw (::com::sun::star::uno::RuntimeException) = 0;
-	//IAccessibility2 Implementation 2009-----
 	//Add this method to support Form Controls
 	virtual AccessibleControlShape* GetAccControlShapeFromModel
 		(::com::sun::star::beans::XPropertySet*) 
@@ -99,7 +96,6 @@ public:
             ::com::sun::star::drawing::XShape>&)
 			throw (::com::sun::star::uno::RuntimeException){return NULL;};
 	virtual sal_Bool IsDocumentSelAll(){ return sal_False; }
-	//-----IAccessibility2 Implementation 2009
 };
 
 } // end of namespace accessibility

Modified: openoffice/branches/l10n40/main/svx/inc/svx/ctredlin.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/ctredlin.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/ctredlin.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/ctredlin.hxx Sun Dec  1 11:40:24 2013
@@ -299,9 +299,7 @@ public:
 	void			Enable( bool bEnable = true, bool bChild = true );
 	void			Disable( bool bChild = true );
 
-	//IAccessibility2 Implementation 2009-----
 	void			SetAccessibleRelationMemberOf( Window* pWindow);
-	//-----IAccessibility2 Implementation 2009
 
 	// } Methoden fuer Calc
 };

Modified: openoffice/branches/l10n40/main/svx/inc/svx/dialogs.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/dialogs.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/dialogs.hrc (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/dialogs.hrc Sun Dec  1 11:40:24 2013
@@ -48,13 +48,11 @@
 #define RID_SVXSTR_LINESTYLE                (RID_SVX_START + 173)
 #define RID_SVXSTR_FIELDUNIT_TABLE			(RID_SVX_START + 311)
 #define RID_SVXSTR_COLOR_USER               (RID_SVX_START + 250)
-//IAccessibility2 Implementation 2009-----
 #define RID_SVXSTR_GALLERYPROPS_GALTHEME	(RID_SVX_START + 251)
 #define RID_SVXSTR_GALLERY_THEMEITEMS		(RID_SVX_START + 252)
 #define RID_SVXSTR_GALLERY_THEMENAME		(RID_SVX_START + 253)
 #define RID_SVXSTR_GALLERY_FILESFOUND		(RID_SVX_START + 254)
 #define RID_SVXSTR_GALLERY_PREVIEW			(RID_SVX_START + 255)
-//-----IAccessibility2 Implementation 2009
 
 // factory IDs of tabpages implemented in CUI
 #define RID_SVXPAGE_CHAR_TWOLINES			(RID_SVX_START + 242)
@@ -951,9 +949,7 @@
 #define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_3                     (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 3)
 #define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_4                     (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 4)
 
-//IAccessibility2 Implementation 2009-----
 #define RID_SVXSTR_TEXTCOLOR								(RID_SVX_START + 1178)
-//-----IAccessibility2 Implementation 2009
 
 #define RID_SVXSTR_FINDBAR_FIND                             (RID_SVX_START + 1190)
 

Modified: openoffice/branches/l10n40/main/svx/inc/svx/dlgctrl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/dlgctrl.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/dlgctrl.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/dlgctrl.hxx Sun Dec  1 11:40:24 2013
@@ -78,8 +78,7 @@ typedef sal_uInt16 CTL_STATE;
 #define CS_NOVERT	2		// no vertikal input information is used
 
 class SvxRectCtlAccessibleContext;
-class SvxPixelCtlAccessible; // IAccessibility2 implementation 2009
-
+class SvxPixelCtlAccessible;
 class SVX_DLLPUBLIC SvxRectCtl : public Control
 {
 private:
@@ -215,11 +214,9 @@ protected:
 	Size		aRectSize;
 	sal_uInt16* 	pPixel;
 	sal_Bool		bPaintable;
-	// IAccessibility2 implementation 2009. ------
 	//Solution:Add member identifying position
 	Point       aFocusPosition;
 	Rectangle   implCalFocusRect( const Point& aPosition );
-	// ------ IAccessibility2 implementation 2009.
 	void	ChangePixel( sal_uInt16 nPixel );
 
 public:
@@ -245,7 +242,6 @@ public:
 
 	void	SetPaintable( sal_Bool bTmp ) { bPaintable = bTmp; }
 	void	Reset();
-	// IAccessibility2 implementation 2009. ------
 	SvxPixelCtlAccessible*	m_pAccess;
 	::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >		m_xAccess;
 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
@@ -263,7 +259,6 @@ public:
 	virtual void        KeyInput( const KeyEvent& rKEvt );
 	virtual void        GetFocus();
     virtual void        LoseFocus();
-	// ------ IAccessibility2 implementation 2009.
 };
 
 /*************************************************************************

Modified: openoffice/branches/l10n40/main/svx/inc/svx/sdr/table/tablecontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/sdr/table/tablecontroller.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/sdr/table/tablecontroller.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/sdr/table/tablecontroller.hxx Sun Dec  1 11:40:24 2013
@@ -102,7 +102,6 @@ public:
 
     SVX_DLLPRIVATE void onTableModified();
 
-//IAccessibility2 Implementation 2009-----
 	sal_Bool selectRow( sal_Int32 row );
 	sal_Bool selectColumn( sal_Int32 column );
 	sal_Bool deselectRow( sal_Int32 row );
@@ -114,7 +113,6 @@ public:
 	::sdr::table::SdrTableObj* GetTableObj() { return dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); }
 	//declare event notification method
 	void NotifySelection( const CellPos& firstPos, const CellPos& lastPos, const CellPos& newPos );
-//-----IAccessibility2 Implementation 2009
 private:
     SvxTableController(SvxTableController &); // not defined
     void operator =(SvxTableController &); // not defined

Modified: openoffice/branches/l10n40/main/svx/inc/svx/srchdlg.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/srchdlg.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/srchdlg.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/srchdlg.hxx Sun Dec  1 11:40:24 2013
@@ -155,19 +155,15 @@ public:
 	PushButton&     GetReplaceBtn() { return aReplaceBtn; }
 
 	sal_Int32			GetTransliterationFlags() const;
-//IAccessibility2 Impplementaton 2009-----
 	void SetDocWin( Window* pDocWin ) { mpDocWin = pDocWin; }
 	Window* GetDocWin() { return mpDocWin; }
 	void SetSrchFlag( sal_Bool bSuccess = sal_False ) { mbSuccess = bSuccess; }
 	sal_Bool GetSrchFlag() { return mbSuccess; }
 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > 
 		GetComponentInterface( sal_Bool bCreate );
-//-----IAccessibility2 Impplementaton 2009
 private:
-//IAccessibility2 Impplementaton 2009-----
 	Window*			mpDocWin;
 	sal_Bool			mbSuccess;
-//-----IAccessibility2 Impplementaton 2009
 	FixedText       aSearchText;
 	ComboBox        aSearchLB;
 	ListBox         aSearchTmplLB;

Modified: openoffice/branches/l10n40/main/svx/inc/svx/svdmodel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/svdmodel.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/svdmodel.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/svdmodel.hxx Sun Dec  1 11:40:24 2013
@@ -84,9 +84,7 @@ namespace comphelper{
     class IEmbeddedHelper;
 }
 
-//IAccessibility2 Implementation 2009-----
 class ImageMap;
-//-----IAccessibility2 Implementation 2009
 
 namespace sfx2{
     class LinkManager;
@@ -728,10 +726,8 @@ public:
 
     static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId();
 
-	//IAccessibility2 Implementation 2009-----
 	virtual ImageMap* GetImageMapForObject(SdrObject*){return NULL;};
 	virtual sal_Int32 GetHyperlinkCount(SdrObject*){return 0;}
-	//-----IAccessibility2 Implementation 2009
 
 	/** enables (true) or disables (false) recording of undo actions
 		If undo actions are added while undo is disabled, they are deleted.

Modified: openoffice/branches/l10n40/main/svx/inc/svx/svdmrkv.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/svdmrkv.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/svdmrkv.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/svdmrkv.hxx Sun Dec  1 11:40:24 2013
@@ -511,9 +511,7 @@ public:
 	// Endpunkt der Spiegelachse
     const Point& GetRef2() const { return aRef1; }
     void SetRef2(const Point& rPt);
-//IAccessibility2 Implementation 2009-----
 	void UnmarkObj(SdrObject* pObj);
-//-----IAccessibility2 Implementation 2009
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

Modified: openoffice/branches/l10n40/main/svx/inc/svx/svdoashp.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/svdoashp.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/svdoashp.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/svdoashp.hxx Sun Dec  1 11:40:24 2013
@@ -259,9 +259,7 @@ public:
 
 	using SdrTextObj::NbcSetOutlinerParaObject;
 
-	//IAccessibility2 Implementation 2009-----
 	::rtl::OUString GetCustomShapeName();
-	//-----IAccessibility2 Implementation 2009
 };
 
 #endif //_SVDOASHP_HXX

Modified: openoffice/branches/l10n40/main/svx/inc/svx/svdobj.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/svdobj.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/svdobj.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/svdobj.hxx Sun Dec  1 11:40:24 2013
@@ -452,9 +452,6 @@ protected:
 	SdrObjUserCall*				pUserCall;
 	SdrObjPlusData*				pPlusData;    // Broadcaster, UserData, Konnektoren, ... (Das ist der Bitsack)
 
-//IAccessibility2 Implementation 2009-----
-	SdrObject*	pCaptionObj;
-//-----IAccessibility2 Implementation 2009
 	sal_uInt32					nOrdNum;      // Rangnummer des Obj in der Liste
 
     /** Position in the navigation order.  SAL_MAX_UINT32 when not used.
@@ -1131,9 +1128,6 @@ public:
     // #121917#
     virtual bool HasText() const;
 
-//IAccessibility2 Implementation 2009-----
-	const SdrObject* GetCaptionObj() const;
-//-----IAccessibility2 Implementation 2009
 protected:
     void    impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxUnoShape );
 

Modified: openoffice/branches/l10n40/main/svx/inc/svx/svdoole2.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/svdoole2.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/svdoole2.hxx (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/svdoole2.hxx Sun Dec  1 11:40:24 2013
@@ -84,9 +84,7 @@ protected:
 	void Init();
 
 public:
-//IAccessibility2 Implementation 2009-----
 	String GetStyleString();
-//-----IAccessibility2 Implementation 2009
 	TYPEINFO();
 
 	SdrOle2Obj(FASTBOOL bFrame_=sal_False);

Modified: openoffice/branches/l10n40/main/svx/inc/svx/svdstr.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/inc/svx/svdstr.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/inc/svx/svdstr.hrc (original)
+++ openoffice/branches/l10n40/main/svx/inc/svx/svdstr.hrc Sun Dec  1 11:40:24 2013
@@ -181,7 +181,6 @@
 #define STR_ObjNameSingulMEDIA				(STR_ObjNameBegin + 143)
 #define STR_ObjNamePluralMEDIA				(STR_ObjNameBegin + 144)
 
-//IAccessibility2 Implementation 2009-----
 #define STR_ObjNameSingulFONTWORK			(STR_ObjNameBegin+145)
 #define STR_ObjNamePluralFONTWORK			(STR_ObjNameBegin+146)
 
@@ -191,7 +190,6 @@
 
 #define STR_ObjNameEnd               		(STR_ObjNamePluralGRAFSVG)
 
-//-----IAccessibility2 Implementation 2009
 #define STR_EditBegin                (STR_ObjNameEnd+1)
 #define STR_EditWithCopy             (STR_EditBegin  +  0)
 #define STR_EditPosSize              (STR_EditBegin  +  1)

Modified: openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleControlShape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleControlShape.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleControlShape.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleControlShape.cxx Sun Dec  1 11:40:24 2013
@@ -44,7 +44,6 @@
 #include <svx/svdpagv.hxx>
 #include "svx/svdstr.hrc"
 #include <algorithm>
-//IAccessibility2 Implementation 2009-----
 #ifndef _COMPHELPER_PROPERTY_HXX_
 #include <comphelper/property.hxx>
 #endif
@@ -60,7 +59,6 @@
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLERELATIONTYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #endif
-//-----IAccessibility2 Implementation 2009
 using namespace ::comphelper;
 using namespace ::accessibility;
 using namespace	::com::sun::star::accessibility;
@@ -94,14 +92,12 @@ namespace
 		static ::rtl::OUString s_sLabelPropertyLabel( RTL_CONSTASCII_USTRINGPARAM( "Label" ) );
 		return s_sLabelPropertyLabel;
 	}
-	//IAccessibility2 Implementation 2009-----
 	//................................................................
 	const ::rtl::OUString& lcl_getLabelControlPropertyName( )
 	{
 		static ::rtl::OUString s_sLabelControlPropertyLabel( RTL_CONSTASCII_USTRINGPARAM( "LabelControl" ) );
 		return s_sLabelControlPropertyLabel;
 	}
-	//-----IAccessibility2 Implementation 2009
 	//................................................................
 	// return the property which should be used as AccessibleName
 	const ::rtl::OUString& lcl_getPreferredAccNameProperty( const Reference< XPropertySetInfo >& _rxPSI )
@@ -661,7 +657,6 @@ Reference< XAccessibleRelationSet > SAL_
 {
 	// TODO
 	// return AccessibleShape::getAccessibleRelationSet( );
-	//IAccessibility2 Implementation 2009-----
     utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
 	ensureControlModelAccess();
 	AccessibleControlShape* pCtlAccShape = GetLabeledByControlShape();
@@ -682,14 +677,12 @@ Reference< XAccessibleRelationSet > SAL_
 	}
 	Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
 	return xSet;
-	//-----IAccessibility2 Implementation 2009
 }
 
 //--------------------------------------------------------------------
 ::rtl::OUString AccessibleControlShape::CreateAccessibleName (void) throw (RuntimeException)
 {
 	ensureControlModelAccess();
-	//IAccessibility2 Implementation 2009-----
 	::rtl::OUString sName;
 	if ( getAccessibleRole() != AccessibleRole::SHAPE	
 		&& getAccessibleRole() != AccessibleRole::RADIO_BUTTON  )
@@ -710,7 +703,6 @@ Reference< XAccessibleRelationSet > SAL_
 			sName = AccessibleShape::CreateAccessibleName();
 		}
 	}
-	//-----IAccessibility2 Implementation 2009
 	// now that somebody first asked us for our name, ensure that we are listening to name changes on the model
 	m_bListeningForName = ensureListeningState( m_bListeningForName, sal_True, lcl_getPreferredAccNameProperty( m_xModelPropsMeta ) );
 
@@ -972,7 +964,6 @@ void SAL_CALL AccessibleControlShape::el
 {
     // not interested in
 }
-//IAccessibility2 Implementation 2009-----
 AccessibleControlShape* SAL_CALL AccessibleControlShape::GetLabeledByControlShape( )
 {
 	if(m_xControlModel.is())
@@ -993,4 +984,3 @@ AccessibleControlShape* SAL_CALL Accessi
 	}
 	return NULL;
 }
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleFrameSelector.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleFrameSelector.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleFrameSelector.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleFrameSelector.cxx Sun Dec  1 11:40:24 2013
@@ -191,9 +191,7 @@ sal_Int32 AccFrameSelector::getAccessibl
 sal_Int16 AccFrameSelector::getAccessibleRole(  ) throw (RuntimeException)
 {
     // return AccessibleRole::OPTION_PANE;
-	//IAccessibility2 Implementation 2009-----
 	return meBorder == FRAMEBORDER_NONE ? AccessibleRole::OPTION_PANE : AccessibleRole::CHECK_BOX;
-	//-----IAccessibility2 Implementation 2009
 }
 
 // ----------------------------------------------------------------------------
@@ -238,7 +236,6 @@ Reference< XAccessibleRelationSet > AccF
     //        pHelper->AddRelation(aLabelRelation);
     //    }
     //}
-	//IAccessibility2 Implementation 2009-----
     if(meBorder == FRAMEBORDER_NONE)
     {
         //add the label relation
@@ -261,7 +258,6 @@ Reference< XAccessibleRelationSet > AccF
             pHelper->AddRelation(aMemberOfRelation);
 		}
     }
-	//-----IAccessibility2 Implementation 2009
     return xRet;
 }
 

Modified: openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleGraphicShape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleGraphicShape.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleGraphicShape.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleGraphicShape.cxx Sun Dec  1 11:40:24 2013
@@ -61,10 +61,8 @@ AccessibleGraphicShape::~AccessibleGraph
 ::rtl::OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
-//IAccessibility2 Implementation 2009-----
 	if(m_pShape)						 
       		return m_pShape->GetTitle();
-//-----IAccessibility2 Implementation 2009
     return AccessibleShape::getAccessibleDescription ();
 }
 
@@ -210,18 +208,14 @@ uno::Sequence<uno::Type> SAL_CALL
     AccessibleGraphicShape::CreateAccessibleDescription (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
-//IAccessibility2 Implementation 2009-----
 	//Solution: Don't use the same information for accessible name and accessible description.
-      	//return CreateAccessibleName ();
   	 ::rtl::OUString sDesc;
 		if(m_pShape)						 
     	sDesc =  m_pShape->GetTitle();
 		if(sDesc.getLength() > 0)
 			return sDesc;
     	return CreateAccessibleBaseName();
-//-----IAccessibility2 Implementation 2009
 }
-//IAccessibility2 Implementation 2009-----
 //	Return this object's role.
 sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole (void)
 		throw (::com::sun::star::uno::RuntimeException)
@@ -230,10 +224,8 @@ sal_Int16 SAL_CALL AccessibleGraphicShap
 	if( m_pShape->GetModel()->GetImageMapForObject(m_pShape) != NULL )
 		return AccessibleRole::IMAGE_MAP;
 	else
-		//return AccessibleRole::SHAPE;
 		return AccessibleShape::getAccessibleRole();
 	return nAccessibleRole;
 }
-//-----IAccessibility2 Implementation 2009
 
 

Modified: openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleOLEShape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleOLEShape.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleOLEShape.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleOLEShape.cxx Sun Dec  1 11:40:24 2013
@@ -29,9 +29,7 @@
 
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxShapeTypes.hxx>
-//IAccessibility2 Implementation 2009-----
 #include <svx/svdoole2.hxx>
-//-----IAccessibility2 Implementation 2009
 using namespace accessibility;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -181,7 +179,6 @@ uno::Sequence<uno::Type> SAL_CALL
 
 	return aTypeList;
 }
-//IAccessibility2 Implementation 2009-----
 //=====  XAccessibleExtendedAttributes  ========================================================
 uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes() 
 		throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) 
@@ -198,7 +195,6 @@ uno::Any SAL_CALL AccessibleOLEShape::ge
 	strRet <<= style;
 	return strRet;
 }
-//-----IAccessibility2 Implementation 2009
 
 
 ///	Set this object's name if is different to the current name.

Modified: openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleShape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleShape.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleShape.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleShape.cxx Sun Dec  1 11:40:24 2013
@@ -31,11 +31,9 @@
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLE_ROLE_HPP_
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #endif
-//IAccessibility2 Implementation 2009-----
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLETEXTTYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleTextType.hpp>
 #endif
-//-----IAccessibility2 Implementation 2009
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLE_STATE_TYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #endif
@@ -66,7 +64,6 @@
 #include <unotools/accessiblestatesethelper.hxx>
 #include <svx/svdview.hxx>
 #include "AccessibleEmptyEditSource.hxx"
-//IAccessibility2 Implementation 2009-----
 #include <svx/svdpage.hxx>
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLERELATIONTYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
@@ -74,20 +71,15 @@
 #ifndef _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
 #include <unotools/accessiblerelationsethelper.hxx>
 #endif
-//-----IAccessibility2 Implementation 2009
 using namespace ::com::sun::star;
 using namespace	::com::sun::star::accessibility;
-//IAccessibility2 Implementation 2009-----
 using ::com::sun::star::lang::IndexOutOfBoundsException;
 using ::com::sun::star::uno::RuntimeException;
-//-----IAccessibility2 Implementation 2009
 using ::com::sun::star::uno::Reference;
 using ::rtl::OUString;
-//IAccessibility2 Implementation 2009-----
 #include <algorithm>
 
 // #include <Accessiblehyperlink.hxx>
-//-----IAccessibility2 Implementation 2009
 namespace accessibility {
 
 namespace {
@@ -128,9 +120,7 @@ OUString GetOptionalProperty (
 AccessibleShape::AccessibleShape (
     const AccessibleShapeInfo& rShapeInfo,
     const AccessibleShapeTreeInfo& rShapeTreeInfo)
-    //IAccessibility2 Implementation 2009-----
     : AccessibleContextBase (rShapeInfo.mxParent,AccessibleRole::SHAPE),
-    //-----IAccessibility2 Implementation 2009
       mpChildrenManager(NULL),
       mxShape (rShapeInfo.mxShape),
       maShapeTreeInfo (rShapeTreeInfo),
@@ -142,7 +132,6 @@ AccessibleShape::AccessibleShape (
 	m_pShape = GetSdrObjectFromXShape(mxShape);
     UpdateNameAndDescription();
 }
-//IAccessibility2 Implementation 2009-----
 AccessibleShape::AccessibleShape (
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::drawing::XShape>& rxShape,
@@ -161,7 +150,6 @@ AccessibleShape::AccessibleShape (
 {
 	m_pShape = GetSdrObjectFromXShape(mxShape);
 }
-//-----IAccessibility2 Implementation 2009
 AccessibleShape::~AccessibleShape (void)
 {
     if (mpChildrenManager != NULL)
@@ -297,13 +285,11 @@ void AccessibleShape::UpdateStates (void
     else
         pStateSet->RemoveState (AccessibleStateType::SELECTED);
 }
-//IAccessibility2 Implementation 2009-----
     ::rtl::OUString AccessibleShape::GetStyle()
     {
 	    return ShapeTypeHandler::CreateAccessibleBaseName( mxShape );
     }
 
-//-----IAccessibility2 Implementation 2009
 bool AccessibleShape::operator== (const AccessibleShape& rShape)
 {
     return this==&rShape;
@@ -365,7 +351,6 @@ sal_Bool AccessibleShape::GetState (sal_
     else
         return AccessibleContextBase::GetState (aState);
 }
-//IAccessibility2 Implementation 2009-----
 // Solution: OverWrite the parent's getAccessibleName method
 ::rtl::OUString SAL_CALL AccessibleShape::getAccessibleName (void)
     throw (::com::sun::star::uno::RuntimeException)
@@ -386,7 +371,6 @@ sal_Bool AccessibleShape::GetState (sal_
 	else
 		return OUString( RTL_CONSTASCII_USTRINGPARAM( " " ));
 }
-//-----IAccessibility2 Implementation 2009
 //=====  XAccessibleContext  ==================================================
 
 /** The children of this shape come from two sources: The children from
@@ -446,45 +430,34 @@ uno::Reference<XAccessible> SAL_CALL
     return xChild;
 }
 
-//IAccessibility2 Implementation 2009-----
 uno::Reference<XAccessibleRelationSet> SAL_CALL
-	AccessibleShape::getAccessibleRelationSet (void)
+    AccessibleShape::getAccessibleRelationSet (void)
         throw (::com::sun::star::uno::RuntimeException)
 {
-	::osl::MutexGuard aGuard (maMutex);
-    ::utl::AccessibleRelationSetHelper* pRelationSet =
-		new utl::AccessibleRelationSetHelper;
-	SdrObject* pCaptionSdr = const_cast < SdrObject* > ( m_pShape->GetCaptionObj() )  ;
-	if(pCaptionSdr!=NULL)
-	{
-			uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
-			uno::Reference<drawing::XShape> xCaptionShape ( pCaptionSdr->getUnoShape(),uno::UNO_QUERY);
-			if(xCaptionShape.is())
-			{
-				aSequence[0] = mpParent->GetAccessibleCaption(xCaptionShape);
-				pRelationSet->AddRelation( AccessibleRelation( AccessibleRelationType::DESCRIBED_BY, aSequence ) );
-		}
-	}
-	else
-	{
-		//this mxshape is the captioned shape, only for sw
-		if(mpParent->GetAccessibleCaption(mxShape).get())
-		{
-			uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
-			aSequence[0] = mpParent->GetAccessibleCaption(mxShape);
-			pRelationSet->AddRelation( AccessibleRelation( AccessibleRelationType::DESCRIBED_BY, aSequence ) );
-		}
-	}
-   if (pRelationSet != NULL)
+    ::osl::MutexGuard aGuard (maMutex);
+    ::utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper;
+    uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
+    aSequence[0] = mpParent->GetAccessibleCaption(mxShape);
+
+    //this mxshape is the captioned shape, only for sw
+    if(aSequence[0].get())
+    {
+        pRelationSet->AddRelation( 
+            AccessibleRelation( AccessibleRelationType::DESCRIBED_BY, aSequence ) );
+    }
+
+    if (pRelationSet != NULL)
     {
         return uno::Reference<XAccessibleRelationSet> (
             new ::utl::AccessibleRelationSetHelper (*pRelationSet));
     }
     else
+    {
         return uno::Reference<XAccessibleRelationSet>(NULL);
-	return uno::Reference<XAccessibleRelationSet>();
+    }
+
+    return uno::Reference<XAccessibleRelationSet>();
 }
-//-----IAccessibility2 Implementation 2009
 
 /**	Return a copy of the state set.
     Possible states are:
@@ -501,8 +474,6 @@ uno::Reference<XAccessibleStateSet> SAL_
 
 	if (rBHelper.bDisposed || mpText == NULL)
         // Return a minimal state set that only contains the DEFUNC state.
-	//IAccessibility2 Implementation 2009-----
-	//xStateSet = AccessibleContextBase::getAccessibleStateSet ();
 	{
         xStateSet = AccessibleContextBase::getAccessibleStateSet ();
 		::utl::AccessibleStateSetHelper* pStateSet = 
@@ -534,7 +505,6 @@ uno::Reference<XAccessibleStateSet> SAL_
 		    }
 			xStateSet = Reference<XAccessibleStateSet>(
                 new ::utl::AccessibleStateSetHelper (*pStateSet));
-			//-----IAccessibility2 Implementation 2009
     }else
     {
         ::utl::AccessibleStateSetHelper* pStateSet =
@@ -550,7 +520,6 @@ uno::Reference<XAccessibleStateSet> SAL_
                 else
                     pStateSet->RemoveState (AccessibleStateType::FOCUSED);
             }
-			//IAccessibility2 Implementation 2009-----
 			//Solution:Just when the document is not read-only,set states EDITABLE,RESIZABLE,MOVEABLE
 		    ::com::sun::star::uno::Reference<XAccessible> xTempAcc = getAccessibleParent();
 		    if( xTempAcc.is() )
@@ -577,16 +546,13 @@ uno::Reference<XAccessibleStateSet> SAL_
 					}
 				}
 		    }
-			//-----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));
         }
     }
-//IAccessibility2 Implementation 2009-----
 	UpdateDocumentAllSelState(xStateSet);
-//-----IAccessibility2 Implementation 2009
     return xStateSet;
 }
 
@@ -864,7 +830,6 @@ sal_Int32 SAL_CALL AccessibleShape::getB
             uno::Any aColor;
             aColor = aSet->getPropertyValue (OUString::createFromAscii ("FillColor"));
             aColor >>= nColor;
-			//IAccessibility2 Implementation 2009-----
 			aColor = aSet->getPropertyValue (OUString::createFromAscii ("FillTransparence"));
 			short nTrans=0;
 			aColor >>= nTrans;
@@ -879,7 +844,6 @@ sal_Int32 SAL_CALL AccessibleShape::getB
 				crBk.SetTransparency(sal_uInt8(nTrans));
 			}
 			nColor = crBk.GetColor();
-			//-----IAccessibility2 Implementation 2009
         }
     }
     catch (::com::sun::star::beans::UnknownPropertyException)
@@ -938,18 +902,14 @@ com::sun::star::uno::Any SAL_CALL
         aReturn = ::cppu::queryInterface (rType,
             static_cast<XAccessibleComponent*>(this),
             static_cast<XAccessibleExtendedComponent*>(this),
-	    //IAccessibility2 Implementation 2009-----
             static_cast< ::com::sun::star::accessibility::XAccessibleSelection* >(this),
 
 	     static_cast< ::com::sun::star::accessibility::XAccessibleExtendedAttributes* >(this),
-	     //-----IAccessibility2 Implementation 2009
             static_cast<lang::XEventListener*>(this),
             static_cast<document::XEventListener*>(this),
             static_cast<lang::XUnoTunnel*>(this),
-	//IAccessibility2 Implementation 2009-----
             static_cast<XAccessibleGroupPosition*>(this),
             static_cast<XAccessibleHypertext*>(this)
-	//-----IAccessibility2 Implementation 2009
             );
     return aReturn;
 }
@@ -973,7 +933,6 @@ void SAL_CALL
 {
     AccessibleContextBase::release ();
 }
-//IAccessibility2 Implementation 2009-----
 //
 //=====  XAccessibleSelection  ============================================
 //
@@ -1093,7 +1052,6 @@ uno::Any SAL_CALL AccessibleShape::getEx
 	strRet <<= style;
 	return strRet;
 }
-//-----IAccessibility2 Implementation 2009
 //=====  XServiceInfo  ========================================================
 
 ::rtl::OUString SAL_CALL
@@ -1328,7 +1286,6 @@ void AccessibleShape::ViewForwarderChang
     throw (::com::sun::star::uno::RuntimeException)
 {
     //OUString sName (CreateAccessibleBaseName());
-//IAccessibility2 Implementation 2009-----
 	OUString sName;
 	sName = GetFullAccessibleName(this);
 	return sName;
@@ -1423,7 +1380,6 @@ void AccessibleShape::ViewForwarderChang
     aAccName = sName;
 	return sName;    
 }
-//-----IAccessibility2 Implementation 2009
 ::rtl::OUString
     AccessibleShape::CreateAccessibleDescription (void)
     throw (::com::sun::star::uno::RuntimeException)
@@ -1595,7 +1551,6 @@ void AccessibleShape::UpdateNameAndDescr
     {
     }
 }
-//IAccessibility2 Implementation 2009-----
 //	Return this object's role.
 sal_Int16 SAL_CALL AccessibleShape::getAccessibleRole (void)
         throw (::com::sun::star::uno::RuntimeException)
@@ -1712,10 +1667,8 @@ throw (uno::RuntimeException)
         for(sal_Int32 i = 0 ; i < nObj ; ++i)
         {
             SdrObject *pSubObj = pGrpList->GetObj(i);
-			//IAccessibility2 Implementation 2009-----
             if (pSubObj && 
 				xParentContext->getAccessibleChild(i)->getAccessibleContext()->getAccessibleRole() != AccessibleRole::GROUP_BOX)
-			//-----IAccessibility2 Implementation 2009
             {
 				vXShapes.push_back( GetXShapeForSdrObject(pSubObj) );
             }
@@ -1840,5 +1793,4 @@ sal_Bool SAL_CALL AccessibleShape::setSe
 }
 sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException){return sal_True;}
 
-//-----IAccessibility2 Implementation 2009
 } // end of namespace accessibility

Modified: openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleTextHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleTextHelper.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleTextHelper.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/accessibility/AccessibleTextHelper.cxx Sun Dec  1 11:40:24 2013
@@ -50,7 +50,6 @@
 #include <unotools/accessiblestatesethelper.hxx>
 #include <vcl/unohelp.hxx>
 #include <vcl/svapp.hxx>
-//IAccessibility2 Implementation 2009-----
 //add TEXT_SELECTION_CHANGED event
 #ifndef _TEXTDATA_HXX
 #include <svtools/textdata.hxx>
@@ -58,7 +57,6 @@
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
-//-----IAccessibility2 Implementation 2009
 //------------------------------------------------------------------------
 //
 // Project-local header
@@ -76,10 +74,8 @@
 #include "editeng/AccessibleEditableTextPara.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpntv.hxx>
-//IAccessibility2 Implementation 2009-----
 #include "../table/cell.hxx"
 #include "../table/accessiblecell.hxx"
-//-----IAccessibility2 Implementation 2009
 #include <editeng/editdata.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
@@ -89,7 +85,6 @@ using namespace ::com::sun::star::access
 
 namespace accessibility
 {
-//IAccessibility2 Implementation 2009-----
 	Window* GetCurrentEditorWnd()
 	{
 		Window* pWin = NULL;
@@ -104,7 +99,6 @@ namespace accessibility
 		}
 		return pWin;
 	}
-//-----IAccessibility2 Implementation 2009
 
 //------------------------------------------------------------------------
 //
@@ -512,7 +506,6 @@ namespace accessibility
         {
             if( bHaveFocus )
             {
-				//IAccessibility2 Implementation 2009-----
 				if( mxFrontEnd.is() )
 				{
 					AccessibleCell* pAccessibleCell = dynamic_cast< AccessibleCell* > ( mxFrontEnd.get() );
@@ -525,7 +518,6 @@ namespace accessibility
 							pAccTable->SetStateDirectly(AccessibleStateType::FOCUSED);
 					}
 				}
-				//-----IAccessibility2 Implementation 2009
                 DBG_TRACE("AccessibleTextHelper_Impl::SetShapeFocus(): Parent object received focus" );
             }
             else
@@ -597,7 +589,6 @@ namespace accessibility
             if( !pViewForwarder )
                 return sal_False;
 
-			//IAccessibility2 Implementation 2009-----
 			if( mxFrontEnd.is() )
 			{
 				AccessibleCell* pAccessibleCell = dynamic_cast< AccessibleCell* > ( mxFrontEnd.get() );
@@ -608,7 +599,6 @@ namespace accessibility
 						return xCell->IsTextEditActive();
 				}
 			}
-			//-----IAccessibility2 Implementation 2009
             if( pViewForwarder->IsValid() )
                 return sal_True;
             else
@@ -927,12 +917,7 @@ namespace accessibility
 
                 // convert to screen coordinates
                 aParaBB = ::accessibility::AccessibleEditableTextPara::LogicToPixel( aTmpBB, rCacheTF.GetMapMode(), rCacheVF );
-		//IAccessibility2 Implementation 2009-----
-				/*
-                if( aParaBB.IsOver( aViewArea ) )
-                {
-                */
-				//-----IAccessibility2 Implementation 2009
+
                     // at least partially visible
                     if( bFirstChild )
                     {
@@ -953,23 +938,6 @@ namespace accessibility
                                                                                    mxFrontEnd, GetEditSource(), nCurrPara ).first ),
                                           AccessibleEventId::CHILD );
                     }
-		    //IAccessibility2 Implementation 2009-----
-				/*
-                }
-                else
-                {
-                    // not or no longer visible
-                    if( maParaManager.IsReferencable( nCurrPara ) )
-                    {
-                        if( bBroadcastEvents )
-                            LostPropertyEvent( uno::makeAny( maParaManager.GetChild( nCurrPara ).first.get().getRef() ),
-                                               AccessibleEventId::CHILD );
-
-                        // clear reference
-                        maParaManager.Release( nCurrPara );
-                    }
-                }*/
-				//-----IAccessibility2 Implementation 2009
             }
         }
         catch( const uno::Exception& )
@@ -1448,12 +1416,10 @@ namespace accessibility
                         {
                             case HINT_BEGEDIT:
                             {
-			    //IAccessibility2 Implementation 2009-----
 								if(!IsActive())
 								{
 									break;
 								}
-//-----IAccessibility2 Implementation 2009
                                 // change children state
                                 maParaManager.SetActive();
 

Modified: openoffice/branches/l10n40/main/svx/source/accessibility/ChildrenManager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svx/source/accessibility/ChildrenManager.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svx/source/accessibility/ChildrenManager.cxx (original)
+++ openoffice/branches/l10n40/main/svx/source/accessibility/ChildrenManager.cxx Sun Dec  1 11:40:24 2013
@@ -86,7 +86,6 @@ long ChildrenManager::GetChildCount (voi
     return mpImpl->GetChild (nIndex);
 }
 
-//IAccessibility2 Implementation 2009-----
 Reference<XAccessible> ChildrenManager::GetChild (const Reference<drawing::XShape>& xShape)
     throw (::com::sun::star::uno::RuntimeException)
 {
@@ -101,7 +100,6 @@ Reference<XAccessible> ChildrenManager::
 	OSL_ASSERT (mpImpl != NULL);
     return mpImpl->GetChildShape(nIndex);
 }
-//-----IAccessibility2 Implementation 2009
 
 
 void ChildrenManager::Update (bool bCreateNewObjectsOnDemand)



Mime
View raw message