openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1546355 [2/9] - in /openoffice/trunk/main: accessibility/inc/accessibility/extended/ accessibility/inc/accessibility/standard/ accessibility/source/extended/ accessibility/source/helper/ accessibility/source/standard/ chart2/source/control...
Date Thu, 28 Nov 2013 12:17:39 GMT
Modified: openoffice/trunk/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx (original)
+++ openoffice/trunk/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx Thu Nov 28 12:17:31 2013
@@ -83,9 +83,7 @@ namespace accessibility
             return ( lhs.Name == rhs.Name && lhs.Value == rhs.Value );
         }
     };
-//IAccessibility2 Implementation 2009-----
 sal_Unicode cNewLine(0x0a);
-//-----IAccessibility2 Implementation 2009
 	//------------------------------------------------------------------------
 	//
 	// Static Helper
@@ -122,9 +120,7 @@ sal_Unicode cNewLine(0x0a);
      */
     class AccessibleStaticTextBase_Impl
     {
-	//IAccessibility2 Implementation 2009-----
 		friend class AccessibleStaticTextBase;
-	//-----IAccessibility2 Implementation 2009
     public:
 
         // receive pointer to our frontend class and view window
@@ -198,9 +194,7 @@ sal_Unicode cNewLine(0x0a);
                                               sal_Int32 nEndPara, sal_Int32 nEndIndex );
 
         Rectangle                   GetParagraphBoundingBox() const;
-	//IAccessibility2 Implementation 2009-----
 		sal_Bool					RemoveLineBreakCount( sal_Int32& rIndex );
-	//-----IAccessibility2 Implementation 2009
 
     private:
 
@@ -393,9 +387,7 @@ sal_Unicode cNewLine(0x0a);
         {
             nCurrCount = GetParagraph( nCurrPara ).getCharacterCount();
             nCurrIndex += nCurrCount;
-	//IAccessibility2 Implementation 2009-----
             if( nCurrIndex >= nFlatIndex )
-	//-----IAccessibility2 Implementation 2009
             {
                 // check overflow
                 DBG_ASSERT(nCurrPara >= 0 && nCurrPara <= USHRT_MAX &&
@@ -485,7 +477,6 @@ sal_Unicode cNewLine(0x0a);
         }
         return aRect;
     }
-    	//IAccessibility2 Implementation 2009-----
 	//the input argument is the index(including "\n" ) in the string.
 	//the function will calculate the actual index(not including "\n") in the string.
 	//and return true if the index is just at a "\n"
@@ -537,7 +528,6 @@ sal_Unicode cNewLine(0x0a);
 		}
 		return sal_False;
 	}
-	//-----IAccessibility2 Implementation 2009
 	//------------------------------------------------------------------------
 	//
 	// AccessibleStaticTextBase implementation
@@ -726,10 +716,8 @@ sal_Unicode cNewLine(0x0a);
     uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
-	//IAccessibility2 Implementation 2009-----
 		//get the actual index without "\n"
 		mpImpl->RemoveLineBreakCount( nIndex );
-	//IAccessibility2 Implementation 2009-----
 
         EPosition aPos( mpImpl->Index2Internal(nIndex) );
 
@@ -761,10 +749,8 @@ sal_Unicode cNewLine(0x0a);
         sal_Int32 i, nCount, nParas;
         for( i=0, nCount=0, nParas=mpImpl->GetParagraphCount(); i<nParas; ++i )
             nCount += mpImpl->GetParagraph(i).getCharacterCount();
-	//IAccessibility2 Implementation 2009-----
 		//count on the number of "\n" which equals number of paragraphs decrease 1.
 		nCount = nCount + (nParas-1);
-	//IAccessibility2 Implementation 2009-----
         return nCount;
     }
 
@@ -867,7 +853,6 @@ sal_Unicode cNewLine(0x0a);
 
         if( nStartIndex > nEndIndex )
             ::std::swap(nStartIndex, nEndIndex);
-		//IAccessibility2 Implementation 2009-----
 		//if startindex equals endindex we will get nothing. So return an empty string directly.
 		if ( nStartIndex == nEndIndex )
 		{
@@ -908,20 +893,16 @@ sal_Unicode cNewLine(0x0a);
 			//we don't return the string directly now for that we have to do some further process for "\n"
 			aRes = mpImpl->GetParagraph( aStartIndex.nPara ).getTextRange( aStartIndex.nIndex, aEndIndex.nIndex );
             //return mpImpl->GetParagraph( aStartIndex.nPara ).getTextRange( aStartIndex.nIndex, aEndIndex.nIndex );
-			//-----IAccessibility2 Implementation 2009
         }
         else
         {
             sal_Int32 i( aStartIndex.nPara );
-	    		//IAccessibility2 Implementation 2009-----
 	            aRes = mpImpl->GetParagraph(i).getTextRange( aStartIndex.nIndex,
                                                                         mpImpl->GetParagraph(i).getCharacterCount()/*-1*/);
-			//-----IAccessibility2 Implementation 2009
             ++i;
 
             // paragraphs inbetween are fully included
             for( ; i<aEndIndex.nPara; ++i )
-	    //IAccessibility2 Implementation 2009-----
 			{
 				aRes += rtl::OUString(cNewLine);
                 aRes += mpImpl->GetParagraph(i).getText();
@@ -950,16 +931,13 @@ sal_Unicode cNewLine(0x0a);
 			aRes += rtl::OUString(cNewLine);
 		}
 		return aRes;
-		//-----IAccessibility2 Implementation 2009
     }
 
     ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
     {
-    	//IAccessibility2 Implementation 2009-----
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
 		sal_Bool bLineBreak = mpImpl->RemoveLineBreakCount( nIndex );
-	//-----IAccessibility2 Implementation 2009
         EPosition aPos( mpImpl->Range2Internal(nIndex) );
 
         ::com::sun::star::accessibility::TextSegment aResult;
@@ -979,7 +957,6 @@ sal_Unicode cNewLine(0x0a);
             aResult.SegmentStart = mpImpl->Internal2Index( EPosition( aPos.nPara, 0 ) );
             aResult.SegmentEnd = aResult.SegmentStart + aResult.SegmentText.getLength();
         }
-	//IAccessibility2 Implementation 2009-----
         else if ( AccessibleTextType::ATTRIBUTE_RUN == aTextType )
         {
               SvxAccessibleTextAdapter& rTextForwarder = mpImpl->GetParagraph( aPos.nIndex ).GetTextForwarder();
@@ -991,7 +968,6 @@ sal_Unicode cNewLine(0x0a);
                      aResult.SegmentEnd = nEndIndex;
               }
         }
-	//-----IAccessibility2 Implementation 2009
         else
         {
             // No special handling required, forward to wrapped class
@@ -999,12 +975,10 @@ sal_Unicode cNewLine(0x0a);
 
             // #112814# Adapt the start index with the paragraph offset
             mpImpl->CorrectTextSegment( aResult, aPos.nPara );
-	    //IAccessibility2 Implementation 2009-----
 			if ( bLineBreak )
 			{
 				aResult.SegmentText = rtl::OUString(cNewLine);
 			}
-	    //-----IAccessibility2 Implementation 2009
         }
 
         return aResult;
@@ -1013,10 +987,8 @@ sal_Unicode cNewLine(0x0a);
     ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
     {
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
-		//IAccessibility2 Implementation 2009-----
 		sal_Int32 nOldIdx = nIndex;
 		sal_Bool bLineBreak =  mpImpl->RemoveLineBreakCount( nIndex );
-		//-----IAccessibility2 Implementation 2009
         EPosition aPos( mpImpl->Range2Internal(nIndex) );
 
         ::com::sun::star::accessibility::TextSegment aResult;
@@ -1048,12 +1020,10 @@ sal_Unicode cNewLine(0x0a);
 
             // #112814# Adapt the start index with the paragraph offset
             mpImpl->CorrectTextSegment( aResult, aPos.nPara );
-			//IAccessibility2 Implementation 2009-----
 			if ( bLineBreak && (nOldIdx-1) >= 0)
 			{
 				aResult = getTextAtIndex( nOldIdx-1, aTextType );
 			}
-			//-----IAccessibility2 Implementation 2009			
         }
 
         return aResult;
@@ -1062,11 +1032,9 @@ sal_Unicode cNewLine(0x0a);
     ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
     {
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
-	//IAccessibility2 Implementation 2009-----
 		sal_Int32 nTemp = nIndex+1;
 		sal_Bool bLineBreak = mpImpl->RemoveLineBreakCount( nTemp );
 		mpImpl->RemoveLineBreakCount( nIndex );
-	//-----IAccessibility2 Implementation 2009
         EPosition aPos( mpImpl->Range2Internal(nIndex) );
 
         ::com::sun::star::accessibility::TextSegment aResult;
@@ -1092,12 +1060,10 @@ sal_Unicode cNewLine(0x0a);
 
             // #112814# Adapt the start index with the paragraph offset
             mpImpl->CorrectTextSegment( aResult, aPos.nPara );
-			//IAccessibility2 Implementation 2009-----
 			if ( bLineBreak )
 			{
 				aResult.SegmentText = rtl::OUString(cNewLine) + aResult.SegmentText;
 			}
-			//-----IAccessibility2 Implementation 2009
        }
 
         return aResult;

Modified: openoffice/trunk/main/editeng/source/editeng/edtspell.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/editeng/edtspell.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/editeng/edtspell.cxx (original)
+++ openoffice/trunk/main/editeng/source/editeng/edtspell.cxx Thu Nov 28 12:17:31 2013
@@ -140,9 +140,7 @@ sal_Bool __EXPORT EditSpellWrapper::Spel
 	if ( pSpellInfo->bMultipleDoc )
 	{
 		bMore = pImpEE->GetEditEnginePtr()->SpellNextDocument();
-		//IAccessibility2 Implementation 2009-----
 		SetCurTextObj( pImpEE->GetEditEnginePtr()->GetCurTextObj() );
-		//-----IAccessibility2 Implementation 2009
 		if ( bMore )
 		{
 			// Der Text wurde in diese Engine getreten, bei Rueckwaerts

Modified: openoffice/trunk/main/editeng/source/editeng/impedit.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/editeng/impedit.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/editeng/impedit.cxx (original)
+++ openoffice/trunk/main/editeng/source/editeng/impedit.cxx Thu Nov 28 12:17:31 2013
@@ -122,7 +122,6 @@ void ImpEditView::SetEditSelection( cons
 
     if ( pEditEngine->pImpEditEngine->GetNotifyHdl().IsSet() )
     {
-    //IAccessibility2 Implementation 2009-----
 		const EditDoc& rDoc = pEditEngine->pImpEditEngine->GetEditDoc();
 		const EditPaM pmEnd = rDoc.GetEndPaM();
 		EENotifyType eNotifyType;
@@ -138,7 +137,6 @@ void ImpEditView::SetEditSelection( cons
 		}
         //EENotify aNotify( EE_NOTIFY_TEXTVIEWSELECTIONCHANGED );
         EENotify aNotify( eNotifyType );
-	//-----IAccessibility2 Implementation 2009
         aNotify.pEditEngine = pEditEngine;
         aNotify.pEditView = GetEditViewPtr();
         pEditEngine->pImpEditEngine->CallNotify( aNotify );

Modified: openoffice/trunk/main/editeng/source/editeng/impedit2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/editeng/impedit2.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/editeng/impedit2.cxx (original)
+++ openoffice/trunk/main/editeng/source/editeng/impedit2.cxx Thu Nov 28 12:17:31 2013
@@ -136,8 +136,7 @@ ImpEditEngine::ImpEditEngine( EditEngine
 	bIsFormatting 		= sal_False;
 	bFormatted			= sal_False;
 	bUpdate 			= sal_True;
-	bUpdateForAcc		= TRUE;		//IAccessible2 implementation 2009
-    bUseAutoColor       = sal_True;
+	bUpdateForAcc		= TRUE;    bUseAutoColor       = sal_True;
     bForceAutoColor     = sal_False;
     bAddExtLeading      = sal_False;
 	bUndoEnabled 		= sal_True;

Modified: openoffice/trunk/main/editeng/source/uno/unoedhlp.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/uno/unoedhlp.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/uno/unoedhlp.cxx (original)
+++ openoffice/trunk/main/editeng/source/uno/unoedhlp.cxx Thu Nov 28 12:17:31 2013
@@ -28,10 +28,8 @@
 #include <editeng/unoedhlp.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/editeng.hxx>
-//IAccessibility2 Implementation 2009-----
 #include <svl/itemset.hxx>
 
-//-----IAccessibility2 Implementation 2009
 //------------------------------------------------------------------------
 
 TYPEINIT1( SvxEditSourceHint, TextHint );
@@ -79,9 +77,7 @@ void SvxEditSourceHint::SetEndValue( sal
 {
     mnEnd = n; 
 }
-//IAccessibility2 Implementation 2009-----
 TYPEINIT1( SvxEditSourceHintEndPara , SvxEditSourceHint );
-//-----IAccessibility2 Implementation 2009
 //------------------------------------------------------------------------
 
 ::std::auto_ptr<SfxHint> SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify )
@@ -122,10 +118,8 @@ TYPEINIT1( SvxEditSourceHintEndPara , Sv
 
             case EE_NOTIFY_INPUT_END:
                 return ::std::auto_ptr<SfxHint>( new TextHint( TEXT_HINT_INPUT_END, 0 ) );
-	//IAccessibility2 Implementation 2009-----
 			case EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA:
 				return ::std::auto_ptr<SfxHint>( new SvxEditSourceHintEndPara( EDITSOURCE_HINT_SELECTIONCHANGED ) );
-	//-----IAccessibility2 Implementation 2009
             default:
                 DBG_ERROR( "SvxEditSourceHelper::EENotification2Hint unknown notification" );
                 break;
@@ -140,8 +134,7 @@ sal_Bool SvxEditSourceHelper::GetAttribu
 	// Need to verify implementation with AT (IA2 and ATK)
 	// Old implementation at the end of the method for reference...
 
-#if 1 // IA2 CWS
-
+#if 1
     //added dummy attributes for the default text
 	EECharAttribArray aCharAttribs, aTempCharAttribs;
 	rEE.GetCharAttribs( nPara, aTempCharAttribs );

Modified: openoffice/trunk/main/editeng/source/uno/unoedprx.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/uno/unoedprx.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/uno/unoedprx.cxx (original)
+++ openoffice/trunk/main/editeng/source/uno/unoedprx.cxx Thu Nov 28 12:17:31 2013
@@ -508,7 +508,6 @@ String SvxAccessibleTextAdapter::GetText
     EBulletInfo aBulletInfo1 = GetBulletInfo( static_cast< sal_uInt16 >(aStartIndex.GetParagraph()) );
     EBulletInfo aBulletInfo2 = GetBulletInfo( static_cast< sal_uInt16 >(aEndIndex.GetParagraph()) );
 
-    //IAccessibility2 Implementation 2009-----
 	// MT: This was done in OOo, commented out in IA2 CWS...
     /*
     if( aStartIndex.InBullet() )
@@ -525,7 +524,6 @@ String SvxAccessibleTextAdapter::GetText
         sBullet += sStr;
         sStr = sBullet;
     }*/
-    //-----IAccessibility2 Implementation 2009
     if( aEndIndex.InBullet() )
     {
         // append trailing bullet
@@ -754,7 +752,6 @@ EBulletInfo SvxAccessibleTextAdapter::Ge
 
     return mrTextForwarder->GetBulletInfo( nPara );
 }
-//IAccessible2 Implementation 2009----
 void	SvxAccessibleTextAdapter::SetUpdateModeForAcc( sal_Bool bUp)
 {
 	return mrTextForwarder->SetUpdateModeForAcc( bUp );
@@ -763,7 +760,6 @@ sal_Bool	SvxAccessibleTextAdapter::GetUp
 {
 	return mrTextForwarder->GetUpdateModeForAcc( );
 }
-//-----IAccessible2 Implementation 2009
 Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");

Modified: openoffice/trunk/main/editeng/source/uno/unonrule.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/uno/unonrule.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/uno/unonrule.cxx (original)
+++ openoffice/trunk/main/editeng/source/uno/unonrule.cxx Thu Nov 28 12:17:31 2013
@@ -221,9 +221,7 @@ Sequence<beans::PropertyValue> SvxUnoNum
 	}
 
 	{
-	//IAccessibility2 Implementation 2009-----
 		if(SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType())
-	//-----IAccessibility2 Implementation 2009
 		{
 		sal_Unicode nCode = rFmt.GetBulletChar();
 		OUString aStr( &nCode, 1 );

Modified: openoffice/trunk/main/formula/source/ui/dlg/formdlgs.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/formula/source/ui/dlg/formdlgs.src?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/formula/source/ui/dlg/formdlgs.src (original)
+++ openoffice/trunk/main/formula/source/ui/dlg/formdlgs.src Thu Nov 28 12:17:31 2013
@@ -225,17 +225,13 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
 	    Right = TRUE ;
 	    Text [ en-US ] = "Function result" ;
     };
-//IAccessibility2 Implementation 2009-----
     //Window WND_RESULT
 	FixedText WND_RESULT
-//-----IAccessibility2 Implementation 2009
     {
 	    Border = TRUE ;
 	    Pos = MAP_APPFONT ( 255 , 4 ) ;
 	    Size = MAP_APPFONT ( 60 , 12 ) ;
-//IAccessibility2 Implementation 2009-----
 		Text [ en-US ] = "Function result" ;
-//-----IAccessibility2 Implementation 2009
     };
     FixedText FT_FORMULA_RESULT
     {

Modified: openoffice/trunk/main/formula/source/ui/dlg/formula.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/formula/source/ui/dlg/formula.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/formula/source/ui/dlg/formula.cxx (original)
+++ openoffice/trunk/main/formula/source/ui/dlg/formula.cxx Thu Nov 28 12:17:31 2013
@@ -309,11 +309,9 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog*
     aRefBtn.Hide();
 
     pMEdit = aMEFormula.GetEdit();
-	//IAccessibility2 Implementation 2009-----
 	aMEFormula.SetAccessibleName(aFtFormula.GetText());
 	if (pMEdit)
 		pMEdit->SetAccessibleName(aFtFormula.GetText());
-	//-----IAccessibility2 Implementation 2009
     m_aEditHelpId = pMEdit->GetHelpId();
     pMEdit->SetUniqueId( m_aEditHelpId );
 

Modified: openoffice/trunk/main/formula/source/ui/dlg/funcutl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/formula/source/ui/dlg/funcutl.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/formula/source/ui/dlg/funcutl.cxx (original)
+++ openoffice/trunk/main/formula/source/ui/dlg/funcutl.cxx Thu Nov 28 12:17:31 2013
@@ -34,9 +34,7 @@
 #include "ControlHelper.hxx"
 #include "ModuleHelper.hxx"
 #include "ForResId.hrc"
-// IAccessibility2 implementation 2009. ------
 #include "com/sun/star/accessibility/AccessibleRole.hpp"
-// ------ IAccessibility2 implementation 2009.
 
 
 namespace formula
@@ -476,7 +474,6 @@ void ArgInput::Show()
 		pRefBtn->Show();
 	}
 }
-//IAccessibility2 Implementation 2009-----
 void ArgInput::UpdateAccessibleNames()
 {
 	String aArgName = String::CreateFromAscii(":");

Modified: openoffice/trunk/main/framework/source/loadenv/loadenv.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/loadenv/loadenv.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/loadenv/loadenv.cxx (original)
+++ openoffice/trunk/main/framework/source/loadenv/loadenv.cxx Thu Nov 28 12:17:31 2013
@@ -187,11 +187,9 @@ css::uno::Reference< css::lang::XCompone
           css::io::IOException               ,
           css::uno::RuntimeException         )
 {
-	//IAccessibility2 Implementation 2009-----
 #ifdef WNT	
 	CEnableAccessInterface e;
 #endif
-	//-----IAccessibility2 Implementation 2009
     css::uno::Reference< css::lang::XComponent > xComponent;
 
     try

Modified: openoffice/trunk/main/offapi/com/sun/star/accessibility/AccessibleEventId.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/accessibility/AccessibleEventId.idl?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/accessibility/AccessibleEventId.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/accessibility/AccessibleEventId.idl Thu Nov 28 12:17:31 2013
@@ -377,7 +377,6 @@ published constants AccessibleEventId
     */
     const short LISTBOX_ENTRY_COLLAPSED = 33;
 
-    //IAccessibility2 Implementation 2009-----
     const short ACTIVE_DESCENDANT_CHANGED_NOFOCUS = 34;
     const short SELECTION_CHANGED_ADD =35;
     const short SELECTION_CHANGED_REMOVE =36;
@@ -385,7 +384,6 @@ published constants AccessibleEventId
     const short PAGE_CHANGED =38;
     const short SECTION_CHANGED =39;
     const short COLUMN_CHANGED =40;
-    //-----IAccessibility2 Implementation 2009
 
 };
 

Modified: openoffice/trunk/main/sc/inc/chgtrack.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/chgtrack.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/inc/chgtrack.hxx (original)
+++ openoffice/trunk/main/sc/inc/chgtrack.hxx Thu Nov 28 12:17:31 2013
@@ -44,7 +44,6 @@
 #endif
 
 #define DEBUG_CHANGETRACK 0
-//IAccessibility2 Implementation 2009-----
 class ScChangeAction;
 class ScAppOptions;
 class ScActionColorChanger
@@ -62,7 +61,6 @@ public:
 				void		Update( const ScChangeAction& rAction );
 				ColorData	GetColor() const	{ return nColor; }
 };
-//-----IAccessibility2 Implementation 2009
 class ScBaseCell;
 class ScDocument;
 

Modified: openoffice/trunk/main/sc/inc/detfunc.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/detfunc.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/inc/detfunc.hxx (original)
+++ openoffice/trunk/main/sc/inc/detfunc.hxx Thu Nov 28 12:17:31 2013
@@ -155,9 +155,7 @@ public:
 	static ColorData GetCommentColor();
 	static void InitializeColors();
 	static sal_Bool	IsColorsInitialized();
-//IAccessibility2 Implementation 2009-----
 	static void AppendChangTrackNoteSeparator(String &str);
-//-----IAccessibility2 Implementation 2009
 };
 
 

Modified: openoffice/trunk/main/sc/inc/document.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/document.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/inc/document.hxx (original)
+++ openoffice/trunk/main/sc/inc/document.hxx Thu Nov 28 12:17:31 2013
@@ -440,7 +440,6 @@ private:
 
     sal_Int16           mnNamedRangesLockCount;
 
-//IAccessibility2 Implementation 2009-----
 	String msDocAccTitle;
 public:
 	// SC_DLLPUBLIC sal_Bool RowHidden( SCROW nRow, SCTAB nTab );
@@ -456,7 +455,6 @@ public:
 	virtual sal_Bool getDocReadOnly() const { return bReadOnly; }
 	sal_Bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder);
 	void GetCellChangeTrackNote( const ScAddress &cell,String &strTrackText,sal_Bool &pbLeftEdge);
-//-----IAccessibility2 Implementation 2009
 	SC_DLLPUBLIC sal_uLong			GetCellCount() const;		// alle Zellen
     SCSIZE          GetCellCount(SCTAB nTab, SCCOL nCol) const;
 	sal_uLong			GetWeightedCount() const;	// Formeln und Edit staerker gewichtet
@@ -482,9 +480,7 @@ public:
 	SC_DLLPUBLIC void			InitDrawLayer( SfxObjectShell* pDocShell = NULL );
 	XColorListSharedPtr GetColorTable();
 
-//IAccessibility2 Implementation 2009-----
 	ScTable*      GetTableByIndex(sal_Int32 nIndex);
-//-----IAccessibility2 Implementation 2009
 	SC_DLLPUBLIC sfx2::LinkManager*		GetLinkManager() const;
 
 	SC_DLLPUBLIC const ScDocOptions&		GetDocOptions() const;

Modified: openoffice/trunk/main/sc/inc/drwlayer.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/drwlayer.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/inc/drwlayer.hxx (original)
+++ openoffice/trunk/main/sc/inc/drwlayer.hxx Thu Nov 28 12:17:31 2013
@@ -230,10 +230,8 @@ public:
 							const Point& rWinPoint, const Window& rCmpWnd );
 
     static ScMacroInfo* GetMacroInfo( SdrObject* pObj, sal_Bool bCreate = sal_False );
-//IAccessibility2 Implementation 2009-----
 	virtual ImageMap* GetImageMapForObject(SdrObject* pObj);
 	virtual sal_Int32 GetHyperlinkCount(SdrObject* pObj);
-//-----IAccessibility2 Implementation 2009
 
 private:
 	static SfxObjectShell* pGlobalDrawPersist;			// fuer AllocModel

Modified: openoffice/trunk/main/sc/inc/sc.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/sc.hrc?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/inc/sc.hrc (original)
+++ openoffice/trunk/main/sc/inc/sc.hrc Thu Nov 28 12:17:31 2013
@@ -998,13 +998,11 @@
 #define STR_ACC_DATAPILOT_DATA_DESCR (STR_START + 180)
 #define STR_ACC_DATAPILOT_SEL_DESCR (STR_START + 181)
 
-//IAccessibility2 Implementation 2009-----
 #define	STR_ACC_TOOLBAR_FORMULA		(STR_START + 182)
 #define STR_ACC_DOC_SPREADSHEET		(STR_START + 185)
 #define STR_ACC_DOC_PREVIEW_SUFFIX (STR_START + 186)
 #define STR_ACC_DOC_SPREADSHEET_READONLY		(STR_START + 187)
 
-//-----IAccessibility2 Implementation 2009
 
 // --------------------------------------------------
 

Modified: openoffice/trunk/main/sc/inc/table.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/table.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/inc/table.hxx (original)
+++ openoffice/trunk/main/sc/inc/table.hxx Thu Nov 28 12:17:31 2013
@@ -938,10 +938,8 @@ private:
         SCROW mnUBound;
     };
 
-//IAccessibility2 Implementation 2009-----
 public :
 	ScColumn* GetColumnByIndex(sal_Int32 index);
-//-----IAccessibility2 Implementation 2009
 };
 
 

Modified: openoffice/trunk/main/sc/source/core/data/documen2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/documen2.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/data/documen2.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/documen2.cxx Thu Nov 28 12:17:31 2013
@@ -87,11 +87,9 @@
 #include "recursionhelper.hxx"
 #include "lookupcache.hxx"
 #include "externalrefmgr.hxx"
-//IAccessibility2 Implementation 2009-----
 #include "appoptio.hxx"
 #include "scmod.hxx"
 #include "../../ui/inc/viewutil.hxx"
-//-----IAccessibility2 Implementation 2009
 #include "tabprotection.hxx"
 #include "formulaparserpool.hxx"
 #include "clipparam.hxx"
@@ -222,9 +220,7 @@ ScDocument::ScDocument( ScDocumentMode	e
         mbStreamValidLocked( false ),
         mbIsTemporary(false), // #118840#
         mnNamedRangesLockCount( 0 ),
-//IAccessibility2 Implementation 2009-----
 		bReadOnly(sal_False)
-//-----IAccessibility2 Implementation 2009
 {
     SetStorageGrammar( formula::FormulaGrammar::GRAM_STORAGE_DEFAULT);
 
@@ -1303,7 +1299,6 @@ void ScDocument::ClearLookupCaches()
     if( pLookupCacheMapImpl )
         pLookupCacheMapImpl->clear();
 }
-//IAccessibility2 Implementation 2009-----
 sal_Bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder)
 {
 	ScChangeTrack* pTrack = GetChangeTrack();
@@ -1457,4 +1452,3 @@ void ScDocument::GetCellChangeTrackNote(
 		}
 	}
 }
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/trunk/main/sc/source/core/data/document.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/document.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/data/document.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/document.cxx Thu Nov 28 12:17:31 2013
@@ -200,7 +200,6 @@ sal_Bool ScDocument::GetTable( const Str
 	return sal_False;
 }
 
-//IAccessibility2 Implementation 2009-----
 ScTable* ScDocument::GetTableByIndex(sal_Int32 nIndex)
 {
   if ( nIndex <= MAXTAB && nIndex >= 0)
@@ -208,7 +207,6 @@ ScTable* ScDocument::GetTableByIndex(sal
 
   return NULL;
 }
-//-----IAccessibility2 Implementation 2009
 
 sal_Bool ScDocument::ValidTabName( const String& rName ) const
 {

Modified: openoffice/trunk/main/sc/source/core/data/drwlayer.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/drwlayer.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/data/drwlayer.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/drwlayer.cxx Thu Nov 28 12:17:31 2013
@@ -2027,7 +2027,6 @@ ScMacroInfo* ScDrawLayer::GetMacroInfo( 
     }
     return 0;
 }
-//IAccessibility2 Implementation 2009-----
 ImageMap* ScDrawLayer::GetImageMapForObject(SdrObject* pObj)
 {
 	ScIMapInfo* pIMapInfo = const_cast<ScIMapInfo*>( GetIMapInfo( pObj ) );
@@ -2047,7 +2046,6 @@ sal_Int32 ScDrawLayer::GetHyperlinkCount
 		nHLCount = 0; // pMacroInfo->GetHlink().getLength() > 0 ? 1 : 0;
 	return nHLCount;
 }
-//-----IAccessibility2 Implementation 2009
 void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist)			// static
 {
 	DBG_ASSERT(!pGlobalDrawPersist,"SetGlobalDrawPersist mehrfach");

Modified: openoffice/trunk/main/sc/source/core/data/table2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/table2.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/data/table2.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/table2.cxx Thu Nov 28 12:17:31 2013
@@ -3308,7 +3308,6 @@ sal_uLong ScTable::GetColOffset( SCCOL n
 	return n;
 }
 
-//IAccessibility2 Implementation 2009-----
 ScColumn* ScTable::GetColumnByIndex(sal_Int32 index)
 {
 	if( index <= MAXCOL && index >= 0 )
@@ -3317,5 +3316,4 @@ ScColumn* ScTable::GetColumnByIndex(sal_
 	}
 	return NULL;
 }
-//-----IAccessibility2 Implementation 2009
 

Modified: openoffice/trunk/main/sc/source/core/tool/detfunc.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/tool/detfunc.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/tool/detfunc.cxx (original)
+++ openoffice/trunk/main/sc/source/core/tool/detfunc.cxx Thu Nov 28 12:17:31 2013
@@ -1706,10 +1706,8 @@ sal_Bool ScDetectiveFunc::IsColorsInitia
 	return bColorsInitialized;
 }
 
-//IAccessibility2 Implementation 2009-----
 void ScDetectiveFunc::AppendChangTrackNoteSeparator(String &aDisplay)
 {
 	aDisplay.AppendAscii( RTL_CONSTASCII_STRINGPARAM("\n--------\n") );	
 }
-//-----IAccessibility2 Implementation 2009
 

Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx Thu Nov 28 12:17:31 2013
@@ -40,9 +40,7 @@
 #include "editsrc.hxx"
 #include "dociter.hxx"
 #include "cell.hxx"
-//IAccessibility2 Implementation 2009-----
 #include "validat.hxx"
-//-----IAccessibility2 Implementation 2009
 #ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX
 #include <unotools/accessiblestatesethelper.hxx>
 #endif
@@ -60,9 +58,7 @@
 #include <comphelper/sequence.hxx>
 #include <float.h>
 
-//IAccessibility2 Implementation 2009-----
 #include "AccessibleSpreadsheet.hxx"
-//-----IAccessibility2 Implementation 2009
 using namespace	::com::sun::star;
 using namespace	::com::sun::star::accessibility;
 
@@ -245,7 +241,6 @@ uno::Reference<XAccessibleStateSet> SAL_
 		pStateSet->AddState(AccessibleStateType::DEFUNC);
     else
     {
-//IAccessibility2 Implementation 2009-----
 		if (IsFormulaMode())
 		{
 			pStateSet->AddState(AccessibleStateType::ENABLED);
@@ -263,7 +258,6 @@ uno::Reference<XAccessibleStateSet> SAL_
 				pStateSet->AddState(AccessibleStateType::VISIBLE);
 			return pStateSet;
 		}
-//-----IAccessibility2 Implementation 2009
 	    if (IsEditable(xParentStates))
 	    {
 		    pStateSet->AddState(AccessibleStateType::EDITABLE);
@@ -272,9 +266,7 @@ uno::Reference<XAccessibleStateSet> SAL_
 	    pStateSet->AddState(AccessibleStateType::ENABLED);
 	    pStateSet->AddState(AccessibleStateType::MULTI_LINE);
 	    pStateSet->AddState(AccessibleStateType::MULTI_SELECTABLE);
-//IAccessibility2 Implementation 2009-----
 	    pStateSet->AddState(AccessibleStateType::FOCUSABLE);
-//-----IAccessibility2 Implementation 2009
 	    if (IsOpaque(xParentStates))
 		    pStateSet->AddState(AccessibleStateType::OPAQUE);
 	    pStateSet->AddState(AccessibleStateType::SELECTABLE);
@@ -371,7 +363,6 @@ sal_Bool ScAccessibleCell::IsOpaque(
 
 sal_Bool ScAccessibleCell::IsSelected()
 {
-//IAccessibility2 Implementation 2009-----
 	if (IsFormulaMode())
 	{
 		const ScAccessibleSpreadsheet *pSheet =static_cast<const ScAccessibleSpreadsheet*>(mxParent.get());
@@ -381,7 +372,6 @@ sal_Bool ScAccessibleCell::IsSelected()
 		}
 		return sal_False;
 	}
-//-----IAccessibility2 Implementation 2009
 	sal_Bool bResult(sal_False);
 	if (mpViewShell && mpViewShell->GetViewData())
 	{
@@ -401,12 +391,10 @@ ScDocument* ScAccessibleCell::GetDocumen
 
 ::std::auto_ptr< SvxEditSource > ScAccessibleCell::CreateEditSource(ScTabViewShell* pViewShell, ScAddress aCell, ScSplitPos eSplitPos)
 {
-//IAccessibility2 Implementation 2009-----
 	if (IsFormulaMode())
 	{
 		return ::std::auto_ptr< SvxEditSource >();
 	}
-//-----IAccessibility2 Implementation 2009
 	::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData
         ( new ScAccessibleCellTextData( pViewShell, aCell, eSplitPos, this ) );
 	::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessibleCellTextData));
@@ -497,7 +485,6 @@ void ScAccessibleCell::AddRelation(const
 		pRelationSet->AddRelation(aRelation);
 	}
 }
-//IAccessibility2 Implementation 2009-----
 ::rtl::OUString ReplaceOneChar(::rtl::OUString oldOUString, ::rtl::OUString replacedChar, ::rtl::OUString replaceStr)
 {
 	int iReplace = -1;
@@ -591,7 +578,6 @@ sal_Bool ScAccessibleCell::IsDropdown()
 	sal_uInt16 nPosX = maCellAddress.Col();
 	sal_uInt16 nPosY = sal_uInt16(maCellAddress.Row());
 	sal_uInt16 nTab = maCellAddress.Tab();
-	//IAccessibility2 Implementation 2009-----
 	sal_uInt32 nValidation = static_cast< const SfxUInt32Item* >( mpDoc->GetAttr( nPosX, nPosY, nTab, ATTR_VALIDDATA ) )->GetValue();
     if( nValidation )
     {
@@ -599,7 +585,6 @@ sal_Bool ScAccessibleCell::IsDropdown()
         if( pData && pData->HasSelectionList() )
             return sal_True;
     }
-	//-----IAccessibility2 Implementation 2009
 	ScMergeFlagAttr* pAttr;
 	pAttr = (ScMergeFlagAttr*)mpDoc->GetAttr( nPosX, nPosY, nTab, ATTR_MERGE_FLAG );
 	if( pAttr->HasAutoFilter() )
@@ -639,4 +624,3 @@ sal_Bool ScAccessibleCell::IsDropdown()
 	}
 	return sal_False;
 }
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx Thu Nov 28 12:17:31 2013
@@ -38,10 +38,8 @@
 #include "sc.hrc"
 #endif
 #include "unonames.hxx"
-//IAccessibility2 Implementation 2009-----
 #include "detfunc.hxx"
 #include "chgtrack.hxx"
-//-----IAccessibility2 Implementation 2009
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEROLE_HPP_
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #endif
@@ -55,11 +53,9 @@
 #include <rtl/uuid.h>
 #include <comphelper/sequence.hxx>
 #include <sfx2/objsh.hxx>
-//IAccessibility2 Implementation 2009-----
 #include <com/sun/star/sheet/XSheetAnnotation.hpp>
 #include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp>
 #include <com/sun/star/text/XSimpleText.hpp>
-//-----IAccessibility2 Implementation 2009
 
 #include <float.h>
 
@@ -234,7 +230,6 @@ sal_Int32
     ScAccessibleCellBase::createAccessibleName(void)
     throw (uno::RuntimeException)
 {
-//IAccessibility2 Implementation 2009-----
 	//String sName( ScResId(STR_ACC_CELL_NAME) );
 	String sAddress;
 	// Document not needed, because only the cell address, but not the tablename is needed
@@ -247,7 +242,6 @@ sal_Int32
     //sName.Append( ' ' );
     //return rtl::OUString(sName);
     return rtl::OUString(sAddress);
-//-----IAccessibility2 Implementation 2009
 }
 
 	//=====  XAccessibleValue  ================================================
@@ -260,14 +254,12 @@ uno::Any SAL_CALL
     IsObjectValid();
 	uno::Any aAny;
 	if (mpDoc)
-//IAccessibility2 Implementation 2009-----
 		//aAny <<= mpDoc->GetValue(maCellAddress);
 	{
 		String valStr;
 		mpDoc->GetString(maCellAddress.Col(),maCellAddress.Row(),maCellAddress.Tab(), valStr);
 		aAny <<= rtl::OUString(valStr);
 	}
-//-----IAccessibility2 Implementation 2009
 	return aAny;
 }
 
@@ -356,7 +348,6 @@ sal_Bool ScAccessibleCellBase::IsEditabl
 		bEditable = sal_True;
 	return bEditable;
 }
-//IAccessibility2 Implementation 2009-----
 ::rtl::OUString SAL_CALL ScAccessibleCellBase::GetNote(void)
 								throw (::com::sun::star::uno::RuntimeException)
 {
@@ -657,4 +648,3 @@ sal_Bool ScAccessibleCellBase::IsEditabl
 	strNote += GetNote();
 	return strNote;
 }
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx Thu Nov 28 12:17:31 2013
@@ -31,12 +31,10 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 
-//IAccessibility2 Implementation 2009-----
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <comphelper/accessiblekeybindinghelper.hxx>
 #include <com/sun/star/awt/KeyModifier.hpp>
 #include <vcl/keycodes.hxx>
-//-----IAccessibility2 Implementation 2009
 #ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX
 #include <unotools/accessiblestatesethelper.hxx>
 #endif
@@ -45,18 +43,14 @@
 #include <toolkit/helper/convert.hxx>
 #include <tools/debug.hxx>
 
-//IAccessibility2 Implementation 2009-----
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <unotools/accessiblerelationsethelper.hxx>
-//-----IAccessibility2 Implementation 2009
 using namespace	::com::sun::star;
 using namespace	::com::sun::star::accessibility;
 
 class ScAccessibleDataPilotButton
 	:	public ScAccessibleContextBase
-//IAccessibility2 Implementation 2009-----
 	, public ::com::sun::star::accessibility::XAccessibleAction
-//-----IAccessibility2 Implementation 2009
 {
 public:
 	//=====  internal  ========================================================
@@ -78,7 +72,6 @@ public:
 protected:
 	virtual ~ScAccessibleDataPilotButton(void);
 public:
-//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);
@@ -90,7 +83,6 @@ public:
 		throw (::com::sun::star::uno::RuntimeException);
 	virtual void SAL_CALL acquire() throw ();
 	virtual void SAL_CALL release() throw ();
-//-----IAccessibility2 Implementation 2009
 	///=====  XAccessibleComponent  ============================================
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
@@ -132,10 +124,8 @@ public:
             ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
     	getAccessibleStateSet(void)
         throw (::com::sun::star::uno::RuntimeException);
-//IAccessibility2 Implementation 2009-----
 	::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > 
 		SAL_CALL getAccessibleRelationSet(	) throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
 	///=====  XServiceInfo  ====================================================
 
     /**	Returns an identifier for the implementation of this object.
@@ -327,10 +317,8 @@ void ScAccessibleDataPilotControl::GotFo
     {
         DBG_ASSERT(mpFieldWindow->GetFieldCount() == maChildren.size(), "did not recognize a child count change");
 
-//IAccessibility2 Implementation 2009-----
 		if(maChildren.size()==0)
 			return ;
-//-----IAccessibility2 Implementation 2009
         sal_Int32 nIndex(mpFieldWindow->GetSelectedIndex());
         uno::Reference < XAccessible > xTempAcc = maChildren[nIndex].xWeakAcc;
         if (xTempAcc.is() && maChildren[nIndex].pAcc)
@@ -343,10 +331,8 @@ void ScAccessibleDataPilotControl::LostF
     if (mpFieldWindow)
     {
         DBG_ASSERT(mpFieldWindow->GetFieldCount() == maChildren.size(), "did not recognize a child count change");
-//IAccessibility2 Implementation 2009-----
 		if(maChildren.size()==0)
 			return ;
-//-----IAccessibility2 Implementation 2009
         sal_Int32 nIndex(mpFieldWindow->GetSelectedIndex());
         uno::Reference < XAccessible > xTempAcc = maChildren[nIndex].xWeakAcc;
         if (xTempAcc.is() && maChildren[nIndex].pAcc)
@@ -556,11 +542,9 @@ ScAccessibleDataPilotButton::ScAccessibl
         ::com::sun::star::accessibility::XAccessible>& rxParent,
         ScPivotFieldWindow* pFieldWindow,
         sal_Int32 nIndex)
-//IAccessibility2 Implementation 2009-----
 //change role frome PUSH_BUTTON to BUTTON_MENU
     //: ScAccessibleContextBase(rxParent, AccessibleRole::PUSH_BUTTON),
     : ScAccessibleContextBase(rxParent, AccessibleRole::BUTTON_MENU),
-//-----IAccessibility2 Implementation 2009
     mpFieldWindow(pFieldWindow),
     mnIndex(nIndex)
 {
@@ -699,7 +683,6 @@ uno::Reference<XAccessibleStateSet> SAL_
 
     return pStateSet;
 }
-//IAccessibility2 Implementation 2009-----
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > 
 	SAL_CALL ScAccessibleDataPilotButton::getAccessibleRelationSet(	) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -715,7 +698,6 @@ uno::Reference<XAccessibleStateSet> SAL_
 	return xSet;
 
 }
-//-----IAccessibility2 Implementation 2009
 	///=====  XServiceInfo  ====================================================
 
 ::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::getImplementationName(void)
@@ -743,10 +725,8 @@ uno::Sequence<sal_Int8> SAL_CALL ScAcces
 ::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleDescription(void)
         throw (::com::sun::star::uno::RuntimeException)
 {
-//IAccessibility2 Implementation 2009-----
 	 if (mpFieldWindow)
         return mpFieldWindow->GetHelpText();
-//-----IAccessibility2 Implementation 2009
     return rtl::OUString();
 }
 
@@ -783,7 +763,6 @@ Rectangle ScAccessibleDataPilotButton::G
     else
         return Rectangle();
 }
-//IAccessibility2 Implementation 2009-----
 // -----------------------------------------------------------------------------
 // XAccessibleAction
 // -----------------------------------------------------------------------------
@@ -845,5 +824,4 @@ void SAL_CALL ScAccessibleDataPilotButto
 {
 	ScAccessibleContextBase::release();
 }
-//-----IAccessibility2 Implementation 2009
 

Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx Thu Nov 28 12:17:31 2013
@@ -70,7 +70,6 @@
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <toolkit/helper/convert.hxx>
 
-//IAccessibility2 Implementation 2009-----
 #include <svx/AccessibleControlShape.hxx>
 #include <svx/AccessibleShape.hxx>
 #include <svx/ShapeTypeHandler.hxx>
@@ -78,15 +77,12 @@
 #include <sfx2/objsh.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/editeng.hxx>
-//-----IAccessibility2 Implementation 2009
 #include <list>
 #include <algorithm>
-//IAccessibility2 Implementation 2009-----
 #include "AccessibleCell.hxx"
 
 #include "svx/unoapi.hxx"
 #include "scmod.hxx"
-//-----IAccessibility2 Implementation 2009
 using namespace	::com::sun::star;
 using namespace	::com::sun::star::accessibility;
 using ::std::for_each;
@@ -259,7 +255,6 @@ public:
 		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);
@@ -268,7 +263,6 @@ public:
         GetAccessibleCaption (const ::com::sun::star::uno::Reference<
             ::com::sun::star::drawing::XShape>& xShape)
 			throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
     ///=====  Internal  ========================================================
     void SetDrawBroadcaster();
 
@@ -489,7 +483,6 @@ sal_Bool ScChildrenShapes::ReplaceChild 
     return bResult;
 }
 
-//IAccessibility2 Implementation 2009-----
 ::accessibility::AccessibleControlShape * ScChildrenShapes::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet* pSet) throw (::com::sun::star::uno::RuntimeException)
 {
 	sal_Int32 count = GetCount();
@@ -527,7 +520,6 @@ ScChildrenShapes::GetAccessibleCaption (
 	}
 	return NULL;
 }
-//-----IAccessibility2 Implementation 2009
 sal_Int32 ScChildrenShapes::GetCount() const
 {
 	SdrPage* pDrawPage = GetDrawPage();
@@ -806,9 +798,7 @@ uno::Reference< XAccessible > ScChildren
         std::vector < uno::Reference < drawing::XShape > > aShapes;
         FillShapes(aShapes);
 
-//IAccessibility2 Implementation 2009-----
 		if(aShapes.size()<=0) return xAccessible;
-//-----IAccessibility2 Implementation 2009
         SortedShapes::iterator aItr;
         if (FindShape(aShapes[nSelectedChildIndex], aItr))
             xAccessible = Get(aItr - maZOrderedShapes.begin());
@@ -953,20 +943,16 @@ sal_Bool ScChildrenShapes::FindSelectedS
     }
     else
         mnShapesSelected = 0;
-//IAccessibility2 Implementation 2009-----
 	SdrObject *pFocusedObj = NULL;
 	if( mnShapesSelected == 1 && aShapesList.size() == 1)
 	{
 		pFocusedObj = GetSdrObjectFromXShape(aShapesList[0]->xShape);
 	}
-//-----IAccessibility2 Implementation 2009
     ScShapeDataLess aLess;
     std::sort(aShapesList.begin(), aShapesList.end(), aLess);
-//IAccessibility2 Implementation 2009-----
 	SortedShapes vecSelectedShapeAdd;
 	SortedShapes vecSelectedShapeRemove;
 	sal_Bool bHasSelect=sal_False;
-//-----IAccessibility2 Implementation 2009
     SortedShapes::iterator aXShapesItr(aShapesList.begin());
     SortedShapes::const_iterator aXShapesEndItr(aShapesList.end());
     SortedShapes::iterator aDataItr(maZOrderedShapes.begin());
@@ -991,18 +977,14 @@ sal_Bool ScChildrenShapes::FindSelectedS
                         (*aDataItr)->pAccShape->SetState(AccessibleStateType::SELECTED);
                         (*aDataItr)->pAccShape->ResetState(AccessibleStateType::FOCUSED);
                         bResult = sal_True;
-//IAccessibility2 Implementation 2009-----
 						vecSelectedShapeAdd.push_back((*aDataItr));
-//-----IAccessibility2 Implementation 2009
                     }
                     aFocusedItr = aDataItr;
                 }
-//IAccessibility2 Implementation 2009-----
 				else
 				{
 					 bHasSelect = sal_True;
 				}
-//-----IAccessibility2 Implementation 2009
                 ++aDataItr;
                 ++aXShapesItr;
             }
@@ -1016,9 +998,7 @@ sal_Bool ScChildrenShapes::FindSelectedS
                         (*aDataItr)->pAccShape->ResetState(AccessibleStateType::SELECTED);
                         (*aDataItr)->pAccShape->ResetState(AccessibleStateType::FOCUSED);
                         bResult = sal_True;
-//IAccessibility2 Implementation 2009-----
 						vecSelectedShapeRemove.push_back(*aDataItr);
-//-----IAccessibility2 Implementation 2009
                     }
                 }
                 ++aDataItr;
@@ -1033,7 +1013,6 @@ sal_Bool ScChildrenShapes::FindSelectedS
         else
             ++aDataItr;
     }
-//IAccessibility2 Implementation 2009-----
 	bool bWinFocus=false;
 	ScGridWindow* pWin = static_cast<ScGridWindow*>(mpViewShell->GetWindowByPos(meSplitPos));
 	if (pWin)
@@ -1148,7 +1127,6 @@ sal_Bool ScChildrenShapes::FindSelectedS
 		aEvent.NewValue <<= xChild;
 		mpAccessibleDocument->CommitChange(aEvent);
 	}
-//-----IAccessibility2 Implementation 2009
     std::for_each(aShapesList.begin(), aShapesList.end(), Destroy());
 
     return bResult;
@@ -1559,7 +1537,6 @@ void ScAccessibleDocument::Notify( SfxBr
 		const ScAccGridWinFocusGotHint& rRef = (const ScAccGridWinFocusGotHint&)rHint;
 		if (rRef.GetNewGridWin() == meSplitPos)
         {
-//IAccessibility2 Implementation 2009-----
 			uno::Reference<XAccessible> xAccessible;
 			if (mpChildrenShapes)
 			{
@@ -1584,7 +1561,6 @@ void ScAccessibleDocument::Notify( SfxBr
             else
                 CommitFocusGained();
 			}            
-//-----IAccessibility2 Implementation 2009
         }
 	}
 	else if (rHint.ISA( SfxSimpleHint ))
@@ -1603,18 +1579,14 @@ void ScAccessibleDocument::Notify( SfxBr
             {
                 mpChildrenShapes = new ScChildrenShapes( this, mpViewShell, meSplitPos );
             }
-//IAccessibility2 Implementation 2009-----
 			//Invoke Init() to rebuild the mpChildrenShapes variable
 			this->Init();
-//-----IAccessibility2 Implementation 2009
 			AccessibleEventObject aEvent;
 			aEvent.EventId = AccessibleEventId::INVALIDATE_ALL_CHILDREN;
 			aEvent.Source = uno::Reference< XAccessibleContext >(this);
 			CommitChange(aEvent); // all childs changed
-//IAccessibility2 Implementation 2009-----
 			if (mpAccessibleSpreadsheet)
 				mpAccessibleSpreadsheet->FireFirstCellFocus();
-//-----IAccessibility2 Implementation 2009
 		}
         else if (rRef.GetId() == SC_HINT_ACC_MAKEDRAWLAYER)
         {
@@ -1625,7 +1597,6 @@ void ScAccessibleDocument::Notify( SfxBr
         {
             if (mpViewShell && mpViewShell->GetViewData()->HasEditView(meSplitPos))
             {
-				//IAccessibility2 Implementation 2009------
 				EditEngine* pEditEng = mpViewShell->GetViewData()->GetEditView(meSplitPos)->GetEditEngine();
 				if (pEditEng && pEditEng->GetUpdateMode())
 				{
@@ -1643,7 +1614,6 @@ void ScAccessibleDocument::Notify( SfxBr
 
 					mpTempAccEdit->GotFocus();
 				}
-				//------IAccessibility2 Implementation 2009
             }
         }
         else if (rRef.GetId() == SC_HINT_ACC_LEAVEEDITMODE)
@@ -1655,15 +1625,11 @@ void ScAccessibleDocument::Notify( SfxBr
 
                 mpTempAccEdit = NULL;
                 RemoveChild(mxTempAcc, sal_True);
-//IAccessibility2 Implementation 2009-----
                 //if (mpAccessibleSpreadsheet)
                 if (mpAccessibleSpreadsheet && mpViewShell->IsActive())
-//-----IAccessibility2 Implementation 2009
                     mpAccessibleSpreadsheet->GotFocus();
-//IAccessibility2 Implementation 2009-----
                 //else
                 else if( mpViewShell->IsActive())
-//-----IAccessibility2 Implementation 2009
                     CommitFocusGained();
             }
         }
@@ -1724,12 +1690,10 @@ void SAL_CALL ScAccessibleDocument::sele
 
 		CommitChange(aEvent);
 	}
-//IAccessibility2 Implementation 2009-----
     if(mpChildrenShapes )
 	{
 		mpChildrenShapes->SelectionChanged();
 	}
-//-----IAccessibility2 Implementation 2009
 }
 
 	//=====  XInterface  =====================================================
@@ -1737,7 +1701,6 @@ void SAL_CALL ScAccessibleDocument::sele
 uno::Any SAL_CALL ScAccessibleDocument::queryInterface( uno::Type const & rType )
 	throw (uno::RuntimeException)
 {
-//IAccessibility2 Implementation 2009-----
 	uno::Any aAnyTmp;
 	if(rType == ::getCppuType((com::sun::star::uno::Reference<XAccessibleGetAccFlowTo> *)NULL) )
        {
@@ -1745,7 +1708,6 @@ uno::Any SAL_CALL ScAccessibleDocument::
             aAnyTmp <<= AccFromXShape;
 	     return aAnyTmp;
        }
-//-----IAccessibility2 Implementation 2009
 	uno::Any aAny (ScAccessibleDocumentImpl::queryInterface(rType));
 	return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType);
 }
@@ -1897,7 +1859,6 @@ uno::Reference<XAccessibleStateSet> SAL_
 	return pStateSet;
 }
 
-//IAccessibility2 Implementation 2009-----
 ::rtl::OUString SAL_CALL
     ScAccessibleDocument::getAccessibleName(void)
     throw (::com::sun::star::uno::RuntimeException)
@@ -1927,7 +1888,6 @@ uno::Reference<XAccessibleStateSet> SAL_
 	}
 	return sName;
 }
-//-----IAccessibility2 Implementation 2009
 	///=====  XAccessibleSelection  ===========================================
 
 void SAL_CALL
@@ -2400,7 +2360,6 @@ rtl::OUString ScAccessibleDocument::GetC
 {
     return rtl::OUString();
 }
-//IAccessibility2 Implementation 2009-----
 ScDocument *ScAccessibleDocument::GetDocument() const
 {
 	return mpViewShell ? mpViewShell->GetViewData()->GetDocument() : NULL;  
@@ -2597,5 +2556,4 @@ sal_Int32 SAL_CALL ScAccessibleDocument:
     IsObjectValid();
     return SC_MOD()->GetColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor;
 }
-//-----IAccessibility2 Implementation 2009
 

Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx Thu Nov 28 12:17:31 2013
@@ -45,10 +45,8 @@ ScAccessibleDocumentBase::ScAccessibleDo
 ScAccessibleDocumentBase::~ScAccessibleDocumentBase(void)
 {
 }
-//IAccessibility2 Implementation 2009-----
 void ScAccessibleDocumentBase::SwitchViewFireFocus()
 {
 	CommitFocusGained();
 }
-//-----IAccessibility2 Implementation 2009
 

Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx Thu Nov 28 12:17:31 2013
@@ -1899,7 +1899,6 @@ ScShapeChilds* ScAccessibleDocumentPageP
     return mpShapeChilds;
 }
 
-//IAccessibility2 Implementation 2009-----
 ::rtl::OUString ScAccessibleDocumentPagePreview::getAccessibleName(void)
 throw (::com::sun::star::uno::RuntimeException)
 {
@@ -1926,7 +1925,6 @@ throw (::com::sun::star::uno::RuntimeExc
 
 	return sName;
 }
-//-----IAccessibility2 Implementation 2009=======
 
 //UNUSED2009-05 uno::Reference < XAccessible > ScAccessibleDocumentPagePreview::GetCurrentAccessibleTable()
 //UNUSED2009-05 {

Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleEditObject.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleEditObject.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleEditObject.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleEditObject.cxx Thu Nov 28 12:17:31 2013
@@ -44,7 +44,6 @@
 #include <rtl/uuid.h>
 #include <tools/debug.hxx>
 #include <svx/AccessibleTextHelper.hxx>
-//IAccessibility2 Implementation 2009-----
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
 #include <editeng/editview.hxx>
@@ -60,7 +59,6 @@
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
 using ::com::sun::star::lang::IndexOutOfBoundsException;
 using ::com::sun::star::uno::RuntimeException;
-//-----IAccessibility2 Implementation 2009
 using namespace	::com::sun::star;
 using namespace	::com::sun::star::accessibility;
 
@@ -81,7 +79,6 @@ ScAccessibleEditObject::ScAccessibleEdit
     CreateTextHelper();
     SetName(rName);
     SetDescription(rDescription);
-//IAccessibility2 Implementation 2009-----
 	if( meObjectType == CellInEditMode)
 	{
 		const ScAccessibleDocument *pAccDoc = const_cast<ScAccessibleDocument*>(static_cast<ScAccessibleDocument*>(rxParent.get())) ;
@@ -97,7 +94,6 @@ ScAccessibleEditObject::ScAccessibleEdit
 	}
 	else
 		m_pScDoc=NULL;
-//-----IAccessibility2 Implementation 2009
 }
 
 ScAccessibleEditObject::~ScAccessibleEditObject()
@@ -136,7 +132,6 @@ void ScAccessibleEditObject::GotFocus()
         mpTextHelper->SetFocus(sal_True);
 }
 
-//IAccessibility2 Implementation 2009-----
 //=====  XInterface  ==========================================================
 
 com::sun::star::uno::Any SAL_CALL
@@ -162,7 +157,6 @@ void SAL_CALL
 {
     ScAccessibleContextBase::release ();
 }
-//-----IAccessibility2 Implementation 2009
 	//=====  XAccessibleComponent  ============================================
 
 uno::Reference< XAccessible > SAL_CALL ScAccessibleEditObject::getAccessibleAtPoint(
@@ -408,7 +402,6 @@ void ScAccessibleEditObject::CreateTextH
         }
     }
 }
-//IAccessibility2 Implementation 2009-----
 sal_Int32 SAL_CALL ScAccessibleEditObject::getForeground(  ) 
         throw (::com::sun::star::uno::RuntimeException)
 {
@@ -556,5 +549,4 @@ uno::Reference< XAccessibleRelationSet >
 	}
 	return uno::Reference< XAccessibleRelationSet >();
 }
-//-----IAccessibility2 Implementation 2009
 

Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx Thu Nov 28 12:17:31 2013
@@ -50,16 +50,13 @@
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
 #include <svtools/colorcfg.hxx>
-//IAccessibility2 Implementation 2009-----
 #include "scresid.hxx"
 #include "sc.hrc"
-//-----IAccessibility2 Implementation 2009
 #include <algorithm>
 
 using namespace	::com::sun::star;
 using namespace	::com::sun::star::accessibility;
 
-//IAccessibility2 Implementation 2009-----
 bool CompMinCol(const std::pair<sal_uInt16,sal_uInt16> & pc1,const std::pair<sal_uInt16,sal_uInt16>  &pc2)
 {
     return pc1.first < pc2.first;
@@ -255,7 +252,6 @@ sal_Bool ScAccessibleSpreadsheet::CalcSc
     }
     return sal_False;
 }
-//-----IAccessibility2 Implementation 2009
 //=====  internal  ============================================================
 
 ScAccessibleSpreadsheet::ScAccessibleSpreadsheet(
@@ -267,12 +263,10 @@ ScAccessibleSpreadsheet::ScAccessibleSpr
 	ScAccessibleTableBase (pAccDoc, GetDocument(pViewShell),
         ScRange(ScAddress(0, 0, nTab),ScAddress(MAXCOL, MAXROW, nTab))),
     mbIsSpreadsheet( sal_True ),
-//IAccessibility2 Implementation 2009-----
 	m_bFormulaMode(sal_False),
 	m_bFormulaLastMode(sal_False),
 	m_pAccFormulaCell(NULL),
 	m_nMinX(0),m_nMaxX(0),m_nMinY(0),m_nMaxY(0)
-//-----IAccessibility2 Implementation 2009
 {
     ConstructScAccessibleSpreadsheet( pAccDoc, pViewShell, nTab, eSplitPos );
 }
@@ -289,10 +283,8 @@ ScAccessibleSpreadsheet::~ScAccessibleSp
 {
 	if (mpMarkedRanges)
 		delete mpMarkedRanges;
-//IAccessibility2 Implementation 2009-----
 	//if (mpSortedMarkedCells)
 	//	delete mpSortedMarkedCells;
-//-----IAccessibility2 Implementation 2009
 	if (mpViewShell)
 		mpViewShell->RemoveAccessibilityObject(*this);
 }
@@ -326,13 +318,11 @@ void ScAccessibleSpreadsheet::ConstructS
         mpAccCell = GetAccessibleCellAt(maActiveCell.Row(), maActiveCell.Col());
         mpAccCell->acquire();
         mpAccCell->Init();
-		//IAccessibility2 Implementation 2009-----
 		ScDocument* pScDoc= GetDocument(mpViewShell);
 		if (pScDoc)
 		{
 			pScDoc->GetName( maActiveCell.Tab(), m_strOldTabName );
 		}
-		//-----IAccessibility2 Implementation 2009
     }	
 }
 
@@ -355,18 +345,14 @@ void SAL_CALL ScAccessibleSpreadsheet::d
 
 void ScAccessibleSpreadsheet::CompleteSelectionChanged(sal_Bool bNewState)
 {
-//IAccessibility2 Implementation 2009-----
 	if (IsFormulaMode())
 	{
 		return ;
 	}
-//-----IAccessibility2 Implementation 2009
 	if (mpMarkedRanges)
 		DELETEZ(mpMarkedRanges);
-//IAccessibility2 Implementation 2009-----
 	//if (mpSortedMarkedCells)
 	//	DELETEZ(mpSortedMarkedCells);
-//-----IAccessibility2 Implementation 2009
 	mbHasSelection = bNewState;
 
     AccessibleEventObject aEvent;
@@ -395,13 +381,10 @@ void ScAccessibleSpreadsheet::LostFocus(
 
 void ScAccessibleSpreadsheet::GotFocus()
 {
-//IAccessibility2 Implementation 2009-----
     //CommitFocusGained();
-//-----IAccessibility2 Implementation 2009
 	AccessibleEventObject aEvent;
 	aEvent.EventId = AccessibleEventId::ACTIVE_DESCENDANT_CHANGED;
 	aEvent.Source = uno::Reference< XAccessibleContext >(this);
-//IAccessibility2 Implementation 2009-----
     //uno::Reference< XAccessible > xNew = mpAccCell;
     uno::Reference< XAccessible > xNew;
 	if (IsFormulaMode())
@@ -434,7 +417,6 @@ void ScAccessibleSpreadsheet::GotFocus()
 			return ;
 		}		
 	}
-//-----IAccessibility2 Implementation 2009
 	aEvent.NewValue <<= xNew;
 
 	CommitChange(aEvent);
@@ -466,7 +448,6 @@ void ScAccessibleSpreadsheet::Notify( Sf
 	{
 		const SfxSimpleHint& rRef = (const SfxSimpleHint&)rHint;
 		// only notify if child exist, otherwise it is not necessary
-//IAccessibility2 Implementation 2009-----		
 		//if ((rRef.GetId() == SC_HINT_ACC_CURSORCHANGED))
 		//{
 		//	if (mpViewShell)
@@ -749,7 +730,6 @@ void ScAccessibleSpreadsheet::Notify( Sf
                 }
             }
         }
-//-----IAccessibility2 Implementation 2009
         // no longer needed, because the document calls the VisAreaChanged method
 /*		else if (rRef.GetId() == SC_HINT_ACC_VISAREACHANGED)
 		{
@@ -850,7 +830,6 @@ void ScAccessibleSpreadsheet::Notify( Sf
 
 	ScAccessibleTableBase::Notify(rBC, rHint);
 }
-//IAccessibility2 Implementation 2009-----
 void ScAccessibleSpreadsheet::RemoveSelection(ScMarkData &refScMarkData)
 {
 	AccessibleEventObject aEvent;
@@ -905,7 +884,6 @@ sal_Bool ScAccessibleSpreadsheet::IsSame
 {
     return m_LastMarkedRanges == *mpMarkedRanges;
 }
-//-----IAccessibility2 Implementation 2009
 	//=====  XAccessibleTable  ================================================
 
 uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessibleRowHeaders(  )
@@ -952,12 +930,10 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAc
 	ScUnoGuard aGuard;
     IsObjectValid();
 	uno::Sequence<sal_Int32> aSequence;
-//IAccessibility2 Implementation 2009-----
 	if (IsFormulaMode())
 	{
 		return aSequence;
 	}
-//-----IAccessibility2 Implementation 2009
 	if (mpViewShell && mpViewShell->GetViewData())
 	{
 		aSequence.realloc(maRange.aEnd.Row() - maRange.aStart.Row() + 1);
@@ -985,12 +961,10 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAc
 	ScUnoGuard aGuard;
     IsObjectValid();
 	uno::Sequence<sal_Int32> aSequence;
-//IAccessibility2 Implementation 2009-----
 	if (IsFormulaMode())
 	{
 		return aSequence;
 	}
-//-----IAccessibility2 Implementation 2009
 	if (mpViewShell && mpViewShell->GetViewData())
 	{
 		aSequence.realloc(maRange.aEnd.Col() - maRange.aStart.Col() + 1);
@@ -1017,12 +991,10 @@ sal_Bool SAL_CALL ScAccessibleSpreadshee
 {
 	ScUnoGuard aGuard;
     IsObjectValid();
-//IAccessibility2 Implementation 2009-----
 	if (IsFormulaMode())
 	{
 		return sal_False;
 	}
-//-----IAccessibility2 Implementation 2009
 
     if ((nRow > (maRange.aEnd.Row() - maRange.aStart.Row())) || (nRow < 0))
         throw lang::IndexOutOfBoundsException();
@@ -1042,12 +1014,10 @@ sal_Bool SAL_CALL ScAccessibleSpreadshee
 	ScUnoGuard aGuard;
     IsObjectValid();
 
-//IAccessibility2 Implementation 2009-----
 	if (IsFormulaMode())
 	{
 		return sal_False;
 	}
-//-----IAccessibility2 Implementation 2009
     if ((nColumn > (maRange.aEnd.Col() - maRange.aStart.Col())) || (nColumn < 0))
         throw lang::IndexOutOfBoundsException();
 
@@ -1063,7 +1033,6 @@ sal_Bool SAL_CALL ScAccessibleSpreadshee
 ScAccessibleCell* ScAccessibleSpreadsheet::GetAccessibleCellAt(sal_Int32 nRow, sal_Int32 nColumn)
 {
     ScAccessibleCell* pAccessibleCell = NULL;
-//IAccessibility2 Implementation 2009-----
 	if (IsFormulaMode())
 	{
 		ScAddress aCellAddress(static_cast<SCCOL>(nColumn), nRow, mpViewShell->GetViewData()->GetTabNo());
@@ -1076,7 +1045,6 @@ ScAccessibleCell* ScAccessibleSpreadshee
 	}
 	else
 	{
-//-----IAccessibility2 Implementation 2009
 	ScAddress aCellAddress(static_cast<SCCOL>(maRange.aStart.Col() + nColumn),
 		static_cast<SCROW>(maRange.aStart.Row() + nRow), maRange.aStart.Tab());
     if ((aCellAddress == maActiveCell) && mpAccCell)
@@ -1095,7 +1063,6 @@ uno::Reference< XAccessible > SAL_CALL S
 {
 	ScUnoGuard aGuard;
     IsObjectValid();
-//IAccessibility2 Implementation 2009-----
 	if (!IsFormulaMode())
 	{
     if (nRow > (maRange.aEnd.Row() - maRange.aStart.Row()) ||
@@ -1104,7 +1071,6 @@ uno::Reference< XAccessible > SAL_CALL S
         nColumn < 0)
         throw lang::IndexOutOfBoundsException();
 	}
-//-----IAccessibility2 Implementation 2009
     uno::Reference<XAccessible> xAccessible;
     ScAccessibleCell* pAccessibleCell = GetAccessibleCellAt(nRow, nColumn);
     xAccessible = pAccessibleCell;
@@ -1118,13 +1084,11 @@ sal_Bool SAL_CALL ScAccessibleSpreadshee
 	ScUnoGuard aGuard;
     IsObjectValid();
 
-//IAccessibility2 Implementation 2009-----
 	if (IsFormulaMode())
 	{
 		ScAddress addr(static_cast<SCCOL>(nColumn), nRow, 0);
 		return IsScAddrFormulaSel(addr);
 	}
-//-----IAccessibility2 Implementation 2009
     if ((nColumn > (maRange.aEnd.Col() - maRange.aStart.Col())) || (nColumn < 0) ||
         (nRow > (maRange.aEnd.Row() - maRange.aStart.Row())) || (nRow < 0))
         throw lang::IndexOutOfBoundsException();
@@ -1154,7 +1118,6 @@ uno::Reference< XAccessible > SAL_CALL S
 		    SCsCOL nX;
             SCsROW nY;
 		    mpViewShell->GetViewData()->GetPosFromPixel( rPoint.X, rPoint.Y, meSplitPos, nX, nY);
-//IAccessibility2 Implementation 2009-----
 			try{
 		    xAccessible = getAccessibleCellAt(nY, nX);
 			}
@@ -1162,7 +1125,6 @@ uno::Reference< XAccessible > SAL_CALL S
 			{
 				return NULL;
 			}
-//-----IAccessibility2 Implementation 2009
 	    }
     }
 	return xAccessible;
@@ -1270,9 +1232,7 @@ void SAL_CALL
     IsObjectValid();
 	if (mpViewShell)
 	{
-//IAccessibility2 Implementation 2009-----
 		if (!IsFormulaMode())
-//-----IAccessibility2 Implementation 2009
 		mpViewShell->Unmark();
 	}
 }
@@ -1285,7 +1245,6 @@ void SAL_CALL
     IsObjectValid();
 	if (mpViewShell)
 	{
-//IAccessibility2 Implementation 2009-----
 		if (IsFormulaMode())
 		{
 			ScViewData *pViewData = mpViewShell->GetViewData();		
@@ -1295,7 +1254,6 @@ void SAL_CALL
 			mpViewShell->UpdateRef(MAXCOL, MAXROW, pViewData->GetTabNo());
 		}
 		else
-//-----IAccessibility2 Implementation 2009
 		mpViewShell->SelectAll();
 	}
 }
@@ -1309,21 +1267,17 @@ sal_Int32 SAL_CALL
 	sal_Int32 nResult(0);
 	if (mpViewShell)
 	{
-//IAccessibility2 Implementation 2009-----
 		if (IsFormulaMode())
 		{
 			nResult =  GetRowAll() * GetColAll() ;
 		}
 		else
 		{		
-//-----IAccessibility2 Implementation 2009
 		if (!mpMarkedRanges)
 		{
 			mpMarkedRanges = new ScRangeList();
             ScMarkData aMarkData(mpViewShell->GetViewData()->GetMarkData());
-//IAccessibility2 Implementation 2009-----
             //aMarkData.MarkToMulti();
-//-----IAccessibility2 Implementation 2009
 			aMarkData.FillRangeListWithMarks(mpMarkedRanges, sal_False);
 		}
 		// is possible, because there shouldn't be overlapped ranges in it
@@ -1341,7 +1295,6 @@ uno::Reference<XAccessible > SAL_CALL
 	ScUnoGuard aGuard;
     IsObjectValid();
 	uno::Reference < XAccessible > xAccessible;
-//IAccessibility2 Implementation 2009-----
 	if (IsFormulaMode())
 	{
 		if(CheckChildIndex(nSelectedChildIndex))
@@ -1351,7 +1304,6 @@ uno::Reference<XAccessible > SAL_CALL
 		}
 		return xAccessible;
 	}
-//-----IAccessibility2 Implementation 2009
 	if (mpViewShell)
 	{
 		if (!mpMarkedRanges)
@@ -1361,7 +1313,6 @@ uno::Reference<XAccessible > SAL_CALL
 		}
 		if (mpMarkedRanges)
 		{
-//IAccessibility2 Implementation 2009-----
 			//if (!mpSortedMarkedCells)
 			//	CreateSortedMarkedCells();
 			//if (mpSortedMarkedCells)
@@ -1381,7 +1332,6 @@ uno::Reference<XAccessible > SAL_CALL
 				xAccessible = m_mapSelectionSend[addr];
 			else			
 				xAccessible = getAccessibleCellAt(addr.Row(), addr.Col());
-//-----IAccessibility2 Implementation 2009
 		}
 	}
 	return xAccessible;
@@ -1402,7 +1352,6 @@ void SAL_CALL
 		sal_Int32 nCol(getAccessibleColumn(nChildIndex));
 		sal_Int32 nRow(getAccessibleRow(nChildIndex));
 
-//IAccessibility2 Implementation 2009-----
 		if (IsFormulaMode())
 		{
 			if(IsScAddrFormulaSel(
@@ -1413,7 +1362,6 @@ void SAL_CALL
 			}
 			return ;
 		}
-//-----IAccessibility2 Implementation 2009
 		if (mpViewShell->GetViewData()->GetMarkData().IsCellMarked(static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow)))
 			SelectCell(nRow, nCol, sal_True);
 	}
@@ -1421,7 +1369,6 @@ void SAL_CALL
 
 void ScAccessibleSpreadsheet::SelectCell(sal_Int32 nRow, sal_Int32 nCol, sal_Bool bDeselect)
 {
-//IAccessibility2 Implementation 2009-----
 	if (IsFormulaMode())
 	{
 		if (bDeselect)
@@ -1437,7 +1384,6 @@ void ScAccessibleSpreadsheet::SelectCell
 		}
 		return ;
 	}
-//-----IAccessibility2 Implementation 2009
 	mpViewShell->SetTabNo( maRange.aStart.Tab() );
 
 	mpViewShell->DoneBlockMode( sal_True ); // continue selecting
@@ -1445,7 +1391,6 @@ void ScAccessibleSpreadsheet::SelectCell
 
 	mpViewShell->SelectionChanged();
 }
-//IAccessibility2 Implementation 2009-----
 //void ScAccessibleSpreadsheet::CreateSortedMarkedCells()
 //{
 //	mpSortedMarkedCells = new std::vector<ScMyAddress>();
@@ -1490,7 +1435,6 @@ void ScAccessibleSpreadsheet::SelectCell
 		}
 	}
 }*/
-//-----IAccessibility2 Implementation 2009
 
 	//=====  XServiceInfo  ====================================================
 
@@ -1540,7 +1484,6 @@ void SAL_CALL ScAccessibleSpreadsheet::a
     IsObjectValid();
     ScAccessibleTableBase::addEventListener(xListener);
 
-//IAccessibility2 Implementation 2009-----
 /*    if (!mbIsFocusSend)
     {
         mbIsFocusSend = sal_True;
@@ -1554,7 +1497,6 @@ void SAL_CALL ScAccessibleSpreadsheet::a
 		CommitChange(aEvent);
     }
 */
-//-----IAccessibility2 Implementation 2009
 }
 
 	//====  internal  =========================================================
@@ -1596,12 +1538,10 @@ sal_Bool ScAccessibleSpreadsheet::IsDefu
 sal_Bool ScAccessibleSpreadsheet::IsEditable(
     const uno::Reference<XAccessibleStateSet>& /* rxParentStates */)
 {
-//IAccessibility2 Implementation 2009-----
 	if (IsFormulaMode())
 	{
 		return sal_False;
 	}
-//-----IAccessibility2 Implementation 2009
 	sal_Bool bProtected(sal_False);
 	if (mpDoc && mpDoc->IsTabProtected(maRange.aStart.Tab()))
 		bProtected = sal_True;
@@ -1621,12 +1561,10 @@ sal_Bool ScAccessibleSpreadsheet::IsFocu
 
 sal_Bool ScAccessibleSpreadsheet::IsCompleteSheetSelected()
 {
-//IAccessibility2 Implementation 2009-----
 	if (IsFormulaMode())
 	{
 		return sal_False;
 	}
-//-----IAccessibility2 Implementation 2009
 	sal_Bool bResult(sal_False);
 	if(mpViewShell)
 	{
@@ -1677,7 +1615,6 @@ Rectangle ScAccessibleSpreadsheet::GetVi
 	else
 		return Rectangle();
 }
-//IAccessibility2 Implementation 2009-----
 sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectRow( sal_Int32 row ) 
 throw (lang::IndexOutOfBoundsException, uno::RuntimeException) 
 {
@@ -1950,4 +1887,3 @@ uno::Reference < XAccessible > ScAccessi
 		else
 			return getAccessibleCellAt(maActiveCell.Row(), maActiveCell .Col());
 }
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleTableBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleTableBase.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleTableBase.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleTableBase.cxx Thu Nov 28 12:17:31 2013
@@ -77,7 +77,6 @@ void SAL_CALL ScAccessibleTableBase::dis
 uno::Any SAL_CALL ScAccessibleTableBase::queryInterface( uno::Type const & rType )
 	throw (uno::RuntimeException)
 {
-//IAccessibility2 Implementation 2009-----
 	//uno::Any aAny (ScAccessibleTableBaseImpl::queryInterface(rType));
 	//return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType);
 	uno::Any aRet;
@@ -93,7 +92,6 @@ uno::Any SAL_CALL ScAccessibleTableBase:
 		return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType);
 	}
 	return aRet;
-//-----IAccessibility2 Implementation 2009
 }
 
 void SAL_CALL ScAccessibleTableBase::acquire()
@@ -168,7 +166,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase
 	{
 		SCROW nEndRow(0);
         SCCOL nEndCol(0);
-//IAccessibility2 Implementation 2009-----
 		mpDoc->GetTableByIndex(maRange.aStart.Tab())->GetColumnByIndex(nColumn)->
 			ExtendMerge( static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow), nRow, nEndCol, nEndRow, sal_False, sal_False );
 		if (nEndRow > nRow)
@@ -179,7 +176,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase
 	//	    if (nEndRow > nRow)
 	//		    nCount = nEndRow - nRow + 1;
         //}
-//-----IAccessibility2 Implementation 2009
 	}
 
 	return nCount;
@@ -203,7 +199,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase
 	{
 		SCROW nEndRow(0);
         SCCOL nEndCol(0);
-//IAccessibility2 Implementation 2009-----
 		mpDoc->GetTableByIndex(maRange.aStart.Tab())->GetColumnByIndex(nColumn)->
 			ExtendMerge( static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow), nRow, nEndCol, nEndRow, sal_False, sal_False );
 		if (nEndCol > nColumn)
@@ -214,7 +209,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase
 	//	    if (nEndCol > nColumn)
 	//		    nCount = nEndCol - nColumn + 1;
         //}
-//-----IAccessibility2 Implementation 2009
 	}
 
 	return nCount;
@@ -516,7 +510,6 @@ void ScAccessibleTableBase::CommitTableM
 
 	CommitChange(aEvent);
 }
-//IAccessibility2 Implementation 2009-----
 sal_Bool SAL_CALL ScAccessibleTableBase::selectRow( sal_Int32 ) 
 throw (lang::IndexOutOfBoundsException, uno::RuntimeException) 
 {
@@ -537,6 +530,5 @@ sal_Bool SAL_CALL ScAccessibleTableBase:
 {
 	return sal_True;
 }
-//-----IAccessibility2 Implementation 2009
 
 

Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleText.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleText.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleText.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleText.cxx Thu Nov 28 12:17:31 2013
@@ -1058,10 +1058,8 @@ ScDocShell* ScAccessibleCellTextData::Ge
 
 
 // ============================================================================
-//IAccessibility2 Implementation 2009-----
 //ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin)
 ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, sal_Bool isClone)
-//-----IAccessibility2 Implementation 2009
 	:
 	mpViewForwarder(NULL),
 	mpEditViewForwarder(NULL),
@@ -1070,22 +1068,18 @@ ScAccessibleEditObjectTextData::ScAccess
     mpForwarder(NULL),
     mpWindow(pWin)
 {
-//IAccessibility2 Implementation 2009-----
 	// Solution: If the object is cloned, do NOT add notify hdl.
 	mbIsCloned = isClone;
     //if (mpEditEngine)
     if (mpEditEngine && !mbIsCloned)
-//-----IAccessibility2 Implementation 2009
         mpEditEngine->SetNotifyHdl( LINK(this, ScAccessibleEditObjectTextData, NotifyHdl) );
 }
 
 ScAccessibleEditObjectTextData::~ScAccessibleEditObjectTextData()
 {
-//IAccessibility2 Implementation 2009-----
 	// Solution: If the object is cloned, do NOT set notify hdl.
     //if (mpEditEngine)
     if (mpEditEngine && !mbIsCloned)
-//-----IAccessibility2 Implementation 2009
         mpEditEngine->SetNotifyHdl(Link());
 	if (mpViewForwarder)
 		delete mpViewForwarder;
@@ -1117,11 +1111,9 @@ void ScAccessibleEditObjectTextData::Not
 
 ScAccessibleTextData* ScAccessibleEditObjectTextData::Clone() const
 {
-//IAccessibility2 Implementation 2009-----
 	// Solution: Add para to indicate the object is cloned
 	//return new ScAccessibleEditObjectTextData(mpEditView, mpWindow);
 	return new ScAccessibleEditObjectTextData(mpEditView, mpWindow,sal_True);
-//-----IAccessibility2 Implementation 2009
 }
 
 SvxTextForwarder* ScAccessibleEditObjectTextData::GetTextForwarder()
@@ -1130,11 +1122,9 @@ SvxTextForwarder* ScAccessibleEditObject
 	{
         if (!mpEditEngine)
             mpEditEngine = mpEditView->GetEditEngine();
-//IAccessibility2 Implementation 2009-----
 			// Solution: If the object is cloned, do NOT add notify hdl.
         //if (mpEditEngine && !mpEditEngine->GetNotifyHdl().IsSet())
 	if (mpEditEngine && !mpEditEngine->GetNotifyHdl().IsSet()&&!mbIsCloned)
-//-----IAccessibility2 Implementation 2009
             mpEditEngine->SetNotifyHdl( LINK(this, ScAccessibleEditObjectTextData, NotifyHdl) );
         if(!mpForwarder)
             mpForwarder = new SvxEditEngineForwarder(*mpEditEngine);

Modified: openoffice/trunk/main/sc/source/ui/app/inputhdl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/app/inputhdl.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/app/inputhdl.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/app/inputhdl.cxx Thu Nov 28 12:17:31 2013
@@ -3453,13 +3453,11 @@ void ScInputHandler::NotifyChange( const
 							else
 								aCursorPos.Format( aPosStr, SCA_VALID | nFlags, pDoc, aAddrDetails );
 						}
-						//IAccessibility2 Implementation 2009-----
 						// Disable the accessible VALUE_CHANGE event
 						sal_Bool bIsSuppressed = pInputWin->IsAccessibilityEventsSuppressed(sal_False);
 						pInputWin->SetAccessibilityEventsSuppressed(sal_True);
 						pInputWin->SetPosString(aPosStr);
 						pInputWin->SetAccessibilityEventsSuppressed(bIsSuppressed);
-						//-----IAccessibility2 Implementation 2009
 						pInputWin->SetSumAssignMode();
 					}
 

Modified: openoffice/trunk/main/sc/source/ui/dbgui/dbnamdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/dbgui/dbnamdlg.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/dbgui/dbnamdlg.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/dbgui/dbnamdlg.cxx Thu Nov 28 12:17:31 2013
@@ -180,11 +180,9 @@ ScDbNameDlg::ScDbNameDlg( SfxBindings* p
 						aBtnDoSize, aBtnKeepFmt, aBtnStripData, theCurArea );
 	Init();
 	FreeResource();
-	//IAccessibility2 Implementation 2009-----
 	SynFocusTimer.SetTimeout(150);
 	SynFocusTimer.SetTimeoutHdl(LINK( this, ScDbNameDlg, FocusToComoboxHdl));
 	SynFocusTimer.Start();
-	//-----IAccessibility2 Implementation 2009
 	aRbAssign.SetAccessibleRelationMemberOf(&aFlAssign);
 }
 
@@ -721,7 +719,6 @@ IMPL_LINK( ScDbNameDlg, AssModifyHdl, vo
 	String aText = aEdAssign.GetText();
 	if ( aTmpRange.ParseAny( aText, pDoc, aAddrDetails ) & SCA_VALID )
 		theCurArea = aTmpRange;
-//IAccessibility2 Implementation 2009-----
     if( aText.Len() > 0 && aEdName.GetText().Len() > 0 )
     {
 		aBtnAdd.Enable();
@@ -742,11 +739,9 @@ IMPL_LINK( ScDbNameDlg, AssModifyHdl, vo
 		aFTSource.Disable();
 		aFTOperations.Disable();
     }
-//-----IAccessibility2 Implementation 2009
 	return 0;
 }
 
-//IAccessibility2 Implementation 2009-----
 IMPL_LINK( ScDbNameDlg, FocusToComoboxHdl, Timer*, pTi)
 {	
 	(void)pTi;
@@ -754,4 +749,3 @@ IMPL_LINK( ScDbNameDlg, FocusToComoboxHd
 	// aEdName.CallEventListeners( VCLEVENT_CONTROL_GETFOCUS );
 	return 0;
 }
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/trunk/main/sc/source/ui/dbgui/scendlg.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/dbgui/scendlg.hrc?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/dbgui/scendlg.hrc (original)
+++ openoffice/trunk/main/sc/source/ui/dbgui/scendlg.hrc Thu Nov 28 12:17:31 2013
@@ -51,6 +51,4 @@
 #define STR_CREATEDBY           31
 #define STR_ON                  32
 #define STR_EDIT                33
-//IAccessibility2 Implementation 2009-----
 #define STR_COLOR		34
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/trunk/main/sc/source/ui/docshell/docsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/docshell/docsh.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/docshell/docsh.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/docshell/docsh.cxx Thu Nov 28 12:17:31 2013
@@ -121,9 +121,7 @@
 
 #include "docsh.hxx"
 #include "docshimp.hxx"
-//IAccessibility2 Implementation 2009-----
 #include <sfx2/viewfrm.hxx>
-//-----IAccessibility2 Implementation 2009
 #include <rtl/logfile.hxx>
 
 #include <comphelper/processfactory.hxx>
@@ -1590,7 +1588,6 @@ sal_Bool __EXPORT ScDocShell::SaveAs( Sf
 
     PrepareSaveGuard aPrepareGuard( *this);
 
-//IAccessibility2 Implementation 2009-----
 	aDocument.setDocAccTitle(String());
 	// SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this, TYPE(SfxTopViewFrame));
 	SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this );
@@ -1606,7 +1603,6 @@ sal_Bool __EXPORT ScDocShell::SaveAs( Sf
 			}
 		}
 	}
-//-----IAccessibility2 Implementation 2009
 	//	wait cursor is handled with progress bar
     sal_Bool bRet = SfxObjectShell::SaveAs( rMedium );
 	if( bRet )

Modified: openoffice/trunk/main/sc/source/ui/drawfunc/fudraw.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/drawfunc/fudraw.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/drawfunc/fudraw.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/drawfunc/fudraw.cxx Thu Nov 28 12:17:31 2013
@@ -354,11 +354,9 @@ sal_Bool __EXPORT FuDraw::KeyInput(const
 					// changeover to the next object
 					if(!pView->MarkNextObj( !aCode.IsShift() ))
 					{
-//IAccessibility2 Implementation 2009-----
 						//If there is only one object, don't do the UnmarkAlllObj() & MarkNextObj(). 
 						if ( pView->GetMarkableObjCount() > 1 && pView->HasMarkableObj() )
 						{
-//-----IAccessibility2 Implementation 2009
 						// #97016# No next object: go over open end and
 						// get first from the other side
 						pView->UnmarkAllObj();

Modified: openoffice/trunk/main/sc/source/ui/inc/AccessibleCell.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/inc/AccessibleCell.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/inc/AccessibleCell.hxx (original)
+++ openoffice/trunk/main/sc/source/ui/inc/AccessibleCell.hxx Thu Nov 28 12:17:31 2013
@@ -32,11 +32,9 @@
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <editeng/AccessibleStaticTextBase.hxx>
 #include <comphelper/uno3.hxx>
-//IAccessibility2 Implementation 2009-----
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_XAccessibleExtendedAttributes_HPP_
 #include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
 #endif
-//-----IAccessibility2 Implementation 2009
 
 class ScTabViewShell;
 class ScAccessibleDocument;
@@ -51,9 +49,7 @@ typedef cppu::ImplHelper1< ::com::sun::s
 class ScAccessibleCell
 	:	public	ScAccessibleCellBase,
         public  accessibility::AccessibleStaticTextBase,
-//IAccessibility2 Implementation 2009-----
 		public  ScAccessibleCellAttributeImpl
-//-----IAccessibility2 Implementation 2009
 {
 public:
 	//=====  internal  ========================================================
@@ -145,14 +141,12 @@ public:
     	getSupportedServiceNames(void)
         throw (::com::sun::star::uno::RuntimeException);
 
-//IAccessibility2 Implementation 2009-----
     virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() 
 		throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
 
 	// Override this method to handle cell's ParaIndent attribute specially.
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) 
 		throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
 private:
 	ScTabViewShell* mpViewShell;
     ScAccessibleDocument* mpAccDoc;
@@ -182,10 +176,8 @@ private:
 	void AddRelation(const ScRange& rRange,
 		const sal_uInt16 aRelationType,
 		::utl::AccessibleRelationSetHelper* pRelationSet);
-//IAccessibility2 Implementation 2009-----
 	sal_Bool IsFormulaMode();
 	sal_Bool IsDropdown();
-//-----IAccessibility2 Implementation 2009
 };
 
 

Modified: openoffice/trunk/main/sc/source/ui/inc/AccessibleCellBase.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/inc/AccessibleCellBase.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/inc/AccessibleCellBase.hxx (original)
+++ openoffice/trunk/main/sc/source/ui/inc/AccessibleCellBase.hxx Thu Nov 28 12:17:31 2013
@@ -142,7 +142,6 @@ private:
 	virtual sal_Bool IsEditable(
 		const com::sun::star::uno::Reference<
 		::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
-//IAccessibility2 Implementation 2009-----
 protected:
 	virtual ::rtl::OUString SAL_CALL GetNote(void)
         throw (::com::sun::star::uno::RuntimeException);
@@ -156,7 +155,6 @@ protected:
 public:
 	const ScAddress& GetCellAddress() const { return maCellAddress; }
 	sal_Bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder);
-//-----IAccessibility2 Implementation 2009
 };
 	
 



Mime
View raw message