Modified: openoffice/branches/ia2/main/sw/source/core/access/accpara.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/access/accpara.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/core/access/accpara.cxx (original) +++ openoffice/branches/ia2/main/sw/source/core/access/accpara.cxx Fri Sep 27 03:21:44 2013 @@ -1625,7 +1625,7 @@ vos::OGuard aGuard(Application::GetSolar // already get the caret postion - // Sym2_5073----, modified by Steve Yin + //IAccessibility2 Implementation 2009----- /*SwFrm* pTFrm = const_cast<SwFrm*>(GetFrm()); com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs = pTFrm->GetTabStopInfo(aCoreRect.Left());*/ @@ -1637,7 +1637,7 @@ vos::OGuard aGuard(Application::GetSolar SwFrm* pTFrm = const_cast<SwFrm*>(GetFrm()); tabs = pTFrm->GetTabStopInfo(aCoreRect.Left()); } - // ----Sym2_5073 + //-----IAccessibility2 Implementation 2009 if( tabs.hasElements() ) { @@ -3458,7 +3458,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph } //IAccessibility2 Implementation 2009----- - // Added by qiuhd, 2007/02/28, for SODC_6986 /* Can't fin the function "GetTOCFirstWordEndIndex" declaration in sym2.0 (Added by yanjun) if( GetTOXSortTabBase() ) { @@ -3467,7 +3466,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph nCount++; } */ - // End by qiuhd, 2007/02/28, for SODC_6986 //-----IAccessibility2 Implementation 2009 return nCount; } @@ -3489,7 +3487,6 @@ uno::Reference< XAccessibleHyperlink > S sal_Int32 nARCount = 0; sal_Int32 nARIndex = 0; sal_Int32 nTIndex = -1; - // Added by qiuhd, 2007/02/28, for SODC_6986 sal_Int32 nTOCEndIndex = -1; SwTxtNode* pNode = NULL; SwTOXSortTabBase* pTBase = GetTOXSortTabBase(); @@ -3500,15 +3497,12 @@ uno::Reference< XAccessibleHyperlink > S nTOCEndIndex = -1; //if(pNode) // nTOCEndIndex = pNode->GetTOCFirstWordEndIndex(); - // End by qiuhd, 2007/02/28, for SODC_6986 SwTxtAttr* pHt = (SwTxtAttr*)(aHIter.next()); while( (nLinkIndex < getHyperLinkCount()) && nTIndex < nLinkIndex) { // no candidates, exit - // modified by qiuhd, 2007/02/28, for SODC_6986 //if( (!pHt) && (nARIndex >= nARCount) && nTOCEndIndex <= 0) // break; - // end by qiuhd, 2007/02/28, for SODC_6986 sal_Int32 nHStt = -1; sal_Int32 nAStt = -1; @@ -3525,15 +3519,13 @@ uno::Reference< XAccessibleHyperlink > S aARHelper.getPosition( nARIndex, nAStt, nAEnd ); */ } - // Added by qiuhd, 2007/02/28, for SODC_6986 sal_Bool bTOC = sal_False; // Inside TOC & get the first link if( pTBase && nTIndex == -1 ) { nTIndex++; bTOC = sal_True; - } - // End by qiuhd, 2007/02/28, for SODC_6986 + } else { if( nHStt >=0 && nAStt >=0 ) @@ -3562,8 +3554,6 @@ uno::Reference< XAccessibleHyperlink > S { // it's a hyperlink if( pHt ) { - - // Added by Zijie Jia ,9/8/2006 , CR_ID:SODC_5061 // const SwField* pFFld = pHt->GetFld().GetFld(); { if( !pHyperTextData ) @@ -3597,12 +3587,10 @@ uno::Reference< XAccessibleHyperlink > S } } } - // Added by qiuhd, 2007/02/28, for SODC_6986 else if( bTOC ) { //xRet = new SwAccessibleTOCLink( this ); } - // End by qiuhd, 2007/02/28, for SODC_6986 else if( bA ) { /* @@ -3727,7 +3715,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph nRet = nPos; } //IAccessibility2 Implementation 2009----- - // Added by qiuhd, 2007/02/28, for SODC_6986 /* Added by yanjun for acc miagration if( nRet == -1 && GetTOXSortTabBase() ) { @@ -3736,7 +3723,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph nRet = 0; } */ - // End by qiuhd, 2007/02/28, for SODC_6986 if (nRet == -1) throw lang::IndexOutOfBoundsException();
Modified: openoffice/branches/ia2/main/sw/source/core/access/acctable.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/access/acctable.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/core/access/acctable.cxx (original) +++ openoffice/branches/ia2/main/sw/source/core/access/acctable.cxx Fri Sep 27 03:21:44 2013 @@ -213,10 +213,8 @@ void SwAccessibleTableData_Impl::Collect pLine = pLine->GetUpper()->GetUpper(); // Headerline? - //begin of comment wangguoyang for errata table header SODC_6033 11/27/2006 //if(mpTabFrm->GetTable()->GetTabLines()[ 0 ] != pLine) //return ; - //end of comment wangguoyang for errata table header SODC_6033 11/27/2006 maRows.insert( pLower->Frm().Top() - maTabFrmPos.Y() ); @@ -1185,7 +1183,7 @@ uno::Reference< XAccessibleTable > SAL_C { //for errata table header SwAccessibleTableData_Impl *mpHeadTableData = new SwAccessibleTableData_Impl( pTabFrm, sal_False, sal_True); - //end modified by duan mei hua, 2006/10/25, for errata table header + //for errata table header SwAccessibleTable *pHeadAccessibleTable = new SwAccessibleTable(GetMap(),pTabFrm); pHeadAccessibleTable->SetTableData(mpHeadTableData); xRet = pHeadAccessibleTable; Modified: openoffice/branches/ia2/main/sw/source/core/access/acctextframe.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/access/acctextframe.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/core/access/acctextframe.cxx (original) +++ openoffice/branches/ia2/main/sw/source/core/access/acctextframe.cxx Fri Sep 27 03:21:44 2013 @@ -189,7 +189,6 @@ void SAL_CALL SwAccessibleContext::release (); } -// added by qiuhd, // //===== XAccessibleSelection ============================================ // Modified: openoffice/branches/ia2/main/sw/source/core/edit/ednumber.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/edit/ednumber.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/core/edit/ednumber.cxx (original) +++ openoffice/branches/ia2/main/sw/source/core/edit/ednumber.cxx Fri Sep 27 03:21:44 2013 @@ -209,7 +209,7 @@ sal_Bool SwEditShell::SelectionHasNumber return bResult; } -//Sym3_879 add a new function to determine number on/off status +//add a new function to determine number on/off status sal_Bool SwEditShell::SelectionHasBullet() const { sal_Bool bResult = HasBullet(); Modified: openoffice/branches/ia2/main/sw/source/filter/ww8/wrtw8esh.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/filter/ww8/wrtw8esh.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/filter/ww8/wrtw8esh.cxx (original) +++ openoffice/branches/ia2/main/sw/source/filter/ww8/wrtw8esh.cxx Fri Sep 27 03:21:44 2013 @@ -2011,7 +2011,7 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrame { const SvxShadowItem* pSI = (const SvxShadowItem*)pShadItem; - const sal_uInt16 nCstScale = 635; // unit scale between SODC and MS Word + const sal_uInt16 nCstScale = 635; // unit scale between AOO and MS Word const sal_uInt32 nShadowType = 131074; // shadow type of ms word. need to set the default value. sal_uInt32 nColor = (sal_uInt32)(pSI->GetColor().GetColor()) ; Modified: openoffice/branches/ia2/main/sw/source/ui/shells/txtnum.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/shells/txtnum.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/shells/txtnum.cxx (original) +++ openoffice/branches/ia2/main/sw/source/ui/shells/txtnum.cxx Fri Sep 27 03:21:44 2013 @@ -354,7 +354,7 @@ void SwTextShell::ExecSetNumber(SfxReque numfunc::GetDefaultPositionAndSpaceMode() ); SvxNumRule aTempRule = aTmpRule.MakeSvxNumRule(); - //Sym3_2508, set unit attribute to NB Manager + // set unit attribute to NB Manager SfxItemSet aSet(GetPool(), SID_ATTR_NUMBERING_RULE, SID_PARAM_CUR_NUM_LEVEL, 0 ); @@ -407,7 +407,7 @@ void SwTextShell::ExecSetNumber(SfxReque numfunc::GetDefaultPositionAndSpaceMode() ); SvxNumRule aTempRule = aTmpRule.MakeSvxNumRule(); - //Sym3_2508, set unit attribute to NB Manager + // set unit attribute to NB Manager SfxItemSet aSet(GetPool(), SID_ATTR_NUMBERING_RULE, SID_PARAM_CUR_NUM_LEVEL, 0 ); Modified: openoffice/branches/ia2/main/sw/source/ui/table/tabledlg.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/table/tabledlg.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/table/tabledlg.cxx (original) +++ openoffice/branches/ia2/main/sw/source/ui/table/tabledlg.cxx Fri Sep 27 03:21:44 2013 @@ -991,11 +991,9 @@ IMPL_LINK( SwTableColumnPage, AutoClickH sEntry += sIndex; pTextArr[i]->SetText( sEntry ); //IAccessibility2 Impplementaton 2009----- - //added by menghu for SODC_5143,12/12/2006 String sColumnWidth = SW_RESSTR( STR_ACCESS_COLUMN_WIDTH); sColumnWidth.SearchAndReplace( DEFINE_CONST_UNICODE("%1"), sIndex ); pFieldArr[i]->SetAccessibleName( sColumnWidth ); - //end of SODC_5143 //-----IAccessibility2 Impplementaton 2009 } Modified: openoffice/branches/ia2/main/vcl/inc/vcl/vclevent.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/vcl/vclevent.hxx?rev=1526782&r1=1526781&r2=1526782&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/inc/vcl/vclevent.hxx (original) +++ openoffice/branches/ia2/main/vcl/inc/vcl/vclevent.hxx Fri Sep 27 03:21:44 2013 @@ -207,7 +207,7 @@ namespace com { namespace sun { namespac #define VCLEVENT_TOOLBOX_BUTTONSTATECHANGED 1233 // pData = itempos #define VCLEVENT_TABLECELL_NAMECHANGED 1234 // pData = struct(Entry, Column, oldText) #define VCLEVENT_TABLEROW_SELECT 1235 -// IAccessible2 implementation 2009, Sym2_1986 +// IAccessible2 implementation 2009 #define VCLEVENT_LISTBOX_STATEUPDATE 1236 class VCL_DLLPUBLIC VclSimpleEvent { Modified: openoffice/branches/ia2/main/vcl/source/app/svapp.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/app/svapp.cxx?rev=1526782&r1=1526781&r2=1526782&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/source/app/svapp.cxx (original) +++ openoffice/branches/ia2/main/vcl/source/app/svapp.cxx Fri Sep 27 03:21:44 2013 @@ -2096,7 +2096,6 @@ sal_Bool InitAccessBridge( sal_Bool bSho #ifdef WNT sal_Bool HasAtHook() { - // Added by Steve Yin sal_Int32 bIsRuning=0; // BOOL WINAPI SystemParametersInfo( // __in UINT uiAction,
