diff options
Diffstat (limited to 'sw/source/core')
270 files changed, 210 insertions, 1240 deletions
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx index c3350f202180..c70e08ff8c09 100644 --- a/sw/source/core/SwNumberTree/SwNodeNum.cxx +++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <editeng/svxenum.hxx> #include <numrule.hxx> #include <SwNodeNum.hxx> @@ -102,7 +101,6 @@ void SwNodeNum::PreAdd() GetNumRule()->AddTxtNode( *(GetTxtNode()) ); } - { if ( GetTxtNode() && GetTxtNode()->GetNodes().IsDocNodes() ) @@ -225,7 +223,6 @@ bool SwNodeNum::IsCountedForNumbering() const GetTxtNode()->HasBullet() ); // text node } - void SwNodeNum::NotifyNode() { ValidateMe(); diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx index e579c126e59e..60e5f99e9eb6 100644 --- a/sw/source/core/SwNumberTree/SwNumberTree.cxx +++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <algorithm> #include <functional> #include <SwNumberTree.hxx> @@ -26,7 +25,6 @@ using std::vector; using std::find; - SwNumberTreeNode::SwNumberTreeNode() : mChildren(), mpParent( 0 ), @@ -490,7 +488,6 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild, OSL_ENSURE(! (aInsertDeepIt != mChildren.end() && (*aInsertDeepIt)->IsPhantom()), " unexspected phantom"); - if (aInsertDeepIt == mChildren.begin()) { SwNumberTreeNode * pNew = CreatePhantom(); @@ -710,7 +707,6 @@ bool SwNumberTreeNode::IsContinueingPreviousSubTree() const return mbContinueingPreviousSubTree; } - vector<SwNumberTree::tSwNumTreeNumber> SwNumberTreeNode::GetNumberVector() const { vector<SwNumberTree::tSwNumTreeNumber> aResult; diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index acccc7913308..2efe469ff924 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -632,7 +632,6 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() pFEShell->GetPageNumber(-1,sal_True,nPage,nLogPage,sDisplay); sAttrName = "page-name:"; - sValue = sAttrName + sDisplay ; sAttrName = ";page-number:"; sValue += sAttrName; @@ -642,11 +641,8 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() sValue += OUString::number( pCrsrShell->GetPageCnt() ) ; sValue += ";"; - sAttrName = "line-number:"; - - SwCntntFrm* pCurrFrm = pCrsrShell->GetCurrFrm(); SwPageFrm* pCurrPage=((SwFrm*)pCurrFrm)->FindPageFrm(); sal_uLong nLineNum = 0; @@ -745,7 +741,6 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() sValue += ";"; - SwFrm* pCurrCol=((SwFrm*)pCurrFrm)->FindColFrm(); sAttrName = "column-number:"; diff --git a/sw/source/core/access/accfield.cxx b/sw/source/core/access/accfield.cxx index fa850a20b091..c6e2d2dc2600 100644 --- a/sw/source/core/access/accfield.cxx +++ b/sw/source/core/access/accfield.cxx @@ -169,7 +169,6 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleField::getAccessibleAtPoint( return xAcc; } - /** Get bounding box. @@ -210,7 +209,6 @@ awt::Point SAL_CALL SwAccessibleField::getLocation() return aPoint; } - awt::Point SAL_CALL SwAccessibleField::getLocationOnScreen() throw (RuntimeException, std::exception) { @@ -219,7 +217,6 @@ awt::Point SAL_CALL SwAccessibleField::getLocationOnScreen() return awt::Point( aRect.X,aRect.Y);//aPixPos.X() + aRect.nLeft , aPixPos.Y() + + aRect.nRight ); } - awt::Size SAL_CALL SwAccessibleField::getSize() throw (RuntimeException, std::exception) { @@ -236,7 +233,6 @@ void SAL_CALL SwAccessibleField::grabFocus() return; } - sal_Int32 SAL_CALL SwAccessibleField::getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) { diff --git a/sw/source/core/access/accfield.hxx b/sw/source/core/access/accfield.hxx index f5c4b2401df8..2c11371ee659 100644 --- a/sw/source/core/access/accfield.hxx +++ b/sw/source/core/access/accfield.hxx @@ -163,12 +163,10 @@ public: virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBoundsImpl(sal_Bool bRelative) throw (::com::sun::star::uno::RuntimeException) ; - }; #endif diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 5db03a8d523d..8717d7e3e1a6 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -1403,7 +1403,6 @@ void SwAccessibleMap::DoInvalidateShapeSelection(sal_Bool bInvalidateFocusMode / static_cast< const SwFEShell * >( pVSh ) : 0; sal_uInt16 nSelShapes = pFESh ? pFESh->IsObjSelected() : 0; - //when InvalidateFocus Call this function ,and the current selected shape count is not 1 , //return if (bInvalidateFocusMode && nSelShapes != 1) @@ -2092,7 +2091,6 @@ void SwAccessibleMap::RemoveGroupContext(const SdrObject *pParentObj, ::com::sun } //End - void SwAccessibleMap::AddGroupContext(const SdrObject *pParentObj, uno::Reference < XAccessible > xAccParent) { osl::MutexGuard aGuard( maMutex ); @@ -2612,7 +2610,6 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm ) InvalidatePosOrSize(aFrmOrObj.GetSwFrm(),0,0,rcEmpty); } - aIter = mpFrmMap->find( aFrmOrObj.GetSwFrm() ); if( aIter != mpFrmMap->end() ) diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index 7f6ace405e87..c3ab7efedb3e 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -295,10 +295,8 @@ OUString SAL_CALL SwAccessibleNoTextFrame::getTextRange( sal_Int32 , sal_Int32 ) sal_Bool SAL_CALL SwAccessibleNoTextFrame::copyText( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return sal_True;} - -// // XAccessibleHyperText -// + sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getHyperLinkCount() throw (uno::RuntimeException, std::exception) { diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx index ed1fd2f1e431..ff7a02847ffb 100644 --- a/sw/source/core/access/accnotextframe.hxx +++ b/sw/source/core/access/accnotextframe.hxx @@ -119,7 +119,6 @@ public: virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - //===== XAccessibleHypertext ============================================ virtual sal_Int32 SAL_CALL getHyperLinkCount() throw (::com::sun::star::uno::RuntimeException, std::exception); diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx index 07dcc64f5aa1..b6387b63800e 100644 --- a/sw/source/core/access/accnotexthyperlink.hxx +++ b/sw/source/core/access/accnotexthyperlink.hxx @@ -18,7 +18,6 @@ #ifndef _ACCNOTEXTHYPERLINK_HXX #define _ACCNOTEXTHYPERLINK_HXX - #include <com/sun/star/accessibility/XAccessibleHyperlink.hpp> #include <com/sun/star/uno/RuntimeException.hpp> #include <cppuhelper/implbase1.hxx> diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index aa72e262908d..54e9c9f0a774 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -963,7 +963,7 @@ sal_Bool SwAccessibleParagraph::GetTextBoundary( { nLast += pWrongList->Len( nWrongPos ); } - // + const bool bIn = pWrongList->InWrongWord(nBegin, nLen); // && !pTxtNode->IsSymbol(nBegin) ) if(bIn) { @@ -1263,7 +1263,6 @@ uno::Sequence< OUString > getSupplementalAttributeNames() return *pNames; } - // XInterface uno::Any SwAccessibleParagraph::queryInterface( const uno::Type& rType ) @@ -2561,7 +2560,6 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint ) { SolarMutexGuard aGuard; - CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); // construct SwPosition (where GetCrsrOfst() will put the result into) @@ -2860,7 +2858,6 @@ OUString SwAccessibleParagraph::getTextRange( if( nIndex == rText.getLength() ) return aResult; - // get first word, then skip to next word i18n::Boundary aBound; GetTextBoundary( aBound, rText, nIndex, nTextType ); @@ -3275,7 +3272,6 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL sal_Bool bH = sal_False; sal_Bool bA = sal_False; - if( pHt ) nHStt = *pHt->GetStart(); if( nARIndex < nARCount ) @@ -3903,7 +3899,6 @@ sal_Bool SwAccessibleParagraph::GetSelectionAtIndex( { if(nIndex < 0) return sal_False; - sal_Bool bRet = sal_False; nStart = -1; nEnd = -1; @@ -4061,7 +4056,6 @@ sal_Int16 SAL_CALL SwAccessibleParagraph::getAccessibleRole (void) throw (::com: } } - //Get the real heading level, Heading1 ~ Heading10 sal_Int32 SwAccessibleParagraph::GetRealHeadingLevel() { diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index 00e7645e7f31..abc9ca2defe4 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -118,7 +118,6 @@ class SwAccessibleParagraph : // be selected) SwXTextPortion* CreateUnoPortion( sal_Int32 nStart, sal_Int32 nEnd ); - // methods for checking the parameter range: // does nPos point to a char? @@ -298,7 +297,6 @@ public: getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception); - // XInterface // (XInterface methods need to be implemented to disambiguate diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx index df68f9abec3b..cc0a222bffbb 100644 --- a/sw/source/core/access/accselectionhelper.cxx +++ b/sw/source/core/access/accselectionhelper.cxx @@ -80,7 +80,6 @@ void SwAccessibleSelectionHelper::throwIndexOutOfBoundsException() throw aExcept; } - // XAccessibleSelection void SwAccessibleSelectionHelper::selectAccessibleChild( sal_Int32 nChildIndex ) diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 9487053d6706..aada56cdd115 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -205,7 +205,6 @@ void SwAccessibleTableData_Impl::CollectRowHeaderData( const SwFrm *pFrm ) CollectRowHeaderData( pLower ); - } else if( pLower->IsCellFrm() && rLower.IsAccessible( mbIsInPagePreview ) ) @@ -254,7 +253,6 @@ void SwAccessibleTableData_Impl::CollectColumnHeaderData( const SwFrm *pFrm ) CollectColumnHeaderData( pLower ); - } else if( pLower->IsCellFrm() && rLower.IsAccessible( mbIsInPagePreview ) ) @@ -1890,7 +1888,6 @@ SwAccessibleTableData_Impl* SwAccessibleTableColHeaders::CreateNewTableData() return new SwAccessibleTableData_Impl( *(GetMap()), pTabFrm, IsInPagePreview(), true ); } - void SwAccessibleTableColHeaders::Modify( const SfxPoolItem * /*pOld*/, const SfxPoolItem * /*pNew*/ ) { } diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index 3bbaedbcea03..f396d59f362e 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star::accessibility; using utl::AccessibleRelationSetHelper; using ::com::sun::star::accessibility::XAccessibleContext; - SwAccessibleTextFrame::SwAccessibleTextFrame( SwAccessibleMap* pInitMap, const SwFlyFrm& rFlyFrm ) : @@ -151,9 +150,6 @@ com::sun::star::uno::Any SAL_CALL return aReturn; } - - - void SAL_CALL SwAccessibleTextFrame::acquire (void) throw () @@ -168,10 +164,7 @@ void SAL_CALL SwAccessibleContext::release (); } -// //===== XAccessibleSelection ============================================ -// - void SAL_CALL SwAccessibleTextFrame::selectAccessibleChild( sal_Int32 ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) @@ -179,7 +172,6 @@ void SAL_CALL SwAccessibleTextFrame::selectAccessibleChild( sal_Int32 ) DBG_ASSERT( false, "<SwAccessibleTextFrame::selectAccessibleChild( sal_Int32 )> - missing implementation" ); } - sal_Bool SAL_CALL SwAccessibleTextFrame::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { @@ -206,21 +198,18 @@ sal_Bool SAL_CALL SwAccessibleTextFrame::isAccessibleChildSelected( sal_Int32 nC return sal_False; } - void SAL_CALL SwAccessibleTextFrame::clearAccessibleSelection( ) throw ( uno::RuntimeException, std::exception ) { DBG_ASSERT( false, "<SwAccessibleTextFrame::clearAccessibleSelection( )> - missing implementation" ); } - void SAL_CALL SwAccessibleTextFrame::selectAllAccessibleChildren( ) throw ( uno::RuntimeException, std::exception ) { DBG_ASSERT( false, "<SwAccessibleTextFrame::selectAllAccessibleChildren( )> - missing implementation" ); } - sal_Int32 SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChildCount() throw ( uno::RuntimeException, std::exception ) { @@ -232,7 +221,6 @@ sal_Int32 SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChildCount() return nCount; } - uno::Reference<XAccessible> SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -251,7 +239,6 @@ uno::Reference<XAccessible> SAL_CALL SwAccessibleTextFrame::getSelectedAccessibl return uno::Reference<XAccessible>(); } - void SAL_CALL SwAccessibleTextFrame::deselectAccessibleChild( sal_Int32 ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx index d5b390319a2f..b987c1d9ac81 100644 --- a/sw/source/core/attr/calbck.cxx +++ b/sw/source/core/attr/calbck.cxx @@ -27,10 +27,8 @@ static SwClientIter* pClientIters = 0; TYPEINIT0( SwClient ); - // SwClient - SwClient::SwClient( SwModify* pToRegisterIn ) : pLeft( 0 ), pRight( 0 ), pRegisteredIn( 0 ), mbIsAllowedToBeRemovedInModifyCall( false ) { @@ -84,10 +82,8 @@ bool SwClient::GetInfo( SfxPoolItem& ) const return true; } - // SwModify - SwModify::SwModify() : SwClient(0), pRoot(0) { @@ -359,10 +355,8 @@ void SwModify::ModifyBroadcast( const SfxPoolItem* pOldValue, const SfxPoolItem* } } - // SwDepend - SwDepend::SwDepend( SwClient* pTellHim, SwModify* pDepend ) : SwClient( pDepend ) { @@ -388,10 +382,8 @@ bool SwDepend::GetInfo( SfxPoolItem& rInfo ) const return pToTell ? pToTell->GetInfo( rInfo ) : true; } - // SwClientIter - SwClientIter::SwClientIter( const SwModify& rModify ) : rRoot( rModify ) { diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx index 1722936ed22e..6a02833161f2 100644 --- a/sw/source/core/attr/cellatr.cxx +++ b/sw/source/core/attr/cellatr.cxx @@ -31,10 +31,8 @@ #include <switerator.hxx> #include <swtable.hxx> - // SwTblBoxNumFormat - SwTblBoxNumFormat::SwTblBoxNumFormat( sal_uInt32 nFormat, sal_Bool bFlag ) : SfxUInt32Item( RES_BOXATR_FORMAT, nFormat ), bAuto( bFlag ) { @@ -52,10 +50,8 @@ SfxPoolItem* SwTblBoxNumFormat::Clone( SfxItemPool* ) const return new SwTblBoxNumFormat( GetValue(), bAuto ); } - // SwTblBoxFormula - SwTblBoxFormula::SwTblBoxFormula( const OUString& rFormula ) : SfxPoolItem( RES_BOXATR_FORMULA ), SwTableFormula( rFormula ), @@ -196,10 +192,8 @@ void SwTblBoxFormula::Calc( SwTblCalcPara& rCalcPara, double& rValue ) } } - // SwTblBoxValue - SwTblBoxValue::SwTblBoxValue() : SfxPoolItem( RES_BOXATR_VALUE ), nValue( 0 ) { diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx index 539fca13af87..a518aed32334 100644 --- a/sw/source/core/attr/hints.cxx +++ b/sw/source/core/attr/hints.cxx @@ -165,7 +165,6 @@ SwVirtPageNumInfo::SwVirtPageNumInfo( const SwPageFrm *pPg ) : { } - SwFindNearestNode::SwFindNearestNode( const SwNode& rNd ) : SwMsgPoolItem( RES_FINDNEARESTNODE ), pNd( &rNd ), pFnd( 0 ) { diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx index 0c38fef4486b..3180ad528467 100644 --- a/sw/source/core/attr/swatrset.cxx +++ b/sw/source/core/attr/swatrset.cxx @@ -36,10 +36,8 @@ #include <svl/whiter.hxx> #include <svx/xtable.hxx> - // SwAttrPool - SwAttrPool::SwAttrPool( SwDoc* pD ) : SfxItemPool( OUString("SWG"), POOLATTR_BEGIN, POOLATTR_END-1, @@ -60,10 +58,8 @@ SwAttrPool::~SwAttrPool() { } - // SwAttrSet - SwAttrSet::SwAttrSet( SwAttrPool& rPool, sal_uInt16 nWh1, sal_uInt16 nWh2 ) : SfxItemSet( rPool, nWh1, nWh2 ), pOldSet( 0 ), pNewSet( 0 ) { @@ -121,7 +117,6 @@ bool SwAttrSet::Put_BC( const SfxPoolItem& rAttr, return nRet; } - bool SwAttrSet::Put_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew ) { diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx index 7caf1f49acf8..120d1193fc0c 100644 --- a/sw/source/core/bastyp/index.cxx +++ b/sw/source/core/bastyp/index.cxx @@ -26,10 +26,8 @@ TYPEINIT0(SwIndexReg); - // SwIndex - SwIndex::SwIndex(SwIndexReg *const pReg, sal_Int32 const nIdx) : m_nIndex( nIdx ) , m_pIndexReg( pReg ) @@ -213,10 +211,8 @@ SwIndex& SwIndex::Assign( SwIndexReg* pArr, sal_Int32 nIdx ) return *this; } - // SwIndexReg - SwIndexReg::SwIndexReg() : m_pFirst( 0 ), m_pLast( 0 ) { @@ -287,10 +283,8 @@ void SwIndexReg::MoveTo( SwIndexReg& rArr ) #ifdef DBG_UTIL - // SwIndex - sal_Int32 SwIndex::operator++(int) { OSL_ASSERT( m_nIndex < SAL_MAX_INT32 ); diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index 78f443430504..d0301f212808 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -420,7 +420,6 @@ SfxItemInfo aSlotTab[] = { 0, SFX_ITEM_POOLABLE } // RES_UNKNOWNATR_CONTAINER }; - sal_uInt16* SwAttrPool::pVersionMap1 = 0; sal_uInt16* SwAttrPool::pVersionMap2 = 0; sal_uInt16* SwAttrPool::pVersionMap3 = 0; @@ -507,7 +506,6 @@ void _InitCore() aAttrTab[ RES_CHRATR_BIDIRTL - POOLATTR_BEGIN ] = new SfxInt16Item( RES_CHRATR_BIDIRTL, sal_Int16(-1) ); aAttrTab[ RES_CHRATR_IDCTHINT - POOLATTR_BEGIN ] = new SfxInt16Item( RES_CHRATR_IDCTHINT, sal_Int16(-1) ); - aAttrTab[ RES_TXTATR_REFMARK - POOLATTR_BEGIN ] = new SwFmtRefMark( OUString() ); aAttrTab[ RES_TXTATR_TOXMARK - POOLATTR_BEGIN ] = new SwTOXMark; aAttrTab[ RES_TXTATR_META - POOLATTR_BEGIN ] = SwFmtMeta::CreatePoolDefault(RES_TXTATR_META); diff --git a/sw/source/core/crsr/annotationmark.cxx b/sw/source/core/crsr/annotationmark.cxx index 80751a4c6992..95faaa52fe90 100644 --- a/sw/source/core/crsr/annotationmark.cxx +++ b/sw/source/core/crsr/annotationmark.cxx @@ -43,12 +43,10 @@ namespace sw { namespace mark } } - AnnotationMark::~AnnotationMark() { } - void AnnotationMark::InitDoc(SwDoc* const io_pDoc) { SwTxtFld* pTxtFld = @@ -79,7 +77,6 @@ namespace sw { namespace mark io_pDoc->SetModified(); } - const SwFmtFld* AnnotationMark::GetAnnotationFmtFld() const { SwDoc* pDoc = GetMarkPos().GetDoc(); diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index f136cb300d12..3ea8d07d3b28 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -113,10 +113,8 @@ void CheckRange( SwCursor* pCurCrsr ) } } - // SwCrsrShell - SwPaM * SwCrsrShell::CreateCrsr() { // don't create Crsr in a table Selection (sic!) @@ -455,7 +453,6 @@ void SwCrsrShell::FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewCo #endif } - void SwCrsrShell::FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection) { #ifdef ACCESSIBLE_LAYOUT diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 211e39bf0d98..e05e98fb6153 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -727,7 +727,6 @@ sal_Bool SwCrsrShell::MoveFldType( } const _SetGetExpFld& rFnd = **it; - SET_CURR_SHELL( this ); SwCallLink aLk( *this ); // watch Crsr-Moves SwCrsrSaveState aSaveState( *pCrsr ); @@ -762,7 +761,6 @@ sal_Bool SwCrsrShell::GotoFld( const SwFmtFld& rFld ) return bRet; } - SwTxtFld * SwCrsrShell::GetTxtFldAtPos( const SwPosition* pPos, const bool bIncludeInputFldAtStart ) const @@ -778,7 +776,6 @@ SwTxtFld * SwCrsrShell::GetTxtFldAtPos( return pTxtFld; } - SwField* SwCrsrShell::GetFieldAtCrsr( const SwPaM* pCrsr, const bool bIncludeInputFldAtStart ) const @@ -802,7 +799,6 @@ SwField* SwCrsrShell::GetFieldAtCrsr( return pFieldAtCrsr; } - SwField* SwCrsrShell::GetCurFld( const bool bIncludeInputFldAtStart ) const { SwPaM* pCrsr = GetCrsr(); @@ -824,7 +820,6 @@ SwField* SwCrsrShell::GetCurFld( const bool bIncludeInputFldAtStart ) const return pCurFld; } - bool SwCrsrShell::CrsrInsideInputFld() const { bool bCrsrInsideInputFld = false; @@ -842,13 +837,11 @@ bool SwCrsrShell::CrsrInsideInputFld() const return bCrsrInsideInputFld; } - bool SwCrsrShell::PosInsideInputFld( const SwPosition& rPos ) const { return dynamic_cast<const SwTxtInputFld*>(GetTxtFldAtPos( &rPos, false )) != NULL; } - bool SwCrsrShell::DocPtInsideInputFld( const Point& rDocPt ) const { SwPosition aPos( *(GetCrsr()->Start()) ); @@ -860,7 +853,6 @@ bool SwCrsrShell::DocPtInsideInputFld( const Point& rDocPt ) const return false; } - sal_Int32 SwCrsrShell::StartOfInputFldAtPos( const SwPosition& rPos ) const { const SwTxtInputFld* pTxtInputFld = dynamic_cast<const SwTxtInputFld*>(GetTxtFldAtPos( &rPos, true )); @@ -872,7 +864,6 @@ sal_Int32 SwCrsrShell::StartOfInputFldAtPos( const SwPosition& rPos ) const return *(pTxtInputFld->GetStart()); } - sal_Int32 SwCrsrShell::EndOfInputFldAtPos( const SwPosition& rPos ) const { const SwTxtInputFld* pTxtInputFld = dynamic_cast<const SwTxtInputFld*>(GetTxtFldAtPos( &rPos, true )); @@ -884,7 +875,6 @@ sal_Int32 SwCrsrShell::EndOfInputFldAtPos( const SwPosition& rPos ) const return *(pTxtInputFld->End()); } - void SwCrsrShell::GotoOutline( sal_uInt16 nIdx ) { SwCursor* pCrsr = getShellCrsr( true ); @@ -1700,7 +1690,6 @@ bool SwContentAtPos::IsInRTLText()const return bRet; } - sal_Bool SwCrsrShell::SelectTxt( const sal_Int32 nStart, const sal_Int32 nEnd ) { @@ -1725,7 +1714,6 @@ sal_Bool SwCrsrShell::SelectTxt( const sal_Int32 nStart, return bRet; } - sal_Bool SwCrsrShell::SelectTxtAttr( sal_uInt16 nWhich, sal_Bool bExpand, const SwTxtAttr* pTxtAttr ) diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index 396c2df0e4a2..963d929b2460 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -995,7 +995,6 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove, pPam->GetPoint()->nContent.Assign( pNd, bSrchForward ? 0 : pNd->Len() ); } - while( 0 != ( pNode = ::GetNode( *pPam, bFirst, fnMove, bInReadOnly ) ) ) { if( aCmpArr.Count() ) diff --git a/sw/source/core/crsr/overlayrangesoutline.cxx b/sw/source/core/crsr/overlayrangesoutline.cxx index 61e9273bf465..ed8e352fc1d5 100644 --- a/sw/source/core/crsr/overlayrangesoutline.cxx +++ b/sw/source/core/crsr/overlayrangesoutline.cxx @@ -23,8 +23,6 @@ #include <basegfx/polygon/b2dpolypolygoncutter.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// - namespace { // combine ranges geometrically to a single, ORed polygon @@ -105,5 +103,4 @@ namespace sw } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// // eof diff --git a/sw/source/core/crsr/overlayrangesoutline.hxx b/sw/source/core/crsr/overlayrangesoutline.hxx index 1e2d168f7be4..d5a6e1eddf83 100644 --- a/sw/source/core/crsr/overlayrangesoutline.hxx +++ b/sw/source/core/crsr/overlayrangesoutline.hxx @@ -23,8 +23,6 @@ #include <vector> -////////////////////////////////////////////////////////////////////////////// - namespace sw { namespace overlay @@ -57,8 +55,6 @@ namespace sw } // end of namespace overlay } // end of namespace sw -////////////////////////////////////////////////////////////////////////////// - #endif //_SW_OVERLAY_OVERLAYRANGESOUTLINE_HXX // eof diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 6a55d6dba40f..17c66187be3a 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -488,7 +488,6 @@ SwShellCrsr::SwShellCrsr( , pPt(SwPaM::GetPoint()) {} - SwShellCrsr::SwShellCrsr( const SwCrsrShell& rCShell, const SwPosition &rPos, diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index bf8ef7615430..3cb4dffd4483 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -350,7 +350,6 @@ namespace sw { namespace mark , m_pDoc(&rDoc) { } - ::sw::mark::IMark* MarkManager::makeMark(const SwPaM& rPaM, const OUString& rName, const IDocumentMarkAccess::MarkType eType) @@ -491,7 +490,6 @@ namespace sw { namespace mark return pFieldMark; } - ::sw::mark::IMark* MarkManager::getMarkForTxtNode( const SwTxtNode& rTxtNode, const IDocumentMarkAccess::MarkType eType ) @@ -505,7 +503,6 @@ namespace sw { namespace mark return makeMark(aPaM, OUString(), eType); } - sw::mark::IMark* MarkManager::makeAnnotationMark( const SwPaM& rPaM, const ::rtl::OUString& rName ) @@ -550,7 +547,6 @@ namespace sw { namespace mark return true; } - void MarkManager::correctMarksAbsolute( const SwNodeIndex& rOldNode, const SwPosition& rNewPos, @@ -593,7 +589,6 @@ namespace sw { namespace mark #endif } - void MarkManager::correctMarksRelative(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset) { const SwNode* const pOldNode = &rOldNode.GetNode(); @@ -636,7 +631,6 @@ namespace sw { namespace mark #endif } - void MarkManager::deleteMarks( const SwNodeIndex& rStt, const SwNodeIndex& rEnd, @@ -1006,7 +1000,6 @@ namespace sw { namespace mark return m_vCommonMarks.size(); } - IDocumentMarkAccess::const_iterator_t MarkManager::getAnnotationMarksBegin() const { return m_vAnnotationMarks.begin(); @@ -1098,7 +1091,7 @@ namespace // Array structure: 2 longs, // 1st long contains the type and position in the DocArray, // 2nd long contains the ContentPosition - // + // CntntType -- // 0x8000 = Bookmark Pos1 // 0x8001 = Bookmark Pos2 @@ -1344,7 +1337,6 @@ void SaveBookmark::SetInDoc( } } - // _DelBookmarks, _{Save,Restore}CntntIdx void _DelBookmarks( diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index eb233d2a7b63..990d645d7364 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -173,7 +173,6 @@ private: ~CompareSequence(); }; - static void CountDifference( const CompareData& rData, sal_uLong* pCounts ); static void SetDiscard( const CompareData& rData, sal_Char* pDiscard, sal_uLong* pCounts ); diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx index a2fef4efc020..927699ec55b9 100644 --- a/sw/source/core/doc/docdde.cxx +++ b/sw/source/core/doc/docdde.cxx @@ -390,7 +390,6 @@ bool SwDoc::SelectServerObj( const OUString& rStr, SwPaM*& rpPam, return static_cast<bool>(rpPam); } - // _FindItem aPara( bCaseSensitive ? sItem : rCC.lowercase( sItem ) ); if( !mpSectionFmtTbl->empty() ) diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 584b51fc0b31..801593dd856a 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -867,7 +867,6 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags ) &pEnd->nContent); } - bool bUpdateFtn = false; SwFtnIdxs aTmpFntIdx; @@ -1080,7 +1079,7 @@ bool SwDoc::MoveNodeRange( SwNodeRange& rRange, SwNodeIndex& rPos, // Bookmarks are moved too (currently without Undo support). // If footnotes are being moved to the special section, remove them now. - // + // Or else delete the Frames for all footnotes that are being moved // and have it rebuild after the Move (footnotes can change pages). // Additionally we have to correct the FtnIdx array's sorting. diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 48a3492761a1..6584d20f2f1f 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -2658,7 +2658,6 @@ bool SwDoc::PutValueToField(const SwPosition & rPos, Any aOldVal; SwField * pField = GetFieldAtPos(rPos); - if (GetIDocumentUndoRedo().DoesUndo() && pField->QueryValue(aOldVal, nWhich)) { diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index a6f9607aa467..d2af898982e1 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -1855,7 +1855,6 @@ SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl& rColl ) if( pParent != rColl.DerivedFrom() ) pParent = CopyTxtColl( *(SwTxtFmtColl*)rColl.DerivedFrom() ); - //FEATURE::CONDCOLL if( RES_CONDTXTFMTCOLL == rColl.Which() ) { diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx index e9ce943092a8..1aee6b563cb2 100644 --- a/sw/source/core/doc/docftn.cxx +++ b/sw/source/core/doc/docftn.cxx @@ -221,7 +221,6 @@ SwFtnInfo& SwFtnInfo::operator=(const SwFtnInfo& rInfo) return *this; } - bool SwFtnInfo::operator==( const SwFtnInfo& rInfo ) const { return ePos == rInfo.ePos && @@ -231,7 +230,6 @@ bool SwFtnInfo::operator==( const SwFtnInfo& rInfo ) const aErgoSum == rInfo.aErgoSum; } - SwFtnInfo::SwFtnInfo(const SwFtnInfo& rInfo) : SwEndNoteInfo( rInfo ), aQuoVadis( rInfo.aQuoVadis ), diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 846ec64fdcd2..cac57ef73351 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -537,7 +537,6 @@ SdrObject* SwDoc::CloneSdrObj( const SdrObject& rObj, bool bMoveWithinDoc, } pObj->SetLayer( nLayerIdForClone ); - return pObj; } @@ -854,7 +853,6 @@ SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet, return pFmt; } - // Insert drawing object, which has to be already inserted in the DrawModel SwDrawFrmFmt* SwDoc::InsertDrawObj( const SwPaM &rRg, @@ -1236,7 +1234,6 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl, format. */ SfxItemSet* pNewSet = pNewFmt->GetAttrSet().Clone( sal_True ); - // Copy only the set attributes. // The others should apply from the Templates. lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_PRINT ); @@ -2274,7 +2271,6 @@ SwViewShell *SwDoc::GetCurrentViewShell() return mpCurrentView; } - // It must be able to communicate to a SwViewShell. This is going to be removed later. const SwRootFrm *SwDoc::GetCurrentLayout() const { diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index dad0fdb950ef..48e0951e7b1e 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -329,7 +329,7 @@ SwDoc::SwDoc() // Note: Any non-hidden compatibility flag should obtain its default // by asking SvtCompatibilityOptions, see below. - // + const SvtCompatibilityOptions aOptions; mbParaSpaceMax = aOptions.IsAddSpacing(); mbParaSpaceMaxAtPages = aOptions.IsAddSpacingAtPages(); diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index dff009a75a2f..79aa45d61e47 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -379,7 +379,6 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset ) OSL_ENSURE(aMoveArr[nLevel] >= 0, "move table: current TxtColl not found when building table!"); - if (nLevel < MAXLEVEL && aMoveArr[nLevel] >= 0) { pColl = aCollArr[ aMoveArr[nLevel] ]; @@ -682,7 +681,7 @@ static sal_uInt16 lcl_FindOutlineNum( const SwNodes& rNds, OUString& rName ) // Add this bullet point: // A Name can contain a Number and/or the Text. -// + // First, we try to find the correct Entry via the Number. // If it exists, we compare the Text, to see if it's the right one. // If that's not the case, we search again via the Text. If it is diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 15cc3515a70f..10df07a5402d 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -3981,7 +3981,6 @@ void SwExtraRedlineTbl::DeleteAndDestroyAll() DeleteAndDestroy(0, m_aExtraRedlines.size()); } - SwExtraRedline::SwExtraRedline( ) { } @@ -4028,9 +4027,7 @@ bool SwDoc::AppendTableRowRedline( SwTableRowRedline* pNewRedl, bool bCallDelete pNewRedl->InvalidateRange(); */ - // =========================================================== // Make equivelant of 'AppendRedline' checks inside here too - // =========================================================== mpExtraRedlineTbl->Insert( pNewRedl ); } @@ -4091,9 +4088,7 @@ bool SwDoc::AppendTableCellRedline( SwTableCellRedline* pNewRedl, bool bCallDele pNewRedl->InvalidateRange(); */ - // =========================================================== // Make equivelant of 'AppendRedline' checks inside here too - // =========================================================== mpExtraRedlineTbl->Insert( pNewRedl ); } diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx index 44d7915f4a52..3c7490427a19 100644 --- a/sw/source/core/doc/docruby.cxx +++ b/sw/source/core/doc/docruby.cxx @@ -280,7 +280,6 @@ sal_Bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_ bIgnoreChar = true; break; - case UnicodeType::OTHER_LETTER: bChkNxtWrd = true; diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index 7caaed06472d..68e46c9749e0 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -272,7 +272,6 @@ double SwSortBoxElement::GetValue( sal_uInt16 nKey ) const else pFndBox = pBox->GetBox(nRow, nCol); // Sort columns - double nVal; if( pFndBox ) { diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 6ff26a535f86..7fb5b700162e 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -1141,7 +1141,7 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl, const SwTxtNode* pTOXSrc = pTxtMark->GetpTxtNd(); // Only insert TOXMarks from the Doc, not from the // UNDO. - // + // If selected use marks from the same chapter only if( pTOXSrc->GetNodes().IsDocNodes() && pTOXSrc->GetTxt().getLength() && pTOXSrc->GetDepends() && diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx index 25e3186c68e3..3abe684217dc 100644 --- a/sw/source/core/doc/gctable.cxx +++ b/sw/source/core/doc/gctable.cxx @@ -244,7 +244,6 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara ) *pTopLine, nSttTop, true ); if( !nTopEndPos ) nTopEndPos = nTopPos; - if( nTopEndPos <= nBtmEndPos ) { // Delete the TopBorders until BottomEndPos diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index d234f76998a3..dc7d3e33188e 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -725,21 +725,21 @@ void SwHTMLTableLayout::AutoLayoutPass1() // values in pColumn // Take over values according to the following table (Netscape 4.0 pv 3): - // + // WIDTH: no COLS COLS - // + // none min = min min = absmin // max = max max = max - // + // >= min min = min min = width // max = width max = width - // + // >= absmin min = wdith(*) min = width // max = width max = width - // + // < absmin min = absmin min = absmin // max = absmin max = absmin - // + // (*) Netscape uses the minimum width without a break before // the last graphic here. We don't have that (yet?), // so we leave it set to width. @@ -895,10 +895,10 @@ void SwHTMLTableLayout::AutoLayoutPass1() // minimum width of all affected cells with the relative width // of the column. // Thus, the width ratio among the columns is correct. - // + // Furthermore, a factor is calculated that says by how much the // cell has gotten wider than the minimum width. - // + // In the second step the calculated widths are divided by this // factor. Thereby a cell's width is preserved and serves as a // basis for the other cells. @@ -1163,14 +1163,14 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv // the available width. // Top tables only get a relative width if the available space // is *strictly larger* than the minimum width. - // + // CAUTION: We need the "strictly larger" because changing from a // relative width to an absolute width by resizing would lead // to an infinite loop. - // + // Because we do not call resize for tables in frames if the // frame has a non-relative width, we cannot play such games. - // + // Let's play such games now anyway. We had a graphic in a 1% wide // table and it didn't fit in of course. nAbsTabWidth = (sal_uInt16)( ((sal_uLong)nAbsAvail * nWidthOption) / 100 ); diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index fc282cc439eb..56e47df244fc 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -735,7 +735,6 @@ bool paintUsingPrimitivesHelper( return false; } - void paintGraphicUsingPrimitivesHelper(OutputDevice & rOutputDevice, Graphic const& rGraphic, GraphicAttr const& rGraphicAttr, SwRect const& rAlignedGrfArea) diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index b05d8e408f4f..89163eb48c55 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -746,7 +746,6 @@ OUString SwNumRule::MakeRefNumString( const SwNodeNum& rNodeNum, if (nListLevel >= MAXLEVEL) nListLevel = MAXLEVEL - 1; - SwNumFmt aFmt( Get( static_cast<sal_uInt16>(nListLevel) ) ); bMakeNumStringForPhantom = aFmt.IsEnumeration() && SVX_NUM_NUMBER_NONE != aFmt.GetNumberingType(); @@ -1001,7 +1000,6 @@ void SwNumRule::Validate() std::for_each( aLists.begin(), aLists.end(), std::mem_fun( &SwList::ValidateListTree ) ); - SetInvalidRule(sal_False); } diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 3c03d058202d..be9b1f1ee9d2 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -1084,7 +1084,6 @@ SwTableAutoFmtTbl::SwTableAutoFmtTbl() for( i = 9; i <= 10; ++i ) pNew->SetBoxFmt( aNew, i ); - SvxBoxItem aBox( RES_BOX ); aBox.SetDistance( 55 ); SvxBorderLine aLn( &aColor, DEF_LINE_WIDTH_0 ); diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 104c84841537..9270ea449131 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -4280,7 +4280,6 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType, return false; } - if( ppUndo ) *ppUndo = aParam.CreateUndo( bBigger ? UNDO_TABLE_INSROW diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index d1576c1411df..4a7f4e552ebf 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -677,7 +677,6 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts, aRg.aEnd++; } - if( aRg.aEnd.GetIndex() == aRg.aStart.GetIndex() ) { OSL_FAIL( "empty range" ); @@ -758,7 +757,6 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts, aBoxFmtArr2.reset(new std::vector<SwTableBoxFmt*>( nBoxArrLen, NULL )); } - SfxItemSet aCharSet( GetAttrPool(), RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1 ); SwHistory* pHistory = pUndo ? &pUndo->GetHistory() : 0; @@ -1174,7 +1172,6 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> > aRg.aEnd++; } - if( aRg.aEnd.GetIndex() == aRg.aStart.GetIndex() ) { OSL_FAIL( "empty range" ); diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index 4de82f0333bf..08bad4c638e5 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -149,7 +149,6 @@ inline void InsertLine( std::vector<SwTableLine*>& rLineArr, SwTableLine* pLine rLineArr.push_back( pLine ); } - static bool lcl_IsAnLower( const SwTableLine *pLine, const SwTableLine *pAssumed ) { const SwTableLine *pTmp = pAssumed->GetUpper() ? @@ -620,7 +619,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet ) // All Cell Borders that match the UnionRect or extend it are // Outer Borders. All others are Inner Borders. - // + // New: The Outer Borders can, depending on whether it's a // Start/Middle/Follow Table (for Selection via FollowTabs), // also not be Outer Borders. @@ -1510,7 +1509,7 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, sal_Bool bBalance ) // In order to make the implementation easier, but still use the available // space properly, we do this twice. - // + // The problem: The first column is getting wider, the others get slimmer // only afterwards. // The first column's desired width would be discarded as it would cause diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 04623ff27c53..2626b616ecda 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -907,7 +907,6 @@ SwCntntNode::SwCntntNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType, { } - SwCntntNode::~SwCntntNode() { // The base class SwClient of SwFrm excludes itself from the dependency list! @@ -1307,7 +1306,6 @@ SwCntntNode *SwCntntNode::JoinNext() return this; } - SwCntntNode *SwCntntNode::JoinPrev() { return this; diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index b4d455b5caf1..26aa735e0501 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -534,7 +534,6 @@ void SwRedlineTbl::dumpAsXml( xmlTextWriterPtr w ) } writer.endElement( ); // swposition_start - const SwPosition* pEnd; bool bEndIsMark = false; if ( pStart == pRedline->GetPoint() ) diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 14c1f957799c..b723bf3450ad 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -538,7 +538,6 @@ void SwSection::SetRefObject( SwServerObject* pObj ) m_RefObj = pObj; } - void SwSection::SetCondHidden(bool const bFlag) { if (!m_Data.IsCondHidden() == !bFlag) @@ -809,7 +808,6 @@ void SwSectionFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) } return ; - case RES_PROTECT: case RES_EDIT_IN_READONLY: // edit in readonly sections // Pass through these Messages until the End of the tree! diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 33083b141fc6..ebe533ca35e0 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1157,9 +1157,8 @@ class NestedUserCallHdl } }; -// // !!!ATTENTION!!! The object may commit suicide!!! -// + void SwDrawContact::_Changed( const SdrObject& rObj, SdrUserCallType eType, const Rectangle* pOldBoundRect ) diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index a0d2c15057d7..d02a4c79bfee 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -105,7 +105,6 @@ namespace sdr } // end of namespace contact } // end of namespace sdr - sdr::properties::BaseProperties* SwFlyDrawObj::CreateObjectSpecificProperties() { // create default properties @@ -386,7 +385,6 @@ SwVirtFlyDrawObj::SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly) : bSizProt = rP.IsSizeProtected(); } - SwVirtFlyDrawObj::~SwVirtFlyDrawObj() { if ( GetPage() ) //Withdraw SdrPage the responsibility. diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index b3022c0885b4..51c4a3c44d56 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -187,7 +187,6 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView, sTxt = SwViewShell::GetShellRes()->aLinkClick + ": " + sTxt; } - if( rEvt.GetMode() & HELPMODE_BALLOON ) { Help::ShowBalloon( pWindow, rEvt.GetMousePosPixel(), sTxt ); diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index b86cc1a52318..d9313c36f97f 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -395,7 +395,6 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos, return bRet; } - // Called by the functions: // - FnCptlSttWrd // - FnCptlSttSntnc diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 60d454ed81c2..5a718895d243 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -811,7 +811,6 @@ sal_uInt16 SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, sal_Int32& rPos, else cNumTyp = '0' + SVX_NUM_CHARS_LOWER_LETTER, eTmpScan = LOWER_ALPHA; - // Switch to roman numbers (only for c/d!) if( 1 == nDigitCnt && ( eScan & (UPPER_ALPHA|LOWER_ALPHA) ) && ( 3 == nStart || 4 == nStart) && 256 > cLow && @@ -1713,7 +1712,6 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces ) bInsTab = false; } - m_aDelPam.DeleteMark(); m_aDelPam.GetPoint()->nNode = m_aNdIdx; m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, nSpacePos ); @@ -1814,7 +1812,6 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos ) m_aFlags.bCptlSttWrd || m_aFlags.bCptlSttSntnc || m_aFlags.bAddNonBrkSpace; - m_aDelPam.DeleteMark(); m_aDelPam.GetPoint()->nNode = m_aNdIdx; m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, 0 ); @@ -2009,7 +2006,6 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos ) else bCallACorr = true; - if( bCallACorr ) { bCallACorr = false; diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx index 9f90348dea00..3f5fe7cf7a13 100644 --- a/sw/source/core/edit/eddel.cxx +++ b/sw/source/core/edit/eddel.cxx @@ -240,7 +240,6 @@ long SwEditShell::Copy( SwEditShell* pDestShell ) bRet = sal_True; FOREACHPAM_END() - // Maybe nothing has been moved? if( !bFirstMove ) { diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx index 23789028293c..e7d34db629e2 100644 --- a/sw/source/core/edit/edfld.cxx +++ b/sw/source/core/edit/edfld.cxx @@ -207,7 +207,6 @@ void SwEditShell::Insert2(SwField& rFld, const bool bForceExpandHints) EndAllAction(); } - /// Are the PaMs positioned on fields? static SwTxtFld* lcl_FindInputFld( SwDoc* pDoc, SwField& rFld ) { diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 370c94a7253c..03d4a0526c40 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -726,7 +726,6 @@ sal_Bool SwEditShell::DelINetAttrWithText() return bRet; } - /// Set the DontExpand flag at the text character attributes bool SwEditShell::DontExpandFmt() { diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index f03b557bb59c..899e1b27000e 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -115,7 +115,6 @@ class SwSpellIter : public SwLinguIter bool bBackToStartOfSentence; bool bMoveToEndOfSentence; - void CreatePortion(uno::Reference< XSpellAlternatives > xAlt, linguistic2::ProofreadingResult* pGrammarResult, bool bIsField, bool bIsHidden); @@ -785,7 +784,6 @@ uno::Reference< uno::XInterface > return xRet; } - /** Insert soft hyphen * * @param nHyphPos Offset in the to be separated word diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index c3c002e862a7..04a3ef8011f9 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -664,7 +664,6 @@ bool SwEditShell::NumOrNoNum( return bRet; } - sal_Bool SwEditShell::IsNoNum( sal_Bool bChkStart ) const { // a Backspace in the paragraph without number becomes a Delete diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx index ea87afee5ffe..bee6c3c0fcca 100644 --- a/sw/source/core/edit/edsect.cxx +++ b/sw/source/core/edit/edsect.cxx @@ -30,7 +30,6 @@ #include <tabfrm.hxx> #include <rootfrm.hxx> - SwSection const* SwEditShell::InsertSection( SwSectionData & rNewData, SfxItemSet const*const pAttr) @@ -290,7 +289,6 @@ sal_uInt16 SwEditShell::GetFullSelectedSectionCount() const return nRet; } - /** Find the suitable node for a special insert (alt-enter). * * This should enable inserting text before/after sections and tables. diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx index 29d59ce4f3b9..8e8165e0b787 100644 --- a/sw/source/core/edit/edtox.cxx +++ b/sw/source/core/edit/edtox.cxx @@ -316,7 +316,7 @@ void SwEditShell::ApplyAutoMark() sal_Int32 nLEV_Longer = 3; //! -> deletedChars; sal_Int32 nLEV_Shorter = 1; //! -> insertedChars; sal_Int32 nTransliterationFlags = 0; - // + sal_Int32 nSrchFlags = 0; if (!bCaseSensitive) { @@ -330,7 +330,7 @@ void SwEditShell::ApplyAutoMark() if ( bSrchInSel) nSrchFlags |= (SearchFlags::REG_NOT_BEGINOFLINE | SearchFlags::REG_NOT_ENDOFLINE ); - // + OUString sEmpty; SearchOptions aSearchOpt( SearchAlgorithms_ABSOLUTE, nSrchFlags, @@ -365,7 +365,7 @@ void SwEditShell::ApplyAutoMark() //3. bCaseSensitive = !sCase.isEmpty() && !comphelper::string::equals(sCase, cZero); bWordOnly = !sWordOnly.isEmpty() && !comphelper::string::equals(sWordOnly, cZero); - // + if (!bCaseSensitive) { aSearchOpt.transliterateFlags |= @@ -380,7 +380,7 @@ void SwEditShell::ApplyAutoMark() aSearchOpt.searchFlag |= SearchFlags::NORM_WORD_ONLY; else aSearchOpt.searchFlag &= ~SearchFlags::NORM_WORD_ONLY; - // + aSearchOpt.searchString = sToSelect; KillPams(); diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx index 67b9883ad48a..28e1364c49d7 100644 --- a/sw/source/core/edit/edws.cxx +++ b/sw/source/core/edit/edws.cxx @@ -193,19 +193,15 @@ void SwEditShell::InsertTOXType(const SwTOXType& rTyp) void SwEditShell::DoUndo( sal_Bool bOn ) { GetDoc()->GetIDocumentUndoRedo().DoUndo( bOn ); } - sal_Bool SwEditShell::DoesUndo() const { return GetDoc()->GetIDocumentUndoRedo().DoesUndo(); } - void SwEditShell::DoGroupUndo( sal_Bool bOn ) { GetDoc()->GetIDocumentUndoRedo().DoGroupUndo( bOn ); } - sal_Bool SwEditShell::DoesGroupUndo() const { return GetDoc()->GetIDocumentUndoRedo().DoesGroupUndo(); } - void SwEditShell::DelAllUndoObj() { GetDoc()->GetIDocumentUndoRedo().DelAllUndoObj(); diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index dc072498eb2d..877e1af764e7 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -64,7 +64,6 @@ static OUString lcl_BoxNmToRel( const SwTable& rTbl, OUString sGetStr, bool bExtrnlNm); - /** Get value of this box. * * The value is comes from the first TextNode. If it starts with a number/ @@ -465,7 +464,6 @@ void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, OUString& rNewStr, rNewStr += OUString(rFirstBox[ rFirstBox.getLength()-1 ]); } - void SwTableFormula::PtrToBoxNms( const SwTable& rTbl, OUString& rNewStr, OUString& rFirstBox, OUString* pLastBox, void* ) const { diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index 981997cbb014..f5cbf4c8b80a 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -293,7 +293,6 @@ void SwDDEFieldType::SetDoc( SwDoc* pNewDoc ) } } - void SwDDEFieldType::_RefCntChgd() { if( nRefCnt ) diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index bb2b39627325..8a3bb55ce8c5 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -1720,7 +1720,6 @@ OUString SwPostItField::Expand() const return OUString(); } - OUString SwPostItField::GetDescription() const { return SW_RES(STR_NOTE); diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 07a3ee852d40..32302b3a4e5a 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -550,7 +550,6 @@ extern void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt pNd->GetNodes().IsDocNodes() ) InsertSort( aArr, ((SwSetExpField*)pF->GetField())->GetSeqNumber() ); - // check first if number already exists sal_uInt16 nNum = rFld.GetSeqNumber(); if( USHRT_MAX != nNum ) @@ -868,10 +867,10 @@ void SwGetExpField::SetValue( const double& rAny ) */ sal_Int32 SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc, sal_Int32 nHint) { - // + const SwTxtFld* pTxtFld = rFmt.GetTxtFld(); const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode(); - // + sal_Int32 nRet = nHint ? nHint : *pTxtFld->GetStart() + 1; OUString sNodeText = rTxtNode.GetTxt(); @@ -948,7 +947,6 @@ void SwSetExpField::SetPar2(const OUString& rStr) } } - bool SwSetExpField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { sal_Int32 nTmp32 = 0; @@ -1035,7 +1033,6 @@ bool SwSetExpField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) return true; } - bool SwSetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const { switch( nWhichId ) @@ -1101,8 +1098,6 @@ bool SwSetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const return true; } - - SwInputFieldType::SwInputFieldType( SwDoc* pD ) : SwFieldType( RES_INPUTFLD ) , pDoc( pD ) @@ -1134,7 +1129,6 @@ SwInputField::~SwInputField() { } - void SwInputField::SetFmtFld( SwFmtFld& rFmtFld ) { mpFmtFld = &rFmtFld; @@ -1244,7 +1238,6 @@ OUString SwInputField::Expand() const return OUString(); } - bool SwInputField::isFormField() const { return mbIsFormField @@ -1252,7 +1245,6 @@ bool SwInputField::isFormField() const || !aToolTip.isEmpty(); } - bool SwInputField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const { switch( nWhichId ) @@ -1297,7 +1289,6 @@ bool SwInputField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) return true; } - /// set condition void SwInputField::SetPar1(const OUString& rStr) { diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx index 0732979c4564..087efd6ff901 100644 --- a/sw/source/core/fields/macrofld.cxx +++ b/sw/source/core/fields/macrofld.cxx @@ -40,7 +40,6 @@ SwFieldType* SwMacroFieldType::Copy() const return pType; } - SwMacroField::SwMacroField(SwMacroFieldType* pInitType, const OUString& rLibAndName, const OUString& rTxt) : SwField(pInitType), aMacro(rLibAndName), aText(rTxt), bIsScriptURL(sal_False) diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx index b35344d1f532..056e68797354 100644 --- a/sw/source/core/fields/tblcalc.cxx +++ b/sw/source/core/fields/tblcalc.cxx @@ -130,7 +130,6 @@ void SwTblField::SetSubType(sal_uInt16 nType) nSubType = nType; } - void SwTblField::SetValue( const double& rVal ) { SwValueField::SetValue(rVal); diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx index d8a1eeab949c..e01269508992 100644 --- a/sw/source/core/frmedt/fedesc.cxx +++ b/sw/source/core/frmedt/fedesc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <fesh.hxx> #include <doc.hxx> @@ -226,7 +225,6 @@ const SwPageDesc* SwFEShell::GetSelectedPageDescs() const else pMkFrm = pPtFrm; - if( !pMkFrm || !pPtFrm ) pFnd = 0; else if( pMkFrm == pPtFrm ) @@ -263,6 +261,4 @@ const SwPageDesc* SwFEShell::GetSelectedPageDescs() const return pRetDesc; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 43ef4fb420a7..2df7ce45ba1d 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <svl/itemiter.hxx> #include <svtools/imapobj.hxx> @@ -200,9 +199,8 @@ static sal_Bool lcl_FindAnchorPos( return bRet; } -// //! also used in unoframe.cxx -// + sal_Bool sw_ChkAndSetNewAnchor( SwEditShell& rEditShell, const SwFlyFrm& rFly, @@ -896,7 +894,6 @@ SwFlyFrmFmt* SwFEShell::InsertObject( const svt::EmbeddedObjectRef& xObj, return pFmt; } - void SwFEShell::InsertDrawObj( SdrObject& rDrawObj, const Point& rInsertPosition ) { @@ -1161,7 +1158,6 @@ sal_Bool SwFEShell::SetDrawingAttr( SfxItemSet& rSet ) return bRet; } - /*********************************************************************** #* Class : SwFEShell #* Methode : ResetFlyFrmAttr @@ -1389,7 +1385,7 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference < Size aSz( rRect.SSize() ); //JP 28.02.2001: Task 74707 - ask for fly in fly with automatic size - // + const SwFrm* pAnchor; const SwTxtNode* pTNd; const SwpHints* pHts; @@ -1486,7 +1482,6 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference < return aResult; } - /*********************************************************************** #* Class : SwFEShell #* Methode : WizzardFindCurFrmFmt @@ -1543,7 +1538,6 @@ OUString SwFEShell::GetFlyName() const return OUString(); } - const uno::Reference < embed::XEmbeddedObject > SwFEShell::GetOleRef() const { uno::Reference < embed::XEmbeddedObject > xObj; @@ -1557,7 +1551,6 @@ const uno::Reference < embed::XEmbeddedObject > SwFEShell::GetOleRef() const return xObj; } - OUString SwFEShell::GetUniqueGrfName() const { return GetDoc()->GetUniqueGrfName(); @@ -1674,7 +1667,6 @@ const Graphic *SwFEShell::GetGrfAtPos( const Point &rPt, return 0; } - const SwFrmFmt* SwFEShell::GetFmtFromObj( const Point& rPt, SwRect** pRectToFill ) const { SwFrmFmt* pRet = 0; @@ -1851,7 +1843,6 @@ ObjCntType SwFEShell::GetObjCntTypeOfSelection( SdrObject** ppObj ) const return eType; } - sal_Bool SwFEShell::ReplaceSdrObj( const OUString& rGrfName, const OUString& rFltName, const Graphic* pGrf ) { @@ -2110,7 +2101,6 @@ void SwFEShell::SetObjDescription( const OUString& rDescription ) } } - void SwFEShell::AlignFormulaToBaseline( const uno::Reference < embed::XEmbeddedObject >& xObj, SwFlyFrm * pFly ) { #if OSL_DEBUG_LEVEL > 0 @@ -2172,7 +2162,6 @@ void SwFEShell::AlignFormulaToBaseline( const uno::Reference < embed::XEmbeddedO } } - void SwFEShell::AlignAllFormulasToBaseline() { StartAllAction(); diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx index 01896a7e72f7..d551c8e210ad 100644 --- a/sw/source/core/frmedt/feflyole.cxx +++ b/sw/source/core/frmedt/feflyole.cxx @@ -82,19 +82,16 @@ SwFlyFrm *SwFEShell::FindFlyFrm( const uno::Reference < embed::XEmbeddedObject > return pFly; } - OUString SwFEShell::GetUniqueOLEName() const { return GetDoc()->GetUniqueOLEName(); } - OUString SwFEShell::GetUniqueFrameName() const { return GetDoc()->GetUniqueFrameName(); } - void SwFEShell::MakeObjVisible( const uno::Reference < embed::XEmbeddedObject >& xObj ) const { SwFlyFrm *pFly = FindFlyFrm( xObj ); @@ -134,7 +131,4 @@ sal_Bool SwFEShell::FinishOLEObj() // Server is terminated return bRet; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 6cc515094489..19b446f5d8f2 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -750,7 +750,6 @@ const SwFrmFmt* SwFEShell::SelFlyGrabCrsr() return 0; } - /************************************************************************* |* |* SwFEShell::SelectionToTop(), SelectionToBottom() @@ -1361,7 +1360,6 @@ const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_ pList = getIDocumentDrawModelAccess()->GetDrawModel()->GetPage( 0 ); } - OSL_ENSURE( pList, "No object list to iterate" ); SdrObjListIter aObjIter( *pList, bFlat ? IM_FLAT : IM_DEEPNOGROUPS ); @@ -1598,7 +1596,6 @@ sal_Bool SwFEShell::EndCreate( sal_uInt16 eSdrCreateCmd ) return ImpEndCreate(); } - sal_Bool SwFEShell::ImpEndCreate() { OSL_ENSURE( Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() == 1, @@ -1934,7 +1931,6 @@ sal_Bool SwFEShell::ImpEndCreate() return sal_True; } - /************************************************************************* |* |* SwFEShell::BreakCreate() @@ -2217,8 +2213,6 @@ Point SwFEShell::GetObjAbsPos() const return Imp()->GetDrawView()->GetDragStat().GetActionRect().TopLeft(); } - - /************************************************************************* |* |* SwFEShell::IsGroupSelected() @@ -2444,7 +2438,6 @@ sal_uInt16 SwFEShell::GetFlyCount( FlyCntType eType ) const return GetDoc()->GetFlyCount(eType); } - const SwFrmFmt* SwFEShell::GetFlyNum(sal_uInt16 nIdx, FlyCntType eType ) const { return GetDoc()->GetFlyNum(nIdx, eType ); @@ -2462,7 +2455,6 @@ void SwFEShell::MakeSelVisible() SwCrsrShell::MakeSelVisible(); } - // how is the selected object protected? sal_uInt8 SwFEShell::IsSelObjProtected( sal_uInt16 eType ) const { @@ -2596,7 +2588,6 @@ sal_Bool SwFEShell::IsAlignPossible() const return sal_False; } - // temporary fix till SS of JOE is available void SwFEShell::CheckUnboundObjects() { @@ -2672,8 +2663,6 @@ void SwFEShell::SetCalcFieldValueHdl(Outliner* pOutliner) GetDoc()->SetCalcFieldValueHdl(pOutliner); } - - int SwFEShell::Chainable( SwRect &rRect, const SwFrmFmt &rSource, const Point &rPt ) const { @@ -2743,7 +2732,6 @@ void SwFEShell::Unchain( SwFrmFmt &rFmt ) EndAllAction(); } - void SwFEShell::HideChainMarker() { if ( pChainFrom ) diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 3d650f666f14..56a8d75fffb5 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -62,7 +62,6 @@ using namespace ::com::sun::star; - // also see swtable.cxx #define COLFUZZY 20L @@ -80,7 +79,6 @@ const SwTable *pRowCacheLastTable = 0; const SwTabFrm *pRowCacheLastTabFrm = 0; const SwFrm *pRowCacheLastCellFrm = 0; - class TblWait { SwWait *pWait; @@ -98,7 +96,6 @@ TblWait::TblWait(size_t const nCnt, SwFrm *pFrm, SwDocShell &rDocShell, size_t c pWait = new SwWait( rDocShell, true ); } - void SwFEShell::ParkCursorInTab() { SwCursor * pSwCrsr = GetSwCrsr(); @@ -525,7 +522,6 @@ sal_Bool SwFEShell::SplitTab( sal_Bool bVert, sal_uInt16 nCnt, sal_Bool bSameHei return bRet; } - /*********************************************************************** #* Class : SwFEShell #* Methods : _GetTabCols @@ -753,7 +749,6 @@ void SwFEShell::GetRowSplit( SwFmtRowSplit*& rpSz ) const GetDoc()->GetRowSplit( *getShellCrsr( false ), rpSz ); } - /*********************************************************************** * Class : SwFEShell * Methods : SetRowHeight(), GetRowHeight() @@ -832,7 +827,6 @@ void SwFEShell::GetTabBorders( SfxItemSet& rSet ) const GetDoc()->GetTabBorders( *getShellCrsr( false ), rSet ); } - /*********************************************************************** #* Class : SwFEShell #* Methods : SetBoxBackground(), GetBoxBackground() @@ -908,7 +902,6 @@ void SwFEShell::GetTabBackground( SvxBrushItem &rToFill ) const rToFill = pFrm->ImplFindTabFrm()->GetFmt()->GetBackground(); } - /*********************************************************************** #* Class : SwFEShell #* Methods : HasWholeTabSelection() @@ -1646,10 +1639,9 @@ static const SwCellFrm *lcl_FindFrm( const SwLayoutFrm *pLay, const Point &rPt, return pRet && pRet->IsCellFrm() ? static_cast<const SwCellFrm*>(pRet) : 0; } -// // pbCol = 0 => Used for moving table rows/cols with mouse // pbCol != 0 => Used for selecting table/rows/cols -// + #define ENHANCED_TABLE_SELECTION_FUZZY 10 const SwFrm* SwFEShell::GetBox( const Point &rPt, bool* pbRow, bool* pbCol ) const @@ -1943,7 +1935,6 @@ bool SwFEShell::SelTblRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag return bRet; } - /************************************************************************* |* |* SwFEShell::WhichMouseTabCol() @@ -2470,6 +2461,4 @@ sal_Bool SwFEShell::IsTableVertical() const return pFrm->ImplFindTabFrm()->IsVertical(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index 58e7ee4fab4a..01cc00cd2be5 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svdobj.hxx> #include <init.hxx> #include <fesh.hxx> @@ -50,10 +49,8 @@ #include <dflyobj.hxx> #include <dcontact.hxx> - using namespace com::sun::star; - TYPEINIT1(SwFEShell,SwEditShell) /*********************************************************************** @@ -75,7 +72,6 @@ void SwFEShell::EndAllActionAndCall() } while( this != ( pTmp = (SwViewShell*)pTmp->GetNext() )); } - /*********************************************************************** #* Class : SwFEShell #* Method : GetCntntPos @@ -88,7 +84,6 @@ Point SwFEShell::GetCntntPos( const Point& rPoint, sal_Bool bNext ) const return GetLayout()->GetNextPrevCntntPos( rPoint, bNext ); } - const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt, const uno::Reference < embed::XEmbeddedObject >& xObj ) const { @@ -171,7 +166,6 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt, return bFrm ? pFrm->Frm() : pFrm->Prt(); } - sal_uInt16 SwFEShell::GetPageNumber( const Point &rPoint ) const { const SwFrm *pPage = GetLayout()->Lower(); @@ -183,7 +177,6 @@ sal_uInt16 SwFEShell::GetPageNumber( const Point &rPoint ) const return 0; } - sal_Bool SwFEShell::GetPageNumber( long nYPos, sal_Bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay) const { const SwFrm *pPage; @@ -531,7 +524,6 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const OUString &rTxt, cons } } - /*********************************************************************** #* Class : SwFEShell #* Method : Sort diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index 8f6747e9084f..29be25a4200a 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <editeng/boxitem.hxx> #include <editeng/protitem.hxx> @@ -88,10 +87,8 @@ struct _CmpLPt long Y() const { return aPos.Y(); } }; - typedef o3tl::sorted_vector<_CmpLPt> _MergePos; - struct _Sort_CellFrm { const SwCellFrm* pFrm; @@ -419,8 +416,6 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd, OSL_ENSURE( nLoopMax, "Table layout is still invalid!" ); } - - sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd ) { const SwTableNode* pTNd = rSttNd.FindTableNode(); @@ -459,7 +454,6 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd ) const SwLayoutFrm *pEnd = pCNd ? pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aNullPos )->GetUpper() : 0; OSL_ENSURE( pEnd, "without frame nothing works" ); - bool bTblIsValid, bValidChartSel; // #i55421# Reduced value 10 int nLoopMax = 10; //JP 28.06.99: max 100 loops - Bug 67292 @@ -654,7 +648,6 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd ) return bValidChartSel ? sal_True : sal_False; } - sal_Bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell ) { OSL_ENSURE( pCell->IsCellFrm(), "Frame without Gazelle" ); @@ -763,7 +756,6 @@ sal_Bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes ) } } - // 2. check if box on left contains value/formula if( bTstRow ) { @@ -850,7 +842,6 @@ sal_Bool HasProtectedCells( const SwSelBoxes& rBoxes ) return bRet; } - _CmpLPt::_CmpLPt( const Point& rPt, const SwTableBox* pBox, bool bVertical ) : aPos( rPt ), pSelBox( pBox ), bVert( bVertical ) {} @@ -1404,7 +1395,6 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, pUndo->AddNewBox( (*ppMergeBox)->GetSttIdx() ); } - static bool lcl_CheckCol(_FndBox const&, bool* pPara); static bool lcl_CheckRow( const _FndLine& rFndLine, bool* pPara ) @@ -1438,7 +1428,6 @@ static bool lcl_CheckCol( _FndBox const& rFndBox, bool* pPara ) return *pPara; } - sal_uInt16 CheckMergeSel( const SwPaM& rPam ) { SwSelBoxes aBoxes; @@ -1595,7 +1584,6 @@ static void lcl_FindStartEndRow( const SwLayoutFrm *&rpStart, if( !bChkProtected ) // protected cell ? return; - // Beginning and end should not be in protected cells while ( rpStart->GetFmt()->GetProtect().IsCntntProtected() ) rpStart = (SwLayoutFrm*)rpStart->GetNext(); @@ -1603,7 +1591,6 @@ static void lcl_FindStartEndRow( const SwLayoutFrm *&rpStart, rpEnd = (SwLayoutFrm*)rpEnd->GetPrev(); } - static void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart, const SwLayoutFrm *&rpEnd, const int bChkProtected ) @@ -1662,11 +1649,11 @@ static void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart, const SwTabFrm* pLastValidTab = pTab; while ( pTab->GetFollow() ) { - // + // Check if pTab->GetFollow() is a valid follow table: // Only follow tables with at least on non-FollowFlowLine // should be considered. - // + if ( pTab->HasFollowFlowLine() ) { pTab = pTab->GetFollow(); @@ -1759,7 +1746,6 @@ static void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart, } } - void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart, const SwLayoutFrm *pEnd, const SwTblSearchType eSearchType ) { @@ -2035,7 +2021,6 @@ sal_Bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv, return sal_True; } - // These Classes copy the current table selections (rBoxes), // into a new structure, retaining the table structure // new: SS for targeted erasing/restoring of the layout @@ -2058,7 +2043,6 @@ static void lcl_InsertRow( SwTableLine &rLine, SwLayoutFrm *pUpper, SwFrm *pSibl pRow->RegistFlys(); } - static void _FndBoxCopyCol( SwTableBox* pBox, _FndPara* pFndPara ) { _FndBox* pFndBox = new _FndBox( pBox, pFndPara->pFndLine ); @@ -2610,5 +2594,4 @@ sal_Bool _FndBox::AreLinesToRestore( const SwTable &rTable ) const return sal_True; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index f086908290c3..549d06b016a0 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -51,7 +51,6 @@ namespace sw { const SwPaM& rPaM, const ::rtl::OUString& rName ); - virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM); virtual bool renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName); virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset); diff --git a/sw/source/core/inc/UndoBookmark.hxx b/sw/source/core/inc/UndoBookmark.hxx index 4cfb8543c7d0..e910ecba3e8c 100644 --- a/sw/source/core/inc/UndoBookmark.hxx +++ b/sw/source/core/inc/UndoBookmark.hxx @@ -58,7 +58,6 @@ public: virtual SwRewriter GetRewriter() const; }; - class SwUndoInsBookmark : public SwUndoBookmark { public: diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx index 4c30e00a7e03..8cc86427d771 100644 --- a/sw/source/core/inc/blink.hxx +++ b/sw/source/core/inc/blink.hxx @@ -77,7 +77,6 @@ public: // Blink-Manager, global variable, see Blink.Cxx extern SwBlink *pBlink; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index 060bd89f11f8..234e94d5dae3 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -206,7 +206,6 @@ public: sal_Bool IsLockDeleteContent() const { return bLockDeleteContent; } void SetLockDeleteContent( sal_Bool bNew ) { bLockDeleteContent = bNew; } - sal_Bool IsClipped() const { return bHeightClipped || bWidthClipped; } sal_Bool IsHeightClipped() const { return bHeightClipped; } sal_Bool IsWidthClipped() const { return bWidthClipped; } @@ -224,7 +223,6 @@ public: sal_Bool GetContour( PolyPolygon& rContour, const sal_Bool _bForPaint = sal_False ) const; - // Paint on this shell (consider Preview, print flag, etc. recursively)? static sal_Bool IsPaint( SdrObject *pObj, const SwViewShell *pSh ); diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index ae8684b85065..c78614ab2c5e 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -1141,7 +1141,6 @@ inline const SwFrm *SwFrm::FindPrev() const return ((SwFrm*)this)->_FindPrev(); } - inline bool SwFrm::IsLayoutFrm() const { return GetType() & FRM_LAYOUT; diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index 341af85e1146..a56db5fa4284 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -242,7 +242,7 @@ public: // SwBorderAttrs encapsulates the calculation for margin attributes including // border. The whole class is cached. -// + // WARNING! If more attributes should be cached also adjust the method // Modify::Modify! class SwBorderAttrs : public SwCacheObj @@ -533,7 +533,6 @@ void GetSpacingValuesOfFrm( const SwFrm& rFrm, const SwCntntFrm* GetCellCntnt( const SwLayoutFrm& rCell_ ); - /** helper class to check if a frame has been deleted during an operation * WARNING! This should only be used as a last and desperate means to make the * code robust. diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx index 83f118e60ffb..b778d67a2155 100644 --- a/sw/source/core/inc/layact.hxx +++ b/sw/source/core/inc/layact.hxx @@ -34,16 +34,15 @@ class SwWait; class SfxProgress; // The usage of LayAction is always the same: -// + // 1. Generation of the LayAction object. // 2. Specifying the wanted bahaviour via the Set-methods // 3. Calling Action() // 4. Soon after that the destruction of the object -// + // Das Objekt meldet sich im CTor beim SwViewImp an und erst im DTor // wieder ab! Es handelt sich mithin um ein typisches Stackobjekt. - class SwLayAction { SwRootFrm *pRoot; diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx index 7bc2974e5803..c162bf1dcdee 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -77,7 +77,6 @@ public: void ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew, const sal_Bool bChgFtn = sal_False ); - //Painted die Column-Trennlinien fuer die innenliegenden Columns. void PaintColLines( const SwRect &, const SwFmtCol &, const SwPageFrm * ) const; diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx index 2454d2df7187..1bc4b6b09114 100644 --- a/sw/source/core/inc/layouter.hxx +++ b/sw/source/core/inc/layouter.hxx @@ -138,10 +138,8 @@ public: static void ClearMoveBwdLayoutInfo( const SwDoc& p_rDoc ); }; - extern void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTxtFrm& rTxtFrm ); #endif // INCLUDED_SW_SOURCE_CORE_INC_LAYOUTER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx index 8683d68f69fc..c1d83d9f9e20 100644 --- a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx +++ b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx @@ -31,7 +31,6 @@ typedef std::map< const SwTxtNode*, const sal_uInt32 > NodeMap; typedef std::map< const SwTxtNode*, const sal_uInt32 >::const_iterator NodeMapIter; typedef NodeMap::value_type NodeMapEntry; - class SwMovedFwdFrmsByObjPos { private: diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index b86726a13ae7..1c84b86987b7 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -88,7 +88,6 @@ void _RestoreCntntIdx( SwDoc* pDoc, std::vector<sal_uLong>& rSaveArr, void _RestoreCntntIdx( std::vector<sal_uLong>& rSaveArr, const SwNode& rNd, sal_Int32 nLen, sal_Int32 nCorrLen ); - /** data structure to temporarily hold fly anchor positions relative to some * location. */ struct _SaveFly @@ -113,7 +112,6 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos, void DelFlyInRange( const SwNodeIndex& rMkNdIdx, const SwNodeIndex& rPtNdIdx ); - class SwDataChanged { const SwPaM* pPam; @@ -131,7 +129,6 @@ public: sal_Int32 GetCntnt() const { return nCntnt; } }; - // Funktions-Deklaration damit auch alles unter der CrsrShell mal die // Crsr verschieben kann // die Funktionen rufen nicht die SwDoc::Corr - Methoden! @@ -145,7 +142,6 @@ void PaMCorrRel( const SwNodeIndex &rOldNode, const SwPosition &rNewPos, const sal_Int32 nOffset = 0 ); - // Hilfsklasse zum kopieren von absatzgebundenen Flys. Durch die Sortierung // nach der Ordnungsnummer wird versucht die layout seitige Anordnung // bei zu behalten @@ -172,7 +168,6 @@ public: const SwFmtAnchor* GetAnchor() const { return pAnchor; } }; - class SwTblNumFmtMerge { SvNumberFormatter* pNFmt; @@ -181,7 +176,6 @@ public: ~SwTblNumFmtMerge(); }; - class _SaveRedlEndPosForRestore { std::vector<SwPosition*>* pSavArr; @@ -195,7 +189,6 @@ public: void Restore() { if( pSavArr ) _Restore(); } }; - #endif // INCLUDED_SW_SOURCE_CORE_INC_MVSAVE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx index 734f0c1796fa..2a2f7671578f 100644 --- a/sw/source/core/inc/noteurl.hxx +++ b/sw/source/core/inc/noteurl.hxx @@ -60,7 +60,6 @@ public: // globale Variable, in NoteURL.Cxx angelegt extern SwNoteURL *pNoteURL; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx index fc5964c46885..f6967599f2c4 100644 --- a/sw/source/core/inc/objectformatter.hxx +++ b/sw/source/core/inc/objectformatter.hxx @@ -31,11 +31,10 @@ class SwLayAction; // OD 2004-10-04 #i26945# class SwPageNumAndTypeOfAnchors; -// ----------------------------------------------------------------------------- // #i28701# // Format floating screen objects, which are anchored at the given anchor frame // and registered at the given page frame. -// ----------------------------------------------------------------------------- + class SwObjectFormatter { private: diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index 35e164690cb6..67e3e508e8fc 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -438,8 +438,6 @@ inline sal_Bool SwPageFrm::IsInvalidFly() const #define GETGRIDWIDTH( pGrid , pDoc ) pDoc->IsSquaredPageMode() ? \ pGrid->GetBaseHeight(): pGrid->GetBaseWidth() - - #endif // INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx index 0d4db6f469d0..adb659025c26 100644 --- a/sw/source/core/inc/pamtyp.hxx +++ b/sw/source/core/inc/pamtyp.hxx @@ -58,7 +58,6 @@ sal_Bool GoPrevSection( SwPaM&, SwPosSection); sal_Bool GoCurrSection( SwPaM&, SwPosSection); sal_Bool GoNextSection( SwPaM&, SwPosSection); - // ------------ Typedefiniton fuer Funktionen ---------------------- typedef sal_Bool (*GoNd)( SwNode*, SwIndex*, sal_uInt16 ); @@ -71,7 +70,6 @@ typedef bool (utl::TextSearch:: *SearchTxt)( const OUString&, sal_Int32*, sal_Int32*, ::com::sun::star::util::SearchResult* ); typedef void (SwNodes:: *MvSection)( SwNodeIndex * ) const; - struct SwMoveFnCollection { GoNd fnNd; @@ -87,8 +85,6 @@ struct SwMoveFnCollection // --------- Funktionsdefinitionen fuers Suchen -------------- SwCntntNode* GetNode( SwPaM&, sal_Bool&, SwMoveFn, sal_Bool bInReadOnly = sal_False ); - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 43dcf284e30a..227be352bdb3 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -322,7 +322,6 @@ public: bool IsInDelList( SwSectionFrm* pSct ) const; #endif - void SetCallbackActionEnabled( sal_Bool b ) { bCallbackActionEnabled = b; } sal_Bool IsCallbackActionEnabled() const { return bCallbackActionEnabled; } diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx index 2983e4561559..62beae41b38c 100644 --- a/sw/source/core/inc/rowfrm.hxx +++ b/sw/source/core/inc/rowfrm.hxx @@ -66,8 +66,6 @@ public: //wenn die Direction nicht der Hoehe entspricht. void AdjustCells( const SwTwips nHeight, const sal_Bool bHeight ); - // - // SwRowFrm* GetFollowRow() const { return pFollowRow; } void SetFollowRow( SwRowFrm* pNew ) { pFollowRow = pNew; } diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx index 03aef3c9da80..49842c9da413 100644 --- a/sw/source/core/inc/scriptinfo.hxx +++ b/sw/source/core/inc/scriptinfo.hxx @@ -187,9 +187,7 @@ public: sal_uInt8 CompType( const sal_Int32 nPos ) const; #endif - // // HIDDEN TEXT STUFF START - // /** Hidden text range information - static and non-version @@ -251,9 +249,7 @@ public: */ static void DeleteHiddenRanges( SwTxtNode& rNode ); - // // HIDDEN TEXT STUFF END - // // examines the range [ nStart, nStart + nEnd ] if there are kanas // returns start index of kana entry in array, otherwise USHRT_MAX @@ -312,8 +308,6 @@ public: sal_Int32 GetKashidaPositions(sal_Int32 nStt, sal_Int32 nLen, sal_Int32* pKashidaPosition); - - /** Use regular blank justification instead of kashdida justification for the given line of text. nStt Start char index of the line referring to the paragraph. nLen Number of characters in the line diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index f8a793971fe5..b15b75346e29 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -160,7 +160,6 @@ inline const SwCntntFrm *SwSectionFrm::FindLastCntnt( sal_uInt8 nMode ) const return ((SwSectionFrm*)this)->FindLastCntnt( nMode ); } - #endif // INCLUDED_SW_SOURCE_CORE_INC_SECTFRM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/setmapvirtdev.hxx b/sw/source/core/inc/setmapvirtdev.hxx index 00ba6fca2ff9..d7d8c902a95f 100644 --- a/sw/source/core/inc/setmapvirtdev.hxx +++ b/sw/source/core/inc/setmapvirtdev.hxx @@ -56,7 +56,6 @@ void SetMappingForVirtDev( const Point& _rNewOrigin, const OutputDevice* _pOrgOutDev, VirtualDevice* _pVirDev ); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index 840485c40990..b07ca6796756 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -22,7 +22,6 @@ #include <tools/datetime.hxx> #include <o3tl/sorted_vector.hxx> - class SwPaM; class SwDoc; class SvxMacroTableDtor; @@ -51,7 +50,6 @@ public: class SwBlockNames : public o3tl::sorted_vector<SwBlockName*, o3tl::less_ptr_to<SwBlockName> > {}; - class SwImpBlocks { friend class SwTextBlocks; diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index 5da48343b1e3..7b2ea25953b7 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -68,7 +68,6 @@ class SwCache sal_uInt16 nCurMax; //Mehr werden nicht aufgenommen. - void DeleteObj( SwCacheObj *pObj ); #ifdef DBG_UTIL @@ -280,7 +279,6 @@ inline SwCacheObj *SwCacheAccess::Get() return pObj; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx index 1169f9455e5e..07ef171962b6 100644 --- a/sw/source/core/inc/swfntcch.hxx +++ b/sw/source/core/inc/swfntcch.hxx @@ -76,7 +76,6 @@ public: * class SwFontAccess *************************************************************************/ - class SwFontAccess : public SwCacheAccess { SwViewShell *pShell; diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 7a3d81468ee0..c11a29a86909 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -38,7 +38,7 @@ class SwViewShell; class IDocumentSettingAccess; const sal_Unicode CH_BLANK = ' '; // ' ' blank spaces -const sal_Unicode CH_BREAK = 0x0A; // +const sal_Unicode CH_BREAK = 0x0A; const sal_Unicode CH_TAB = '\t'; // \t const sal_Unicode CH_PAR = 0xB6; // paragraph const sal_Unicode CH_BULLET = 0xB7; // centered dot @@ -464,7 +464,6 @@ inline void SwSubFont::SetColor( const Color& rColor ) Font::SetColor( rColor ); } - // encapsulated SV-Font-method inline void SwSubFont::SetFillColor( const Color& rColor ) { @@ -1044,7 +1043,6 @@ public: void SetPos( const Point& rPoint ) { aPos = rPoint; } }; - /************************************************************************* * class SvStatistics *************************************************************************/ diff --git a/sw/source/core/inc/swthreadmanager.hxx b/sw/source/core/inc/swthreadmanager.hxx index e4c332287e1c..9ac208008004 100644 --- a/sw/source/core/inc/swthreadmanager.hxx +++ b/sw/source/core/inc/swthreadmanager.hxx @@ -26,7 +26,6 @@ #include <boost/utility.hpp> #include <memory> - class ObservableThread; class ThreadManager; diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index 93984274a532..7d8c15ad2cab 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -148,9 +148,8 @@ public: void SetResizeHTMLTable() { bResizeHTMLTable = sal_True; } // same void SetONECalcLowers() { bONECalcLowers = sal_True; } - // // Start: New stuff for breaking table rows - // + sal_Bool HasFollowFlowLine() const { return bHasFollowFlowLine; } void SetFollowFlowLine( sal_Bool bNew ) { bHasFollowFlowLine = bNew; } //return the SwTabFrm (if any) that this SwTabFrm is a follow flow line for @@ -195,9 +194,8 @@ public: } bool RemoveFollowFlowLine(); - // + // End: New stuff for breaking table rows - // sal_Bool CalcFlyOffsets( SwTwips& rUpper, diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index 5d2a701e24e9..8e243cd8cf72 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -41,7 +41,6 @@ struct _InsULPara; void sw_LineSetHeadCondColl( const SwTableLine* pLine ); - #ifdef DBG_UTIL void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ); #endif @@ -146,7 +145,6 @@ public: void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara ); - class SwShareBoxFmt { const SwFrmFmt* pOldFmt; @@ -166,7 +164,6 @@ public: bool RemoveFormat( const SwFrmFmt& rFmt ); }; - typedef boost::ptr_vector<SwShareBoxFmt> _SwShareBoxFmts; class SwShareBoxFmts @@ -192,8 +189,6 @@ public: void RemoveFormat( const SwFrmFmt& rFmt ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx index 68cff5faaf0d..7d44dd70b54e 100644 --- a/sw/source/core/inc/threadmanager.hxx +++ b/sw/source/core/inc/threadmanager.hxx @@ -140,7 +140,6 @@ class ThreadManager : public IThreadListenerOwner } }; - inline oslInterlockedCount RetrieveNewThreadID() { return osl_atomic_increment( &mnThreadIDCounter ); diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index 3021f1bbd703..ed11c7e2d30d 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/lang/Locale.hpp> - class CharClass; class SwCntntNode; class SwTxtNode; @@ -57,7 +56,6 @@ struct SwTOXSource typedef std::vector<SwTOXSource> SwTOXSources; - struct TextAndReading { OUString sText; @@ -71,7 +69,6 @@ struct TextAndReading {} }; - class SwTOXInternational { IndexEntrySupplierWrapper* pIndexWrapper; @@ -188,7 +185,6 @@ struct SwTOXIndex : public SwTOXSortTabBase const ::com::sun::star::lang::Locale& rLocale ); virtual ~SwTOXIndex() {} - virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const; virtual sal_uInt16 GetLevel() const; virtual bool operator==( const SwTOXSortTabBase& ); @@ -291,7 +287,6 @@ public: virtual sal_uInt16 GetLevel() const; }; - #endif // INCLUDED_SW_SOURCE_CORE_INC_TXMSRT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 9a6c8c27ca18..b23ba02b91f1 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -78,7 +78,6 @@ class SwTxtFrm: public SwCntntFrm // It is NOT used for the determination of printing area. SwTwips mnAdditionalFirstLineOffset; - sal_Int32 nOfst; //nOfst gibt den Offset im Cntnt (Anzahl Zeichen) an. sal_uInt16 nCacheIdx; //Index in den Cache, USHRT_MAX wenn definitiv @@ -258,7 +257,6 @@ public: virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const; - //Liefert in nOffset den Offset des Characters innerhalb des //gesetzten Textbuffers zurueck, welcher der durch aPoint //gegebenen Position innerhalb der SSize des Layout am @@ -504,7 +502,6 @@ public: // Ermittelt die Startposition und Schrittweite des Registers bool FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff ); - sal_uInt16 GetLineCount( sal_Int32 nPos ); //Ermittelt die Zeilenanzahl //Fuer die Anzeige der Zeilennummern. diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx index f88a94ab2f2a..639f6b6d7c67 100644 --- a/sw/source/core/inc/unobookmark.hxx +++ b/sw/source/core/inc/unobookmark.hxx @@ -34,10 +34,8 @@ #include <unobaseclass.hxx> #include <IDocumentMarkAccess.hxx> - class SwDoc; - typedef ::cppu::ImplInheritanceHelper5 < ::sfx2::MetadatableMixin , ::com::sun::star::lang::XUnoTunnel diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx index 0fcd86fb9333..569710eb06ac 100644 --- a/sw/source/core/inc/unoevent.hxx +++ b/sw/source/core/inc/unoevent.hxx @@ -22,7 +22,6 @@ #include <svtools/unoevent.hxx> #include <svl/macitem.hxx> - class SvxMacroItem; class SvxMacro; class SwXFrame; @@ -32,8 +31,6 @@ class SwXTextEmbeddedObject; class SwXFrameStyle; class SwFmtINetFmt; - - class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor { const OUString sImplName; @@ -47,8 +44,6 @@ public: SwHyperlinkEventDescriptor(); - - void copyMacrosFromINetFmt(const SwFmtINetFmt& aFmt); void copyMacrosIntoINetFmt(SwFmtINetFmt& aFmt); @@ -57,8 +52,6 @@ public: ::com::sun::star::container::XNameReplace> & xReplace); }; - - // SwEventDescriptor for // 1) SwXTextFrame // 2) SwXGraphicObject @@ -106,7 +99,6 @@ protected: virtual sal_uInt16 getMacroItemWhich() const; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx index d9a04c0721a5..0065c2529ce4 100644 --- a/sw/source/core/inc/unofield.hxx +++ b/sw/source/core/inc/unofield.hxx @@ -32,7 +32,6 @@ #include <unobaseclass.hxx> - class SwFieldType; class SwDoc; class SwFmtFld; @@ -151,7 +150,6 @@ public: }; - typedef ::cppu::WeakImplHelper5 < ::com::sun::star::text::XDependentTextField , ::com::sun::star::lang::XServiceInfo diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx index a62b22be373f..537ca3a4317a 100644 --- a/sw/source/core/inc/unofootnote.hxx +++ b/sw/source/core/inc/unofootnote.hxx @@ -31,7 +31,6 @@ #include <unotext.hxx> - class SwDoc; class SwModify; class SwFmtFtn; @@ -56,7 +55,6 @@ private: class Impl; ::sw::UnoImplPtr<Impl> m_pImpl; - protected: virtual const SwStartNode *GetStartNode() const; diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx index e92395e7115e..0be41286f40a 100644 --- a/sw/source/core/inc/unoidx.hxx +++ b/sw/source/core/inc/unoidx.hxx @@ -35,7 +35,6 @@ #include <toxe.hxx> #include <unobaseclass.hxx> - class SwDoc; class SwTOXBaseSection; class SwTOXMark; @@ -185,7 +184,6 @@ public: ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() throw (::com::sun::star::uno::RuntimeException, std::exception); - // XDocumentIndex virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException, std::exception); diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index d7fd7f831858..2d343de927bc 100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -37,7 +37,6 @@ #include <unobaseclass.hxx> - typedef ::std::deque< ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > > TextRangeList_t; @@ -233,7 +232,6 @@ public: }; - typedef ::cppu::ImplInheritanceHelper2 < SwXMeta , ::com::sun::star::beans::XPropertySet diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx index 7dea474b7420..953ee5589e96 100644 --- a/sw/source/core/inc/unoparaframeenum.hxx +++ b/sw/source/core/inc/unoparaframeenum.hxx @@ -32,13 +32,11 @@ #include <unobaseclass.hxx> - class SwDepend; class SwNodeIndex; class SwPaM; class SwFrmFmt; - struct FrameDependSortListEntry { sal_Int32 nIndex; @@ -56,7 +54,6 @@ typedef ::std::deque< FrameDependSortListEntry > typedef ::std::deque< ::boost::shared_ptr<SwDepend> > FrameDependList_t; - // #i28701# - adjust 4th parameter void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx, FrameDependSortList_t & rFrames, diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index a29b765fb554..fcaf6434dfe7 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -44,13 +44,11 @@ #include <calbck.hxx> #include <unobaseclass.hxx> - class SwFmtFld; class SwFrmFmt; class SwRangeRedline; class SwTxtRuby; - typedef ::std::deque< ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > > TextRangeList_t; @@ -80,7 +78,6 @@ enum SwTextPortionType PORTION_ANNOTATION_END }; - class SwXTextPortion : public cppu::WeakImplHelper8 < ::com::sun::star::beans::XTolerantMultiPropertySet, @@ -282,7 +279,6 @@ public: SwXTextPortionEnumeration(SwPaM& rParaCrsr, TextRangeList_t const & rPortions ); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx index e33fe1b05328..8f5360e3bf78 100644 --- a/sw/source/core/inc/unorefmark.hxx +++ b/sw/source/core/inc/unorefmark.hxx @@ -30,7 +30,6 @@ #include <unobaseclass.hxx> - class SwDoc; class SwModify; class SwFmtRefMark; diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx index 7c97d1031522..017db44dd49d 100644 --- a/sw/source/core/inc/unosection.hxx +++ b/sw/source/core/inc/unosection.hxx @@ -35,11 +35,8 @@ #include <unobaseclass.hxx> - class SwSectionFmt; - - struct SwTextSectionProperties_Impl; typedef ::cppu::ImplInheritanceHelper7 diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx index a4b1d89d8911..96980afef814 100644 --- a/sw/source/core/inc/unotextmarkup.hxx +++ b/sw/source/core/inc/unotextmarkup.hxx @@ -37,7 +37,6 @@ namespace com { namespace sun { namespace star { namespace text { class XTextRange; } } } } - class SwTxtNode; class SfxPoolItem; @@ -79,7 +78,6 @@ protected: const ModelToViewHelper maConversionMap; }; - /** Implementation of the ::com::sun::star::container::XStringKeyMap interface */ class SwXStringKeyMap: @@ -108,5 +106,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 4a7604cbbfe7..89d6c0bac095 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -52,7 +52,6 @@ enum WrongListType WRONGLIST_CHANGETRACKING }; - // ST2 class SwWrongArea { diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 2a36d1c8d86a..51a0d5373d1a 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -756,7 +756,6 @@ bool SwFmtPageDesc::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } - // class SwFmtCol // Partially implemented inline in hxx @@ -1049,7 +1048,7 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) (sal_uInt16) 0x3fff ); sal_uInt16 nWidthSum = 0; // #101224# one column is no column - // + if(nCount > 1) for(sal_uInt16 i = 0; i < nCount; i++) { @@ -1137,7 +1136,6 @@ sal_uInt16 SwFmtSurround::GetValueCount() const return SURROUND_END - SURROUND_BEGIN; } - bool SwFmtSurround::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // here we convert always! @@ -1322,7 +1320,6 @@ bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } - // class SwFmtHoriOrient // Partially implemented inline in hxx diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index e6198bd74961..b8e9b12ca2c4 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -1134,7 +1134,6 @@ void SwCntntFrm::MakeAll() } } - // if ( GetUpper()->IsSctFrm() && HasFollow() && GetFollow()->GetFrm() == GetNext() ) @@ -1475,7 +1474,7 @@ void SwCntntFrm::MakeAll() // This way, we keep control until (almost) everything is stable, // allowing us to avoid endless loops caused by ever repeating // retries. - // + // bMoveFwdInvalid is required for #38407#. This was originally solved // in flowfrm.cxx rev 1.38, but broke the above schema and // preferred to play towers of hanoi (#43669#). @@ -1537,7 +1536,7 @@ void SwCntntFrm::MakeAll() // This situation arises with freshly created Follows that had been moved // to the next page but is still too big for it - ie. needs to be split // as well. - // + // If I'm unable to split (WouldFit()) and can't be fitted, I'm going // to tell my TxtFrm part that, if possible, we still need to split despite // the "don't split" attribute. @@ -1675,7 +1674,6 @@ void SwCntntFrm::MakeAll() ), static_cast<SwTxtFrm&>(*this) ); - delete pSaveFtn; UnlockJoin(); @@ -1938,7 +1936,7 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace, pNxt->FindFtnFrm()->GetAttr() == pFtnFrm->GetAttr() ) ) ) { // TestFormat(?) does not like paragraph- or character anchored objects. - // + // current solution for the test formatting doesn't work, if // objects are present in the remaining area of the new upper if ( bTstMove && diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 6c8ec803908f..fd6a7780b95b 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -1594,7 +1594,7 @@ const SwRowFrm* SwFrm::IsInSplitTableRow() const OSL_ENSURE( pRow->GetUpper()->IsTabFrm(), "Confusion in table layout" ); const SwTabFrm* pTab = (SwTabFrm*)pRow->GetUpper(); - // + // If most upper row frame is a headline row, the current frame // can't be in a splitted table row. Thus, add corresponding condition. if ( pRow->GetNext() || diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 16cb1334ce10..cdb913d7af93 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -253,7 +253,7 @@ sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRe // The return value helps deciding whether we need to flow back (3), // or whether we can use the good old WouldFit (0, 1), or if // it's reasonable to relocate and test-format (2). - // + // Bit 1 in this case means that there are objects anchored to myself, // bit 2 means that I have to evade other objects. @@ -775,7 +775,7 @@ SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, sal_Bool bFwd ) sal_Bool SwFrm::WrongPageDesc( SwPageFrm* pNew ) { // Now it's getting a bit complicated: - // + // Maybe i'm bringing a Pagedesc myself; in that case, // the pagedesc of the next page needs to correspond. // Otherwise, I'll have to dig a bit deeper to see where @@ -840,7 +840,6 @@ sal_Bool SwFrm::WrongPageDesc( SwPageFrm* pNew ) || (pNewDesc && pNewDesc == pDesc); } - /// Returns the next layout leaf in which we can move the frame. SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) { @@ -2438,7 +2437,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) } pNewUpper->Calc(); m_rThis.Cut(); - // + // optimization: format section, if its size is invalidated and if it's // the new parent of moved backward frame. bool bFormatSect( false ); diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 776d3c0c2b1c..1da9bd4fb049 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -2278,7 +2278,7 @@ const SdrObject *SwOrderIter::Prev() // when attaching it again. Only the pointers necessary for the chain connection need to be // adjusted. The correction happens in RestoreCntnt(). In between all access is restricted. // During this action, the Flys are detached from the page. -// + // #115759# - 'remove' also drawing object from page and // at-fly anchored objects from page static void lcl_RemoveObjsFromPage( SwFrm* _pFrm ) diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index 8f0f30610235..598f037b7fe4 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -48,7 +48,7 @@ #include <flyfrm.hxx> // OD 2004-05-24 #i28701# #include <sortedobjs.hxx> -// + #include <pam.hxx> #include <docsh.hxx> #include <poolfmt.hxx> @@ -81,8 +81,6 @@ void SwLayoutCache::Read( SvStream &rStream ) } } - - void SwLayCacheImpl::Insert( sal_uInt16 nType, sal_uLong nIndex, sal_Int32 nOffset ) { aType.push_back( nType ); @@ -449,7 +447,6 @@ void SwLayoutCache::ClearImpl() } } - SwLayoutCache::~SwLayoutCache() { OSL_ENSURE( !nLockCount, "Deleting a locked SwLayoutCache!?" ); @@ -1069,8 +1066,6 @@ bool SwLayHelper::CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly ) return bRet; } -// ----------------------------------------------------------------------------- - SwLayCacheIoImpl::SwLayCacheIoImpl( SvStream& rStrm, bool bWrtMd ) : pStream( &rStrm ), nFlagRecEnd ( 0 ), diff --git a/sw/source/core/layout/objectformatterlayfrm.cxx b/sw/source/core/layout/objectformatterlayfrm.cxx index b3fc1d84be6a..6fee5811fb1d 100644 --- a/sw/source/core/layout/objectformatterlayfrm.cxx +++ b/sw/source/core/layout/objectformatterlayfrm.cxx @@ -121,7 +121,6 @@ bool SwObjectFormatterLayFrm::_AdditionalFormatObjsOnPage() return false; } - SwPageFrm& rPageFrm = static_cast<SwPageFrm&>(GetAnchorFrm()); if ( !rPageFrm.GetSortedObjs() ) diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index e6519e200997..8e99d9e9f065 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -760,7 +760,6 @@ SwPageDesc *SwPageFrm::FindPageDesc() if ( !pRet ) pRet = &GetFmt()->GetDoc()->GetPageDesc( 0 ); - OSL_ENSURE( pRet, "could not find page descriptor." ); return pRet; } diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 4b089c64c9cc..11d76f449ae6 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -561,7 +561,6 @@ void BorderLines::AddBorderLine( m_Lines.push_back(xLine); } - SwLineRect::SwLineRect( const SwRect &rRect, const Color *pCol, const SvxBorderStyle nStyl, const SwTabFrm *pT, const sal_uInt8 nSCol ) : SwRect( rRect ), @@ -1940,21 +1939,21 @@ void DrawGraphic( const SvxBrushItem *pBrush, // For PDF export, every draw operation for bitmaps takes a // noticeable amount of place (~50 characters). Thus, optimize // between tile bitmap size and number of drawing operations here. - // + // A_out // n_chars = k1 * ---------- + k2 * A_bitmap // A_bitmap - // + // minimum n_chars is obtained for (derive for A_bitmap, // set to 0, take positive solution): // k1 // A_bitmap = Sqrt( ---- A_out ) // k2 - // + // where k1 is the number of chars per draw operation, and // k2 is the number of chars per bitmap pixel. // This is approximately 50 and 7 for current PDF writer, respectively. - // + const double k1( 50 ); const double k2( 7 ); const Size aSize( aAlignedPaintRect.SSize() ); @@ -2164,8 +2163,6 @@ void DrawGraphic( const SvxBrushItem *pBrush, } } - - /** local help method for SwRootFrm::Paint(..) - Adjust given rectangle to pixel size By OD at 27.09.2002 for #103636# @@ -5185,7 +5182,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, // - flag to control, //-hack has to be used. const bool bb4779636HackActive = true; - // + const SwFrm* pCellFrmForBottomBorderAttrs = 0; const SwFrm* pCellFrmForTopBorderAttrs = 0; bool bFoundCellForTopOrBorderAttrs = false; diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 2b3d2853863b..5cd6643c80f6 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -545,7 +545,7 @@ static void lcl_PreprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine, // The line completely fits into the master table. // Nevertheless, we build a follow (otherwise painting problems // with empty cell). - // + // 2. Case: // The line has to be split, the minimum height still fits into // the master table, and the table structure is not to complex. @@ -682,7 +682,7 @@ static bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, lcl_PostprocessRowsInCells( rTab, rLastLine ); // Do a couple of checks on the current situation. - // + // If we are not happy with the current situation we return false. // This will start a new try to split the table, this time we do not // try to split the table rows. @@ -695,7 +695,7 @@ static bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, bRet = false; // 2. Check if each cell in the last line has at least one content frame. - // + // Note: a FollowFlowRow may contains empty cells! if ( bRet ) { @@ -1987,7 +1987,7 @@ void SwTabFrm::MakeAll() bLowersFormatted = sal_True; if ( bKeep && KEEPTAB ) { - // + // Consider case that table is inside another table, // because it has to be avoided, that superior table // is formatted. @@ -2150,7 +2150,6 @@ void SwTabFrm::MakeAll() { delete pAccess; - // // Consider case that table is inside another table, because // it has to be avoided, that superior table is formatted. // Thus, find next content, table or section and, if a section @@ -3216,10 +3215,9 @@ SwCntntFrm *SwTabFrm::FindLastCntnt() return pRet->FindSctFrm()->FindLastCntnt(); } - // // pRet may be a cell frame without a lower (cell has been split). // We have to find the last content the hard way: - // + OSL_ENSURE( pRet->IsCellFrm(), "SwTabFrm::FindLastCntnt failed" ); const SwFrm* pRow = pRet->GetUpper(); while ( pRow && !pRow->GetUpper()->IsTabFrm() ) @@ -5127,7 +5125,7 @@ static SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine ) // 1. Case: rSourceLine is a follow flow line. // In this case we have to return the minimum of the heights // of the first lines in rSourceLine. - // + // 2. Case: rSourceLine is not a follow flow line. // In this case we have to return the maximum of the heights // of the first lines in rSourceLine. diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 0a3d6d8c1d5a..3e36e6b0b664 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -655,7 +655,6 @@ static bool lcl_IsInRepeatedHeadline( const SwFrm *pFrm, return pTab && pTab->IsFollow() && pTab->IsInHeadline( *pFrm ); } - /// Skip protected table cells. Optionally also skip repeated headlines. //MA 1998-01-26: Chg also skip other protected areas //FME: Skip follow flow cells @@ -737,7 +736,6 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, pCnt = (*fnNxtPrv)( pCnt ? pCnt : pStart ); pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel ); - const SwTabFrm *pStTab = pStart->FindTabFrm(); const SwTabFrm *pTable = 0; const bool bTab = pStTab || (pCnt && pCnt->IsInTab()); diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 0bb81e82a04b..f0c92d042ddd 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -963,7 +963,7 @@ void SwCntntFrm::Cut() { if ( pUp->GetUpper() ) { - // + // prevent delete of <ColLocked> footnote frame if ( pUp->IsFtnFrm() && !pUp->IsColLocked()) { @@ -978,7 +978,7 @@ void SwCntntFrm::Cut() } else { - // + if ( pSct->IsColLocked() || !pSct->IsInFtn() || ( pUp->IsFtnFrm() && pUp->IsColLocked() ) ) { @@ -1054,7 +1054,6 @@ void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling) //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin fnRect = GetUpper()->IsVertical() ? ( GetUpper()->IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori; - if( (Frm().*fnRect->fnGetWidth)() != (pParent->Prt().*fnRect->fnGetWidth)()) _InvalidateSize(); _InvalidatePos(); diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx index ca380bde28b0..b6a3d06f8e6f 100644 --- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/text/HoriOrientation.hpp> - using namespace ::com::sun::star; using namespace objectpositioning; diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx index f192a75bafa6..9861bc6ff76d 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -46,7 +46,6 @@ using namespace objectpositioning; using namespace ::com::sun::star; - SwToCntntAnchoredObjectPosition::SwToCntntAnchoredObjectPosition( SdrObject& _rDrawObj ) : SwAnchoredObjectPosition ( _rDrawObj ), mpVertPosOrientFrm( 0 ), diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx index 7d06e08a563d..c575b8710177 100644 --- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx @@ -37,7 +37,6 @@ using namespace objectpositioning; using namespace ::com::sun::star; - SwToLayoutAnchoredObjectPosition::SwToLayoutAnchoredObjectPosition( SdrObject& _rDrawObj ) : SwAnchoredObjectPosition( _rDrawObj ), maRelPos( Point() ), @@ -87,7 +86,6 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() aVert.GetRelationOrient(), aVert.GetPos(), rLR, rUL, nVertOffsetToFrmAnchorPos ); - // keep the calculated relative vertical position - needed for filters // (including the xml-filter) { diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index bceafee77284..cf7d48a09409 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -145,7 +145,6 @@ void SAL_CALL SwOLEListener_Impl::disposing( const lang::EventObject& ) throw (u pOLELRU_Cache->RemoveObj( *mpObj ); } - // SwEmbedObjectLink // TODO/LATER: actually SwEmbedObjectLink should be used here, but because different objects are used to control @@ -166,8 +165,6 @@ public: bool Connect() { return GetRealObject() != NULL; } }; - - SwEmbedObjectLink::SwEmbedObjectLink(SwOLENode* pNode): ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ), pOleNode(pNode) @@ -175,14 +172,10 @@ SwEmbedObjectLink::SwEmbedObjectLink(SwOLENode* pNode): SetSynchron( sal_False ); } - - SwEmbedObjectLink::~SwEmbedObjectLink() { } - - ::sfx2::SvBaseLink::UpdateResult SwEmbedObjectLink::DataChanged( const OUString&, const uno::Any& ) { @@ -216,19 +209,14 @@ SwEmbedObjectLink::~SwEmbedObjectLink() return SUCCESS; } - - void SwEmbedObjectLink::Closed() { pOleNode->BreakFileLink_Impl(); SvBaseLink::Closed(); } - - // SwOLENode - SwOLENode::SwOLENode( const SwNodeIndex &rWhere, const svt::EmbeddedObjectRef& xObj, SwGrfFmtColl *pGrfColl, @@ -364,7 +352,6 @@ sal_Bool SwOLENode::SavePersistentData() pCnt->RemoveEmbeddedObject( aOLEObj.aName, false, bKeepObjectToTempStorage ); // modify end - // TODO/LATER: aOLEObj.aName has no meaning here, since the undo container contains the object // by different name, in future it might makes sence that the name is transported here. aOLEObj.xOLERef.AssignToContainer( 0, aOLEObj.aName ); @@ -384,7 +371,6 @@ sal_Bool SwOLENode::SavePersistentData() return sal_True; } - SwOLENode * SwNodes::MakeOLENode( const SwNodeIndex & rWhere, const svt::EmbeddedObjectRef& xObj, SwGrfFmtColl* pGrfColl, @@ -408,7 +394,6 @@ SwOLENode * SwNodes::MakeOLENode( const SwNodeIndex & rWhere, return pNode; } - SwOLENode * SwNodes::MakeOLENode( const SwNodeIndex & rWhere, const OUString &rName, sal_Int64 nAspect, SwGrfFmtColl* pGrfColl, SwAttrSet* pAutoAttr ) { @@ -667,7 +652,6 @@ SwOLEObj::SwOLEObj( const svt::EmbeddedObjectRef& xObj ) : } } - SwOLEObj::SwOLEObj( const OUString &rString, sal_Int64 nAspect ) : pOLENd( 0 ), pListener( 0 ), @@ -677,7 +661,6 @@ SwOLEObj::SwOLEObj( const OUString &rString, sal_Int64 nAspect ) : xOLERef.SetViewAspect( nAspect ); } - SwOLEObj::~SwOLEObj() { if( pListener ) @@ -734,7 +717,6 @@ SwOLEObj::~SwOLEObj() xOLERef.Clear(); } - void SwOLEObj::SetNode( SwOLENode* pNode ) { pOLENd = pNode; @@ -920,7 +902,6 @@ OUString SwOLEObj::GetDescription() return SW_RESSTR(STR_OLE); } - SwOLELRUCache::SwOLELRUCache() : utl::ConfigItem(OUString("Office.Common/Cache")) , m_nLRU_InitSize( 20 ) diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx index 5a7ad4514a2b..4500d8ce1362 100644 --- a/sw/source/core/para/paratr.cxx +++ b/sw/source/core/para/paratr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hintids.hxx" #include <swtypes.hxx> #include "unomid.h" @@ -60,8 +59,6 @@ SwFmtDrop::SwFmtDrop() { } - - SwFmtDrop::SwFmtDrop( const SwFmtDrop &rCpy ) : SfxPoolItem( RES_PARATR_DROP ), SwClient( rCpy.GetRegisteredInNonConst() ), @@ -74,14 +71,10 @@ SwFmtDrop::SwFmtDrop( const SwFmtDrop &rCpy ) { } - - SwFmtDrop::~SwFmtDrop() { } - - void SwFmtDrop::SetCharFmt( SwCharFmt *pNew ) { // Rewire @@ -92,8 +85,6 @@ void SwFmtDrop::SetCharFmt( SwCharFmt *pNew ) nReadFmt = USHRT_MAX; } - - void SwFmtDrop::Modify( const SfxPoolItem*, const SfxPoolItem * ) { if( pDefinedIn ) diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx index 732c15f946f9..82344c28f69c 100644 --- a/sw/source/core/sw3io/swacorr.cxx +++ b/sw/source/core/sw3io/swacorr.cxx @@ -27,10 +27,8 @@ using namespace ::com::sun::star; - TYPEINIT1( SwAutoCorrect, SvxAutoCorrect ); - // - return den Ersetzungstext (nur fuer SWG-Format, alle anderen // koennen aus der Wortliste herausgeholt werden!) // rShort ist der Stream-Name - gecryptet! @@ -79,7 +77,6 @@ bool SwAutoCorrect::PutText( const uno::Reference < embed::XStorage >& rStg, return !IsError( nRet ); } - SwAutoCorrect::SwAutoCorrect( const SvxAutoCorrect& rACorr ) : SvxAutoCorrect( rACorr ) { diff --git a/sw/source/core/swg/SwXMLBlockListContext.cxx b/sw/source/core/swg/SwXMLBlockListContext.cxx index ecbbcaeb11bd..b338b11fb0b3 100644 --- a/sw/source/core/swg/SwXMLBlockListContext.cxx +++ b/sw/source/core/swg/SwXMLBlockListContext.cxx @@ -153,7 +153,6 @@ SwXMLTextBlockDocumentContext::~SwXMLTextBlockDocumentContext ( void ) { } - SwXMLTextBlockTextContext::SwXMLTextBlockTextContext( SwXMLTextBlockImport& rImport, sal_uInt16 nPrefix, @@ -182,7 +181,6 @@ SwXMLTextBlockTextContext::~SwXMLTextBlockTextContext ( void ) { } - SwXMLTextBlockBodyContext::SwXMLTextBlockBodyContext( SwXMLTextBlockImport& rImport, sal_uInt16 nPrefix, diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index 2a0ed6e2cccf..379fefe913fb 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> #include <rtl/ustring.hxx> @@ -43,7 +42,6 @@ using namespace ::com::sun::star; - void SwXMLTextBlocks::InitBlockMode ( const uno::Reference < embed::XStorage >& rStorage ) { xBlkRoot = rStorage; @@ -302,7 +300,6 @@ sal_uLong SwXMLTextBlocks::CopyBlock( SwImpBlocks& rDestImp, OUString& rShort, return nError; } - sal_uLong SwXMLTextBlocks::StartPutBlock( const OUString& rShort, const OUString& rPackageName ) { OSL_ENSURE( xBlkRoot.is(), "No storage set" ); @@ -431,7 +428,6 @@ sal_uLong SwXMLTextBlocks::GetText( const OUString& rShort, OUString& rText ) return GetBlockText( rShort, rText ); } - sal_uLong SwXMLTextBlocks::MakeBlockList() { WriteInfo(); @@ -556,8 +552,6 @@ sal_Bool SwXMLTextBlocks::IsFileUCBStorage( const OUString & rFileName) return bRet; } - - short SwXMLTextBlocks::GetFileType ( void ) const { return SWBLK_XML; diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx index c440aa0f1937..9b134d8cf334 100644 --- a/sw/source/core/swg/SwXMLTextBlocks1.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx @@ -265,7 +265,6 @@ sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx, return nRet; } - sal_uLong SwXMLTextBlocks::GetBlockText( const OUString& rShort, OUString& rText ) { sal_uLong n = 0; @@ -569,7 +568,6 @@ sal_uLong SwXMLTextBlocks::SetMacroTable( aParams[0] <<= xDocHandler; aParams[1] <<= xEvents; - // get filter component OUString sFilterComponent = bOasis ? OUString("com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter") diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx index c784e720fa4b..0a6b0716e579 100644 --- a/sw/source/core/swg/swblocks.cxx +++ b/sw/source/core/swg/swblocks.cxx @@ -40,11 +40,8 @@ #include <statstr.hrc> #include <swerror.h> -////////////////////////////////////////////////////////////////////////// - // Hash-Code errechnen (muss nicht eindeutig sein) - sal_uInt16 SwImpBlocks::Hash( const OUString& r ) { sal_uInt16 n = 0; @@ -57,7 +54,6 @@ sal_uInt16 SwImpBlocks::Hash( const OUString& r ) return n; } - SwBlockName::SwBlockName( const OUString& rShort, const OUString& rLong ) : aShort( rShort ), aLong( rLong ), aPackageName (rShort), bIsOnlyTxtFlagInit( sal_False ), bIsOnlyTxt( sal_False ), bInPutMuchBlocks(false) @@ -74,7 +70,6 @@ SwBlockName::SwBlockName( const OUString& rShort, const OUString& rLong, const O nHashL = SwImpBlocks::Hash( rLong ); } - // Ist die angegebene Datei ein Storage oder gibt es sie nicht? short SwImpBlocks::GetFileType( const OUString& rFile ) @@ -89,7 +84,6 @@ short SwImpBlocks::GetFileType( const OUString& rFile ) return SWBLK_NONE; } - SwImpBlocks::SwImpBlocks( const OUString& rFile, sal_Bool ) : aFile( rFile ), aDateModified( Date::EMPTY ), @@ -105,7 +99,6 @@ SwImpBlocks::SwImpBlocks( const OUString& rFile, sal_Bool ) aName = aObj.GetBase(); } - SwImpBlocks::~SwImpBlocks() { aNames.DeleteAndDestroyAll(); @@ -128,7 +121,6 @@ SwPaM* SwImpBlocks::MakePaM() return pPam; } - sal_uInt16 SwImpBlocks::GetCount() const { return aNames.size(); @@ -149,7 +141,6 @@ sal_uInt16 SwImpBlocks::GetIndex( const OUString& rShort ) const return (sal_uInt16) -1; } - sal_uInt16 SwImpBlocks::GetLongIndex( const OUString& rLong ) const { sal_uInt16 nHash = Hash( rLong ); @@ -163,7 +154,6 @@ sal_uInt16 SwImpBlocks::GetLongIndex( const OUString& rLong ) const return (sal_uInt16) -1; } - OUString SwImpBlocks::GetShortName( sal_uInt16 n ) const { if( n < aNames.size() ) @@ -171,7 +161,6 @@ OUString SwImpBlocks::GetShortName( sal_uInt16 n ) const return OUString(); } - OUString SwImpBlocks::GetLongName( sal_uInt16 n ) const { if( n < aNames.size() ) @@ -201,8 +190,6 @@ void SwImpBlocks::AddName( const OUString& rShort, const OUString& rLong, aNames.insert( pNew ); } - - sal_Bool SwImpBlocks::IsFileChanged() const { Date aTempDateModified( aDateModified ); @@ -213,7 +200,6 @@ sal_Bool SwImpBlocks::IsFileChanged() const aTimeModified != aTempTimeModified ); } - void SwImpBlocks::Touch() { FStatHelper::GetModifiedDateTimeOfFile( aFile, @@ -241,9 +227,6 @@ sal_Bool SwImpBlocks::PutMuchEntries( sal_Bool ) return sal_False; } -//////////////////////////////////////////////////////////////////////////// - - SwTextBlocks::SwTextBlocks( const OUString& rFile ) : pImp( 0 ), nErr( 0 ) { @@ -268,14 +251,12 @@ OUString SwTextBlocks::GetName() return pImp ? pImp->aName : OUString(); } - void SwTextBlocks::SetName( const OUString& r ) { if( pImp ) pImp->SetName( r ); } - sal_Bool SwTextBlocks::IsOld() const { if (pImp) @@ -287,25 +268,21 @@ sal_Bool SwTextBlocks::IsOld() const return sal_False; } - sal_uInt16 SwTextBlocks::GetCount() const { return pImp ? pImp->GetCount() : 0; } - sal_uInt16 SwTextBlocks::GetIndex( const OUString& r ) const { return pImp ? pImp->GetIndex( r ) : (sal_uInt16) -1; } - sal_uInt16 SwTextBlocks::GetLongIndex( const OUString& r ) const { return pImp ? (sal_uInt16)(pImp->GetLongIndex( r )) : (sal_uInt16) -1; } - OUString SwTextBlocks::GetShortName( sal_uInt16 n ) const { if( pImp ) @@ -313,7 +290,6 @@ OUString SwTextBlocks::GetShortName( sal_uInt16 n ) const return OUString(); } - OUString SwTextBlocks::GetLongName( sal_uInt16 n ) const { if( pImp ) @@ -321,7 +297,6 @@ OUString SwTextBlocks::GetLongName( sal_uInt16 n ) const return OUString(); } - sal_Bool SwTextBlocks::Delete( sal_uInt16 n ) { if( pImp && !pImp->bInPutMuchBlocks ) @@ -349,7 +324,6 @@ sal_Bool SwTextBlocks::Delete( sal_uInt16 n ) return sal_False; } - sal_uInt16 SwTextBlocks::Rename( sal_uInt16 n, const OUString* s, const OUString* l ) { sal_uInt16 nIdx = (sal_uInt16)-1; @@ -436,14 +410,12 @@ sal_Bool SwTextBlocks::BeginGetDoc( sal_uInt16 n ) return sal_False; } - void SwTextBlocks::EndGetDoc() { if( pImp && !pImp->bInPutMuchBlocks ) pImp->CloseFile(); } - sal_Bool SwTextBlocks::BeginPutDoc( const OUString& s, const OUString& l ) { if( pImp ) @@ -468,7 +440,6 @@ sal_Bool SwTextBlocks::BeginPutDoc( const OUString& s, const OUString& l ) return 0 == nErr; } - sal_uInt16 SwTextBlocks::PutDoc() { sal_uInt16 nIdx = (sal_uInt16)-1; @@ -541,7 +512,6 @@ sal_uInt16 SwTextBlocks::PutText( const OUString& rShort, const OUString& rName, return nIdx; } - SwDoc* SwTextBlocks::GetDoc() { if( pImp ) @@ -549,7 +519,6 @@ SwDoc* SwTextBlocks::GetDoc() return 0; } - void SwTextBlocks::ClearDoc() { if( pImp ) @@ -559,13 +528,11 @@ void SwTextBlocks::ClearDoc() } } - OUString SwTextBlocks::GetFileName() const { return pImp->GetFileName(); } - sal_Bool SwTextBlocks::IsReadOnly() const { return pImp->bReadOnly; diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index 65d7a4a0df50..ff26c7b2aa65 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <swtable.hxx> #include <tblsel.hxx> #include <tblrwcl.hxx> @@ -46,8 +45,6 @@ #define CHECK_TABLE(t) #endif - - /** SwBoxSelection is a small helperclass (structure) to handle selections of cells (boxes) between table functions @@ -626,7 +623,6 @@ static long lcl_InsertPosition( SwTable &rTable, std::vector<sal_uInt16>& rInsPo /** SwTable::NewInsertCol(..) insert new column(s) into a table - @param pDoc the document @@ -1878,8 +1874,6 @@ void SwTable::PrepareDeleteCol( long nMin, long nMax ) } } - - /** SwTable::ExpandSelection(..) adds all boxes to the box selections which are overlapped by it. */ diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 11c316152743..12f3e5947f58 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <ctype.h> #include <float.h> #include <hintids.hxx> @@ -80,7 +79,6 @@ SV_IMPL_REF( SwServerObject ) void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol, sal_Bool bChgAlign,sal_uLong nNdPos ); - class SwTableBox_Impl { Color *mpUserColor, *mpNumFmtColor; @@ -1332,7 +1330,6 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew, CHECK_TABLE( *this ) } - /************************************************************************* |* |* const SwTableBox* SwTable::GetTblBox( const Strn?ng& rName ) const @@ -1525,8 +1522,6 @@ bool SwTable::IsTblComplex() const return false; } - - /************************************************************************* |* |* SwTableLine::SwTableLine() @@ -2005,7 +2000,6 @@ void SwTable::SetRefObject( SwServerObject* pObj ) refObj = pObj; } - void SwTable::SetHTMLTableLayout( SwHTMLTableLayout *p ) { delete pHTMLLayout; @@ -2206,7 +2200,6 @@ void ChgNumToText( SwTableBox& rBox, sal_uLong nFmt ) } rBox.SetSaveNumFmtColor( pCol ); - // assign vertical orientation if( bChgAlign && SFX_ITEM_SET == rBox.GetFrmFmt()->GetItemState( diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 3460d3362b1a..bacbbd779071 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -77,9 +77,8 @@ using namespace ::com::sun::star; -// // Some static data structures -// + TableColumnsMap SwEnhancedPDFExportHelper::aTableColumnsMap; LinkIdMap SwEnhancedPDFExportHelper::aLinkIdMap; NumListIdMap SwEnhancedPDFExportHelper::aNumListIdMap; @@ -519,9 +518,8 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType ) bool bBox = false; bool bRowSpan = false; - // // Check which attributes to set: - // + switch ( eType ) { case vcl::PDFWriter::Document : @@ -587,9 +585,8 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType ) break; } - // // Set the attributes: - // + if ( bPlacement ) { eVal = vcl::PDFWriter::TableHeader == eType || @@ -752,9 +749,8 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType ) bool bLinkAttribute = false; bool bLanguage = false; - // // Check which attributes to set: - // + switch ( eType ) { case vcl::PDFWriter::Span : @@ -862,9 +858,8 @@ void SwTaggedPDFHelper::BeginNumberedListStructureElements() OSL_ENSURE( rFrm.IsTxtFrm(), "numbered only for text frames" ); const SwTxtFrm& rTxtFrm = static_cast<const SwTxtFrm&>(rFrm); - // // Lowers of NonStructureElements should not be considered: - // + if ( lcl_IsInNonStructEnv( rTxtFrm ) || rTxtFrm.IsFollow() ) return; @@ -997,9 +992,8 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() { const SwFrm* pFrm = &mpFrmInfo->mrFrm; - // // Lowers of NonStructureElements should not be considered: - // + if ( lcl_IsInNonStructEnv( *pFrm ) ) return; @@ -1018,33 +1012,33 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() */ case FRM_PAGE : - // + // Document: Document - // + nPDFType = vcl::PDFWriter::Document; aPDFType = OUString(aDocumentString); break; case FRM_HEADER : case FRM_FOOTER : - // + // Header, Footer: NonStructElement - // + nPDFType = vcl::PDFWriter::NonStructElement; break; case FRM_FTNCONT : - // + // Footnote container: Division - // + nPDFType = vcl::PDFWriter::Division; aPDFType = OUString(aDivString); break; case FRM_FTN : - // + // Footnote frame: Note - // + // Note: vcl::PDFWriter::Note is actually a ILSE. Nevertheless // we treat it like a grouping element! nPDFType = vcl::PDFWriter::Note; @@ -1052,9 +1046,9 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() break; case FRM_SECTION : - // + // Section: TOX, Index, or Sect - // + { const SwSection* pSection = static_cast<const SwSectionFrm*>(pFrm)->GetSection(); @@ -1109,45 +1103,40 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() nPDFType = static_cast<sal_uInt16>(vcl::PDFWriter::Paragraph); aPDFType = sStyleName; - // // Quotations: BlockQuote - // + if (sStyleName.equalsAscii(aQuotations)) { nPDFType = static_cast<sal_uInt16>(vcl::PDFWriter::BlockQuote); aPDFType = OUString(aBlockQuoteString); } - // // Caption: Caption - // + else if (sStyleName.equalsAscii(aCaption)) { nPDFType = static_cast<sal_uInt16>(vcl::PDFWriter::Caption); aPDFType = OUString(aCaptionString); } - // // Caption: Caption - // + else if (sParentStyleName.equalsAscii(aCaption)) { nPDFType = static_cast<sal_uInt16>(vcl::PDFWriter::Caption); aPDFType = sStyleName + aCaptionString; } - // // Heading: H - // + else if (sStyleName.equalsAscii(aHeading)) { nPDFType = static_cast<sal_uInt16>(vcl::PDFWriter::Heading); aPDFType = OUString(aHString); } - // // Heading: H1 - H6 - // + if ( pTxtNd->IsOutline() ) { int nRealLevel = pTxtNd->GetAttrOutlineLevel()-1; @@ -1177,9 +1166,8 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() } } - // // Section: TOCI - // + else if ( pFrm->IsInSct() ) { const SwSectionFrm* pSctFrm = pFrm->FindSctFrm(); @@ -1200,9 +1188,9 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() break; case FRM_TAB : - // + // TabFrm: Table - // + nPDFType = vcl::PDFWriter::Table; aPDFType = OUString(aTableString); @@ -1252,9 +1240,9 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() */ case FRM_ROW : - // + // RowFrm: TR - // + if ( !static_cast<const SwRowFrm*>(pFrm)->IsRepeatedHeadline() ) { nPDFType = vcl::PDFWriter::TableRow; @@ -1267,9 +1255,9 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() break; case FRM_CELL : - // + // CellFrm: TH, TD - // + { const SwTabFrm* pTable = static_cast<const SwCellFrm*>(pFrm)->FindTabFrm(); if ( pTable->IsInHeadline( *pFrm ) || lcl_IsHeadlineCell( *static_cast<const SwCellFrm*>(pFrm) ) ) @@ -1290,7 +1278,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() */ case FRM_FLY : - // + // FlyFrm: Figure, Formula, Control // fly in content or fly at page { @@ -1358,9 +1346,8 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() const SwTxtPaintInfo& rInf = mpPorInfo->mrTxtPainter.GetInfo(); const SwTxtFrm* pFrm = rInf.GetTxtFrm(); - // // Lowers of NonStructureElements should not be considered: - // + if ( lcl_IsInNonStructEnv( *pFrm ) ) return; @@ -1566,23 +1553,20 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() if ( !pPDFExtOutDevData ) return; - // // set the document locale - // + com::sun::star::lang::Locale aDocLocale( LanguageTag( SwEnhancedPDFExportHelper::GetDefaultLanguage() ).getLocale() ); pPDFExtOutDevData->SetDocumentLocale( aDocLocale ); - // // Prepare the output device: - // + mrOut.Push( PUSH_MAPMODE ); MapMode aMapMode( mrOut.GetMapMode() ); aMapMode.SetMapUnit( MAP_TWIP ); mrOut.SetMapMode( aMapMode ); - // // Create new cursor and lock the view: - // + SwDoc* pDoc = mrSh.GetDoc(); mrSh.SwCrsrShell::Push(); mrSh.SwCrsrShell::ClearMark(); @@ -1591,9 +1575,9 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() if ( !mbEditEngineOnly ) { - // + // POSTITS - // + if ( pPDFExtOutDevData->GetIsExportNotes() ) { SwFieldType* pType = mrSh.GetFldType( RES_POSTITFLD, OUString() ); @@ -1648,9 +1632,8 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() } } - // // HYPERLINKS - // + SwGetINetAttrs aArr; const sal_uInt16 nHyperLinkCount = mrSh.GetINetAttrs( aArr ); for( sal_uInt16 n = 0; n < nHyperLinkCount; ++n ) @@ -1754,9 +1737,8 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() mrSh.SwCrsrShell::ClearMark(); } - // // HYPERLINKS (Graphics, Frames, OLEs ) - // + const SwFrmFmts* pTbl = pDoc->GetSpzFrmFmts(); const sal_uInt16 nSpzFrmFmtsCount = pTbl->size(); for( sal_uInt16 n = 0; n < nSpzFrmFmtsCount; ++n ) @@ -1826,9 +1808,8 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() mrSh.SwCrsrShell::ClearMark(); } - // // REFERENCES - // + SwFieldType* pType = mrSh.GetFldType( RES_GETREFFLD, OUString() ); SwIterator<SwFmtFld,SwFieldType> aIter( *pType ); for( SwFmtFld* pFirst = aIter.First(); pFirst; ) @@ -1913,9 +1894,8 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() mrSh.SwCrsrShell::ClearMark(); } - // // FOOTNOTES - // + const sal_uInt16 nFtnCount = pDoc->GetFtnIdxs().size(); for ( sal_uInt16 nIdx = 0; nIdx < nFtnCount; ++nIdx ) { @@ -1981,9 +1961,8 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() } } - // // OUTLINE - // + if( pPDFExtOutDevData->GetIsExportBookmarks() ) { typedef std::pair< sal_Int8, sal_Int32 > StackEntry; @@ -2076,9 +2055,9 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() } else { - // + // LINKS FROM EDITENGINE - // + std::vector< vcl::PDFExtOutDevBookmarkEntry >& rBookmarks = pPDFExtOutDevData->GetBookmarks(); std::vector< vcl::PDFExtOutDevBookmarkEntry >::const_iterator aIBeg = rBookmarks.begin(); const std::vector< vcl::PDFExtOutDevBookmarkEntry >::const_iterator aIEnd = rBookmarks.end(); diff --git a/sw/source/core/text/SwGrammarMarkUp.cxx b/sw/source/core/text/SwGrammarMarkUp.cxx index 7506f8532ce4..1d34f00380f3 100644 --- a/sw/source/core/text/SwGrammarMarkUp.cxx +++ b/sw/source/core/text/SwGrammarMarkUp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SwGrammarMarkUp.hxx" SwGrammarMarkUp::~SwGrammarMarkUp() @@ -37,7 +36,6 @@ void SwGrammarMarkUp::CopyFrom( const SwWrongList& rCopy ) SwWrongList::CopyFrom( rCopy ); } - void SwGrammarMarkUp::MoveGrammar( sal_Int32 nPos, sal_Int32 nDiff ) { Move( nPos, nDiff ); diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index 5de97e21c9c3..cfe91f8532b3 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -226,7 +226,7 @@ static bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr, // 1. case: // We do not want to show visited links: // (printing, pdf export, page preview) - // + if ( pShell->GetOut()->GetOutDevType() == OUTDEV_PRINTER || pShell->GetViewOptions()->IsPDFExport() || pShell->GetViewOptions()->IsPagePreview() ) @@ -251,11 +251,10 @@ static bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr, return false; } - // // 2. case: // We do not want to apply the color set in the hyperlink // attribute, instead we take the colors from the view options: - // + if ( pShell->GetWin() && ( (((SwTxtINetFmt&)rAttr).IsVisited() && SwViewOption::IsVisitedLinks()) || diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx index 3e6cde412333..6f16858fe76e 100644 --- a/sw/source/core/text/blink.cxx +++ b/sw/source/core/text/blink.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "viewsh.hxx" #include "rootfrm.hxx" #include "txtfrm.hxx" @@ -38,7 +37,6 @@ *************************************************************************/ SwBlink *pBlink = NULL; - SwBlink::SwBlink() { bVisible = true; diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx index 91ce85d6a990..b85e4c0d6437 100644 --- a/sw/source/core/text/frmcrsr.cxx +++ b/sw/source/core/text/frmcrsr.cxx @@ -45,12 +45,10 @@ #include "swfntcch.hxx" #include "flyfrm.hxx" - #define MIN_OFFSET_STEP 10 using namespace ::com::sun::star; - /* * - SurvivalKit: For how long do we get past the last char of the line. * - RightMargin abstains from adjusting position with -1 @@ -924,7 +922,6 @@ bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset, return SwCntntFrm::UnitUp( pPam, nOffset, bSetInReadOnly ); } -// // Used for Bidi. nPos is the logical position in the string, bLeft indicates // if left arrow or right arrow was pressed. The return values are: // nPos: the new visual position @@ -1115,9 +1112,8 @@ void SwTxtFrm::PrepareVisualMove( sal_Int32& nPos, sal_uInt8& nCrsrLevel, const bool bVisualRight = ( nDefaultDir == UBIDI_LTR && bForward ) || ( nDefaultDir == UBIDI_RTL && ! bForward ); - // // Bidi functions from icu 2.0 - // + const sal_Unicode* pLineString = GetTxtNode()->GetTxt().getStr(); UErrorCode nError = U_ZERO_ERROR; diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 5129efa7b112..e8908370a779 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <editeng/keepitem.hxx> #include <editeng/hyphenzoneitem.hxx> @@ -516,7 +515,6 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwTxtFrm::GetT SwTxtCursor TxtCursor( this, &aInf ); const Point aCharPos( TxtCursor.GetTopLeft() ); - SwTwips nRight = aLine.Right(); CurrentPos -= aCharPos.X(); diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx index 53fdb7e9837b..fbf317ff606c 100644 --- a/sw/source/core/text/frminf.cxx +++ b/sw/source/core/text/frminf.cxx @@ -116,7 +116,6 @@ SwTwips SwTxtFrmInfo::GetLineStart( const SwTxtCursor &rLine ) const return rLine.GetLineStart(); } - /************************************************************************* * SwTxtFrmInfo::GetLineStart() *************************************************************************/ diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 812395161d00..04d52b5932ea 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/text/HoriOrientation.hpp> #include <hintids.hxx> #include <tools/shl.hxx> @@ -58,8 +57,6 @@ using namespace ::com::sun::star; -//////////////////////////////////////////////////////////// - static bool bInitFont = true; class SwExtraPainter @@ -92,7 +89,6 @@ public: void PaintRedline( SwTwips nY, long nMax ); }; - SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, SwViewShell *pVwSh, const SwLineNumberInfo &rLnInf, const SwRect &rRct, sal_Int16 eHor, bool bLnNm ) diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 56a6b3824877..2a2d4fab005d 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -76,7 +76,6 @@ using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; - #define CHAR_UNDERSCORE ((sal_Unicode)0x005F) #define CHAR_LEFT_ARROW ((sal_Unicode)0x25C0) #define CHAR_RIGHT_ARROW ((sal_Unicode)0x25B6) @@ -168,7 +167,6 @@ SwTxtInfo::SwTxtInfo( const SwTxtInfo &rInf ) nTxtStart( rInf.GetTxtStart() ) { } - #if OSL_DEBUG_LEVEL > 0 void ChkOutDev( const SwTxtSizeInfo &rInf ) @@ -182,14 +180,12 @@ void ChkOutDev( const SwTxtSizeInfo &rInf ) } #endif - inline sal_Int32 GetMinLen( const SwTxtSizeInfo &rInf ) { const sal_Int32 nInfLen = rInf.GetIdx() + rInf.GetLen(); return std::min( rInf.GetTxt().getLength(), nInfLen ); } - SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew ) : SwTxtInfo( rNew ), m_pKanaComp(((SwTxtSizeInfo&)rNew).GetpKanaComp()), @@ -273,9 +269,8 @@ void SwTxtSizeInfo::CtorInitTxtSizeInfo( SwTxtFrm *pFrame, SwFont *pNewFnt, m_nDirection = DIR_LEFT2RIGHT; } - // // The Options - // + m_pOpt = m_pVsh ? m_pVsh->GetViewOptions() : SW_MOD()->GetViewOption( pNd->getIDocumentSettingAccess()->get(IDocumentSettingAccess::HTML_MODE) ); // Options from Module, due to StarONE @@ -528,7 +523,6 @@ static bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf ) pCol = NULL; } - if( !pCol ) pCol = &aGlobalRetoucheColor; @@ -603,7 +597,6 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor SwDrawTextInfo aDrawInf( m_pFrm->getRootFrm()->GetCurrShell(), *m_pOut, pSI, rText, nStart, nLength, rPor.Width(), bBullet ); - aDrawInf.SetLeft( GetPaintRect().Left() ); aDrawInf.SetRight( GetPaintRect().Right()); @@ -1537,9 +1530,8 @@ sal_Int32 SwTxtFormatInfo::ScanPortionEnd( const sal_Int32 nStart, cHookChar = 0; sal_Int32 i = nStart; - // // Used for decimal tab handling: - // + const sal_Unicode cTabDec = GetLastTab() ? (sal_Unicode)GetTabDecimal() : 0; const sal_Unicode cThousandSep = ',' == cTabDec ? '.' : ','; // #i45951# German (Switzerland) uses ' as thousand separator @@ -1587,10 +1579,9 @@ sal_Int32 SwTxtFormatInfo::ScanPortionEnd( const sal_Int32 nStart, } } - // // Compatibility: First non-digit character behind a // a digit character becomes the hook character - // + if ( bTabCompat ) { if ( ( 0x2F < cPos && cPos < 0x3A ) || diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index aab623e433a2..116fece6c601 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -302,9 +302,8 @@ public: KSHORT GetTxtHeight() const; - // // GetTxtSize - // + SwPosSize GetTxtSize( OutputDevice* pOut, const SwScriptInfo* pSI, const OUString& rTxt, const sal_Int32 nIdx, const sal_Int32 nLen, const sal_uInt16 nComp ) const; @@ -316,9 +315,8 @@ public: const sal_Int32 nLen, const sal_uInt16 nComp ) const; inline SwPosSize GetTxtSize( const OUString &rTxt ) const; - // // GetTxtBreak - // + sal_Int32 GetTxtBreak( const long nLineWidth, const sal_Int32 nMaxLen, const sal_uInt16 nComp ) const; @@ -378,9 +376,8 @@ public: return !m_aMaxWidth.empty(); }; - // // Feature: Kana Compression - // + inline MSHORT GetKanaIdx() const { return m_nKanaIdx; } inline void ResetKanaIdx(){ m_nKanaIdx = 0; } inline void SetKanaIdx( MSHORT nNew ) { m_nKanaIdx = nNew; } @@ -514,9 +511,8 @@ public: friend SvStream & WriteSwTxtPaintInfo( SvStream &rOS, const SwTxtPaintInfo &rInf ); - // // STUFF FOR JUSTIFIED ALIGNMENT - // + inline MSHORT GetSpaceIdx() const { return nSpaceIdx; } inline void ResetSpaceIdx(){nSpaceIdx = 0; } inline void SetSpaceIdx( MSHORT nNew ) { nSpaceIdx = nNew; } @@ -529,7 +525,6 @@ public: inline void SetpSpaceAdd( std::vector<long>* pNew ){ pSpaceAdd = pNew; } inline std::vector<long>* GetpSpaceAdd() const { return pSpaceAdd; } - inline void SetWrongList( const SwWrongList *pNew ){ pWrongList = pNew; } inline const SwWrongList* GetpWrongList() const { return pWrongList; } @@ -847,7 +842,6 @@ inline void SwTxtPaintInfo::SetPaintOfst( const SwTwips nNew ) GetParaPortion()->GetRepaint()->SetOfst( nNew ); } - inline void SwTxtPaintInfo::DrawText( const OUString &rText, const SwLinePortion &rPor, const sal_Int32 nStart, const sal_Int32 nLength, diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx index 54fd60afbecf..2dca3187542e 100644 --- a/sw/source/core/text/itradj.cxx +++ b/sw/source/core/text/itradj.cxx @@ -621,7 +621,6 @@ void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent ) SwMarginPortion *pLeft = pCurrent->CalcLeftMargin(); SwGluePortion *pGlue = pLeft; // the last GluePortion - // 2) We attach a right margin: // CalcRightMargin also calculates a possible overlap with FlyFrms. CalcRightMargin( pCurrent ); @@ -880,5 +879,4 @@ void SwTxtAdjuster::CalcDropRepaint() rRepaint.Bottom( nBottom ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx index 7b18a8afeddd..c1592a305781 100644 --- a/sw/source/core/text/itratr.hxx +++ b/sw/source/core/text/itratr.hxx @@ -24,7 +24,6 @@ #include "swfont.hxx" #include "porlay.hxx" - class OutputDevice; class SwFont; class SwpHints; diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index a418f98ca99c..033eb0b1d88d 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -52,7 +52,6 @@ // is set in GetCharRect and is interpreted in UnitUp/Down. bool SwTxtCursor::bRightMargin = false; - /************************************************************************* * lcl_GetCharRectInsideField * @@ -180,9 +179,8 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf ) const bool bListLevelIndentsApplicableAndLabelAlignmentActive( AreListLevelIndentsApplicableAndLabelAlignmentActive( *(pFrm->GetTxtNode()) ) ); - // // Carefully adjust the text formatting ranges. - // + // This whole area desperately needs some rework. There are // quite a couple of values that need to be considered: // 1. paragraph indent @@ -1448,7 +1446,6 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, ( pPor->IsMarginPortion() && nWidth > nX + 30 ) ) ) ((SwCrsrMoveState*)pCMS)->bPosCorr = sal_True; - // #i27615# if (pCMS) { @@ -1677,7 +1674,6 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, nX = std::max(0, nX - GetInfo().GetFont()->GetLeftBorderSpace()); } - aDrawInf.SetOfst( nX ); if ( nSpaceAdd ) diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index cc143573d786..08eca5eba198 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hintids.hxx" #include <boost/scoped_ptr.hpp> @@ -154,7 +153,7 @@ KSHORT SwTxtFormatter::GetFrmRstHeight() const { // We want the rest height relative to the page. // If we're in a table, then pFrm->GetUpper() is not the page. - // + // GetFrmRstHeight() is being called with Ftn. // Wrong: const SwFrm *pUpper = pFrm->GetUpper(); const SwFrm *pPage = (const SwFrm*)pFrm->FindPageFrm(); @@ -874,7 +873,6 @@ void SwMetaPortion::Paint( const SwTxtPaintInfo &rInf ) const } } - /************************************************************************* * SwTxtFormatter::WhichTxtPor() *************************************************************************/ @@ -962,10 +960,10 @@ SwTxtPortion *SwTxtFormatter::NewTxtPortion( SwTxtFormatInfo &rInf ) // We assume that a font's characters are not larger than twice // as wide as heigh. // Very crazy: We need to take the ascent into account. - // + // Mind the trap! GetSize() contains the wished-for height, the real height // is only known in CalcAscent! - // + // The ratio is even crazier: a blank in Times New Roman has an ascent of // 182, a height of 200 and a width of 53! // It follows that a line with a lot of blanks is processed incorrectly. @@ -1004,7 +1002,6 @@ SwTxtPortion *SwTxtFormatter::NewTxtPortion( SwTxtFormatInfo &rInf ) return pPor; } - /************************************************************************* * SwTxtFormatter::WhichFirstPortion() *************************************************************************/ @@ -2053,7 +2050,6 @@ void SwTxtFormatter::CalcUnclipped( SwTwips& rTop, SwTwips& rBottom ) rTop -= nFlyAsc; } - void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart, sal_Int32 nStartIdx, bool bAlways ) const { @@ -2176,7 +2172,6 @@ void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart, } } - void SwTxtFormatter::AlignFlyInCntBase( long nBaseLine ) const { OSL_ENSURE( ! pFrm->IsVertical() || pFrm->IsSwapped(), @@ -2224,7 +2219,6 @@ void SwTxtFormatter::AlignFlyInCntBase( long nBaseLine ) const } } - bool SwTxtFormatter::ChkFlyUnderflow( SwTxtFormatInfo &rInf ) const { OSL_ENSURE( rInf.GetTxtFly()->IsOn(), "SwTxtFormatter::ChkFlyUnderflow: why?" ); @@ -2519,7 +2513,6 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf ) } } - SwFlyCntPortion *SwTxtFormatter::NewFlyCntPortion( SwTxtFormatInfo &rInf, SwTxtAttr *pHint ) const { diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx index e2e6e8f8ef21..d8a2010a17f9 100644 --- a/sw/source/core/text/itrform2.hxx +++ b/sw/source/core/text/itrform2.hxx @@ -31,7 +31,6 @@ class SwExpandPortion; class SwMultiPortion; class SwFtnPortion; - class SwTxtFormatter : public SwTxtPainter { const SwFmtDrop *pDropFmt; @@ -245,8 +244,6 @@ public: void MergeCharacterBorder( SwLinePortion& rPortion, SwTxtFormatInfo& rInf ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx index ab9a7d233edd..5ee8e9bc452e 100644 --- a/sw/source/core/text/itrpaint.cxx +++ b/sw/source/core/text/itrpaint.cxx @@ -365,7 +365,6 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, pUnderLineFnt->SetPos( aTmpPoint ); } - // in extended input mode we do not want a common underline font. SwUnderlineFont* pOldUnderLineFnt = 0; if ( GetRedln() && GetRedln()->ExtOn() ) diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx index d8cba6247063..de34d1f82968 100644 --- a/sw/source/core/text/itrtxt.cxx +++ b/sw/source/core/text/itrtxt.cxx @@ -364,9 +364,8 @@ const SwLineLayout *SwTxtIter::TwipsToLine( const SwTwips y) return pCurr; } -// // Local helper function to check, if pCurr needs a field rest portion: -// + static bool lcl_NeedsFieldRest( const SwLineLayout* pCurr ) { const SwLinePortion *pPor = pCurr->GetPortion(); diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx index 4942055a6811..576b177e1238 100644 --- a/sw/source/core/text/itrtxt.hxx +++ b/sw/source/core/text/itrtxt.hxx @@ -229,7 +229,6 @@ public: }; - /************************************************************************* * class SwTxtAdjuster *************************************************************************/ @@ -364,8 +363,6 @@ inline SwTwips SwTxtMargin::Left() const return (nDropLines >= nLineNr && 1 != nLineNr) ? nFirst + nDropLeft : nLeft; } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx index f51d1ff66840..d19bc203a792 100644 --- a/sw/source/core/text/noteurl.cxx +++ b/sw/source/core/text/noteurl.cxx @@ -28,7 +28,6 @@ // Global variable SwNoteURL *pNoteURL = NULL; - void SwNoteURL::InsertURLNote( const OUString& rURL, const OUString& rTarget, const SwRect& rRect ) { @@ -44,7 +43,6 @@ void SwNoteURL::InsertURLNote( const OUString& rURL, const OUString& rTarget, } } - void SwNoteURL::FillImageMap( ImageMap *pMap, const Point &rPos, const MapMode& rMap ) { diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx index d530ed8702be..120e2910d406 100644 --- a/sw/source/core/text/pordrop.hxx +++ b/sw/source/core/text/pordrop.hxx @@ -114,7 +114,6 @@ public: OUTPUT_OPERATOR }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx index 8b420bb86146..be6334421f49 100644 --- a/sw/source/core/text/porexp.hxx +++ b/sw/source/core/text/porexp.hxx @@ -42,7 +42,6 @@ public: OUTPUT_OPERATOR }; - /************************************************************************* * class SwBlankPortion *************************************************************************/ diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index e75bbdd5e0c3..c424dc82c174 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -203,9 +203,8 @@ void SwFldPortion::CheckScript( const SwTxtSizeInfo &rInf ) nScript = g_pBreakIt->GetBreakIter()->getScriptType( aTxt, nChg ); } - // // nNextScriptChg will be evaluated during SwFldPortion::Format() - // + if (nChg < aTxt.getLength() && nChg >= 0) nNextScriptChg = g_pBreakIt->GetBreakIter()->endOfScript( aTxt, nChg, nScript ); else @@ -465,7 +464,6 @@ SwPosSize SwFldPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const return aSize; } - // class SwHiddenPortion SwFldPortion *SwHiddenPortion::Clone(const OUString &rExpand ) const @@ -492,7 +490,6 @@ bool SwHiddenPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) con return SwFldPortion::GetExpTxt( rInf, rTxt ); } - // class SwNumberPortion SwNumberPortion::SwNumberPortion( const OUString &rExpand, @@ -734,7 +731,6 @@ static sal_Char const sDoubleSpace[] = " "; } } - // class SwBulletPortion SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet, @@ -751,7 +747,6 @@ SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet, SetWhichPor( POR_BULLET ); } - // class SwGrfNumPortion #define GRFNUM_SECURE 10 @@ -942,7 +937,6 @@ void SwGrfNumPortion::Paint( const SwTxtPaintInfo &rInf ) const rInf.GetTxtFrm()->getRootFrm()->GetCurrShell()->InvalidateWindows( aTmp ); } - else if ( pViewShell && !pViewShell->GetAccessibilityOptions()->IsStopAnimatedGraphics() && !pViewShell->IsPreview() && diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx index b5f057a0a107..13f0d6d2a907 100644 --- a/sw/source/core/text/porglue.cxx +++ b/sw/source/core/text/porglue.cxx @@ -295,6 +295,4 @@ void SwMarginPortion::AdjustRight( const SwLineLayout *pCurr ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 7d85900b7f34..3df2be0b07e8 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "porlay.hxx" #include "itrform2.hxx" #include "porglue.hxx" @@ -678,9 +677,8 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL ) const OUString& rTxt = rNode.GetTxt(); - // // HIDDEN TEXT INFORMATION - // + Range aRange( 0, !rTxt.isEmpty() ? rTxt.getLength() - 1 : 0 ); MultiSelection aHiddenMulti( aRange ); CalcHiddenRanges( rNode, aHiddenMulti ); @@ -696,9 +694,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL ) aHiddenChg.push_back( nEnd ); } - // // SCRIPT AND SCRIPT RELATED INFORMATION - // sal_Int32 nChg = nInvalidityPos; @@ -724,9 +720,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL ) const bool bAdjustBlock = SVX_ADJUST_BLOCK == rNode.GetSwAttrSet().GetAdjust().GetAdjust(); - // // FIND INVALID RANGES IN SCRIPT INFO ARRAYS: - // if( nChg ) { @@ -764,9 +758,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL ) } } - // // ADJUST nChg VALUE: - // // by stepping back one position we know that we are inside a group // declared as an nScript group @@ -786,9 +778,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL ) if ( nChg == nGrpStart ) nScript = (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( rTxt, nChg ); - // // INVALID DATA FROM THE SCRIPT INFO ARRAYS HAS TO BE DELETED: - // // remove invalid entries from script information arrays aScriptChanges.erase( aScriptChanges.begin() + nCnt, aScriptChanges.end() ); @@ -820,10 +810,8 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL ) // remove invalid entries from kashida array aKashida.erase( aKashida.begin() + nCntKash, aKashida.end() ); - // // TAKE CARE OF WEAK CHARACTERS: WE MUST FIND AN APPROPRIATE // SCRIPT FOR WEAK CHARACTERS AT THE BEGINNING OF A PARAGRAPH - // if( WEAK == g_pBreakIt->GetBreakIter()->getScriptType( rTxt, nChg ) ) { @@ -858,9 +846,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL ) } } - // // UPDATE THE SCRIPT INFO ARRAYS: - // while ( nChg < rTxt.getLength() || ( aScriptChanges.empty() && rTxt.isEmpty() ) ) { @@ -1261,9 +1247,9 @@ void SwScriptInfo::UpdateBidiInfo( const OUString& rTxt ) { // remove invalid entries from direction information arrays aDirectionChanges.clear(); - // + // Bidi functions from icu 2.0 - // + UErrorCode nError = U_ZERO_ERROR; UBiDi* pBidi = ubidi_openSized( rTxt.getLength(), 0, &nError ); nError = U_ZERO_ERROR; @@ -1285,7 +1271,6 @@ void SwScriptInfo::UpdateBidiInfo( const OUString& rTxt ) ubidi_close( pBidi ); } - /************************************************************************* * SwScriptInfo::NextScriptChg(..) * returns the position of the next character which belongs to another script @@ -1431,9 +1416,8 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPo bool bNewContainsHiddenChars = false; - // // Optimization: First examine the flags at the text node: - // + if ( !rNode.IsCalcHiddenCharFlags() ) { bool bWholePara = rNode.HasHiddenCharAttribute( true ); @@ -1458,9 +1442,9 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPo const SwScriptInfo* pSI = SwScriptInfo::GetScriptInfo( rNode ); if ( pSI ) { - // + // Check first, if we have a valid SwScriptInfo object for this text node: - // + bNewContainsHiddenChars = pSI->GetBoundsOfHiddenRange( nPos, rnStartPos, rnEndPos, pList ); const bool bNewHiddenCharsHidePara = rnStartPos == 0 && rnEndPos >= rNode.GetTxt().getLength(); @@ -1468,9 +1452,9 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPo } else { - // + // No valid SwScriptInfo Object, we have to do it the hard way: - // + Range aRange(0, (!rNode.GetTxt().isEmpty()) ? rNode.GetTxt().getLength() - 1 : 0); @@ -1556,7 +1540,6 @@ bool SwScriptInfo::IsInHiddenRange( const SwTxtNode& rNode, sal_Int32 nPos ) return nStartPos != COMPLETE_STRING; } - #ifdef DBG_UTIL /************************************************************************* * SwScriptInfo::CompType(..) @@ -2256,9 +2239,8 @@ void SwScriptInfo::CalcHiddenRanges( const SwTxtNode& rNode, MultiSelection& rHi // to unhide the redlining ranges: selectRedLineDeleted(rNode, rHiddenMulti, false); - // // We calculated a lot of stuff. Finally we can update the flags at the text node. - // + const bool bNewContainsHiddenChars = rHiddenMulti.GetRangeCount() > 0; bool bNewHiddenCharsHidePara = false; if ( bNewContainsHiddenChars ) diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx index 32519556bd11..92c80d4c6d1c 100644 --- a/sw/source/core/text/porlay.hxx +++ b/sw/source/core/text/porlay.hxx @@ -75,7 +75,6 @@ public: void SetRightOfst( const SwTwips nNew ) { nRightOfst = nNew; } }; - /// Collection of SwLinePortion instances, representing one line of text class SwLineLayout : public SwTxtPortion { diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx index 12c5312f8587..cf2ffa283499 100644 --- a/sw/source/core/text/porlin.cxx +++ b/sw/source/core/text/porlin.cxx @@ -52,7 +52,6 @@ bool ChkChain( SwLinePortion *pStart ) } #endif - SwLinePortion::~SwLinePortion() { if( pBlink ) diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx index ccec88a25473..616fa2d5144c 100644 --- a/sw/source/core/text/porlin.hxx +++ b/sw/source/core/text/porlin.hxx @@ -190,7 +190,6 @@ public: OUTPUT_OPERATOR }; - /************************************************************************* * inline - Implementations *************************************************************************/ diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index b7bb51d10b65..5e0335273027 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -211,7 +211,6 @@ SwBidiPortion::SwBidiPortion( sal_Int32 nEnd, sal_uInt8 nLv ) SetDirection( DIR_LEFT2RIGHT ); } - long SwBidiPortion::CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo& rInf ) const { return HasTabulator() ? 0 : GetSpaceCnt(rInf) * nSpaceAdd / SPACING_PRECISION_FACTOR; @@ -350,7 +349,6 @@ SwDoubleLinePortion::SwDoubleLinePortion(const SwMultiCreator& rCreate, sal_Int3 SetDirection( DIR_LEFT2RIGHT ); } - /*-------------------------------------------------- * SwMultiPortion::PaintBracket paints the wished bracket, * if the multiportion has surrounding brackets. @@ -592,7 +590,6 @@ SwDoubleLinePortion::~SwDoubleLinePortion() * beside the main text, e.g. phonetic characters. * --------------------------------------------------*/ - SwRubyPortion::SwRubyPortion( const SwRubyPortion& rRuby, sal_Int32 nEnd ) : SwMultiPortion( nEnd ), nRubyOffset( rRuby.GetRubyOffset() ), @@ -2334,8 +2331,6 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine, return pRest; } - - /*-------------------------------------------------- * SwTxtCursorSave notes the start and current line of a SwTxtCursor, * sets them to the values for GetCrsrOfst inside a multiportion diff --git a/sw/source/core/text/porref.cxx b/sw/source/core/text/porref.cxx index 5b8dab6c6abd..1f463026b73a 100644 --- a/sw/source/core/text/porref.cxx +++ b/sw/source/core/text/porref.cxx @@ -97,6 +97,4 @@ void SwIsoRefPortion::HandlePortion( SwPortionHandler& rPH ) const rPH.Special( GetLen(), aString, GetWhichPor() ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index 681d050eb333..c39e0a7ad71a 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -122,7 +122,6 @@ void SwBreakPortion::HandlePortion( SwPortionHandler& rPH ) const rPH.Text( GetLen(), GetWhichPor() ); } - SwKernPortion::SwKernPortion( SwLinePortion &rPortion, short nKrn, bool bBG, bool bGK ) : nKern( nKrn ), bBackground( bBG ), bGridKern( bGK ) @@ -163,7 +162,7 @@ void SwKernPortion::Paint( const SwTxtPaintInfo &rInf ) const if( rInf.GetFont()->IsPaintBlank() ) { OUString aTxtDouble(" "); - // + SwRect aClipRect; rInf.CalcRect( *this, &aClipRect, 0 ); SwSaveClip aClip( (OutputDevice*)rInf.GetOut() ); diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx index 285826c378c8..a8cf38b05950 100644 --- a/sw/source/core/text/portab.hxx +++ b/sw/source/core/text/portab.hxx @@ -125,7 +125,6 @@ public: OUTPUT_OPERATOR }; - /************************************************************************* * class SwAutoTabDecimalPortion *************************************************************************/ diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 036d35300bf4..149bfc5168f3 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -385,7 +385,7 @@ bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf ) // (work around different definition of tab stop character - breaking or // non breaking character - in compatibility mode) else if ( ( IsFtnPortion() && rInf.IsFakeLineStart() && - // + rInf.IsOtherThanFtnInside() ) || ( rInf.GetLast() && rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_COMPAT) && @@ -457,8 +457,6 @@ bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf ) * virtual SwTxtPortion::Format() *************************************************************************/ - - bool SwTxtPortion::Format( SwTxtFormatInfo &rInf ) { if( rInf.X() > rInf.Width() || (!GetLen() && !InExpGrp()) ) @@ -488,7 +486,7 @@ bool SwTxtPortion::Format( SwTxtFormatInfo &rInf ) // Santa wraps, "from " turns into "from" and " " in a justified // paragraph, in which the glue gets expanded instead of merged // with the MarginPortion. -// + // rInf.nIdx points to the next word, nIdx-1 is the portion's last char void SwTxtPortion::FormatEOL( SwTxtFormatInfo &rInf ) @@ -597,8 +595,6 @@ void SwTxtPortion::Paint( const SwTxtPaintInfo &rInf ) const * virtual SwTxtPortion::GetExpTxt() *************************************************************************/ - - bool SwTxtPortion::GetExpTxt( const SwTxtSizeInfo &, OUString & ) const { return false; @@ -701,7 +697,6 @@ void SwTxtPortion::HandlePortion( SwPortionHandler& rPH ) const rPH.Text( GetLen(), GetWhichPor(), Height(), Width() ); } - SwTxtInputFldPortion::SwTxtInputFldPortion() : SwTxtPortion() , mbContainsInputFieldStart( false ) @@ -710,7 +705,6 @@ SwTxtInputFldPortion::SwTxtInputFldPortion() SetWhichPor( POR_INPUTFLD ); } - bool SwTxtInputFldPortion::Format( SwTxtFormatInfo &rInf ) { mbContainsInputFieldStart = @@ -795,7 +789,6 @@ bool SwTxtInputFldPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt return true; } - SwPosSize SwTxtInputFldPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const { SwTxtSlot aFormatTxt( &rInf, this, true, false, 0 ); @@ -807,7 +800,6 @@ SwPosSize SwTxtInputFldPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const return rInf.GetTxtSize(); } - KSHORT SwTxtInputFldPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const { if( !Width() @@ -833,8 +825,6 @@ bool SwTxtInputFldPortion::ContainsOnlyDummyChars() const * class SwHolePortion *************************************************************************/ - - SwHolePortion::SwHolePortion( const SwTxtPortion &rPor ) : nBlankWidth( 0 ) { @@ -850,8 +840,6 @@ SwLinePortion *SwHolePortion::Compress() { return this; } * virtual SwHolePortion::Paint() *************************************************************************/ - - void SwHolePortion::Paint( const SwTxtPaintInfo &rInf ) const { if( !rInf.GetOut() ) @@ -887,8 +875,6 @@ void SwHolePortion::Paint( const SwTxtPaintInfo &rInf ) const * virtual SwHolePortion::Format() *************************************************************************/ - - bool SwHolePortion::Format( SwTxtFormatInfo &rInf ) { return rInf.IsFull() || rInf.X() >= rInf.Width(); @@ -1008,5 +994,4 @@ bool SwFieldFormPortion::Format( SwTxtFormatInfo & rInf ) return false; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx index d27f9108f223..1ec658a9c9c2 100644 --- a/sw/source/core/text/portxt.hxx +++ b/sw/source/core/text/portxt.hxx @@ -59,7 +59,6 @@ public: DECL_FIXEDMEMPOOL_NEWDEL(SwTxtPortion) }; - class SwTxtInputFldPortion : public SwTxtPortion { public: diff --git a/sw/source/core/text/possiz.hxx b/sw/source/core/text/possiz.hxx index 0e9fb3697715..980a7bf0bd90 100644 --- a/sw/source/core/text/possiz.hxx +++ b/sw/source/core/text/possiz.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_CORE_TEXT_POSSIZ_HXX #define INCLUDED_SW_SOURCE_CORE_TEXT_POSSIZ_HXX - #include <tools/gen.hxx> #include "txttypes.hxx" @@ -71,7 +70,6 @@ inline SwPosSize &SwPosSize::operator=( const Size &rSize ) return *this; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx index c6c260344d6a..9ea5e207df27 100644 --- a/sw/source/core/text/redlnitr.hxx +++ b/sw/source/core/text/redlnitr.hxx @@ -104,7 +104,6 @@ public: pExt->UpdateFont( rFnt ); } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/txtcache.cxx b/sw/source/core/text/txtcache.cxx index 9a472278ab4e..bb3b6e14452f 100644 --- a/sw/source/core/text/txtcache.cxx +++ b/sw/source/core/text/txtcache.cxx @@ -70,7 +70,6 @@ SwParaPortion *SwTxtLineAccess::GetPara() return pRet->GetPara(); } - /************************************************************************* |* |* SwTxtLineAccess::SwTxtLineAccess() @@ -133,7 +132,6 @@ SwParaPortion *SwTxtFrm::GetPara() return 0; } - /************************************************************************* |* |* SwTxtFrm::ClearPara() @@ -194,5 +192,4 @@ void SwTxtFrm::SetPara( SwParaPortion *pNew, bool bDelete ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx index bd960c9ac4e1..021f5e040ac0 100644 --- a/sw/source/core/text/txtcache.hxx +++ b/sw/source/core/text/txtcache.hxx @@ -42,7 +42,6 @@ public: inline void SetPara( SwParaPortion *pNew ) { pLine = pNew; } }; - class SwTxtLineAccess : public SwCacheAccess { @@ -59,7 +58,6 @@ public: virtual bool IsAvailable() const; }; - inline SwTxtLine &SwTxtLineAccess::GetTxtLine() { return *((SwTxtLine*)Get()); diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index 8be7e90bd6a1..2652f54c39c6 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -245,7 +245,6 @@ bool SwTxtNode::GetDropSize(int& rFontHeight, int& rDropHeight, int& rDropDescen return true; } - // Manipulate the width, otherwise the chars are being stretched void SwDropPortion::PaintTxt( const SwTxtPaintInfo &rInf ) const { diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx index 071197498e6e..cc12ca9536e5 100644 --- a/sw/source/core/text/txtfld.cxx +++ b/sw/source/core/text/txtfld.cxx @@ -55,7 +55,6 @@ * SwTxtFormatter::NewFldPortion() *************************************************************************/ - static bool lcl_IsInBody( SwFrm *pFrm ) { if ( pFrm->IsInDocBody() ) @@ -70,7 +69,6 @@ static bool lcl_IsInBody( SwFrm *pFrm ) } } - SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, const SwTxtAttr *pHint ) const { @@ -419,7 +417,6 @@ SwLinePortion *SwTxtFormatter::NewExtraPortion( SwTxtFormatInfo &rInf ) * SwTxtFormatter::NewNumberPortion() *************************************************************************/ - SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const { if( rInf.IsNumDone() || rInf.GetTxtStart() != nStart @@ -478,9 +475,8 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const { const Font *pFmtFnt = rNumFmt.GetBulletFont(); - // // Build a new bullet font basing on the current paragraph font: - // + pNumFnt = new SwFont( &rInf.GetCharAttr(), pIDSA ); // #i53199# @@ -501,10 +497,9 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const pNumFnt->SetWeight( WEIGHT_NORMAL, SW_CTL ); } - // // Apply the explicit attributes from the character style // associated with the numering to the new bullet font. - // + if( pFmt ) pNumFnt->SetDiffFnt( pFmt, pIDSA ); @@ -544,9 +539,9 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const // vorliegt! if( !aTxt.isEmpty() ) { - // + // Build a new numbering font basing on the current paragraph font: - // + pNumFnt = new SwFont( &rInf.GetCharAttr(), pIDSA ); // #i53199# @@ -559,11 +554,9 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const pNumFnt->SetOverline( UNDERLINE_NONE ); } - - // // Apply the explicit attributes from the character style // associated with the numering to the new bullet font. - // + if( pFmt ) pNumFnt->SetDiffFnt( pFmt, pIDSA ); diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index d8aa4193e8bb..16f0d3d03c7e 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/outdev.hxx> #include <vcl/virdev.hxx> @@ -61,7 +60,6 @@ #include "doc.hxx" #endif - using namespace ::com::sun::star; namespace @@ -312,7 +310,6 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt, return aRet; } - SwTxtFly::SwTxtFly() : pPage(0), mpCurrAnchoredObj(0), @@ -385,7 +382,6 @@ void SwTxtFly::CtorInitTxtFly( const SwTxtFrm *pFrm ) nIndex = ULONG_MAX; } - SwRect SwTxtFly::_GetFrm( const SwRect &rRect, bool bTop ) const { SwRect aRet; @@ -405,7 +401,6 @@ SwRect SwTxtFly::_GetFrm( const SwRect &rRect, bool bTop ) const return aRet; } - bool SwTxtFly::IsAnyFrm() const { SWAP_IF_SWAPPED( pCurrFrm ) @@ -458,7 +453,6 @@ const SwCntntFrm* SwTxtFly::_GetMaster() return pMaster; } - bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf ) { SwSaveClip aClipSave( rInf.GetpOut() ); @@ -582,7 +576,6 @@ bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf ) return true; } - void SwTxtFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect, const SwTxtPaintInfo &rInf, bool bNoGraphic ) { @@ -1019,7 +1012,6 @@ SwTwips SwTxtFly::CalcMinBottom() const return nRet; } - bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, bool bAvoid ) const { SWAP_IF_SWAPPED( pCurrFrm ) @@ -1105,7 +1097,6 @@ bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, bool bAvoid ) const return bRet; } - // #i68520# SwAnchoredObjList::size_type SwTxtFly::GetPos( const SwAnchoredObject* pAnchoredObj ) const { diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx index 47b4f07248cf..77bfe71de137 100644 --- a/sw/source/core/text/txtfly.hxx +++ b/sw/source/core/text/txtfly.hxx @@ -39,7 +39,6 @@ typedef std::vector< SwAnchoredObject* > SwAnchoredObjList; enum PAGESIDE { LEFT_SIDE, RIGHT_SIDE, DONTKNOW_SIDE }; - class SwDrawTextInfo; class SwContourCache; /** Contour-cache global variable, initialized/destroyed in txtinit.cxx @@ -299,7 +298,6 @@ public: void SetIgnoreObjsInHeaderFooter( const bool bNew ); }; - inline SwAnchoredObjList* SwTxtFly::GetAnchoredObjList() const { return mpAnchoredObjList diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index b59056b51c58..cef5612f0593 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -73,7 +73,6 @@ #include <IGrammarContact.hxx> #include <switerator.hxx> - TYPEINIT1( SwTxtFrm, SwCntntFrm ); // Switches width and height of the text frame @@ -1188,7 +1187,6 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SetCompletePaint(); } - if( nCount ) { if( getRootFrm()->GetCurrShell() ) @@ -2066,7 +2064,6 @@ SwTwips SwTxtFrm::CalcFitToContent() if ( IsRightToLeft() ) Frm().Pos() = aOldFrmPos; - SetPara( pOldPara ); return nMax; @@ -2429,7 +2426,6 @@ void SwTxtFrm::ChgThisLines() } } - void SwTxtFrm::RecalcAllLines() { ValidateLineNum(); diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index 41dfb0e78702..17dc849d762f 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -153,7 +153,6 @@ bool SwTxtFrm::CalcPrepFtnAdjust() return true; } - /************************************************************************* * lcl_GetFtnLower() * @@ -179,7 +178,7 @@ static SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower ) // If pFrm is inside a table, we have to check if // a) The table is not allowed to split or // b) The table row is not allowed to split - // + // Inside a table, there are no footnotes, // see SwFrm::FindFtnBossFrm. So we don't have to check // the case that pFrm is inside a (footnote collecting) section diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx index 5aef79091ee5..8a404055fe05 100644 --- a/sw/source/core/text/txthyph.cxx +++ b/sw/source/core/text/txthyph.cxx @@ -360,7 +360,6 @@ bool SwTxtPortion::CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess ) return false; } - /************************************************************************* * virtual SwHyphPortion::GetExpTxt() *************************************************************************/ @@ -630,6 +629,4 @@ SwSoftHyphStrPortion::SwSoftHyphStrPortion( const OUString &rStr ) SetWhichPor( POR_SOFTHYPHSTR ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx index d43913117880..a847d732a296 100644 --- a/sw/source/core/text/txtinit.cxx +++ b/sw/source/core/text/txtinit.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "swcache.hxx" #include "fntcache.hxx" #include "swfntcch.hxx" @@ -84,6 +83,4 @@ void _TextFinit() SwDropPortion::DeleteDropCapCache(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx index 9a3656f84097..8a63de8e3ed8 100644 --- a/sw/source/core/text/txtio.cxx +++ b/sw/source/core/text/txtio.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef DBG_UTIL #include "viewsh.hxx" diff --git a/sw/source/core/text/txtpaint.cxx b/sw/source/core/text/txtpaint.cxx index 26d7111bc6b8..2e81b35546d2 100644 --- a/sw/source/core/text/txtpaint.cxx +++ b/sw/source/core/text/txtpaint.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "txtpaint.hxx" #include "swrect.hxx" #include "rootfrm.hxx" @@ -117,5 +116,4 @@ void SwSaveClip::_ChgClip( const SwRect &rRect, const SwTxtFrm* pFrm, (SwRect&)rRect = aOldRect; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx index 5492d635c3e9..1e67425392ec 100644 --- a/sw/source/core/text/txtpaint.hxx +++ b/sw/source/core/text/txtpaint.hxx @@ -106,7 +106,6 @@ inline SwDbgOut::SwDbgOut( OutputDevice* pOutDev, const bool bOn ) :pOut( bOn ? pOutDev : 0 ) { } - inline DbgBackColor::DbgBackColor( OutputDevice* pOutDev, const bool bOn, ColorData eColor ) :SwDbgOut( pOutDev, bOn ) @@ -146,8 +145,6 @@ inline DbgRect::DbgRect( OutputDevice* pOutDev, const Rectangle &rRect, #endif - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index 612911ecc5e9..bb69a6d0857f 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hintids.hxx" #include <comphelper/string.hxx> #include <editeng/lrspitem.hxx> @@ -84,7 +83,7 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) const bool bRTL = pFrm->IsRightToLeft(); // #i24363# tab stops relative to indent // nTabLeft: The absolute value, the tab stops are relative to: Tabs origin. - // + // #i91133# const bool bTabsRelativeToIndent = pFrm->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT); @@ -94,9 +93,8 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) : pFrm->Frm().Left() + ( bTabsRelativeToIndent ? GetTabLeft() : 0 ); - // // nLinePos: The absolute position, where we started the line formatting. - // + SwTwips nLinePos = GetLeftMargin(); if ( bRTL ) { @@ -105,18 +103,16 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) nLinePos = aPoint.X(); } - // // nTabPos: The current position, relative to the line start. - // + SwTwips nTabPos = rInf.GetLastTab() ? rInf.GetLastTab()->GetTabPos() : 0; if( nTabPos < rInf.X() ) { nTabPos = rInf.X(); } - // // nCurrentAbsPos: The current position in absolute coordinates. - // + const SwTwips nCurrentAbsPos = bRTL ? nLinePos - nTabPos : nLinePos + nTabPos; @@ -139,17 +135,16 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) // #i24363# tab stops relative to indent // nSearchPos: The current position relative to the tabs origin. - // + const SwTwips nSearchPos = bRTL ? nTabLeft - nCurrentAbsPos : nCurrentAbsPos - nTabLeft; - // // First, we examine the tab stops set at the paragraph style or // any hard set tab stops: // Note: If there are no user defined tab stops, there is always a // default tab stop. - // + const SvxTabStop* pTabStop = aLineInf.GetTabStop( nSearchPos, nMyRight ); if ( pTabStop ) { @@ -316,7 +311,6 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) // Die Basisklasse wird erstmal ohne alles initialisiert. - SwTabPortion::SwTabPortion( const KSHORT nTabPosition, const sal_Unicode cFillChar, const bool bAutoTab ) : SwFixPortion( 0, 0 ), nTabPos(nTabPosition), cFill(cFillChar), bAutoTabStop( bAutoTab ) { @@ -329,8 +323,6 @@ SwTabPortion::SwTabPortion( const KSHORT nTabPosition, const sal_Unicode cFillCh * virtual SwTabPortion::Format() *************************************************************************/ - - bool SwTabPortion::Format( SwTxtFormatInfo &rInf ) { SwTabPortion *pLastTab = rInf.GetLastTab(); @@ -345,8 +337,6 @@ bool SwTabPortion::Format( SwTxtFormatInfo &rInf ) * virtual SwTabPortion::FormatEOL() *************************************************************************/ - - void SwTabPortion::FormatEOL( SwTxtFormatInfo &rInf ) { if( rInf.GetLastTab() == this && !IsTabLeftPortion() ) @@ -357,8 +347,6 @@ void SwTabPortion::FormatEOL( SwTxtFormatInfo &rInf ) * SwTabPortion::PreFormat() *************************************************************************/ - - bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf ) { OSL_ENSURE( rInf.X() <= GetTabPos(), "SwTabPortion::PreFormat: rush hour" ); @@ -475,8 +463,6 @@ bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf ) * SwTabPortion::PostFormat() *************************************************************************/ - - bool SwTabPortion::PostFormat( SwTxtFormatInfo &rInf ) { const bool bTabOverMargin = rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_OVER_MARGIN); diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx index f6fef8c1ef15..a7e1c852304f 100644 --- a/sw/source/core/text/widorp.cxx +++ b/sw/source/core/text/widorp.cxx @@ -40,7 +40,6 @@ #undef WIDOWTWIPS - namespace { @@ -481,7 +480,6 @@ bool WidowsAndOrphans::FindWidows( SwTxtFrm *pFrame, SwTxtMargin &rLine ) // die Seite des Masters, haelt sich aber zusammen, so dass er (endlich) // auf die naechste Seite rutscht. - So die Theorie! - // Wir fordern nur noch ein Zeile zur Zeit an, weil eine Zeile des Masters // bei uns durchaus mehrere Zeilen ergeben koennten. // Dafuer behaelt CalcFollow solange die Kontrolle, bis der Follow alle diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx index 78c5940ed948..6e6a43530db2 100644 --- a/sw/source/core/text/widorp.hxx +++ b/sw/source/core/text/widorp.hxx @@ -81,7 +81,6 @@ public: } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 75a493f3b78b..c5a105e91ff8 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/resid.hxx> #include <hintids.hxx> #include <swtypes.hxx> @@ -131,7 +130,6 @@ TYPEINIT2( SwTOXMark, SfxPoolItem, SwClient ); // fuers rtti TOX dtor and ctor --------------------------------------------------------------------*/ - /// pool default constructor SwTOXMark::SwTOXMark() : SfxPoolItem( RES_TXTATR_TOXMARK ) @@ -143,7 +141,6 @@ SwTOXMark::SwTOXMark() { } - SwTOXMark::SwTOXMark( const SwTOXType* pTyp ) : SfxPoolItem( RES_TXTATR_TOXMARK ) , SwModify( const_cast<SwTOXType*>(pTyp) ) @@ -154,7 +151,6 @@ SwTOXMark::SwTOXMark( const SwTOXType* pTyp ) { } - SwTOXMark::SwTOXMark( const SwTOXMark& rCopy ) : SfxPoolItem( RES_TXTATR_TOXMARK ) , SwModify(rCopy.GetRegisteredInNonConst()) @@ -171,12 +167,10 @@ SwTOXMark::SwTOXMark( const SwTOXMark& rCopy ) aAltText = rCopy.aAltText; } - SwTOXMark::~SwTOXMark() { } - void SwTOXMark::RegisterToTOXType( SwTOXType& rMark ) { rMark.Add(this); @@ -188,7 +182,6 @@ bool SwTOXMark::operator==( const SfxPoolItem& rAttr ) const return GetRegisteredIn() == ((SwTOXMark&)rAttr).GetRegisteredIn(); } - SfxPoolItem* SwTOXMark::Clone( SfxItemPool* ) const { return new SwTOXMark( *this ); @@ -253,7 +246,6 @@ SwTOXType::SwTOXType( TOXTypes eTyp, const OUString& rName ) { } - SwTOXType::SwTOXType(const SwTOXType& rCopy) : SwModify( (SwModify*)rCopy.GetRegisteredIn() ), aName(rCopy.aName), @@ -366,14 +358,12 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# } } - SwForm::SwForm(const SwForm& rForm) : eType( rForm.eType ) { *this = rForm; } - SwForm& SwForm::operator=(const SwForm& rForm) { eType = rForm.eType; @@ -414,7 +404,6 @@ bool operator == (const SwFormToken & rToken, FormTokenType eType) return rToken.eTokenType == eType; } - void SwForm::AdjustTabStops(SwDoc& rDoc, sal_Bool bInsertNewTapStops) // #i21237# { for(sal_uInt16 nLevel = 1; nLevel < GetFormMax(); nLevel++) @@ -504,7 +493,6 @@ OUString SwForm::GetFormAuth() {return OUString("<A>");} Ctor TOXBase --------------------------------------------------------------------*/ - SwTOXBase::SwTOXBase(const SwTOXType* pTyp, const SwForm& rForm, sal_uInt16 nCreaType, const OUString& rTitle ) : SwClient((SwModify*)pTyp) @@ -524,7 +512,6 @@ SwTOXBase::SwTOXBase(const SwTOXType* pTyp, const SwForm& rForm, aData.nOptions = 0; } - SwTOXBase::SwTOXBase( const SwTOXBase& rSource, SwDoc* pDoc ) : SwClient( rSource.GetRegisteredInNonConst() ) , mbKeepExpression(sal_True) @@ -610,7 +597,6 @@ void SwTOXBase::SetBookmarkName(const OUString& bName) m_aBookmarkName = bName; } - SwTOXBase & SwTOXBase::operator = (const SwTOXBase & rSource) { aForm = rSource.aForm; diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx index 442edf1aa12f..8c7a78655b25 100644 --- a/sw/source/core/tox/toxhlp.cxx +++ b/sw/source/core/tox/toxhlp.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; - IndexEntrySupplierWrapper::IndexEntrySupplierWrapper() { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 81c9e03cd484..36701c0d79aa 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/resid.hxx> #include <unotools/charclass.hxx> #include <com/sun/star/i18n/CollatorOptions.hpp> @@ -134,7 +133,6 @@ OUString SwTOXInternational::GetFollowingText( sal_Bool bMorePages ) const SortElement for TOX entries --------------------------------------------------------------------*/ - SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd, const SwTxtTOXMark* pMark, const SwTOXInternational* pInter, @@ -275,7 +273,6 @@ bool SwTOXSortTabBase::operator<( const SwTOXSortTabBase& rCmp ) Sorted keyword entry --------------------------------------------------------------------*/ - SwTOXIndex::SwTOXIndex( const SwTxtNode& rNd, const SwTxtTOXMark* pMark, sal_uInt16 nOptions, sal_uInt8 nKyLevel, @@ -288,10 +285,7 @@ SwTOXIndex::SwTOXIndex( const SwTxtNode& rNd, nOpt = nOptions; } -// // Compare keywords. Only relates to the text. -// - bool SwTOXIndex::operator==( const SwTOXSortTabBase& rCmpBase ) { @@ -313,7 +307,6 @@ bool SwTOXIndex::operator==( const SwTOXSortTabBase& rCmpBase ) return bRet; } -// // operator, only depends on the text bool SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase ) @@ -340,7 +333,6 @@ bool SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase ) return bRet; } -// // The keyword itself TextAndReading SwTOXIndex::GetText_Impl() const @@ -401,8 +393,6 @@ void SwTOXIndex::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 ) rNd.InsertText( aRet.sText, rInsPos ); } - - sal_uInt16 SwTOXIndex::GetLevel() const { OSL_ENSURE(pTxtMark, "pTxtMark == 0, No keyword"); @@ -423,7 +413,6 @@ sal_uInt16 SwTOXIndex::GetLevel() const Key and separator --------------------------------------------------------------------*/ - SwTOXCustom::SwTOXCustom(const TextAndReading& rKey, sal_uInt16 nLevel, const SwTOXInternational& rIntl, @@ -433,7 +422,6 @@ SwTOXCustom::SwTOXCustom(const TextAndReading& rKey, { } - bool SwTOXCustom::operator==(const SwTOXSortTabBase& rCmpBase) { return GetLevel() == rCmpBase.GetLevel() && @@ -441,7 +429,6 @@ bool SwTOXCustom::operator==(const SwTOXSortTabBase& rCmpBase) rCmpBase.GetTxt(), rCmpBase.GetLocale() ); } - bool SwTOXCustom::operator < (const SwTOXSortTabBase& rCmpBase) { return GetLevel() <= rCmpBase.GetLevel() && @@ -449,31 +436,26 @@ bool SwTOXCustom::operator < (const SwTOXSortTabBase& rCmpBase) rCmpBase.GetTxt(), rCmpBase.GetLocale() ); } - sal_uInt16 SwTOXCustom::GetLevel() const { return nLev; } - TextAndReading SwTOXCustom::GetText_Impl() const { return m_aKey; } - /*-------------------------------------------------------------------- Sorts the TOX entries --------------------------------------------------------------------*/ - SwTOXContent::SwTOXContent( const SwTxtNode& rNd, const SwTxtTOXMark* pMark, const SwTOXInternational& rIntl) : SwTOXSortTabBase( TOX_SORT_CONTENT, &rNd, pMark, &rIntl ) { } - // The content's text TextAndReading SwTOXContent::GetText_Impl() const @@ -504,10 +486,7 @@ void SwTOXContent::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 } } -// // The level for displaying it -// - sal_uInt16 SwTOXContent::GetLevel() const { @@ -530,7 +509,6 @@ SwTOXPara::SwTOXPara( const SwCntntNode& rNd, SwTOXElement eT, sal_uInt16 nLevel { } - TextAndReading SwTOXPara::GetText_Impl() const { const SwCntntNode* pNd = aTOXSources[0].pNd; @@ -585,7 +563,6 @@ void SwTOXPara::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 ) c } } - sal_uInt16 SwTOXPara::GetLevel() const { sal_uInt16 nRet = m_nLevel; @@ -600,7 +577,6 @@ sal_uInt16 SwTOXPara::GetLevel() const return nRet; } - OUString SwTOXPara::GetURL() const { OUString aTxt; @@ -653,19 +629,16 @@ OUString SwTOXPara::GetURL() const return aTxt; } - /*-------------------------------------------------------------------- Table --------------------------------------------------------------------*/ - SwTOXTable::SwTOXTable( const SwCntntNode& rNd ) : SwTOXSortTabBase( TOX_SORT_TABLE, &rNd, 0, 0 ), nLevel(FORM_ALPHA_DELIMITTER) { } - TextAndReading SwTOXTable::GetText_Impl() const { const SwNode* pNd = aTOXSources[0].pNd; @@ -688,7 +661,6 @@ sal_uInt16 SwTOXTable::GetLevel() const return nLevel; } - OUString SwTOXTable::GetURL() const { const SwNode* pNd = aTOXSources[0].pNd; @@ -788,7 +760,6 @@ bool SwTOXAuthority::operator<( const SwTOXSortTabBase& rBase) SwAuthorityField* pCmpField = (SwAuthorityField*)((SwTOXAuthority&)rBase).m_rField.GetField(); - for(sal_uInt16 i = 0; i < pType->GetSortKeyCount(); i++) { const SwTOXSortKey* pKey = pType->GetSortKey(i); diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx index 9138b02bfca1..058f74a53216 100644 --- a/sw/source/core/txtnode/SwGrammarContact.cxx +++ b/sw/source/core/txtnode/SwGrammarContact.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/timer.hxx> #include <hints.hxx> #include <IGrammarContact.hxx> diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index eb5833e04a5f..6b1ea52bd253 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fldbas.hxx" #include <fmtfld.hxx> #include <txtfld.hxx> @@ -152,7 +151,6 @@ void SwFmtFld::RegisterToFieldType( SwFieldType& rType ) rType.Add(this); } - // #111840# void SwFmtFld::SetField(SwField * _pField) { @@ -292,7 +290,6 @@ bool SwFmtFld::GetInfo( SfxPoolItem& rInfo ) const return false; } - bool SwFmtFld::IsFldInDoc() const { return mpTxtFld != NULL @@ -306,7 +303,6 @@ sal_Bool SwFmtFld::IsProtect() const && mpTxtFld->GetpTxtNode()->IsProtect(); } - SwTxtFld::SwTxtFld( SwFmtFld & rAttr, sal_Int32 const nStartPos, @@ -330,7 +326,6 @@ SwTxtFld::~SwTxtFld( ) } } - bool SwTxtFld::IsFldInDoc() const { return GetpTxtNode() != NULL @@ -369,7 +364,6 @@ void SwTxtFld::ExpandTxtFld() const const_cast<SwTxtFld*>(this)->NotifyContentChange( const_cast<SwFmtFld&>(GetFmtFld()) ); } - void SwTxtFld::CopyTxtFld( SwTxtFld *pDest ) const { OSL_ENSURE( m_pTxtNode, "SwTxtFld: where is my TxtNode?" ); @@ -443,7 +437,6 @@ void SwTxtFld::NotifyContentChange(SwFmtFld& rFmtFld) } } - // input field in-place editing SwTxtInputFld::SwTxtInputFld( SwFmtFld & rAttr, @@ -474,19 +467,16 @@ sal_Int32* SwTxtInputFld::GetEnd() return &m_nEnd; } - void SwTxtInputFld::LockNotifyContentChange() { m_bLockNotifyContentChange = true; } - void SwTxtInputFld::UnlockNotifyContentChange() { m_bLockNotifyContentChange = false; } - void SwTxtInputFld::NotifyContentChange( SwFmtFld& rFmtFld ) { if ( !m_bLockNotifyContentChange ) @@ -546,9 +536,6 @@ void SwTxtInputFld::UpdateTextNodeContent( const OUString& rNewContent ) GetTxtNode().ReplaceText( aIdx, nDelLen, rNewContent ); } - - - // text annotation field SwTxtAnnotationFld::SwTxtAnnotationFld( SwFmtFld & rAttr, @@ -562,7 +549,6 @@ SwTxtAnnotationFld::~SwTxtAnnotationFld() { } - ::sw::mark::IMark* SwTxtAnnotationFld::GetAnnotationMark( SwDoc* pDoc ) const { diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx index 1ee3f8f7d304..add6e4f6cc32 100644 --- a/sw/source/core/txtnode/atrflyin.cxx +++ b/sw/source/core/txtnode/atrflyin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hintids.hxx" #include "cntfrm.hxx" #include "doc.hxx" @@ -62,8 +61,6 @@ SwTxtFlyCnt::SwTxtFlyCnt( SwFmtFlyCnt& rAttr, sal_Int32 nStartPos ) SetHasDummyChar(true); } - - /************************************************************************* * SwTxtFlyCnt::MakeTxtHint() * @@ -270,5 +267,4 @@ SwFlyInCntFrm *SwTxtFlyCnt::_GetFlyFrm( const SwFrm *pCurrFrm ) return pFly; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx index a3408bd3dce7..65acb83b60dc 100644 --- a/sw/source/core/txtnode/atrftn.cxx +++ b/sw/source/core/txtnode/atrftn.cxx @@ -118,7 +118,6 @@ namespace { |* *************************************************************************/ - SwFmtFtn::SwFmtFtn( bool bEndNote ) : SfxPoolItem( RES_TXTATR_FTN ), m_pTxtAttr( 0 ), @@ -127,7 +126,6 @@ SwFmtFtn::SwFmtFtn( bool bEndNote ) { } - bool SwFmtFtn::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); @@ -136,7 +134,6 @@ bool SwFmtFtn::operator==( const SfxPoolItem& rAttr ) const m_bEndNote == ((SwFmtFtn&)rAttr).m_bEndNote; } - SfxPoolItem* SwFmtFtn::Clone( SfxItemPool* ) const { SwFmtFtn* pNew = new SwFmtFtn; @@ -162,7 +159,6 @@ SwFmtFtn::~SwFmtFtn() { } - void SwFmtFtn::GetFtnText( OUString& rStr ) const { if( m_pTxtAttr->GetStartNode() ) @@ -248,14 +244,11 @@ SwTxtFtn::SwTxtFtn( SwFmtFtn& rAttr, sal_Int32 nStartPos ) SetHasDummyChar(true); } - SwTxtFtn::~SwTxtFtn() { SetStartNode( 0 ); } - - void SwTxtFtn::SetStartNode( const SwNodeIndex *pNewNode, sal_Bool bDelNode ) { if( pNewNode ) @@ -324,7 +317,6 @@ void SwTxtFtn::SetStartNode( const SwNodeIndex *pNewNode, sal_Bool bDelNode ) } } - void SwTxtFtn::SetNumber( const sal_uInt16 nNewNum, const OUString &sNumStr ) { SwFmtFtn& rFtn = (SwFmtFtn&)GetFtn(); @@ -397,7 +389,6 @@ void SwTxtFtn::CopyFtn( } } - // lege eine neue leere TextSection fuer diese Fussnote an void SwTxtFtn::MakeNewTextSection( SwNodes& rNodes ) { @@ -428,7 +419,6 @@ void SwTxtFtn::MakeNewTextSection( SwNodes& rNodes ) m_pStartNode = new SwNodeIndex( *pSttNd ); } - void SwTxtFtn::DelFrms( const SwFrm* pSib ) { // delete the FtnFrames from the pages @@ -534,7 +524,4 @@ void SwTxtFtn::CheckCondColl() //FEATURE::CONDCOLL } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/txtnode/atrref.cxx b/sw/source/core/txtnode/atrref.cxx index e019c338742a..94646a4cb278 100644 --- a/sw/source/core/txtnode/atrref.cxx +++ b/sw/source/core/txtnode/atrref.cxx @@ -22,7 +22,6 @@ #include <fmtrfmrk.hxx> #include <swfont.hxx> - /**************************************************************************** * * class SwFmtRefMark diff --git a/sw/source/core/txtnode/atrtox.cxx b/sw/source/core/txtnode/atrtox.cxx index 9cdaa14f2a3d..46379ba01bac 100644 --- a/sw/source/core/txtnode/atrtox.cxx +++ b/sw/source/core/txtnode/atrtox.cxx @@ -72,14 +72,14 @@ void SwTxtTOXMark::CopyTOXMark( SwDoc* pDoc ) } } // kein entsprechender Typ vorhanden -> neu erzeugen - // + if(!pType) { pDoc->InsertTOXType( SwTOXType( eType, rNm ) ); pType = pDoc->GetTOXType(eType, 0); } // Verzeichnistyp umhaengen - // + ((SwTOXType*)pType)->Add( &rTOX ); } diff --git a/sw/source/core/txtnode/chrfmt.cxx b/sw/source/core/txtnode/chrfmt.cxx index 328ce9a98833..86359ff7740e 100644 --- a/sw/source/core/txtnode/chrfmt.cxx +++ b/sw/source/core/txtnode/chrfmt.cxx @@ -19,9 +19,6 @@ #include <charfmt.hxx> - TYPEINIT1( SwCharFmt, SwFmt ); //rtti fuer SwCharFmt - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 8b7567c8165d..8782fdd41dfd 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <poolfmt.hxx> #include "unomid.h" @@ -51,7 +50,6 @@ #include <boost/bind.hpp> #include <algorithm> - using namespace ::com::sun::star; TYPEINIT1_AUTOFACTORY(SwFmtINetFmt, SfxPoolItem); @@ -70,8 +68,6 @@ SwFmtCharFmt::SwFmtCharFmt( SwCharFmt *pFmt ) { } - - SwFmtCharFmt::SwFmtCharFmt( const SwFmtCharFmt& rAttr ) : SfxPoolItem( RES_TXTATR_CHARFMT ), SwClient( rAttr.GetCharFmt() ), @@ -79,27 +75,19 @@ SwFmtCharFmt::SwFmtCharFmt( const SwFmtCharFmt& rAttr ) { } - - SwFmtCharFmt::~SwFmtCharFmt() {} - - bool SwFmtCharFmt::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return GetCharFmt() == ((SwFmtCharFmt&)rAttr).GetCharFmt(); } - - SfxPoolItem* SwFmtCharFmt::Clone( SfxItemPool* ) const { return new SwFmtCharFmt( *this ); } - - // weiterleiten an das TextAttribut void SwFmtCharFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) { @@ -107,8 +95,6 @@ void SwFmtCharFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) pTxtAttr->ModifyNotification( pOld, pNew ); } - - // weiterleiten an das TextAttribut bool SwFmtCharFmt::GetInfo( SfxPoolItem& rInfo ) const { @@ -228,8 +214,6 @@ SwFmtINetFmt::~SwFmtINetFmt() delete mpMacroTbl; } - - bool SwFmtINetFmt::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); @@ -257,15 +241,11 @@ bool SwFmtINetFmt::operator==( const SfxPoolItem& rAttr ) const return rOwn == rOther; } - - SfxPoolItem* SwFmtINetFmt::Clone( SfxItemPool* ) const { return new SwFmtINetFmt( *this ); } - - void SwFmtINetFmt::SetMacroTbl( const SvxMacroTableDtor* pNewTbl ) { if( pNewTbl ) @@ -279,8 +259,6 @@ void SwFmtINetFmt::SetMacroTbl( const SvxMacroTableDtor* pNewTbl ) delete mpMacroTbl, mpMacroTbl = 0; } - - void SwFmtINetFmt::SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro ) { if( !mpMacroTbl ) @@ -289,8 +267,6 @@ void SwFmtINetFmt::SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro ) mpMacroTbl->Insert( nEvent, rMacro ); } - - const SvxMacro* SwFmtINetFmt::GetMacro( sal_uInt16 nEvent ) const { const SvxMacro* pRet = 0; @@ -299,8 +275,6 @@ const SvxMacro* SwFmtINetFmt::GetMacro( sal_uInt16 nEvent ) const return pRet; } - - bool SwFmtINetFmt::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -427,7 +401,6 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } - /************************************************************************* |* class SwFmtRuby *************************************************************************/ @@ -558,7 +531,6 @@ bool SwFmtRuby::PutValue( const uno::Any& rVal, return bRet; } - /************************************************************************* class SwFmtMeta ************************************************************************/ @@ -673,7 +645,6 @@ void SwFmtMeta::DoCopy(::sw::MetaFieldManager & i_rTargetDocManager, } } - namespace sw { /************************************************************************* @@ -832,12 +803,10 @@ void MetaField::SetNumberFormat(sal_uInt32 nNumberFormat) m_nNumberFormat = nNumberFormat; } - /************************************************************************* class sw::MetaFieldManager ************************************************************************/ - MetaFieldManager::MetaFieldManager() { } @@ -891,5 +860,4 @@ MetaFieldManager::getMetaFields() } // namespace sw - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index ccaf3c03181c..78362c372566 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -79,8 +79,6 @@ sal_uInt16 GetDefaultFontHeight( SwDrawTextInfo &rInf ) return (sal_uInt16)aDefaultFontItem.GetHeight(); } - - /************************************************************************* |* |* SwFntCache::Flush() @@ -415,7 +413,6 @@ sal_uInt16 SwFntObj::GetFontLeading( const SwViewShell *pSh, const OutputDevice& return nRet; } - /************************************************************************* * * SwFntObj::CreateScrFont( const SwViewShell& rSh, const OutputDevice& rOut ) @@ -517,7 +514,6 @@ void SwFntObj::CreateScrFont( const SwViewShell& rSh, const OutputDevice& rOut ) pOut->SetFont( aOldOutFont ); } - void SwFntObj::GuessLeading( const SwViewShell& #if defined(WNT) rSh @@ -751,7 +747,6 @@ static void lcl_DrawLineForWrongListData( Point aEnd; lcl_calcLinePos( rCalcLinePosData, aStart, aEnd, nNextStart, nNextEnd - nNextStart ); - sal_uInt16 wrongPos = pWList->GetWrongPos(nNextStart + rInf.GetIdx()); const SwWrongArea* wrongArea = pWList->GetElement(wrongPos); @@ -816,7 +811,6 @@ static void lcl_DrawLineForWrongListData( rInf.GetOut().Pop(); } - void SwFntObj::DrawText( SwDrawTextInfo &rInf ) { OSL_ENSURE( rInf.GetShell(), "SwFntObj::DrawText without shell" ); @@ -847,9 +841,8 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) Font* pTmpFont = bUseScrFont ? pScrFont : pPrtFont; - // // bDirectPrint and bUseScrFont should have these values: - // + // Outdev / RefDef | Printer | VirtPrinter | Window // Printer | 1 - 0 | 0 - 1 | - @@ -857,10 +850,9 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) // VirtPrinter/PDF | 0 - 1 | 0 - 1 | - // Window/VirtWindow| 0 - 1 | 0 - 1 | 1 - 0 - // + // Exception: During painting of a Writer OLE object, we do not have // a window. Therefore bUseSrcFont is always 0 in this case. - // #if OSL_DEBUG_LEVEL > 0 @@ -975,10 +967,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) if ( COMPLETE_STRING == rInf.GetLen() ) rInf.SetLen( rInf.GetText().getLength() ); - - // // ASIAN LINE AND CHARACTER GRID MODE START: snap to characters - // if ( rInf.GetFrm() && rInf.SnapToGrid() && rInf.GetFont() && SW_CJK == rInf.GetFont()->GetActual() ) @@ -1069,7 +1058,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) // For text grid refactor // ASIAN LINE AND CHARACTER GRID MODE START: not snap to characters - // + if ( rInf.GetFrm() && rInf.SnapToGrid() && rInf.GetFont() && SW_CJK == rInf.GetFont()->GetActual() ) { @@ -1211,9 +1200,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) } } - // // DIRECT PAINTING WITHOUT SCREEN ADJUSTMENT - // if ( bDirectPrint ) { @@ -1266,9 +1253,8 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) } } - // // Modify Array for special justifications - // + long nSpaceAdd = rInf.GetSpace() / SPACING_PRECISION_FACTOR; bool bSpecialJust = false; @@ -1435,9 +1421,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) rInf.GetIdx(), rInf.GetLen() ); } - // // PAINTING WITH FORMATTING DEVICE/SCREEN ADJUSTMENT - // else { @@ -1475,9 +1459,8 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) rInf.GetIdx(), rInf.GetLen() ); } - // // Modify Printer and ScreenArrays for special justifications - // + long nSpaceAdd = rInf.GetSpace() / SPACING_PRECISION_FACTOR; bool bNoHalfSpace = false; @@ -2057,7 +2040,6 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf ) return aTxtSize; } - sal_Int32 SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf ) { long nSpaceAdd = rInf.GetSpace() / SPACING_PRECISION_FACTOR; @@ -2265,7 +2247,6 @@ sal_Int32 SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf ) return nCnt; } - /************************************************************************* |* |* SwFntAccess::SwFntAccess() @@ -2292,7 +2273,6 @@ SwFntAccess::SwFntAccess( const void* &rMagic, bCheck = sal_False; } - { OutputDevice* pOut = 0; sal_uInt16 nZoom = USHRT_MAX; diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index f9d9689c0182..3d1c6178e8a7 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -316,7 +316,6 @@ void SwDoDrawCapital::DrawSpace( Point &rPos ) const bool bSwitchL2R = rInf.GetFrm()->IsRightToLeft() && ! rInf.IsIgnoreFrmRTL(); - if ( bSwitchL2R ) rInf.GetFrm()->SwitchLTRtoRTL( aPos ); diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx b/sw/source/core/txtnode/modeltoviewhelper.cxx index 923e4fb3733f..85390d0e1654 100644 --- a/sw/source/core/txtnode/modeltoviewhelper.cxx +++ b/sw/source/core/txtnode/modeltoviewhelper.cxx @@ -187,7 +187,6 @@ sal_Int32 ModelToViewHelper::ConvertToViewPosition( sal_Int32 nModelPos ) const return nModelPos; } - /** Converts a view position into a model position */ ModelToViewHelper::ModelPosition ModelToViewHelper::ConvertToModelPosition( sal_Int32 nViewPos ) const diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx index 4809b151472f..235dc8d4afa8 100644 --- a/sw/source/core/txtnode/ndhints.cxx +++ b/sw/source/core/txtnode/ndhints.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "txatbase.hxx" #include "ndhints.hxx" #include <txtatr.hxx> @@ -28,7 +27,6 @@ #include <set> #endif - inline void DumpHints(const SwpHtStart &, const SwpHtEnd &) { } /************************************************************************* @@ -163,7 +161,6 @@ sal_uInt16 SwpHintsArray::GetPos( const SwTxtAttr *pHt ) const * SwpHintsArray::Check() *************************************************************************/ - #define CHECK_ERR(cond, text) \ if(!(cond)) \ { \ @@ -408,5 +405,4 @@ void SwpHintsArray::Resort() m_HintEnds.Resort(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 383500a8f01c..92d70da86bc9 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -185,10 +185,8 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere, } while( true ); } - // SwTxtNode - SwTxtNode::SwTxtNode( const SwNodeIndex &rWhere, SwTxtFmtColl *pTxtColl, const SfxItemSet* pAutoAttr ) @@ -830,7 +828,6 @@ void SwTxtNode::NewAttrSet( SwAttrPool& rPool ) mpAttrSet = GetDoc()->GetIStyleAccess().getAutomaticStyle( aNewAttrSet, IStyleAccess::AUTO_STYLE_PARA ); } - // override SwIndexReg::Update => text hints do not need SwIndex for start/end! void SwTxtNode::Update( SwIndex const & rPos, @@ -1116,7 +1113,6 @@ void SwTxtNode::_ChgTxtCollUpdateNum( const SwTxtFmtColl *pOldColl, pDoc->GetNodes().UpdateOutlineNode(*this); } - SwNodes& rNds = GetNodes(); // Update beim Level 0 noch die Fussnoten !! if( ( !nNewLevel || !nOldLevel) && !pDoc->GetFtnIdxs().empty() && @@ -1313,7 +1309,6 @@ SwTxtFld* SwTxtNode::GetFldTxtAttrAt( return pTxtFld; } - /************************************************************************* * CopyHint() *************************************************************************/ @@ -1802,7 +1797,6 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest, CHECK_SWPHINTS(this); } - OUString SwTxtNode::InsertText( const OUString & rStr, const SwIndex & rIdx, const IDocumentContentOperations::InsertFlags nMode ) { @@ -1948,7 +1942,6 @@ void SwTxtNode::CutText( SwTxtNode * const pDest, } } - void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart, const SwIndex & rStart, sal_Int32 nLen, const bool bUpdate ) { @@ -2297,7 +2290,6 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart, ModifyNotification( 0, &aDelHint ); } - void SwTxtNode::EraseText(const SwIndex &rIdx, const sal_Int32 nCount, const IDocumentContentOperations::InsertFlags nMode ) { @@ -2802,7 +2794,7 @@ OUString SwTxtNode::GetNumString( const bool _bInclPrefixAndSuffixStrings, SvxNumberType const& rNumberType( pRule->Get( static_cast<sal_uInt16>(nLevel) ) ); if (rNumberType.IsTxtFmt() || - // + (style::NumberingType::NUMBER_NONE == rNumberType.GetNumberingType())) { return pRule->MakeNumString( GetNum()->GetNumberVector(), @@ -2917,7 +2909,6 @@ bool SwTxtNode::GetFirstLineOfsWithNum( short& rFLOffset ) const return false; } -// SwTwips SwTxtNode::GetAdditionalIndentForStartingNewList() const { SwTwips nAdditionalIndent = 0; @@ -4330,7 +4321,7 @@ namespace { { mbAddTxtNodeToList = true; // #i105562# - // + mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr(); } } @@ -4919,7 +4910,6 @@ sal_uInt16 SwTxtNode::ResetAllAttr() return nRet; } - sal_uInt32 SwTxtNode::GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const { SfxItemSet aSet( (SfxItemPool&) (GetDoc()->GetAttrPool()), RES_CHRATR_RSID, RES_CHRATR_RSID ); diff --git a/sw/source/core/txtnode/swfntcch.cxx b/sw/source/core/txtnode/swfntcch.cxx index 803891177e03..61e4b888103f 100644 --- a/sw/source/core/txtnode/swfntcch.cxx +++ b/sw/source/core/txtnode/swfntcch.cxx @@ -73,5 +73,4 @@ SwCacheObj *SwFontAccess::NewObj( ) return new SwFontObj( pOwner, pShell ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index df3da98565ee..d10a394327f6 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -1450,7 +1450,6 @@ void SwSubFont::CalcEsc( SwDrawTextInfo& rInf, Point& rPos ) nOfst = pLastFont->GetFontAscent( rInf.GetShell(), rInf.GetOut() ) - nOrgAscent; - switch ( nDir ) { case 0 : diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 164daf8697f6..b6e23cec0301 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -81,7 +81,6 @@ using namespace ::com::sun::star::i18n; - SwpHints::SwpHints() : m_pHistory(0) , m_bFontChange(true) @@ -570,11 +569,10 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint ) return true; } - // This function takes care for the following text attribute: // RES_TXTATR_CHARFMT, RES_TXTATR_AUTOFMT // These attributes have to be handled in a special way (Portion building). -// + // The new attribute will be split by any existing RES_TXTATR_AUTOFMT or // RES_TXTATR_CHARFMT. The new attribute itself will // split any existing RES_TXTATR_AUTOFMT or RES_TXTATR_CHARFMT. @@ -595,10 +593,9 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, RES_TXTATR_AUTOFMT == rNewHint.Which(), "Expecting CHARFMT or AUTOFMT" ); - // // 2. Find the hints which cover the start and end position // of the new hint. These hints have to be split into two portions: - // + if ( !bNoLengthAttribute ) // nothing to do for no length attributes { for ( sal_uInt16 i = 0; i < Count(); ++i ) @@ -658,9 +655,8 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, CHECK_NOTMERGED; // ignore flags not set properly yet, don't check them #endif - // // 4. Split rNewHint into 1 ... n new hints: - // + std::set<sal_Int32> aBounds; aBounds.insert( nThisStart ); aBounds.insert( nThisEnd ); @@ -689,9 +685,8 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, ++aStartIter; bool bDestroyHint = true; - // // Insert the 1...n new parts of the new attribute: - // + while ( aStartIter != aEndIter || bNoLengthAttribute ) { OSL_ENSURE( bNoLengthAttribute || nPorStart < *aStartIter, "AUTOSTYLES: BuildPortion trouble" ); @@ -1112,7 +1107,6 @@ SwTxtAttr* MakeTxtAttr( SwDoc & rDoc, const SfxItemSet& rSet, return pNew; } - // loesche das Text-Attribut (muss beim Pool abgemeldet werden!) void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr ) { @@ -1650,7 +1644,6 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode ) return bRet; } - /************************************************************************* * SwTxtNode::DeleteAttribute() *************************************************************************/ @@ -1854,7 +1847,6 @@ bool SwTxtNode::TryCharSetExpandToNum(const SfxItemSet& aCharSet) } } - return bRet; } @@ -2298,14 +2290,12 @@ bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd, return rSet.Count() != 0; } - namespace { typedef std::pair<sal_uInt16, sal_uInt16> AttrSpan_t; typedef std::multimap<AttrSpan_t, const SwTxtAttr*> AttrSpanMap_t; - struct IsAutoStyle { bool @@ -2316,7 +2306,6 @@ struct IsAutoStyle } }; - /** Removes from io_rAttrSet all items that are set by style on the given span. */ @@ -2359,7 +2348,6 @@ private: SfxItemSet& m_rAttrSet; }; - /** Collects all style-covered spans from i_rHints to o_rSpanMap. In addition inserts dummy spans with pointer to format equal to 0 for all gaps (i.e. spans not covered by any style). This simplifies @@ -2401,7 +2389,6 @@ lcl_CollectHintSpans(const SwpHints& i_rHints, const sal_uInt16 nLength, } } - void lcl_FillWhichIds(const SfxItemSet& i_rAttrSet, std::vector<sal_uInt16>& o_rClearIds) { @@ -2429,7 +2416,6 @@ struct SfxItemSetClearer } - /** Does the hard work of SwTxtNode::FmtToTxtAttr: the real conversion of items to automatic styles. */ @@ -2516,9 +2502,9 @@ void SwTxtNode::FmtToTxtAttr( SwTxtNode* pNd ) { // There are five possible combinations of items from this and // pNd (pNd is the 'main' node): - // + // case pNd this action - // ---------------------------------------------------- + // 1 - - do nothing // 2 - a convert item to attr of this // 3 a - convert item to attr of pNd @@ -2662,7 +2648,6 @@ bool SwpHints::CalcHiddenParaField() return bOldHasHiddenParaField != bNewHasHiddenParaField; } - /************************************************************************* * SwpHints::NoteInHistory() *************************************************************************/ @@ -3219,7 +3204,6 @@ bool SwpHints::TryInsertHint( return true; } - // Ab hier gibt es nur noch pHint mit einem EndIdx !!! if( *pHtEnd < nHtStart ) @@ -3453,7 +3437,6 @@ sal_uInt16 SwTxtNode::GetLang( const sal_Int32 nBegin, const sal_Int32 nLen, return nRet; } - sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr ) { sal_Unicode cRet = CH_TXTATR_BREAKWORD; @@ -3482,5 +3465,4 @@ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr ) return cRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx index a09bb94344c6..5fc1f4a8255d 100644 --- a/sw/source/core/txtnode/txatritr.cxx +++ b/sw/source/core/txtnode/txatritr.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; - SwScriptIterator::SwScriptIterator( const OUString& rStr, sal_Int32 nStt, bool const bFrwrd) : m_rText(rStr) @@ -94,8 +93,6 @@ bool SwScriptIterator::Next() return bRet; } - - SwTxtAttrIterator::SwTxtAttrIterator( const SwTxtNode& rTNd, sal_uInt16 nWhchId, sal_Int32 nStt, bool bUseGetWhichOfScript ) @@ -231,5 +228,4 @@ void SwTxtAttrIterator::SearchNextChg() } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx index c553b46d60a9..8b26eb26b793 100644 --- a/sw/source/core/txtnode/txtatr2.cxx +++ b/sw/source/core/txtnode/txtatr2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <hints.hxx> #include <sfx2/objsh.hxx> @@ -34,11 +33,9 @@ #include <fmtruby.hxx> #include <fmtmeta.hxx> - TYPEINIT1(SwTxtINetFmt,SwClient); TYPEINIT1(SwTxtRuby,SwClient); - /************************************************************************* * class SwTxtCharFmt *************************************************************************/ @@ -83,7 +80,6 @@ bool SwTxtCharFmt::GetInfo( SfxPoolItem& rInfo ) const return false; } - /************************************************************************* * class SwTxtAttrNesting *************************************************************************/ @@ -104,7 +100,6 @@ SwTxtAttrNesting::~SwTxtAttrNesting() { } - /************************************************************************* * class SwTxtINetFmt *************************************************************************/ @@ -292,7 +287,6 @@ SwCharFmt* SwTxtRuby::GetCharFmt() return pRet; } - /************************************************************************* * class SwTxtMeta *************************************************************************/ diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 9a2e518447ec..81676390aba2 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -717,7 +717,7 @@ SwScanner::SwScanner( const SwTxtNode& rNd, const OUString& rTxt, //MSWord f.e has special emdash and endash behaviour in that they break //words for the purposes of word counting, while a hyphen etc. doesn't. - // + //The default configuration treats emdash/endash as a word break, but //additional ones can be added in under tools->options if (nWordType == i18n::WordType::WORD_COUNT) @@ -947,7 +947,7 @@ sal_uInt16 SwTxtNode::Spell(SwSpellArgs* pArgs) pArgs->xSpellAlt = NULL; // 4 cases: - // + // 1. IsWrongDirty = 0 and GetWrong = 0 // Everything is checked and correct // 2. IsWrongDirty = 0 and GetWrong = 1 @@ -956,7 +956,7 @@ sal_uInt16 SwTxtNode::Spell(SwSpellArgs* pArgs) // Nothing has been checked // 4. IsWrongDirty = 1 and GetWrong = 1 // Text has been checked but there is an invalid range in the wrong list - // + // Nothing has to be done for case 1. if ( ( IsWrongDirty() || GetWrong() ) && m_Text.getLength() ) { @@ -968,7 +968,7 @@ sal_uInt16 SwTxtNode::Spell(SwSpellArgs* pArgs) { nEnd = m_Text.getLength(); } - // + if(!IsWrongDirty()) { const sal_Int32 nTemp = GetWrong()->NextWrong( nBegin ); @@ -1371,9 +1371,8 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, const SwViewOption& rV pNode->GetWrong()->Fresh( nChgStart, nChgEnd, nEnd, 0, nInsertPos, nActPos ); - // // Calculate repaint area: - // + if( nChgStart < nChgEnd ) { aRect = lcl_CalculateRepaintRect( *this, nChgStart, nChgEnd ); @@ -1469,7 +1468,6 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, sal_Int32 /*nActPos*/ rSmartTagMgr.RecognizeTextRange(xRange, xTextMarkup, xController); - sal_Int32 nLangBegin = nBegin; sal_Int32 nLangEnd = nEnd; diff --git a/sw/source/core/undo/SwRewriter.cxx b/sw/source/core/undo/SwRewriter.cxx index 33a05d9c35a9..6fa3304d3868 100644 --- a/sw/source/core/undo/SwRewriter.cxx +++ b/sw/source/core/undo/SwRewriter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <algorithm> #include <SwRewriter.hxx> diff --git a/sw/source/core/undo/SwUndoField.cxx b/sw/source/core/undo/SwUndoField.cxx index 210fc2ea7007..b92ee374e000 100644 --- a/sw/source/core/undo/SwUndoField.cxx +++ b/sw/source/core/undo/SwUndoField.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/rtti.hxx> #include <SwUndoField.hxx> diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx index f61e9c85482f..50e01a08d43f 100644 --- a/sw/source/core/undo/SwUndoFmt.cxx +++ b/sw/source/core/undo/SwUndoFmt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/resid.hxx> #include <poolfmt.hxx> @@ -156,7 +155,6 @@ SwUndoRenameFmt::SwUndoRenameFmt(SwUndoId nUndoId, { } - SwUndoRenameFmt::~SwUndoRenameFmt() { } diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx index cf5d594a5814..ec9a97fa5bb0 100644 --- a/sw/source/core/undo/SwUndoPageDesc.cxx +++ b/sw/source/core/undo/SwUndoPageDesc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/resid.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> @@ -34,7 +33,6 @@ #include <ndindex.hxx> #endif - #if OSL_DEBUG_LEVEL > 1 // Pure debug help function to have a quick look at the header/footer attributes. void DebugHeaderFooterContent( const SwPageDesc& rPageDesc ) @@ -196,7 +194,6 @@ SwUndoPageDesc::~SwUndoPageDesc() { } - void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDest ) { OSL_ENSURE( bExchange, "You shouldn't do that." ); @@ -418,7 +415,6 @@ SwRewriter SwUndoPageDescCreate::GetRewriter() const else aResult.AddRule(UndoArg1, aNew.GetName()); - return aResult; } diff --git a/sw/source/core/undo/SwUndoTOXChange.cxx b/sw/source/core/undo/SwUndoTOXChange.cxx index 5c4341611481..7887b85e44ed 100644 --- a/sw/source/core/undo/SwUndoTOXChange.cxx +++ b/sw/source/core/undo/SwUndoTOXChange.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <SwUndoTOXChange.hxx> #include <swundo.hxx> #include <doctxm.hxx> diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index 7103fc43f1e9..fabbd7c00019 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <UndoManager.hxx> #include <vcl/wrkwin.hxx> @@ -39,12 +38,10 @@ using namespace ::com::sun::star; - // the undo array should never grow beyond this limit: #define UNDO_ACTION_LIMIT (USHRT_MAX - 1000) - -// UndoManager /////////////////////////////////////////////////////////// +// UndoManager namespace sw { @@ -128,7 +125,6 @@ bool UndoManager::DoesDrawUndo() const return m_bDrawUndo; } - bool UndoManager::IsUndoNoResetModified() const { return MARK_INVALID == m_UndoSaveMark; @@ -161,7 +157,6 @@ void UndoManager::UnLockUndoNoModifiedPosition() m_bLockUndoNoModifiedPosition = false; } - SwUndo* UndoManager::GetLastUndo() { if (!SdrUndoManager::GetUndoActionCount(CurrentLevel)) @@ -191,7 +186,6 @@ void UndoManager::DelAllUndoObj() m_UndoSaveMark = MARK_INVALID; } - /**************** UNDO ******************/ SwUndoId @@ -220,7 +214,6 @@ UndoManager::StartUndo(SwUndoId const i_eUndoId, return eUndoId; } - SwUndoId UndoManager::EndUndo(SwUndoId const i_eUndoId, SwRewriter const*const pRewriter) { @@ -328,7 +321,6 @@ SwUndoComments_t UndoManager::GetUndoComments() const return ret; } - /**************** REDO ******************/ bool UndoManager::GetFirstRedoInfo(OUString *const o_pStr, @@ -358,7 +350,6 @@ bool UndoManager::GetFirstRedoInfo(OUString *const o_pStr, return true; } - SwUndoComments_t UndoManager::GetRedoComments() const { OSL_ENSURE(!SdrUndoManager::IsInListAction(), @@ -411,7 +402,7 @@ SwUndo * UndoManager::RemoveLastUndo() return dynamic_cast<SwUndo *>(pLastUndo); } -// svl::IUndoManager ///////////////////////////////////////////////////// +// svl::IUndoManager void UndoManager::EnableUndo(bool bEnable) { diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index d53eec68db73..d7d8140e8ad8 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -876,7 +876,6 @@ SwHistoryChangeFlyAnchor::SwHistoryChangeFlyAnchor( SwFrmFmt& rFmt ) { } - void SwHistoryChangeFlyAnchor::SetInDoc( SwDoc* pDoc, bool ) { ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo()); @@ -968,7 +967,6 @@ void SwHistoryChangeCharFmt::SetInDoc(SwDoc * pDoc, bool ) } // <- #i27615# - SwHistory::SwHistory( sal_uInt16 nInitSz ) : m_SwpHstry() , m_nEndDiff( 0 ) diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index 0e0504e2a10f..73b3a6b4f556 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -570,7 +570,6 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext) pTxtNd->InsertItem( aFmt, pPos->nContent.GetIndex(), 0 ); } - if( RES_DRAWFRMFMT != pFrmFmt->Which() ) pFrmFmt->MakeFrms(); @@ -734,7 +733,6 @@ void SwUndoResetAttr::RepeatImpl(::sw::RepeatContext & rContext) } } - void SwUndoResetAttr::SetAttrs( const std::set<sal_uInt16> &rAttrs ) { m_Ids.clear(); diff --git a/sw/source/core/undo/unbkmk.cxx b/sw/source/core/undo/unbkmk.cxx index 87848b74ece5..569fe21bc4a4 100644 --- a/sw/source/core/undo/unbkmk.cxx +++ b/sw/source/core/undo/unbkmk.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <UndoBookmark.hxx> #include "doc.hxx" @@ -31,7 +30,6 @@ #include "SwRewriter.hxx" - SwUndoBookmark::SwUndoBookmark( SwUndoId nUndoId, const ::sw::mark::IMark& rBkmk ) : SwUndo( nUndoId ) @@ -72,15 +70,11 @@ SwRewriter SwUndoBookmark::GetRewriter() const return aResult; } - - - SwUndoInsBookmark::SwUndoInsBookmark( const ::sw::mark::IMark& rBkmk ) : SwUndoBookmark( UNDO_INSBOOKMARK, rBkmk ) { } - void SwUndoInsBookmark::UndoImpl(::sw::UndoRedoContext & rContext) { ResetInDoc( &rContext.GetDoc() ); @@ -91,5 +85,4 @@ void SwUndoInsBookmark::RedoImpl(::sw::UndoRedoContext & rContext) SetInDoc( &rContext.GetDoc() ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index 496a7e6b1eeb..c69a31aca569 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -1089,7 +1089,6 @@ void SwUndoDelete::RepeatImpl(::sw::RepeatContext & rContext) rContext.m_bDeleteRepeated = true; } - void SwUndoDelete::SetTableName(const OUString & rName) { sTableName = rName; diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 9f2f3256f9be..d1fcd03f5ab0 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -317,7 +317,7 @@ SwUndoSaveCntnt::~SwUndoSaveCntnt() // content. As a result, the attributes will not be expanded. // - MoveTo moves from NodesArray into UndoNodesArray // - MoveFrom moves from UndoNodesArray into NodesArray -// + // If pEndNdIdx is given, Undo/Redo calls -Ins/DelFly. In that case the whole // section should be moved. void SwUndoSaveCntnt::MoveToUndoNds( SwPaM& rPaM, SwNodeIndex* pNodeIdx, @@ -454,14 +454,13 @@ void SwUndoSaveCntnt::MovePtForward( SwPaM& rPam, sal_Bool bMvBkwrd ) } } - // Delete all objects that have ContentIndices to the given area. // Currently (1994) these exist: // - Footnotes // - Flys // - Bookmarks // - Directories -// + // #i81002# - extending method // delete certain (not all) cross-reference bookmarks at text node of <rMark> // and at text node of <rPoint>, if these text nodes aren't the same. @@ -1043,7 +1042,6 @@ sal_Bool SwUndo::FillSaveDataForFmt( const SwPaM& rRange, SwRedlineSaveDatas& rS rSData.push_back( pNewData ); } - } } return !rSData.empty(); @@ -1165,5 +1163,4 @@ void SwRedlineSaveDatas::DeleteAndDestroyAll() clear(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index 69e1f0defa21..68d27ceb3fd2 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -213,7 +213,6 @@ void SwUndoFlyBase::DelFly( SwDoc* pDoc ) pFrmFmt->ResetFmtAttr( RES_ANCHOR ); // delete anchor - // delete from array SwFrmFmts& rFlyFmts = *(SwFrmFmts*)pDoc->GetSpzFrmFmts(); rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), pFrmFmt )); diff --git a/sw/source/core/undo/undoflystrattr.cxx b/sw/source/core/undo/undoflystrattr.cxx index 31069b0fd35f..e5a194a529bf 100644 --- a/sw/source/core/undo/undoflystrattr.cxx +++ b/sw/source/core/undo/undoflystrattr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <undoflystrattr.hxx> #include <frmfmt.hxx> diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index 7dffdcb97648..187c3ceb13b5 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <UndoDraw.hxx> #include <rtl/string.h> @@ -46,7 +45,6 @@ #include <rootfrm.hxx> #include <viewsh.hxx> - struct SwUndoGroupObjImpl { SwDrawFrmFmt* pFmt; @@ -54,7 +52,6 @@ struct SwUndoGroupObjImpl sal_uLong nNodeIdx; }; - // Draw-Objecte IMPL_LINK( SwDoc, AddDrawUndo, SdrUndoAction *, pUndo ) @@ -112,8 +109,6 @@ OUString SwSdrUndo::GetComment() const return pSdrUndo->GetComment(); } - - static void lcl_SendRemoveToUno( SwFmt& rFmt ) { SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, &rFmt ); @@ -326,9 +321,6 @@ void SwUndoDrawGroup::SetGroupFmt( SwDrawFrmFmt* pFmt ) pObjArr->pFmt = pFmt; } - - - SwUndoDrawUnGroup::SwUndoDrawUnGroup( SdrObjGroup* pObj ) : SwUndo( UNDO_DRAWUNGROUP ), bDelFmt( sal_False ) { @@ -503,8 +495,6 @@ void SwUndoDrawUnGroupConnectToLayout::AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt, std::pair< SwDrawFrmFmt*, SdrObject* >( pDrawFrmFmt, pDrawObject ) ); } - - SwUndoDrawDelete::SwUndoDrawDelete( sal_uInt16 nCnt ) : SwUndo( UNDO_DRAWDELETE ), nSize( nCnt ), bDelFmt( sal_True ) { diff --git a/sw/source/core/undo/unfmco.cxx b/sw/source/core/undo/unfmco.cxx index 4e0aaa8279ad..d9d4b9765b3f 100644 --- a/sw/source/core/undo/unfmco.cxx +++ b/sw/source/core/undo/unfmco.cxx @@ -25,8 +25,6 @@ #include "rolbck.hxx" #include "docary.hxx" - - SwUndoFmtColl::SwUndoFmtColl( const SwPaM& rRange, SwFmtColl* pColl, const bool bReset, diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index 6bb64a837d5d..0a14799c5ca5 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <UndoInsert.hxx> #include <hintids.hxx> @@ -56,9 +55,6 @@ using namespace ::com::sun::star; - - - // INSERT OUString * SwUndoInsert::GetTxtFromDoc() const @@ -296,7 +292,6 @@ void SwUndoInsert::UndoImpl(::sw::UndoRedoContext & rContext) DELETEZ(pUndoTxt); } - void SwUndoInsert::RedoImpl(::sw::UndoRedoContext & rContext) { SwDoc *const pTmpDoc = & rContext.GetDoc(); @@ -484,9 +479,7 @@ SwRewriter SwUndoInsert::GetRewriter() const return aResult; } - -// SwUndoReplace ///////////////////////////////////////////////////////// - +// SwUndoReplace class SwUndoReplace::Impl : private SwUndoSaveCntnt @@ -516,7 +509,6 @@ public: OUString const& GetIns() const { return m_sIns; } }; - SwUndoReplace::SwUndoReplace(SwPaM const& rPam, OUString const& rIns, bool const bRegExp) : SwUndo( UNDO_REPLACE ) @@ -790,9 +782,7 @@ void SwUndoReplace::Impl::SetEnd(SwPaM const& rPam) m_nEndCnt = pEnd->nContent.GetIndex(); } - -// SwUndoReRead ////////////////////////////////////////////////////////// - +// SwUndoReRead SwUndoReRead::SwUndoReRead( const SwPaM& rPam, const SwGrfNode& rGrfNd ) : SwUndo( UNDO_REREAD ), nPos( rPam.GetPoint()->nNode.GetIndex() ) @@ -800,7 +790,6 @@ SwUndoReRead::SwUndoReRead( const SwPaM& rPam, const SwGrfNode& rGrfNd ) SaveGraphicData( rGrfNd ); } - SwUndoReRead::~SwUndoReRead() { delete pGrf; @@ -808,7 +797,6 @@ SwUndoReRead::~SwUndoReRead() delete pFltr; } - void SwUndoReRead::SetAndSave(::sw::UndoRedoContext & rContext) { SwDoc & rDoc = rContext.GetDoc(); @@ -843,19 +831,16 @@ void SwUndoReRead::SetAndSave(::sw::UndoRedoContext & rContext) rContext.SetSelections(pGrfNd->GetFlyFmt(), 0); } - void SwUndoReRead::UndoImpl(::sw::UndoRedoContext & rContext) { SetAndSave(rContext); } - void SwUndoReRead::RedoImpl(::sw::UndoRedoContext & rContext) { SetAndSave(rContext); } - void SwUndoReRead::SaveGraphicData( const SwGrfNode& rGrfNd ) { if( rGrfNd.IsGrfLink() ) @@ -874,7 +859,6 @@ void SwUndoReRead::SaveGraphicData( const SwGrfNode& rGrfNd ) nMirr = rGrfNd.GetSwAttrSet().GetMirrorGrf().GetValue(); } - SwUndoInsertLabel::SwUndoInsertLabel( const SwLabelType eTyp, const OUString &rTxt, const OUString& rSeparator, @@ -949,7 +933,6 @@ void SwUndoInsertLabel::UndoImpl(::sw::UndoRedoContext & rContext) } } - void SwUndoInsertLabel::RedoImpl(::sw::UndoRedoContext & rContext) { SwDoc & rDoc = rContext.GetDoc(); diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx index bff9c425600e..034e51a2f22a 100644 --- a/sw/source/core/undo/unnum.cxx +++ b/sw/source/core/undo/unnum.cxx @@ -87,7 +87,6 @@ void SwUndoInsNum::UndoImpl(::sw::UndoRedoContext & rContext) else pNd = 0; - if( nLRSavePos ) { // Update immediately so that potential "old" LRSpaces will be valid again. diff --git a/sw/source/core/undo/unoutl.cxx b/sw/source/core/undo/unoutl.cxx index 45b85a7edbd0..d01baaa69f57 100644 --- a/sw/source/core/undo/unoutl.cxx +++ b/sw/source/core/undo/unoutl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "doc.hxx" #include "swundo.hxx" #include "pam.hxx" @@ -25,7 +24,6 @@ #include <UndoCore.hxx> - SwUndoOutlineLeftRight::SwUndoOutlineLeftRight( const SwPaM& rPam, short nOff ) : SwUndo( UNDO_OUTLINE_LR ), SwUndRng( rPam ), nOffset( nOff ) @@ -49,5 +47,4 @@ void SwUndoOutlineLeftRight::RepeatImpl(::sw::RepeatContext & rContext) rContext.GetDoc().OutlineUpDown(rContext.GetRepeatPaM(), nOffset); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx index 4af1dccde8ce..ee8a518669a7 100644 --- a/sw/source/core/undo/unsect.cxx +++ b/sw/source/core/undo/unsect.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <UndoSection.hxx> #include <sfx2/linkmgr.hxx> @@ -38,7 +37,6 @@ /// class Calc needed for calculation of the hidden condition of a section. #include <calc.hxx> - static SfxItemSet* lcl_GetAttrSet( const SwSection& rSect ) { // save attributes of the format (columns, color, ...) @@ -63,9 +61,6 @@ static SfxItemSet* lcl_GetAttrSet( const SwSection& rSect ) return pAttr; } - -//////////////////////////////////////////////////////////////////////////// - SwUndoInsSection::SwUndoInsSection( SwPaM const& rPam, SwSectionData const& rNewData, SfxItemSet const*const pSet, SwTOXBase const*const pTOXBase) @@ -88,7 +83,6 @@ SwUndoInsSection::SwUndoInsSection( SetRedlineMode( rDoc.GetRedlineMode() ); } - if( !rPam.HasMark() ) { const SwCntntNode* pCNd = rPam.GetPoint()->nNode.GetNode().GetCntntNode(); @@ -246,7 +240,6 @@ void SwUndoInsSection::Join( SwDoc& rDoc, sal_uLong nNode ) } } - void SwUndoInsSection::SaveSplitNode(SwTxtNode *const pTxtNd, bool const bAtStart) { @@ -270,9 +263,6 @@ SwUndoInsSection::SaveSplitNode(SwTxtNode *const pTxtNd, bool const bAtStart) } } - -//////////////////////////////////////////////////////////////////////////// - class SwUndoDelSection : public SwUndo { @@ -385,9 +375,6 @@ void SwUndoDelSection::RedoImpl(::sw::UndoRedoContext & rContext) rDoc.DelSectionFmt( pNd->GetSection().GetFmt() ); } - -//////////////////////////////////////////////////////////////////////////// - class SwUndoUpdateSection : public SwUndo { diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx index 84f8ebcf3026..54e895efda96 100644 --- a/sw/source/core/undo/unspnd.cxx +++ b/sw/source/core/undo/unspnd.cxx @@ -32,7 +32,6 @@ #include "docary.hxx" #include <IShellCursorSupplier.hxx> - // SPLITNODE SwUndoSplitNode::SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos, diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index d0791a144296..859dcb987843 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -284,7 +284,6 @@ void SwUndoInsTbl::UndoImpl(::sw::UndoRedoContext & rContext) pNextNd->SetAttr( *pItem ); } - sTblNm = pTblNd->GetTable().GetFrmFmt()->GetName(); if( pTblNd->GetTable().IsA( TYPE( SwDDETable )) ) pDDEFldType = (SwDDEFieldType*)((SwDDETable&)pTblNd->GetTable()). diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx index 84f4fbcd99ef..b7bbbc706bf7 100644 --- a/sw/source/core/undo/untblk.cxx +++ b/sw/source/core/undo/untblk.cxx @@ -156,7 +156,6 @@ void SwUndoInserts::UndoImpl(::sw::UndoRedoContext & rContext) pPam->GetMark()->nNode.GetNode().GetTxtNode() && pPam->GetPoint()->nNode.GetNode().GetTxtNode(); - // Is there any content? (loading from template does not have content) if( nSttNode != nEndNode || nSttCntnt != nEndCntnt ) { diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx index 1bc093d43c80..86d43b4d315a 100644 --- a/sw/source/core/unocore/SwXTextDefaults.cxx +++ b/sw/source/core/unocore/SwXTextDefaults.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/beans/PropertyAttribute.hpp> #include <osl/mutex.hxx> @@ -38,25 +37,21 @@ #include <unocrsrhelper.hxx> #include <hintids.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; - SwXTextDefaults::SwXTextDefaults ( SwDoc * pNewDoc ) : m_pPropSet( aSwMapProvider.GetPropertySet( PROPERTY_MAP_TEXT_DEFAULT ) ), m_pDoc ( pNewDoc ) { } - SwXTextDefaults::~SwXTextDefaults () { } - uno::Reference< XPropertySetInfo > SAL_CALL SwXTextDefaults::getPropertySetInfo( ) throw(RuntimeException, std::exception) { @@ -64,7 +59,6 @@ uno::Reference< XPropertySetInfo > SAL_CALL SwXTextDefaults::getPropertySetInfo( return xRef; } - void SAL_CALL SwXTextDefaults::setPropertyValue( const OUString& rPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { @@ -130,7 +124,6 @@ void SAL_CALL SwXTextDefaults::setPropertyValue( const OUString& rPropertyName, } } - Any SAL_CALL SwXTextDefaults::getPropertyValue( const OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { @@ -146,35 +139,30 @@ Any SAL_CALL SwXTextDefaults::getPropertyValue( const OUString& rPropertyName ) return aRet; } - void SAL_CALL SwXTextDefaults::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL ( "not implemented" ); } - void SAL_CALL SwXTextDefaults::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL ( "not implemented" ); } - void SAL_CALL SwXTextDefaults::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL ( "not implemented" ); } - void SAL_CALL SwXTextDefaults::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL ( "not implemented" ); } - // XPropertyState PropertyState SAL_CALL SwXTextDefaults::getPropertyState( const OUString& rPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) @@ -193,7 +181,6 @@ PropertyState SAL_CALL SwXTextDefaults::getPropertyState( const OUString& rPrope return eRet; } - Sequence< PropertyState > SAL_CALL SwXTextDefaults::getPropertyStates( const Sequence< OUString >& rPropertyNames ) throw(UnknownPropertyException, RuntimeException, std::exception) { @@ -208,7 +195,6 @@ Sequence< PropertyState > SAL_CALL SwXTextDefaults::getPropertyStates( const Seq return aRet; } - void SAL_CALL SwXTextDefaults::setPropertyToDefault( const OUString& rPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) { @@ -223,7 +209,6 @@ void SAL_CALL SwXTextDefaults::setPropertyToDefault( const OUString& rPropertyNa rSet.ResetPoolDefaultItem ( pMap->nWID ); } - Any SAL_CALL SwXTextDefaults::getPropertyDefault( const OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { diff --git a/sw/source/core/unocore/TextCursorHelper.cxx b/sw/source/core/unocore/TextCursorHelper.cxx index 10445cf4342a..251b22ae91ee 100644 --- a/sw/source/core/unocore/TextCursorHelper.cxx +++ b/sw/source/core/unocore/TextCursorHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "TextCursorHelper.hxx" #include "unobaseclass.hxx" #include <comphelper/servicehelper.hxx> diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx index ccf3e8701c0a..9549df223cea 100644 --- a/sw/source/core/unocore/XMLRangeHelper.cxx +++ b/sw/source/core/unocore/XMLRangeHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "XMLRangeHelper.hxx" #include <unotools/charclass.hxx> #include <rtl/ustrbuf.hxx> @@ -25,9 +24,6 @@ #include <algorithm> #include <functional> - -// ================================================================================ - namespace { /** unary function that escapes backslashes and single quotes in a sal_Unicode @@ -53,8 +49,6 @@ private: OUStringBuffer & m_aResultBuffer; }; - - /** unary function that removes backslash escapes in a sal_Unicode array (which you can get from an OUString with getStr()) and puts the result into the OUStringBuffer given in the CTOR @@ -75,8 +69,6 @@ private: OUStringBuffer & m_aResultBuffer; }; - - void lcl_getXMLStringForCell( const /*::chart::*/XMLRangeHelper::Cell & rCell, OUStringBuffer * output ) { OSL_ASSERT(output != 0); @@ -286,8 +278,6 @@ bool lcl_getCellRangeAddressFromXMLString( } // anonymous namespace -// ================================================================================ - //namespace chart //{ namespace XMLRangeHelper diff --git a/sw/source/core/unocore/XMLRangeHelper.hxx b/sw/source/core/unocore/XMLRangeHelper.hxx index 776f95e2622d..8182f2696c36 100644 --- a/sw/source/core/unocore/XMLRangeHelper.hxx +++ b/sw/source/core/unocore/XMLRangeHelper.hxx @@ -62,7 +62,6 @@ CellRange getCellRangeFromXMLString( const OUString & rXMLString ); OUString getXMLStringFromCellRange( const CellRange & rRange ); - } // namespace XMLRangeHelper //} // namespace chart diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index cd592eb81204..5993bbdb2ae2 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -53,7 +53,6 @@ sal_Int32 GetEnumAsInt32( const ::com::sun::star::uno::Any& rVal ) return eVal; } - // methods for UCB actions sal_Bool UCB_DeleteFile( const OUString& rURL ) { diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index 37f66754df7a..3740b9310c7e 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unobookmark.hxx> #include <osl/mutex.hxx> #include <cppuhelper/interfacecontainer.h> @@ -43,7 +42,6 @@ using namespace ::sw::mark; using namespace ::com::sun::star; - namespace { static OUString lcl_QuoteName(const OUString& rName) @@ -71,7 +69,6 @@ public: ::sw::mark::IMark * m_pRegisteredBookmark; OUString m_sMarkName; - Impl( SwXBookmark & rThis, SwDoc *const pDoc, ::sw::mark::IMark *const /*pBookmark*/) : SwClient() @@ -417,7 +414,6 @@ uno::Reference<frame::XModel> SwXBookmark::GetModel() return 0; } - uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXBookmark::getPropertySetInfo() throw (uno::RuntimeException, std::exception) { @@ -585,7 +581,6 @@ void SwXFieldmarkParameters::Modify(const SfxPoolItem *pOld, const SfxPoolItem * ClientModify(this, pOld, pNew); } - IFieldmark::parameter_map_t* SwXFieldmarkParameters::getCoreParameters() throw (uno::RuntimeException) { @@ -595,7 +590,6 @@ IFieldmark::parameter_map_t* SwXFieldmarkParameters::getCoreParameters() return const_cast< IFieldmark* >(pFieldmark)->GetParameters(); } - void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTextRange ) throw(lang::IllegalArgumentException, uno::RuntimeException) { diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index b93301fde729..5bd25582666f 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -737,9 +737,8 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData } } - // // find label and data sequences to use - // + sal_Int32 oi; // outer index (slower changing index) sal_Int32 ii; // inner index (faster changing index) sal_Int32 oiEnd = bDtaSrcIsColumns ? nCols : nRows; @@ -753,7 +752,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData aDataStartIdx[oi] = -1; aDataLen[oi] = 0; } - // + for (oi = 0; oi < oiEnd; ++oi) { ii = 0; @@ -852,7 +851,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData continue; // get cell ranges for label and data - // + SwRangeDescriptor aLabelDesc; SwRangeDescriptor aDataDesc; if (bDtaSrcIsColumns) // use columns @@ -880,7 +879,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData aDataDesc.nRight = aDataDesc.nLeft + aDataLen[oi] - 1; } OUString aBaseName = pTblFmt->GetName() + "."; - // + OUString aLabelRange; if (aLabelIdx[oi] != -1) { @@ -889,7 +888,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData aLabelRange += ":"; aLabelRange += sw_GetCellName( aLabelDesc.nRight, aLabelDesc.nBottom ); } - // + OUString aDataRange; if (aDataStartIdx[oi] != -1) { @@ -997,9 +996,8 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL SwChartDataProvider::create return Impl_createDataSource( rArguments ); } -//////////////////////////////////////////////////////////// // SwChartDataProvider::GetBrokenCellRangeForExport -// + // fix for #i79009 // we need to return a property that has the same value as the property // 'CellRangeRepresentation' but for all rows which are increased by one. @@ -1130,16 +1128,15 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume return aResult; // failed -> return empty property sequence } - // try to get 'DataRowSource' value (ROWS or COLUMNS) from inspecting // first and last cell used in both sequences - // + sal_Int32 nFirstCol = -1, nFirstRow = -1, nLastCol = -1, nLastRow = -1; OUString aCell( !aLabelStartCell.isEmpty() ? aLabelStartCell : aValuesStartCell ); OSL_ENSURE( !aCell.isEmpty() , "start cell missing?" ); sw_GetCellPosition( aCell, nFirstCol, nFirstRow); sw_GetCellPosition( aValuesEndCell, nLastCol, nLastRow); - // + sal_Int16 nDirection = -1; // -1: not yet set, 0: columns, 1: rows, -2: failed if (nFirstCol == nLastCol && nFirstRow == nLastRow) // a single cell... { @@ -1168,19 +1165,17 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume nDtaSrcIsColumns = -2; // failed } - if (nDtaSrcIsColumns == 0 || nDtaSrcIsColumns == 1) { // build data to obtain 'SequenceMapping' later on - // + OSL_ENSURE( nDtaSrcIsColumns == 0 || /* rows */ nDtaSrcIsColumns == 1, /* columns */ "unexpected value for 'nDtaSrcIsColumns'" ); pSequenceMapping[nDS1] = nDtaSrcIsColumns ? nFirstCol : nFirstRow; - // build data used to determine 'CellRangeRepresentation' later on - // + GetTableByName( *pDoc, aTableName, &pTableFmt, &pTable ); if (!pTable || pTable->IsTblComplex()) return aResult; // failed -> return empty property sequence @@ -1189,7 +1184,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume aMap.resize( nTableRows ); for (sal_Int32 i = 0; i < nTableRows; ++i) aMap[i].resize( nTableCols ); - // + if (!aLabelStartCell.isEmpty() && !aLabelEndCell.isEmpty()) { sal_Int32 nStartCol = -1, nStartRow = -1, nEndCol = -1, nEndRow = -1; @@ -1261,9 +1256,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume #endif } // for - // build value for 'CellRangeRepresentation' - // + OUString aCellRangeBase = aTableName + "."; OUString aCurRange; for (sal_Int32 i = 0; i < nTableRows; ++i) @@ -1319,9 +1313,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume aSortedCellRanges += pSortedRanges[i]; } - // build value for 'SequenceMapping' - // + uno::Sequence< sal_Int32 > aSortedMapping( aSequenceMapping ); sal_Int32 *pSortedMapping = aSortedMapping.getArray(); std::sort( pSortedMapping, pSortedMapping + aSortedMapping.getLength() ); @@ -1345,18 +1338,17 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume if (!bNeedSequenceMapping) aSequenceMapping.realloc(0); - // // build resulting properties - // + OSL_ENSURE(nLabelSeqLen >= 0 || nLabelSeqLen == -2 /*not used*/, "unexpected value for 'nLabelSeqLen'" ); sal_Bool bFirstCellIsLabel = sal_False; // default value if 'nLabelSeqLen' could not properly determined if (nLabelSeqLen > 0) // == 0 means no label sequence in use bFirstCellIsLabel = sal_True; - // + OSL_ENSURE( !aSortedCellRanges.isEmpty(), "CellRangeRepresentation missing" ); OUString aBrokenCellRangeForExport( GetBrokenCellRangeForExport( aSortedCellRanges ) ); - // + aResult.realloc(5); sal_Int32 nProps = 0; aResult[nProps ].Name = "FirstCellAsLabel"; @@ -1643,13 +1635,12 @@ void SwChartDataProvider::DisposeAllDataSequences( const SwTable *pTable ) } } -//////////////////////////////////////// // SwChartDataProvider::AddRowCols tries to notify charts of added columns // or rows and extends the value sequence respectively (if possible). // If those can be added to the end of existing value data-sequences those // sequences get mofdified accordingly and will send a modification // notification (calling 'setModified'). -// + // Since this function is a work-around for non existent Writer core functionality // (no arbitrary multi-selection in tables that can be used to define a // data-sequence) this function will be somewhat unreliable. @@ -1663,7 +1654,7 @@ void SwChartDataProvider::DisposeAllDataSequences( const SwTable *pTable ) // between those. // New rows/cols need to be added already to the table before calling // this function. -// + void SwChartDataProvider::AddRowCols( const SwTable &rTable, const SwSelBoxes& rBoxes, @@ -2135,7 +2126,7 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel( } // build label sequence - // + sal_Int32 nSeqLen = bUseCol ? nColSpan : nRowSpan; aLabels.realloc( nSeqLen ); OUString *pLabels = aLabels.getArray(); @@ -2459,15 +2450,15 @@ void SAL_CALL SwChartDataSequence::dispose( ) //#i119653# The bug is crashed for an exception thrown by //SwCharDataSequence::setModified() because //the SwCharDataSequence object has been disposed. - // + //Actually, the former design of SwClient will disconnect itself //from the notification list in its destructor. - // + //But the SwCharDataSeqence won't be destructed but disposed in code //(the data member SwChartDataSequence::bDisposed will be set to //TRUE), the relationship between client and modification is not //released. - // + //So any notification from modify object will lead to said //exception threw out. Recorrect the logic of code in //SwChartDataSequence::Dispose(), release the relationship @@ -2519,10 +2510,10 @@ sal_Bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox ) // if the implementation cursor gets affected (i.e. thew box where it is located // in gets removed) we need to move it before that... (otherwise it does not need to change) - // + const SwStartNode* pPointStartNode = pTblCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode(); const SwStartNode* pMarkStartNode = pTblCrsr->GetMark()->nNode.GetNode().FindTableBoxStartNode(); - // + if (!pTblCrsr->HasMark() || (pPointStartNode == rBox.GetSttNd() && pMarkStartNode == rBox.GetSttNd())) { bNowEmpty = sal_True; @@ -2665,17 +2656,16 @@ bool SwChartDataSequence::ExtendTo( bool bExtendCol, if (nCount < 1 || nFirstNew < 0 || pTable->IsTblComplex()) return false; - // // get range descriptor (cell range) for current data-sequence - // + pStartNd = pUnoTblCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode(); pEndBox = pTable->GetTblBox( pStartNd->GetIndex() ); const OUString aEndBox( pEndBox->GetName() ); - // + pStartNd = pUnoTblCrsr->GetMark()->nNode.GetNode().FindTableBoxStartNode(); pStartBox = pTable->GetTblBox( pStartNd->GetIndex() ); const OUString aStartBox( pStartBox->GetName() ); - // + OUString aCellRange( aStartBox ); // note that cell range here takes the newly added rows/cols already into account aCellRange += ":"; aCellRange += aEndBox; diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 5923bc5481b2..24d1f699e969 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <swtypes.hxx> #include <cmdid.h> #include <hintids.hxx> @@ -87,7 +86,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; - #ifndef DISABLE_SCRIPTING class SwVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery > @@ -2027,7 +2025,6 @@ SwXReferenceMark* SwXReferenceMarks::GetObject( SwDoc* pDoc, const SwFmtRefMark* return SwXReferenceMark::CreateXReferenceMark(*pDoc, *pMark); } - void SwUnoCollection::Invalidate() { bObjectValid = sal_False; diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index ad11ac168e0c..2e2fe64aff36 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -83,7 +83,6 @@ #include <fmtmeta.hxx> #include <txtfld.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -855,7 +854,6 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam) pDoc->SetNumRule( rPam, aRule, false ); } - } else if(!pSwNum->GetCreatedNumRuleName().isEmpty()) { @@ -1098,7 +1096,6 @@ void InsertFile(SwUnoCrsr* pUnoCrsr, delete pRdr; - } } delete pMed; diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 2e61176c0273..862988371651 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -900,7 +900,6 @@ namespace } } - SwXShape::SwXShape(uno::Reference< uno::XInterface > & xShape) : m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_SHAPE)), m_pPropertyMapEntries(aSwMapProvider.GetPropertyMapEntries(PROPERTY_MAP_TEXT_SHAPE)), diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx index 5eca5d89f089..232d4df6482e 100644 --- a/sw/source/core/unocore/unoevent.cxx +++ b/sw/source/core/unocore/unoevent.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - // HINTIDs must be on top; it is required for the macitem.hxx header #include "hintids.hxx" #include "unoevent.hxx" @@ -43,9 +41,7 @@ using ::com::sun::star::lang::XServiceInfo; using ::com::sun::star::beans::PropertyValue; using ::cppu::WeakImplHelper2; -// // tables of allowed events for specific objects -// const struct SvEventDescription aGraphicEvents[] = { @@ -105,9 +101,7 @@ const struct SvEventDescription aFrameStyleEvents[] = { 0, NULL } }; -// // SwHyperlinkEventDescriptor -// SwHyperlinkEventDescriptor::SwHyperlinkEventDescriptor() : SvDetachedEventDescriptor(aHyperlinkEvents), @@ -152,7 +146,6 @@ void SwHyperlinkEventDescriptor::copyMacrosIntoINetFmt( } } - void SwHyperlinkEventDescriptor::copyMacrosFromNameReplace( uno::Reference< container::XNameReplace> & xReplace) @@ -172,10 +165,7 @@ void SwHyperlinkEventDescriptor::copyMacrosFromNameReplace( } } - -// // SwFrameEventDescriptor -// // use double cast in superclass constructor to avoid ambigous cast SwFrameEventDescriptor::SwFrameEventDescriptor( @@ -225,10 +215,7 @@ OUString SwFrameEventDescriptor::getImplementationName() return sSwFrameEventDescriptor; } - -// // SwFrameStyleEventDescriptor -// SwFrameStyleEventDescriptor::SwFrameStyleEventDescriptor( SwXFrameStyle& rStyleRef ) : diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index c0ee1c828858..d529fabb5db4 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2333,7 +2333,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, // !bFrame && !bHidden: aller Wahrscheinlichkeit handelt es // sich um ein Feld in einem unbenutzten Seitenstyle - // + // bHidden: Feld ist versteckt // FME: Problem: Verstecktes Feld in unbenutzter Seitenvorlage => // bIsFieldUsed = true @@ -2966,7 +2966,7 @@ SwXFieldEnumeration::SwXFieldEnumeration(SwDoc & rDoc) m_pImpl->m_Items.realloc( nSize ); uno::Reference< text::XTextField > *pItems = m_pImpl->m_Items.getArray(); sal_Int32 nFillPos = 0; - // + const SwFldTypes* pFldTypes = m_pImpl->m_pDoc->GetFldTypes(); sal_uInt16 nCount = pFldTypes->size(); for(sal_uInt16 nType = 0; nType < nCount; ++nType) @@ -3057,5 +3057,4 @@ void SwXFieldEnumeration::Impl::Modify( m_pDoc = 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx index 7bfdd25b3d68..1a3b10381ab4 100644 --- a/sw/source/core/unocore/unoflatpara.cxx +++ b/sw/source/core/unocore/unoflatpara.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <editeng/unolingu.hxx> #include <unobaseclass.hxx> @@ -293,7 +292,6 @@ SwXFlatParagraph::getSomething( return sw::UnoTunnelImpl(rId, this); } - /****************************************************************************** * SwXFlatParagraphIterator ******************************************************************************/ @@ -317,7 +315,6 @@ SwXFlatParagraphIterator::~SwXFlatParagraphIterator() { } - void SwXFlatParagraphIterator::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { ClientModify( this, pOld, pNew ); @@ -329,7 +326,6 @@ void SwXFlatParagraphIterator::Modify( const SfxPoolItem* pOld, const SfxPoolIte } } - uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getFirstPara() throw( uno::RuntimeException, std::exception ) { diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 85d8baf4e59e..1c532f20e302 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -739,7 +739,6 @@ bool SwGraphicProperties_Impl::AnyToItemSet( lcl_FillMirror ( rGrSet, *pItemSet, pHEvenMirror, pHOddMirror, pVMirror, bRet ); } - static const :: sal_uInt16 nIDs[] = { RES_GRFATR_CROPGRF, @@ -789,11 +788,10 @@ bool SwOLEProperties_Impl::AnyToItemSet( && !GetProperty(FN_EMBEDDED_OBJECT, 0, pTemp) ) return false; SwFrameProperties_Impl::AnyToItemSet( pDoc, rFrmSet, rSet, rSizeFound); - // + return true; } - class SwXFrame::Impl { private: @@ -805,7 +803,6 @@ public: Impl() : m_EventListeners(m_Mutex) { } }; - namespace { class theSwXFrameUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXFrameUnoTunnelId > {}; @@ -1371,7 +1368,6 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: aSet.SetParent(&pFmt->GetAttrSet()); SwFmtAnchor aAnchor = (const :: SwFmtAnchor&)aSet.Get(pEntry->nWID); - SwPosition aPos(*pFrame->GetFrmFmt()->GetCntnt().GetCntntIdx()); aAnchor.SetAnchor(&aPos); aAnchor.SetType(FLY_AT_FLY); @@ -3174,9 +3170,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL SwXTextEmbeddedObject::getReplaceme return uno::Reference< graphic::XGraphic >(); } - OUString SwXTextEmbeddedObject::getImplementationName(void) throw( uno::RuntimeException, std::exception ) - { return OUString("SwXTextEmbeddedObject"); } @@ -3263,7 +3257,6 @@ void SwXOLEListener::disposing( const lang::EventObject& rEvent ) uno::Reference< util::XModifyListener > xListener( this ); - uno::Reference< frame::XModel > xModel( rEvent.Source, uno::UNO_QUERY ); uno::Reference< util::XModifyBroadcaster > xBrdcst(xModel, uno::UNO_QUERY); diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index a1f8090260d2..eb62ac58799b 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <osl/mutex.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/supportsservice.hxx> @@ -40,7 +39,6 @@ #include <unocrsr.hxx> #include <hints.hxx> - using namespace ::com::sun::star; /****************************************************************** diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 2e320df5e52a..ddedefff7b54 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -1509,7 +1509,6 @@ uno::Reference<frame::XModel> SwXDocumentIndex::GetModel() return 0; } - /****************************************************************** * SwXDocumentIndexMark ******************************************************************/ diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index 1c596578a6f4..5364bdbb1b12 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -301,7 +301,6 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider() { OUString(UNO_NAME_BREAK_TYPE), RES_BREAK, cppu::UnoType<css::style::BreakType>::get(), PropertyAttribute::MAYBEVOID, 0}, \ { OUString(UNO_NAME_PAGE_DESC_NAME), RES_PAGEDESC, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGEDESCNAME }, - #define TABSTOPS_MAP_ENTRY { OUString(UNO_NAME_TABSTOPS), RES_PARATR_TABSTOP, cppu::UnoType< cppu::UnoSequenceType<css::style::TabStop> >::get(), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, #define COMMON_CRSR_PARA_PROPERTIES \ @@ -328,8 +327,6 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider() { OUString(UNO_NAME_NESTED_TEXT_CONTENT), FN_UNO_NESTED_TEXT_CONTENT, cppu::UnoType<css::text::XTextContent>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },\ TABSTOPS_MAP_ENTRY - - #define _BASE_INDEX_PROPERTIES_\ { OUString(UNO_NAME_TITLE), WID_IDX_TITLE, cppu::UnoType<OUString>::get() , PROPERTY_NONE, 0},\ { OUString(UNO_NAME_NAME), WID_IDX_NAME, cppu::UnoType<OUString>::get() , PROPERTY_NONE, 0},\ @@ -413,14 +410,11 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider() { OUString(UNO_NAME_LINE_WIDTH), RES_BOX, cppu::UnoType<sal_Int32>::get(), 0, LINE_WIDTH |CONVERT_TWIPS }, \ { OUString(UNO_NAME_TEXT_VERT_ADJUST), RES_TEXT_VERT_ADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), PROPERTY_NONE ,0}, - - #define COMMON_TEXT_CONTENT_PROPERTIES \ { OUString(UNO_NAME_ANCHOR_TYPE), FN_UNO_ANCHOR_TYPE, cppu::UnoType<css::text::TextContentAnchorType>::get(), PropertyAttribute::READONLY, MID_ANCHOR_ANCHORTYPE},\ ANCHOR_TYPES_PROPERTY\ { OUString(UNO_NAME_TEXT_WRAP), FN_UNO_TEXT_WRAP, cppu::UnoType<css::text::WrapTextMode>::get(), PropertyAttribute::READONLY, MID_SURROUND_SURROUNDTYPE }, - #define _PROP_DIFF_FONTHEIGHT \ { OUString(UNO_NAME_CHAR_PROP_HEIGHT), RES_CHRATR_FONTSIZE , cppu::UnoType<float>::get(), PROPERTY_NONE , MID_FONTHEIGHT_PROP},\ { OUString(UNO_NAME_CHAR_DIFF_HEIGHT), RES_CHRATR_FONTSIZE , cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},\ @@ -429,7 +423,6 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider() { OUString(UNO_NAME_CHAR_PROP_HEIGHT_COMPLEX), RES_CHRATR_CTL_FONTSIZE , cppu::UnoType<float>::get(), PROPERTY_NONE , MID_FONTHEIGHT_PROP},\ { OUString(UNO_NAME_CHAR_DIFF_HEIGHT_COMPLEX), RES_CHRATR_CTL_FONTSIZE , cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS}, - #define COMMON_PARA_STYLE_PROPERTIES \ { OUString(UNO_NAME_BREAK_TYPE), RES_BREAK, cppu::UnoType<css::style::BreakType>::get(), PROPERTY_NONE, 0},\ { OUString(UNO_NAME_PAGE_DESC_NAME), RES_PAGEDESC, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGEDESCNAME },\ @@ -543,7 +536,6 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider() { OUString(UNO_NAME_HIDDEN), FN_UNO_HIDDEN, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, \ { OUString(UNO_NAME_STYLE_INTEROP_GRAB_BAG), FN_UNO_STYLE_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0}, - #define COMMON_FLDTYP_PROPERTIES \ { OUString(UNO_NAME_IS_FIELD_USED), FIELD_PROP_IS_FIELD_USED, cppu::UnoType<float>::get(), PropertyAttribute::READONLY, 0},\ { OUString(UNO_NAME_IS_FIELD_DISPLAYED), FIELD_PROP_IS_FIELD_DISPLAYED, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::READONLY, 0},\ @@ -572,7 +564,6 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider() { OUString(UNO_NAME_PARA_RIGHT_MARGIN), RES_LR_SPACE, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS}, \ { OUString(UNO_NAME_TABSTOPS), RES_PARATR_TABSTOP, cppu::UnoType< cppu::UnoSequenceType<css::style::TabStop> >::get(), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \ - const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(sal_uInt16 nPropertyId) { OSL_ENSURE(nPropertyId < PROPERTY_MAP_END, "Id ?" ); @@ -958,7 +949,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { OUString(UNO_NAME_FOOTER_IS_ON), FN_UNO_FOOTER_ON, cppu::UnoType<bool>::get(), PROPERTY_NONE ,0 }, { OUString(UNO_NAME_FOOTER_DYNAMIC_SPACING), FN_UNO_FOOTER_EAT_SPACING, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID ,0 }, - { OUString(UNO_NAME_IS_LANDSCAPE), SID_ATTR_PAGE, cppu::UnoType<bool>::get(), PROPERTY_NONE ,MID_PAGE_ORIENTATION }, { OUString(UNO_NAME_NUMBERING_TYPE), SID_ATTR_PAGE, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE , MID_PAGE_NUMTYPE }, { OUString(UNO_NAME_PAGE_STYLE_LAYOUT), SID_ATTR_PAGE, cppu::UnoType<css::style::PageStyleLayout>::get(), PROPERTY_NONE ,MID_PAGE_LAYOUT }, diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 4dea9f43e152..f70b05d5203a 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -106,7 +106,6 @@ #include <unoparagraph.hxx> #include <comphelper/servicehelper.hxx> - using namespace ::com::sun::star; // Helper classes diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 4200d8db8aa7..4cf500207431 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -38,7 +38,6 @@ #include <vcl/svapp.hxx> #include <docsh.hxx> - #include <com/sun/star/beans/SetPropertyTolerantFailed.hpp> #include <com/sun/star/beans/GetPropertyTolerantResult.hpp> #include <com/sun/star/beans/TolerantPropertySetResultType.hpp> diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index 568828791afb..03e853fa8b7a 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -46,7 +46,6 @@ #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> - using namespace ::com::sun::star; /****************************************************************** diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index fdbd77ec3256..439b9471dbe0 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unoport.hxx> #include <IMark.hxx> // #i81002# @@ -63,7 +62,6 @@ #include <algorithm> #include <stack> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index 4a72fe588e83..b734e5721f10 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/text/XTextTable.hpp> @@ -43,7 +42,6 @@ #include <doc.hxx> #include <docary.hxx> - using namespace ::com::sun::star; SwXRedlineText::SwXRedlineText(SwDoc* _pDoc, SwNodeIndex aIndex) : diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx index 6429208bb21d..c6ae9baa0069 100644 --- a/sw/source/core/unocore/unoredlines.cxx +++ b/sw/source/core/unocore/unoredlines.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/beans/XPropertySet.hpp> #include <cppuhelper/supportsservice.hxx> diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index a2b3b616cdc0..6e9e2e6fdb11 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <osl/mutex.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/supportsservice.hxx> @@ -37,7 +36,6 @@ #include <hints.hxx> #include <comphelper/servicehelper.hxx> - using namespace ::com::sun::star; /****************************************************************** diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 9e0458ace417..5bcb4c16f7b4 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -60,7 +60,6 @@ #include <comphelper/servicehelper.hxx> #include <comphelper/string.hxx> - using namespace ::com::sun::star; struct SwTextSectionProperties_Impl diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx index db96a0bae340..6cfc66fc6661 100644 --- a/sw/source/core/unocore/unosrch.cxx +++ b/sw/source/core/unocore/unosrch.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "unosrch.hxx" #include <doc.hxx> #include <hints.hxx> @@ -39,7 +38,7 @@ using namespace ::com::sun::star; class SwSearchProperties_Impl { - beans::PropertyValue** pValueArr; // + beans::PropertyValue** pValueArr; sal_uInt32 nArrLen; const PropertyEntryVector_t aPropertyEntries; public: diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 3223525e0d77..448b54858aa3 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svxids.hrc> #include <hintids.hxx> #include <osl/mutex.hxx> @@ -1887,9 +1886,8 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, SwStyleNameMapper::FillUIName(aTmp, aStyleName, lcl_GetSwEnumFromSfxEnum(eFamily), true); - // // check for correct context and style name - // + sal_Int16 nIdx = GetCommandContextIndex( pSeq[i].Name ); pBasePool->SetSearchMask( SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL ); diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index d97d4840b63f..cfc5701a9352 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -3968,7 +3968,6 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An } aBoxInfo.SetValid(nValid, true); - aSet.Put(aBoxInfo); pDoc->GetTabBorders(*pCrsr, aSet); @@ -4145,7 +4144,7 @@ void SwXCellRange::GetDataSequence( sal_Int16 nRowCount = getRowCount(); sal_Int16 nColCount = getColumnCount(); - // + if(!nRowCount || !nColCount) { uno::RuntimeException aRuntime; @@ -4281,7 +4280,7 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXCellRange::getDataArray() SolarMutexGuard aGuard; sal_Int16 nRowCount = getRowCount(); sal_Int16 nColCount = getColumnCount(); - // + if(!nRowCount || !nColCount) { uno::RuntimeException aRuntime; @@ -4398,7 +4397,7 @@ uno::Sequence< uno::Sequence< double > > SwXCellRange::getData(void) throw( uno: SolarMutexGuard aGuard; sal_Int16 nRowCount = getRowCount(); sal_Int16 nColCount = getColumnCount(); - // + if(!nRowCount || !nColCount) { uno::RuntimeException aRuntime; diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 57fc371fbc5e..88e596bf33e2 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -67,10 +67,8 @@ #include <crsskip.hxx> #include <ndtxt.hxx> - using namespace ::com::sun::star; - const sal_Char cInvalidObject[] = "this object is invalid"; /****************************************************************** @@ -2324,7 +2322,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) return xRet; } - void SAL_CALL SwXText::copyText( const uno::Reference< text::XTextCopy >& xSource ) @@ -2352,7 +2349,6 @@ throw (uno::RuntimeException, std::exception) m_pImpl->m_pDoc->CopyRange( *pCursor->GetPaM(), rPos, false ); } - /****************************************************************** * SwXBodyText ******************************************************************/ diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx index fd4b15c2a5db..548a20b08e21 100644 --- a/sw/source/core/unocore/unotextmarkup.cxx +++ b/sw/source/core/unocore/unotextmarkup.cxx @@ -38,7 +38,6 @@ #include <unotextrange.hxx> #include <unotextcursor.hxx> - using namespace ::com::sun::star; /* @@ -108,7 +107,6 @@ void SAL_CALL SwXTextMarkup::commitTextRangeMarkup(::sal_Int32 nType, const ::rt } } - void SAL_CALL SwXTextMarkup::commitStringMarkup( ::sal_Int32 nType, const OUString & rIdentifier, @@ -175,7 +173,6 @@ void SAL_CALL SwXTextMarkup::commitStringMarkup( return; } - const ModelToViewHelper::ModelPosition aStartPos = maConversionMap.ConvertToModelPosition( nStart ); const ModelToViewHelper::ModelPosition aEndPos = @@ -267,7 +264,6 @@ void SAL_CALL SwXTextMarkup::commitStringMarkup( finishGrammarCheck( *mpTxtNode ); } - static void lcl_commitGrammarMarkUp( const ModelToViewHelper& rConversionMap, SwGrammarMarkUp* pWList, @@ -361,7 +357,6 @@ static void lcl_commitGrammarMarkUp( } } - void SAL_CALL SwXTextMarkup::commitMultiTextMarkup( const uno::Sequence< text::TextMarkupDescriptor > &rMarkups ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) @@ -455,7 +450,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) return; } - void SwXTextMarkup::Modify( const SfxPoolItem* /*pOld*/, const SfxPoolItem* /*pNew*/ ) { // FME 2007-07-16 #i79641# In my opinion this is perfectly legal, diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index c5062f1a4b13..87545b51567e 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1478,20 +1478,20 @@ void SwViewShell::_PaintDesktop( const SwRegionRects &rRegion ) // This is done in the users of this method, for each SWpage before painting it. // Since the MapMode is not correct here, the call to DLPostPaint2 will paint // existing FormControls due to the current MapMode. - // + // There are basically three solutions for this: - // + // (1) Set the MapMode correct, move the background painting to the users of // this code - // + // (2) Do no DLPrePaint2/DLPostPaint2 here; no SdrObjects are allowed to lie in // the desktop region. Disadvantage: the desktop will not be part of the // buffers, e.g. overlay. Thus, as soon as overlay will be used over the // desktop, it will not work. - // + // (3) expand DLPostPaint2 with a flag to signal if FormControl paints shall // be done or not - // + // Currently, (3) will be the best possible solution. It will keep overlay and // buffering intact and work without MapMode for single pages. In the medium // to long run, (1) will need to be used and the bool bPaintFormLayer needs |