diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 21:01:20 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 09:41:00 -0600 |
commit | a27462189d1d6a3d22be23a5eee603edca5d8ea3 (patch) | |
tree | 065df066de07f3d7194178352f3449702bc34bd5 /sw/source | |
parent | 150420cbff39967e9376cab05b6af45b642edae8 (diff) |
Remove visual noise from sw
Conflicts:
sw/inc/unodraw.hxx
sw/inc/unoframe.hxx
sw/sdi/swriter.sdi
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unoparagraph.cxx
sw/source/filter/ww8/rtfexportfilter.cxx
sw/source/ui/inc/unotxvw.hxx
sw/source/ui/lingu/hyp.cxx
sw/source/ui/lingu/sdrhhcwrap.cxx
sw/source/ui/uno/swdetect.hxx
Change-Id: Ic0a3fb2392187c277c9b36915ffb10dcf0317908
Reviewed-on: https://gerrit.libreoffice.org/8322
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source')
769 files changed, 444 insertions, 3305 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 diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx index 097145bbdc07..1fb879fb2fd4 100644 --- a/sw/source/filter/ascii/ascatr.cxx +++ b/sw/source/filter/ascii/ascatr.cxx @@ -66,7 +66,6 @@ public: bool OutAttr( sal_Int32 nSwPos ); }; - SwASC_AttrIter::SwASC_AttrIter( SwASCWriter& rWr, const SwTxtNode& rTxtNd, @@ -78,7 +77,6 @@ SwASC_AttrIter::SwASC_AttrIter( nAktSwPos = SearchNext( nStt + 1 ); } - sal_Int32 SwASC_AttrIter::SearchNext( sal_Int32 nStartPos ) { sal_Int32 nMinPos = SAL_MAX_INT32; @@ -119,7 +117,6 @@ sal_Int32 SwASC_AttrIter::SearchNext( sal_Int32 nStartPos ) return nMinPos; } - bool SwASC_AttrIter::OutAttr( sal_Int32 nSwPos ) { bool bRet = false; @@ -168,11 +165,8 @@ bool SwASC_AttrIter::OutAttr( sal_Int32 nSwPos ) return bRet; } - - // Output of the node - static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) { const SwTxtNode& rNd = (SwTxtNode&)rNode; diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 320447832169..8371f1536bbf 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -67,7 +67,6 @@ public: sal_uLong CallParser(); }; - // Call for the general reader interface sal_uLong AsciiReader::Read( SwDoc &rDoc, const OUString&, SwPaM &rPam, const OUString & ) { @@ -130,7 +129,6 @@ SwASCIIParser::~SwASCIIParser() delete pItemSet; } - // Calling the parser sal_uLong SwASCIIParser::CallParser() { diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx index 67ac4c6a7234..8b89a9a8a815 100644 --- a/sw/source/filter/ascii/wrtasc.cxx +++ b/sw/source/filter/ascii/wrtasc.cxx @@ -31,8 +31,6 @@ #include <statstr.hrc> - - SwASCWriter::SwASCWriter( const OUString& rFltNm ) { SwAsciiOptions aNewOpts; @@ -193,11 +191,9 @@ sal_uLong SwASCWriter::WriteStream() return 0; } - void GetASCWriter( const OUString& rFltNm, const OUString& /*rBaseURL*/, WriterRef& xRet ) { xRet = new SwASCWriter( rFltNm ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ascii/wrtasc.hxx b/sw/source/filter/ascii/wrtasc.hxx index 0c6d5b69d5e0..5a76ef7eb1bc 100644 --- a/sw/source/filter/ascii/wrtasc.hxx +++ b/sw/source/filter/ascii/wrtasc.hxx @@ -24,7 +24,6 @@ extern SwNodeFnTab aASCNodeFnTab; - // The ASC writer class SwASCWriter : public Writer @@ -40,7 +39,6 @@ public: OUString GetLineEnd() const { return m_sLineEnd; } }; - #endif // _ INCLUDED_SW_SOURCE_FILTER_ASCII_WRTASC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/basflt/docfact.cxx b/sw/source/filter/basflt/docfact.cxx index 15f73ae79818..a95d122bbd24 100644 --- a/sw/source/filter/basflt/docfact.cxx +++ b/sw/source/filter/basflt/docfact.cxx @@ -23,7 +23,6 @@ #include <cmdid.h> - /****************************************************************************** * Methode : SwDocFac::SwDocFac( SwDoc *pDoc ) ******************************************************************************/ @@ -39,7 +38,6 @@ SwDocFac::SwDocFac( SwDoc *pDc ) * Methode : SwDocFac::~SwDocFac() ******************************************************************************/ - SwDocFac::~SwDocFac() { if( pDoc && !pDoc->release() ) diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 12e7c93eaa96..00b6e9aa9346 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -200,31 +200,22 @@ SwRead GetReader( const OUString& rFltName ) void Writer::SetVersion( const OUString&, long ) {} - sal_Bool Writer::IsStgWriter() const { return sal_False; } sal_Bool StgWriter::IsStgWriter() const { return sal_True; } - - - sal_Bool SwReader::NeedsPasswd( const Reader& /*rOptions*/ ) { return sal_False; } - sal_Bool SwReader::CheckPasswd( const OUString& /*rPasswd*/, const Reader& /*rOptions*/ ) { return sal_True; } - - - // Filter Flags lesen, wird von WW8 / W4W / EXCEL / LOTUS benutzt. - /* <FilterFlags> <Excel_Lotus> @@ -296,16 +287,12 @@ void SwFilterOptions::GetValues( sal_uInt16 nCnt, const sal_Char** ppNames, void SwFilterOptions::Commit() {} void SwFilterOptions::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} - - void StgReader::SetFltName( const OUString& rFltNm ) { if( SW_STORAGE_READER & GetReaderType() ) aFltName = rFltNm; } - - SwRelNumRuleSpaces::SwRelNumRuleSpaces( SwDoc& rDoc, sal_Bool bNDoc ) { pNumRuleTbl = new SwNumRuleTbl(); @@ -601,7 +588,6 @@ OUString NameFromCharSet(rtl_TextEncoding nChrSet) // 3. Fontname // 4. Language // the delimiter character is "," -// void SwAsciiOptions::ReadUserData( const OUString& rStr ) { diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index e8c6729a6c90..f53ad3b62b25 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <iodetect.hxx> #include <boost/scoped_array.hpp> #include <osl/endian.h> @@ -373,7 +372,6 @@ const SfxFilter* SwIoSystem::GetFileFilter(const OUString& rFileName, TerminateBuffer(aBuffer, nBytesRead, sizeof(aBuffer)); - /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ /* suche nach dem bestimmten Filter, falls kein entsprechender */ /* gefunden wird, so wird der ASCII-Filter returnt. */ diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 4e7c6bfa48b1..0d2b4431476c 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <tools/date.hxx> #include <tools/time.hxx> @@ -57,8 +56,6 @@ using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////////// - sal_uLong SwReader::Read( const Reader& rOptions ) { // Variable uebertragen @@ -399,7 +396,6 @@ sal_uLong SwReader::Read( const Reader& rOptions ) return nError; } - /* * Konstruktoren, Destruktor */ @@ -616,18 +612,15 @@ int Reader::SetStrmStgPtr() return sal_False; } - int Reader::GetReaderType() { return SW_STREAM_READER; } - void Reader::SetFltName( const OUString& ) { } - void Reader::ResetFrmFmtAttrs( SfxItemSet &rFrmSet ) { rFrmSet.Put( SvxLRSpaceItem(RES_LR_SPACE) ); @@ -635,7 +628,6 @@ void Reader::ResetFrmFmtAttrs( SfxItemSet &rFrmSet ) rFrmSet.Put( SvxBoxItem(RES_BOX) ); } - void Reader::ResetFrmFmts( SwDoc& rDoc ) { for (sal_uInt16 i=0; i<3; ++i) @@ -672,7 +664,6 @@ size_t Reader::GetSectionList( SfxMedium&, std::vector<OUString*>& ) const return 0; } - sal_Bool SwReader::HasGlossaries( const Reader& rOptions ) { // Variable uebertragen @@ -714,16 +705,11 @@ sal_Bool Reader::ReadGlossaries( SwTextBlocks&, sal_Bool ) const return sal_False; } - - int StgReader::GetReaderType() { return SW_STORAGE_READER; } - - - /* * Writer */ @@ -944,11 +930,6 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName ) return nError; } - - - - - sal_Bool SetHTMLTemplate( SwDoc & rDoc ) { // Vorlagennamen von den Sfx-HTML-Filter besorgen!!! @@ -970,5 +951,4 @@ sal_Bool SetHTMLTemplate( SwDoc & rDoc ) return bRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index ac8162d55541..819b21388c08 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -110,8 +110,6 @@ using ::editeng::SvxBorderLine; #define CSS1_FRMSIZE_ANYHEIGHT 0x0e #define CSS1_FRMSIZE_PIXEL 0x10 - - sal_Char CSS1_CONSTASCII_DEF( sCSS1_rule_end, " }" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_span_tag_end, "\">" ); const sal_Char cCSS1_style_opt_end = '\"'; @@ -203,8 +201,6 @@ public: } }; - - void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, const sal_Char *pVal, const OUString *pSVal ) @@ -258,7 +254,6 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, sOut.append("; "); } - sOut.append(OString(pProp) + ": "); if( nCSS1OutMode & CSS1_OUTMODE_ENCODE ) { @@ -582,7 +577,6 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, sal_Bool bUsed ) } // /Feature: PrintExt - // The text body style has to be exported always (if it is changed compared // to the template), because it is used as reference for any style // that maps to <P>, and that's especially the standard style @@ -643,8 +637,6 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, sal_Bool bUsed ) nDfltBottomMargin = 0; } - - // wenn pPseudo gesetzt ist werden Styles-Sheets ausgegeben, // sonst wird nur nach Token und Class fuer ein Format gesucht sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken, @@ -1644,7 +1636,6 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt, RES_POOLCHR_INET_VISIT==nRefPoolId) ) bCheckForPseudo = true; - // jetzt die Attribute (inkl. Selektor) ausgeben bool bHasScriptDependencies = false; if( OutCSS1Rule( rHTMLWrt, aSelector, aItemSet, CSS1_FMT_ISTAG != nDeep, @@ -1841,7 +1832,6 @@ Writer& OutCSS1_BodyTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet ) SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_STYLE_OPT_ON | CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_BODY ); - // Es werden nur die Attribute der Seiten-Vorlage ausgegeben. // Die Attribute der Standard-Absatz-Vorlage werden schon beim // Export der Absatz-Vorlagen beruecksichtigt. @@ -1927,7 +1917,6 @@ Writer& OutCSS1_TableBGStyleOpt( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule, sal_uInt8 nLevel ) { @@ -1962,8 +1951,6 @@ Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule, return rWrt; } - - void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt, sal_uInt32 nFrmOpts, const SdrObject *pSdrObj, @@ -2322,8 +2309,6 @@ void SwHTMLWriter::OutCSS1_FrmFmtBackground( const SwFrmFmt& rFrmFmt ) } } - - static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt, const SvxUnderlineItem *pUItem, const SvxOverlineItem *pOItem, @@ -2452,7 +2437,6 @@ static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt, return rWrt; } - static Writer& OutCSS1_SvxCaseMap( Writer& rWrt, const SfxPoolItem& rHt ) { SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -2481,7 +2465,6 @@ static Writer& OutCSS1_SvxCaseMap( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - static Writer& OutCSS1_SvxColor( Writer& rWrt, const SfxPoolItem& rHt ) { SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -2502,7 +2485,6 @@ static Writer& OutCSS1_SvxColor( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - static Writer& OutCSS1_SvxCrossedOut( Writer& rWrt, const SfxPoolItem& rHt ) { // Mit dieser Methode werden nur Hints ausgegeben! @@ -2689,7 +2671,6 @@ static Writer& OutCSS1_SvxUnderline( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - static Writer& OutCSS1_SvxOverline( Writer& rWrt, const SfxPoolItem& rHt ) { // Mit dieser Methode werden nur Hints ausgegeben! @@ -3564,7 +3545,6 @@ static Writer& OutCSS1_SvxFrameDirection( Writer& rWrt, const SfxPoolItem& rHt ) * bekannt sein muessen. */ - SwAttrFnTab aCSS1AttrFnTab = { /* RES_CHRATR_CASEMAP */ OutCSS1_SvxCaseMap, /* RES_CHRATR_CHARSETCOLOR */ 0, diff --git a/sw/source/filter/html/css1kywd.cxx b/sw/source/filter/html/css1kywd.cxx index ef3a0ebc7a43..0ac6b283bba8 100644 --- a/sw/source/filter/html/css1kywd.cxx +++ b/sw/source/filter/html/css1kywd.cxx @@ -19,10 +19,8 @@ #include "css1kywd.hxx" - sal_Char CSS1_CONSTASCII_DEF( sCSS_mimetype, "text/css" ); - // ein par allgemeine Strings sal_Char CSS1_CONSTASCII_DEF( sCSS1_import, "import" ); @@ -56,7 +54,6 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_px, "px" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_em, "em" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_ex, "ex" ); - // Strings fuer Font-Properties sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_family, "font-family" ); @@ -67,20 +64,17 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_cursive, "cursive" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_fantasy, "fantasy" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_monospace, "monospace" ); - sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_style, "font-style" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_italic, "italic" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_oblique, "oblique" ); - sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_variant, "font-variant" ); //sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_small_caps, "small-caps" ); - sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_weight, "font-weight" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_extra_light, "extra-light" ); @@ -112,17 +106,12 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_xx_large, "xx-large" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_larger, "larger" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_smaller, "smaller" ); - sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font, "font" ); - - - // Strings fuer Farb- und Hintergrund-Properties sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_color, "color" ); - sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_background, "background" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_background_color, "background-color" ); @@ -139,13 +128,10 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_bottom, "bottom" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_scroll, "scroll" ); - - // Strings fuer Text-Properties sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_letter_spacing, "letter-spacing" ); - sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_decoration, "text-decoration" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" ); @@ -154,7 +140,6 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_overline, "overline" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_line_through, "line-through" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_blink, "blink" ); - sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_align, "text-align" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_left, "left" ); @@ -162,14 +147,10 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_center, "center" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_right, "right" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_justify, "justify" ); - sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_indent, "text-indent" ); - sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_line_height, "line-height" ); - - // Strings fuer Box-Properties sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_left, "margin-left" ); @@ -233,7 +214,6 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_left, "left" ); sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_top, "top" ); - // Feature: PrintExt // Strings fuer Printing Extensions diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx index 257893893041..755d0de9bd83 100644 --- a/sw/source/filter/html/css1kywd.hxx +++ b/sw/source/filter/html/css1kywd.hxx @@ -29,10 +29,8 @@ #define CSS1_CONSTASCII_DEF( n, s ) n[sizeof(s)] = s #endif - extern sal_Char CSS1_CONSTASCII_DECL( sCSS_mimetype, "text/css" ); - // ein par allgemeine Strings extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_import, "import" ); @@ -66,7 +64,6 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_px, "px" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_em, "em" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_ex, "ex" ); - // Strings fuer Font-Properties extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_family, "font-family" ); @@ -77,14 +74,12 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_cursive, "cursive" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_fantasy, "fantasy" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_monospace, "monospace" ); - extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_style, "font-style" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_italic, "italic" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_oblique, "oblique" ); - extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_variant, "font-variant" ); //sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" ); @@ -108,7 +103,6 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_extra_bold, "extra-bold" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_lighter, "lighter" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bolder, "bolder" ); - extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_size, "font-size" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_xx_small, "xx-small" ); @@ -122,17 +116,12 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_xx_large, "xx-large" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_larger, "larger" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_smaller, "smaller" ); - extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font, "font" ); - - - // Strings fuer Farb- und Hintergrund-Properties extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_color, "color" ); - extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_background, "background" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_background_color, "background-color" ); @@ -149,13 +138,10 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bottom, "bottom" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_scroll, "scroll" ); - - // Strings fuer Text-Properties extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_letter_spacing, "letter-spacing" ); - extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_decoration, "text-decoration" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" ); @@ -164,7 +150,6 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_overline, "overline" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_line_through, "line-through" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_blink, "blink" ); - extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_align, "text-align" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_left, "left" ); @@ -172,14 +157,10 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_center, "center" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_right, "right" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_justify, "justify" ); - extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_indent, "text-indent" ); - extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_line_height, "line-height" ); - - // Strings fuer Box-Properties extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_left, "margin-left" ); @@ -243,7 +224,6 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_left, "left" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_top, "top" ); - // Feature: PrintExt // Strings fuer Printing Extensions @@ -269,7 +249,6 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_landscape, "landscape" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_class_abs_pos, "sd-abs-pos" ); - extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_so_language, "so-language" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_direction, "direction" ); extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_ltr, "ltr" ); @@ -280,5 +259,4 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_display, "display" ); #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 083b282c8693..65bb022a1dbd 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -149,7 +149,6 @@ void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl ) nDefListLvl = nNewLvl; } - void SwHTMLWriter::ChangeParaToken( sal_uInt16 nNew ) { if( nNew != nLastParaToken && HTML_PREFORMTXT_ON == nLastParaToken ) @@ -389,7 +388,6 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate, } } - // Die diversen default-Abstaende aus der Vorlage oder der // Vergleischs-Vorlage merken const SvxLRSpaceItem &rLRSpace = @@ -605,7 +603,6 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, pNodeItemSet ? ((const SvxULSpaceItem &)pNodeItemSet->Get(RES_UL_SPACE)) : rFmt.GetULSpace(); - if( (rHWrt.bOutHeader && rWrt.pCurPam->GetPoint()->nNode.GetIndex() == rWrt.pCurPam->GetMark()->nNode.GetIndex()) || @@ -639,7 +636,6 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, return; } - // soll ein ALIGN=... geschrieben werden? const SfxPoolItem* pAdjItem = 0; const SfxPoolItem* pItem; @@ -1040,7 +1036,6 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo ) } } - class HTMLSttEndPos { sal_Int32 nStart; @@ -1085,7 +1080,6 @@ enum HTMLOnOffState { HTML_NOT_SUPPORTED, // nicht unterst. Attribut HTML_DROPCAP_VALUE, // DropCap-Attributs HTML_AUTOFMT_VALUE }; // Attribute for automatic character styles - class HTMLEndPosLst { _HTMLEndLst aStartLst; // nach Anfangs-Psoitionen sortierte Liste @@ -1100,12 +1094,11 @@ class HTMLEndPosLst SwDoc *pDoc; // das aktuelle Dokument SwDoc* pTemplate; // die HTML-Vorlage (oder 0) const Color* pDfltColor;// die Default-Vordergrund-Farbe - std::set<OUString>& rScriptTxtStyles; // + std::set<OUString>& rScriptTxtStyles; sal_uLong nHTMLMode; sal_Bool bOutStyles : 1; // werden Styles exportiert - // die Position eines Items in der Start-/Ende-Liste suchen sal_uInt16 _FindStartPos( const HTMLSttEndPos *pPos ) const; sal_uInt16 _FindEndPos( const HTMLSttEndPos *pPos ) const; @@ -1126,7 +1119,6 @@ class HTMLEndPosLst sal_Bool ExistsOffTagItem( sal_uInt16 nWhich, sal_Int32 nStartPos, sal_Int32 nEndPos ); - // das Ende eines gesplitteten Items anpassen void FixSplittedItem( HTMLSttEndPos *pPos, sal_Int32 nNewEnd, sal_uInt16 nStartPos ); @@ -1176,7 +1168,6 @@ public: sal_Bool IsHTMLMode( sal_uLong nMode ) const { return (nHTMLMode & nMode) != 0; } }; - sal_uInt16 HTMLEndPosLst::_FindStartPos( const HTMLSttEndPos *pPos ) const { sal_uInt16 i; @@ -1200,7 +1191,6 @@ sal_uInt16 HTMLEndPosLst::_FindEndPos( const HTMLSttEndPos *pPos ) const return i==aEndLst.size() ? USHRT_MAX : i; } - void HTMLEndPosLst::_InsertItem( HTMLSttEndPos *pPos, sal_uInt16 nEndPos ) { // In der Start-Liste das Attribut hinter allen vorher und an @@ -1503,7 +1493,6 @@ void HTMLEndPosLst::FixSplittedItem( HTMLSttEndPos *pPos, sal_Int32 nNewEnd, } } - void HTMLEndPosLst::InsertItem( const SfxPoolItem& rItem, sal_Int32 nStart, sal_Int32 nEnd ) { @@ -1536,8 +1525,6 @@ void HTMLEndPosLst::InsertItem( const SfxPoolItem& rItem, sal_Int32 nStart, _InsertItem( new HTMLSttEndPos( rItem, nStart, nEnd ), i ); } - - void HTMLEndPosLst::SplitItem( const SfxPoolItem& rItem, sal_Int32 nStart, sal_Int32 nEnd ) { @@ -1652,8 +1639,6 @@ HTMLEndPosLst::~HTMLEndPosLst() OSL_ENSURE(aEndLst.empty(), "End List not empty in destructor"); } - - void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem, sal_Int32 nStart, sal_Int32 nEnd, SwHTMLFmtInfos& rFmtInfos, sal_Bool bParaAttrs ) @@ -2056,7 +2041,6 @@ void HTMLEndPosLst::OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, } } - /* Ausgabe der Nodes */ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) { @@ -2286,7 +2270,6 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) if( !bOldLFPossible && rHTMLWrt.bLFPossible ) rHTMLWrt.OutNewLine(); - // dann die Bookmarks (inkl. End-Tag) rHTMLWrt.bOutOpts = sal_False; rHTMLWrt.OutBookmarks(); @@ -2334,7 +2317,6 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) rHTMLWrt.aChrFmtInfos, sal_False, sal_True ); } - if( !aOutlineTxt.isEmpty() || rHTMLWrt.pFmtFtn ) { // Absatz-Attribute ausgeben, damit der Text die Attribute des @@ -2361,7 +2343,6 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) // ausgegeben, so muessen auch da die Attribute stimmen!! rHTMLWrt.bTxtAttr = sal_True; - sal_uInt16 nAttrPos = 0; sal_Int32 nStrPos = rHTMLWrt.pCurPam->GetPoint()->nContent.GetIndex(); const SwTxtAttr * pHt = 0; @@ -2651,7 +2632,6 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) return rHTMLWrt; } - sal_uInt32 SwHTMLWriter::ToPixel( sal_uInt32 nVal, const bool bVert ) const { if( Application::GetDefaultDevice() && nVal ) @@ -2665,7 +2645,6 @@ sal_uInt32 SwHTMLWriter::ToPixel( sal_uInt32 nVal, const bool bVert ) const return nVal; } - static Writer& OutHTML_CSS1Attr( Writer& rWrt, const SfxPoolItem& rHt ) { // wenn gerade Hints geschrieben werden versuchen wir den Hint als @@ -2677,7 +2656,6 @@ static Writer& OutHTML_CSS1Attr( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - /* File CHRATR.HXX: */ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt ) @@ -2711,7 +2689,6 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - static Writer& OutHTML_SwPosture( Writer& rWrt, const SfxPoolItem& rHt ) { SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -2833,7 +2810,6 @@ static Writer& OutHTML_SwWeight( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - static Writer& OutHTML_SwCrossedOut( Writer& rWrt, const SfxPoolItem& rHt ) { SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -2855,7 +2831,6 @@ static Writer& OutHTML_SwCrossedOut( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt ) { SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -2886,8 +2861,6 @@ static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - - static Writer& OutHTML_SwUnderline( Writer& rWrt, const SfxPoolItem& rHt ) { SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -2908,7 +2881,6 @@ static Writer& OutHTML_SwUnderline( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - static Writer& OutHTML_SwFlyCnt( Writer& rWrt, const SfxPoolItem& rHt ) { SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -2924,7 +2896,6 @@ static Writer& OutHTML_SwFlyCnt( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - // Das ist jetzt unser Blink-Item. Blinkend wird eingeschaltet, indem man // das Item auf sal_True setzt! static Writer& OutHTML_SwBlink( Writer& rWrt, const SfxPoolItem& rHt ) @@ -3222,7 +3193,6 @@ static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt ) * bekannt sein muessen. */ - SwAttrFnTab aHTMLAttrFnTab = { /* RES_CHRATR_CASEMAP */ OutHTML_CSS1Attr, /* RES_CHRATR_CHARSETCOLOR */ 0, diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 2bcf3b578b0d..b54789245d8c 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -42,12 +42,10 @@ #include "wrthtml.hxx" #include "swhtml.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; - static HTMLOutEvent aBodyEventTable[] = { { OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload, SFX_EVENT_OPENDOC }, @@ -57,7 +55,6 @@ static HTMLOutEvent aBodyEventTable[] = { 0, 0, 0 } }; - void SwHTMLParser::NewScript() { ParseScriptOptions( aScriptType, sBaseURL, eScriptLang, aScriptURL, @@ -341,5 +338,4 @@ void SwHTMLWriter::OutBasicBodyEvents() bCfgStarBasic, eDestEnc, &aNonConvertableCharacters ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 74cc7bcd2aab..186fe93ca0c2 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -62,7 +62,6 @@ using namespace ::com::sun::star; - // Wie viele Zeilen/Zeichen sind fuer DropCaps erlaubt? // (Gibt es vielleicht woanders entsprechende Werte?) #define MAX_DROPCAP_LINES 9 @@ -70,7 +69,6 @@ using namespace ::com::sun::star; static void lcl_swcss1_setEncoding( SwFmt& rFmt, rtl_TextEncoding eEnc ); - // Implementierung des SwCSS1Parsers (eigentlich swcss1.cxx) static struct SwCSS1ItemIds { @@ -131,8 +129,6 @@ SwCSS1Parser::~SwCSS1Parser() { } - - // Feature: PrintExt sal_Bool SwCSS1Parser::SetFmtBreak( SfxItemSet& rItemSet, const SvxCSS1PropertyInfo& rPropInfo ) @@ -1149,7 +1145,6 @@ const FontList *SwCSS1Parser::GetFontList() const return pFList; } - SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const OUString& rClass ) const { // die entsprechende Vorlage suchen @@ -1229,8 +1224,6 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const OUString& rClass ) return pCFmt; } - - SwTxtFmtColl *SwCSS1Parser::GetTxtCollFromPool( sal_uInt16 nPoolId ) const { sal_uInt16 nOldArrLen = pDoc->GetTxtFmtColls()->size(); @@ -1448,18 +1441,17 @@ const SwPageDesc *SwCSS1Parser::GetPageDesc( sal_uInt16 nPoolId, sal_Bool bCreat return pPageDesc; } - sal_Bool SwCSS1Parser::MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo, sal_Bool bAutoWidth ) { // abs-pos // left/top none auto twip perc - // + // none Z Z - - // auto Z Z - - // twip Z Z S/R - // perc - - - - - // + // - das Tag wird absolut positioniert und left/top sind beide // gegeben und enthalten auch keine %-Angabe, oder // - das Tag soll fliessen, und @@ -1475,8 +1467,6 @@ sal_Bool SwCSS1Parser::MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo, SVX_CSS1_LTYPE_PERCENTAGE == rPropInfo.eWidthType ); } - - void SwCSS1Parser::AddClassName( OUString& rFmtName, const OUString& rClass ) { OSL_ENSURE( !rClass.isEmpty(), "Style-Klasse ohne Laenge?" ); @@ -1484,7 +1474,6 @@ void SwCSS1Parser::AddClassName( OUString& rFmtName, const OUString& rClass ) rFmtName += "." + rClass; } - void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop, SfxItemSet& rItemSet, const OUString *pName ) @@ -1561,7 +1550,6 @@ void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop, } } - // CSS1-sezifisches des SwHTMLParsers _HTMLAttr **SwHTMLParser::GetAttrTabEntry( sal_uInt16 nWhich ) @@ -1737,7 +1725,6 @@ sal_Bool SwHTMLParser::FileDownload( const OUString& rURL, GetSrcEncoding()); } - // wurde abgebrochen? if( ( pDoc->GetDocShell() && pDoc->GetDocShell()->IsAbortingImport() ) || 1 == pDoc->getReferenceCount() ) @@ -2149,8 +2136,6 @@ void SwHTMLParser::SetFrmFmtAttrs( SfxItemSet &rItemSet, } } - - _HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken, sal_uInt16 nLimit, sal_Bool bRemove ) { diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx index fb077664de28..adcd9256d7f1 100644 --- a/sw/source/filter/html/htmlctxt.cxx +++ b/sw/source/filter/html/htmlctxt.cxx @@ -38,9 +38,6 @@ using namespace ::com::sun::star; - - - class _HTMLAttrContext_SaveDoc { SwHTMLNumRuleInfo aNumRuleInfo; // In Umgebung gueltige Numerierung @@ -112,7 +109,6 @@ _HTMLAttrTable *_HTMLAttrContext_SaveDoc::GetAttrTab( sal_Bool bCreate ) return pAttrTab; } - _HTMLAttrContext_SaveDoc *_HTMLAttrContext::GetSaveDocContext( sal_Bool bCreate ) { if( !pSaveDocContext && bCreate ) @@ -127,7 +123,6 @@ void _HTMLAttrContext::ClearSaveDocContext() pSaveDocContext = 0; } - void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos ) { // preliminary paragraph attributes are not allowed here, they could @@ -263,7 +258,6 @@ void SwHTMLParser::SaveDocContext( _HTMLAttrContext *pCntxt, SaveAttrTab( *pSaveAttrTab ); } - pSave->SetPos( *pPam->GetPoint() ); *pPam->GetPoint() = *pNewPos; } @@ -332,7 +326,6 @@ void SwHTMLParser::RestoreDocContext( _HTMLAttrContext *pCntxt ) pCntxt->ClearSaveDocContext(); } - void SwHTMLParser::EndContext( _HTMLAttrContext *pContext ) { if( pContext->GetPopStack() ) @@ -418,7 +411,6 @@ void SwHTMLParser::ClearContext( _HTMLAttrContext *pContext ) StartListing(); } - sal_Bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo, _HTMLAttrContext *pContext ) @@ -491,7 +483,6 @@ sal_Bool SwHTMLParser::CreateContainer( const OUString& rClass, return bRet; } - void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo, _HTMLAttrContext *pContext, @@ -556,7 +547,6 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet, GetMarginsFromContext( nOldLeft, nOldRight, nOldIndent, bIgnoreTop ); - // und noch die aktuell gueltigen sal_uInt16 nLeft = nOldLeft, nRight = nOldRight; short nIndent = nOldIndent; diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx index 1dbaedce8ba7..6636a77e40e5 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -38,7 +38,6 @@ #include <svtools/htmlkywd.hxx> #include <svx/svdpool.hxx> - #include "charatr.hxx" #include <frmfmt.hxx> #include <fmtanchr.hxx> @@ -54,7 +53,6 @@ using namespace ::com::sun::star; - const sal_uInt32 HTML_FRMOPTS_MARQUEE = HTML_FRMOPT_ALIGN | HTML_FRMOPT_SPACE; @@ -211,7 +209,6 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, pDoc->InsertDrawObj( *pPam, *pNewDrawObj, aFrmSet ); } - static void PutEEPoolItem( SfxItemSet &rEEItemSet, const SfxPoolItem& rSwItem ) { @@ -599,7 +596,6 @@ void SwHTMLParser::ResizeDrawObject( SdrObject* pObj, SwTwips nWidth ) pObj->SetLogicRect( Rectangle( rOldRect.TopLeft(), aNewSz ) ); } - const SdrObject *SwHTMLWriter::GetMarqueeTextObj( const SwDrawFrmFmt& rFmt ) { const SdrObject* pObj = rFmt.FindSdrObject(); @@ -666,7 +662,6 @@ void SwHTMLWriter::GetEEAttrsFromDrwObj( SfxItemSet& rItemSet, } } - Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, const SwDrawFrmFmt& rFmt, const SdrObject& rSdrObject ) @@ -827,7 +822,6 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) ) rHTMLWrt.OutCSS1_FrmFmtOptions( rFmt, nFrmFlags, &rSdrObject ); - rWrt.Strm().WriteChar( '>' ); // Was jetzt kommt ist das Gegenstueck zu SdrTextObjectt::SetText() @@ -847,5 +841,4 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, return rWrt; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index 1155a34f83b0..69b0fcdb9634 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -101,7 +101,6 @@ static HTMLOptionEnum aHTMLPageNumFldFmtTable[] = { 0, 0 } }; - static HTMLOptionEnum aHTMLExtUsrFldSubTable[] = { { OOO_STRING_SW_HTML_FS_company, EU_COMPANY }, @@ -190,7 +189,6 @@ static HTMLOptionEnum aHTMLFileNameFldFmtTable[] = { 0, 0 } }; - sal_uInt16 SwHTMLParser::GetNumType( const OUString& rStr, sal_uInt16 nDfltType ) { sal_uInt16 nType = nDfltType; @@ -207,7 +205,6 @@ sal_uInt16 SwHTMLParser::GetNumType( const OUString& rStr, sal_uInt16 nDfltType return nType; } - void SwHTMLParser::NewField() { sal_Bool bKnownType = sal_False, bFixed = sal_False, diff --git a/sw/source/filter/html/htmlfld.hxx b/sw/source/filter/html/htmlfld.hxx index 7af294944bf9..87948a7b6e7b 100644 --- a/sw/source/filter/html/htmlfld.hxx +++ b/sw/source/filter/html/htmlfld.hxx @@ -81,5 +81,4 @@ #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index 02057ee0e3f9..19a3314a78ac 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -431,7 +431,6 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, return rWrt; } - Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) { SwFmtFld & rFld = (SwFmtFld&)rHt; @@ -542,5 +541,4 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index c6446cd76c70..d2b7fd6e1d3e 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> @@ -63,7 +62,6 @@ #include "htmlfly.hxx" using namespace ::com::sun::star; -//////////////////////////////////////////////////////////// const sal_uLong HTML_FRMOPTS_IMG_ALL = HTML_FRMOPT_ALT | @@ -126,7 +124,6 @@ const sal_uLong HTML_FRMOPTS_CNTNR = HTML_FRMOPT_ABSSIZE | HTML_FRMOPT_S_PIXSIZE; - static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt ); static Writer& OutHTML_FrmFmtAsMulticol( Writer& rWrt, const SwFrmFmt& rFmt, sal_Bool bInCntnr ); @@ -142,8 +139,6 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFmt, static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt, const SdrObject& rSdrObj ); - - extern HTMLOutEvent aAnchorEventTable[]; static HTMLOutEvent aImageEventTable[] = @@ -161,8 +156,6 @@ static HTMLOutEvent aIMapEventTable[] = { 0, 0, 0 } }; - - sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt, const SdrObject*& rpSdrObj ) { @@ -524,7 +517,6 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt, HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_span, sal_False ); } - OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, const OUString& rAlternateTxt, sal_uInt32 nFrmOpts, @@ -556,7 +548,6 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, OutDirection( nDir ); } - // ALT if( (nFrmOpts & HTML_FRMOPT_ALT) && !rAlternateTxt.isEmpty() ) { @@ -611,7 +602,6 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, append(pStr).append("\""); } - // HSPACE und VSPACE Size aTwipSpc( 0, 0 ); if( (nFrmOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) && @@ -1149,7 +1139,6 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) ) rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmOpts ); - if( nFrmOpts & HTML_FRMOPT_BORDER ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_border). @@ -1225,9 +1214,6 @@ Writer& OutHTML_BulletImage( Writer& rWrt, return rWrt; } - - - static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt ) { SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -1459,7 +1445,6 @@ static Writer & OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFrmFmt, return rWrt; } - static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt, sal_Bool bInCntnr ) { @@ -1483,7 +1468,6 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt, return rWrt; } - static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt, const SdrObject& rSdrObj ) { @@ -1514,8 +1498,6 @@ static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt, return rWrt; } - - Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt, sal_Bool bHeader ) { @@ -1595,7 +1577,6 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt, return rWrt; } - void SwHTMLWriter::AddLinkTarget( const OUString& rURL ) { if( rURL.isEmpty() || rURL[0] != '#' ) @@ -1673,7 +1654,7 @@ void SwHTMLWriter::AddLinkTarget( const OUString& rURL ) } else if( sCmp == "text" ) { - // + } } @@ -1720,8 +1701,6 @@ void SwHTMLWriter::CollectLinkTargets() } } - - SwHTMLPosFlyFrm::SwHTMLPosFlyFrm( const SwPosFlyFrm& rPosFly, const SdrObject *pSdrObj, sal_uInt8 nOutMode ) : diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx index 371824cd24be..3cdee81cd1ca 100644 --- a/sw/source/filter/html/htmlfly.hxx +++ b/sw/source/filter/html/htmlfly.hxx @@ -73,7 +73,6 @@ enum SwHTMLFrmType #define HTML_CNTNR_DIV 0x80 #define HTML_CNTNR_MASK 0xc0 - const sal_uInt16 MAX_FRMTYPES = HTML_FRMTYPE_END; const sal_uInt16 MAX_BROWSERS = 4; diff --git a/sw/source/filter/html/htmlflyt.cxx b/sw/source/filter/html/htmlflyt.cxx index e311a23216a3..21fd0c75dcff 100644 --- a/sw/source/filter/html/htmlflyt.cxx +++ b/sw/source/filter/html/htmlflyt.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "htmlfly.hxx" - #define TE(t,p,c) (sal_uInt8)( HTML_OUT_##t | HTML_POS_##p | HTML_CNTNR_##c ) sal_uInt8 aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 294c84f9a7da..b67db8c9c772 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -2074,7 +2074,6 @@ void SwHTMLParser::NewTextArea() } } - const uno::Reference< lang::XMultiServiceFactory > & rSrvcMgr = pFormImpl->GetServiceFactory(); if( !rSrvcMgr.is() ) diff --git a/sw/source/filter/html/htmlform.hxx b/sw/source/filter/html/htmlform.hxx index fd3a822907fc..c3a7388c4bbf 100644 --- a/sw/source/filter/html/htmlform.hxx +++ b/sw/source/filter/html/htmlform.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFORM_HXX #define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFORM_HXX - enum HTMLEventType { HTML_ET_ONSUBMITFORM, HTML_ET_ONRESETFORM, @@ -36,10 +35,6 @@ extern const sal_Char * aEventMethodTable[]; extern const sal_Char * aEventSDOptionTable[]; extern const sal_Char * aEventOptionTable[]; - - - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 1a718c0e4e11..1c7da56b52f1 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -78,8 +78,6 @@ const sal_uInt32 HTML_FRMOPTS_IMG_CONTROL_CSS1 = HTML_FRMOPT_S_ALIGN | HTML_FRMOPT_S_SPACE; - - static void lcl_html_outEvents( SvStream& rStrm, const uno::Reference< form::XFormComponent > rFormComp, sal_Bool bCfgStarBasic, @@ -649,7 +647,6 @@ void SwHTMLWriter::OutHiddenControls( } } - // hier folgen die Ausgabe-Routinen, dadurch sind die form::Forms gebuendelt: const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrmFmt& rFmt ) @@ -952,7 +949,6 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } break; - case form::FormComponentType::IMAGEBUTTON: eType = TYPE_IMAGE; nFrmOpts = HTML_FRMOPTS_IMG_CONTROL; @@ -1335,7 +1331,6 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, return rWrt; } - // Ermitteln, ob eine Format zu einem Control gehoert und wenn ja // dessen Form zurueckgeben static void AddControl( HTMLControls& rControls, @@ -1370,7 +1365,6 @@ static void AddControl( HTMLControls& rControls, } } - void SwHTMLWriter::GetControls() { // Idee: die absatz- und zeichengebundenen Controls werden erst einmal @@ -1420,14 +1414,12 @@ void SwHTMLWriter::GetControls() } } - HTMLControl::HTMLControl( const uno::Reference< container::XIndexContainer > & rFormComps, sal_uInt32 nIdx ) : xFormComps( rFormComps ), nNdIdx( nIdx ), nCount( 1 ) {} - HTMLControl::~HTMLControl() {} diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 98609a6ebf6b..28994f72af9d 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -42,7 +42,6 @@ struct SwHTMLFootEndNote_Impl sal_Bool bFixed; }; - sal_Int32 lcl_html_getNextPart( OUString& rPart, const OUString& rContent, sal_Int32 nPos ) { diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 0ca80885d0d9..5ff6a3b6f4ab 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hintids.hxx" #include <comphelper/string.hxx> #include <vcl/svapp.hxx> @@ -73,7 +72,6 @@ using namespace ::com::sun::star; - HTMLOptionEnum aHTMLImgHAlignTable[] = { { OOO_STRING_SVTOOLS_HTML_AL_left, text::HoriOrientation::LEFT }, @@ -81,7 +79,6 @@ HTMLOptionEnum aHTMLImgHAlignTable[] = { 0, 0 } }; - HTMLOptionEnum aHTMLImgVAlignTable[] = { { OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::LINE_TOP }, @@ -154,7 +151,6 @@ void SwHTMLParser::ConnectImageMaps() } } - /* */ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri, @@ -508,7 +504,6 @@ IMAGE_SETEVENT: aVBorderLine.SetColor( aHBorderLine.GetColor() ); } - SvxBoxItem aBoxItem( RES_BOX ); aBoxItem.SetLine( &aHBorderLine, BOX_LINE_TOP ); aBoxItem.SetLine( &aHBorderLine, BOX_LINE_BOTTOM ); @@ -919,7 +914,6 @@ void SwHTMLParser::InsertBodyOptions() pCSS1Parser->SetBodyTextSet(); } - // Die Item fuer die Seitenvorlage vorbereiten (Hintergrund, Umrandung) // Beim BrushItem muessen schon gesetzte werte erhalten bleiben! SvxBrushItem aBrushItem( pCSS1Parser->GetPageDescBackground() ); diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx index d4bb2976786f..cc83d3d5dcf1 100644 --- a/sw/source/filter/html/htmlnum.cxx +++ b/sw/source/filter/html/htmlnum.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star; #define HTML_BULLETCHAR_CIRCLE (0xe009) #define HTML_BULLETCHAR_SQUARE (0xe00b) - // <UL TYPE=...> static HTMLOptionEnum aHTMLULTypeTable[] = { @@ -59,7 +58,6 @@ static HTMLOptionEnum aHTMLULTypeTable[] = { 0, 0 } }; - void SwHTMLNumRuleInfo::Set( const SwTxtNode& rTxtNd ) { const SwNumRule* pTxtNdNumRule( rTxtNd.GetNumRule() ); @@ -84,7 +82,6 @@ void SwHTMLNumRuleInfo::Set( const SwTxtNode& rTxtNd ) } } - void SwHTMLParser::NewNumBulList( int nToken ) { SwHTMLNumRuleInfo& rInfo = GetNumInfo(); @@ -460,7 +457,6 @@ void SwHTMLParser::EndNumBulList( int nToken ) } - void SwHTMLParser::NewNumBulListItem( int nToken ) { sal_uInt8 nLevel = GetNumInfo().GetLevel(); @@ -632,7 +628,6 @@ void SwHTMLParser::EndNumBulListItem( int nToken, sal_Bool bSetColl, SetTxtCollAttrs(); } - void SwHTMLParser::SetNodeNum( sal_uInt8 nLevel, bool bCountedInList ) { SwTxtNode* pTxtNode = pPam->GetNode()->GetTxtNode(); @@ -650,8 +645,6 @@ void SwHTMLParser::SetNodeNum( sal_uInt8 nLevel, bool bCountedInList ) GetNumInfo().GetNumRule()->SetInvalidRule( sal_False ); } - - void SwHTMLWriter::FillNextNumInfo() { pNextNumRuleInfo = 0; @@ -779,7 +772,6 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt, } } - OSL_ENSURE( rWrt.nLastParaToken == 0, "<PRE> wurde nicht vor <OL> beendet." ); sal_uInt16 nPrevDepth = diff --git a/sw/source/filter/html/htmlnum.hxx b/sw/source/filter/html/htmlnum.hxx index 2c0b3c9852ed..4f64ac9be5e1 100644 --- a/sw/source/filter/html/htmlnum.hxx +++ b/sw/source/filter/html/htmlnum.hxx @@ -117,8 +117,6 @@ inline void SwHTMLNumRuleInfo::SetNodeStartValue( sal_uInt8 nLvl, sal_uInt16 nVa aNumStarts[nLvl] = nVal; } - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 379edb4c70ae..0b06d56ceac2 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -119,7 +119,6 @@ const sal_uLong HTML_FRMOPTS_OLE_CSS1 = HTML_FRMOPT_S_ALIGN | HTML_FRMOPT_S_SPACE; - void SwHTMLParser::SetFixSize( const Size& rPixSize, const Size& rTwipDfltSize, sal_Bool bPrcWidth, sal_Bool bPrcHeight, @@ -292,7 +291,6 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace, } } - void SwHTMLParser::InsertEmbed() { OUString aURL, aType, aName, aAlt, aId, aStyle, aClass; @@ -485,7 +483,6 @@ void SwHTMLParser::InsertEmbed() } } - #if HAVE_FEATURE_JAVA void SwHTMLParser::NewObject() { @@ -818,8 +815,6 @@ void SwHTMLParser::InsertParam() #endif } - - void SwHTMLParser::InsertFloatingFrame() { OUString aAlt, aId, aStyle, aClass; @@ -954,7 +949,6 @@ void SwHTMLParser::InsertFloatingFrame() bInFloatingFrame = true; } - sal_uInt16 SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode ) { SwOLEObj& rObj = ((SwOLENode*)rNode.GetOLENode())->GetOLEObj(); @@ -1275,5 +1269,4 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt, return rWrt; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 54871c6ddb12..36676e929881 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <rtl/uri.hxx> #include <svl/urihelper.hxx> @@ -59,7 +58,6 @@ #define CONTEXT_FLAGS_HDRFTR (CONTEXT_FLAGS_MULTICOL) #define CONTEXT_FLAGS_FTN (CONTEXT_FLAGS_MULTICOL) - using namespace ::com::sun::star; void SwHTMLParser::NewDivision( int nToken ) @@ -764,7 +762,6 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) PushContext( pCntxt ); } - void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet, _HTMLAttrContext *pCntxt, const OUString& rName, @@ -791,8 +788,6 @@ void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet, SaveDocContext( pCntxt, nFlags, &aNewPos ); } - - void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd, sal_uLong nDestIdx, sal_Bool bFmtBreak ) diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 592ae51b079c..d117be32677b 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hintids.hxx" #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> @@ -33,7 +32,6 @@ #include <svtools/htmlkywd.hxx> #include <svl/urihelper.hxx> - #include <fmtornt.hxx> #include <frmfmt.hxx> #include <fmtfsize.hxx> @@ -63,7 +61,6 @@ using ::editeng::SvxBorderLine; using namespace ::com::sun::star; - static HTMLOptionEnum aHTMLTblVAlignTable[] = { { OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::NONE }, @@ -155,7 +152,6 @@ public: sal_uInt16 GetContextStAttrMin() const { return nContextStAttrMin; } }; - // Cell content is a linked list with SwStartNodes and // HTMLTables. @@ -199,7 +195,6 @@ public: SwHTMLTableLayoutCnts *CreateLayoutInfo(); }; - // Cell of a HTML table class HTMLTableCell { @@ -269,7 +264,6 @@ public: sal_Bool IsCovered() const { return mbCovered; } }; - // Row of a HTML table typedef boost::ptr_vector<HTMLTableCell> HTMLTableCells; @@ -326,7 +320,6 @@ public: sal_Bool IsSplitable() const { return bSplitable; } }; - // Column of a HTML table class HTMLTableColumn { @@ -368,7 +361,6 @@ public: SwHTMLTableLayoutColumn *CreateLayoutInfo(); }; - // HTML table typedef boost::ptr_vector<HTMLTableRow> HTMLTableRows; @@ -454,7 +446,6 @@ class HTMLTable SwHTMLTableLayout *pLayoutInfo; - // die folgenden Parameter stammen aus der dem <TABLE>-Tag sal_uInt16 nWidth; // die Breite der Tabelle sal_uInt16 nHeight; // absolute Hoehe der Tabelle @@ -522,7 +513,6 @@ class HTMLTable void InheritVertBorders( const HTMLTable *pParent, sal_uInt16 nCol, sal_uInt16 nColSpan ); - // Setzen der Umrandung anhand der Benutzervorgaben void SetBorders(); @@ -651,8 +641,6 @@ public: sal_Bool IsOverflowing() const { return nBoxes > 64000; } }; - - void HTMLTableCnts::InitCtor() { pNext = 0; @@ -710,7 +698,6 @@ SwHTMLTableLayoutCnts *HTMLTableCnts::CreateLayoutInfo() return pLayoutInfo; } - HTMLTableCell::HTMLTableCell(): pContents(0), pBGBrush(0), @@ -805,7 +792,6 @@ SwHTMLTableLayoutCell *HTMLTableCell::CreateLayoutInfo() bRelWidth, bNoWrap ); } - HTMLTableRow::HTMLTableRow( sal_uInt16 nCells ): pCells(new HTMLTableCells), bIsEndOfGroup(sal_False), @@ -905,7 +891,6 @@ void HTMLTableRow::Shrink( sal_uInt16 nCells ) pCells->erase( pCells->begin() + nCells, pCells->end() ); } - HTMLTableColumn::HTMLTableColumn(): bIsEndOfGroup(sal_False), nWidth(0), bRelWidth(sal_False), @@ -960,8 +945,6 @@ inline SwFrmFmt *HTMLTableColumn::GetFrmFmt( sal_Bool bBorderLine, return aFrmFmts[GetFrmFmtIdx(bBorderLine,eVertOrient)]; } - - void HTMLTable::InitCtor( const HTMLTableOptions *pOptions ) { pResizeDrawObjs = 0; @@ -1123,7 +1106,6 @@ HTMLTable::HTMLTable( SwHTMLParser* pPars, HTMLTable *pTopTab, pColumns->push_back( new HTMLTableColumn ); } - HTMLTable::~HTMLTable() { delete pResizeDrawObjs; @@ -1224,7 +1206,6 @@ void HTMLTable::ProtectRowSpan( sal_uInt16 nRow, sal_uInt16 nCol, sal_uInt16 nRo } } - // Suchen des SwStartNodes der letzten belegten Vorgaengerbox const SwStartNode* HTMLTable::GetPrevBoxStartNode( sal_uInt16 nRow, sal_uInt16 nCol ) const { @@ -1284,7 +1265,6 @@ const SwStartNode* HTMLTable::GetPrevBoxStartNode( sal_uInt16 nRow, sal_uInt16 n : pPrevCnts->GetTable()->GetPrevBoxStartNode( USHRT_MAX, USHRT_MAX ) ); } - static sal_Bool IsBoxEmpty( const SwTableBox *pBox ) { const SwStartNode *pSttNd = pBox->GetSttNd(); @@ -1659,7 +1639,6 @@ SwTableBox *HTMLTable::NewTableBox( const SwStartNode *pStNd, return pBox; } - static void ResetLineFrmFmtAttrs( SwFrmFmt *pFrmFmt ) { pFrmFmt->ResetFmtAttr( RES_FRM_SIZE ); @@ -1734,7 +1713,6 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper, ResetLineFrmFmtAttrs( pLineFrmFmtNoHeight ); } - SwTableBoxes& rBoxes = pLine->GetTabBoxes(); sal_uInt16 nStartCol = nLeftCol; @@ -1922,7 +1900,7 @@ void HTMLTable::InheritBorders( const HTMLTable *pParent, // ob eine Umrandung der Tabelle noetig/moeglich ist, weil das davon // abhaengt, ob "Filler"-Zellen eingefuegt werden. Hier werden deshalb // erstmal nur Informationen gesammelt - // + if( 0==nRow && pParent->bTopBorder && bFirstPara ) { bTopBorder = true; @@ -1938,7 +1916,6 @@ void HTMLTable::InheritBorders( const HTMLTable *pParent, : pParent->aBorderLine; } - // Die Child Tabelle darf keinen oberen oder linken Rahmen bekommen, // wenn der bereits durch die umgebende Tabelle gesetzt ist. // Sie darf jedoch immer einen oberen Rand bekommen, wenn die Tabelle @@ -2082,7 +2059,6 @@ inline HTMLTableCell *HTMLTable::GetCell( sal_uInt16 nRow, return (*pRows)[nRow].GetCell( nCell ); } - SvxAdjust HTMLTable::GetInheritedAdjust() const { SvxAdjust eAdjust = (nCurCol<nCols ? ((*pColumns)[nCurCol]).GetAdjust() @@ -2297,7 +2273,6 @@ void HTMLTable::CloseRow( sal_Bool bEmpty ) break; } - nCurRow++; } @@ -2355,7 +2330,6 @@ void HTMLTable::InsertCol( sal_uInt16 nSpan, sal_uInt16 nColWidth, bool bRelWidt nCurCol = nColsReq; } - void HTMLTable::CloseTable() { sal_uInt16 i; @@ -2644,7 +2618,6 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, pFrmFmt->ResetFmtAttr( RES_VERT_ORIENT ); pFrmFmt->ResetFmtAttr( RES_BOXATR_FORMAT ); - _MakeTable( pNewBox ); // und noch ggf. rechts eine Zelle einfuegen @@ -2834,7 +2807,6 @@ void _HTMLTableContext::RestorePREListingXMP( SwHTMLParser& rParser ) rParser.StartListing(); } - const SwStartNode *SwHTMLParser::InsertTableSection ( const SwStartNode *pPrevStNd ) { @@ -2937,7 +2909,6 @@ SwStartNode *SwHTMLParser::InsertTempTableCaptionSection() return pStNd; } - sal_Int32 SwHTMLParser::StripTrailingLF() { sal_Int32 nStripped = 0; @@ -3037,7 +3008,6 @@ SvxBrushItem* SwHTMLParser::CreateBrushItem( const Color *pColor, return pBrushItem; } - class _SectionSaveStruct : public SwPendingStackData { sal_uInt16 nBaseFontStMinSave, nFontStMinSave, nFontStHeadStartSave; @@ -3091,7 +3061,6 @@ void _SectionSaveStruct::Restore( SwHTMLParser& rParser ) rParser.aBaseFontStack.end() ); rParser.nBaseFontStMin = nBaseFontStMinSave; - nMin = rParser.nFontStMin; if( rParser.aFontStack.size() > nMin ) rParser.aFontStack.erase( rParser.aFontStack.begin() + nMin, @@ -3116,7 +3085,6 @@ void _SectionSaveStruct::Restore( SwHTMLParser& rParser ) rParser.aParaAttrs.clear(); } - class _CellSaveStruct : public _SectionSaveStruct { OUString aStyle, aId, aClass, aLang, aDir; @@ -3169,7 +3137,6 @@ public: void CheckNoBreak( const SwPosition& rPos, SwDoc *pDoc ); }; - _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable, sal_Bool bHd, sal_Bool bReadOpt ) : _SectionSaveStruct( rParser ), @@ -3440,8 +3407,6 @@ void _CellSaveStruct::CheckNoBreak( const SwPosition& rPos, SwDoc * /*pDoc*/ ) } } - - HTMLTableCnts *SwHTMLParser::InsertTableContents( sal_Bool bHead ) { @@ -4009,7 +3974,6 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, pSubTable->GetTableAdjust(sal_False)!= SVX_ADJUST_RIGHT, "links oder rechts ausgerichtete Tabellen gehoehren in Rahmen" ); - HTMLTableCnts *pParentContents = pSubTable->GetParentContents(); if( pParentContents ) @@ -4205,7 +4169,6 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, delete pSaveStruct; } - class _RowSaveStruct : public SwPendingStackData { public: @@ -4218,7 +4181,6 @@ public: {} }; - void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions, SvxAdjust eGrpAdjust, sal_Int16 eGrpVertOri ) @@ -4595,7 +4557,6 @@ struct _TblColGrpSaveStruct : public SwPendingStackData inline _TblColGrpSaveStruct(); - inline void CloseColGroup( HTMLTable *pTable ); }; @@ -4605,7 +4566,6 @@ inline _TblColGrpSaveStruct::_TblColGrpSaveStruct() : eColGrpVertOri( text::VertOrientation::TOP ) {} - inline void _TblColGrpSaveStruct::CloseColGroup( HTMLTable *pTable ) { pTable->CloseColGroup( nColGrpSpan, nColGrpWidth, @@ -5049,7 +5009,6 @@ public: _TblSaveStruct::~_TblSaveStruct() {} - void _TblSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc ) { pCurTable->MakeTable( 0, nWidth ); @@ -5084,7 +5043,6 @@ void _TblSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc rPos = *pTCntxt->GetPos(); } - HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, SvxAdjust eParentAdjust ) : nCols( 0 ), @@ -5220,7 +5178,6 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, } } - HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust, sal_Bool bIsParentHead, sal_Bool bHasParentSection, @@ -5509,5 +5466,4 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust, return pRetTbl; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 16319b42eeb3..021a431126db 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -61,7 +61,6 @@ using namespace ::com::sun::star; - class SwHTMLWrtTable : public SwWriteTable { void Pixelize( sal_uInt16& rValue ); @@ -94,7 +93,6 @@ public: sal_uInt16 nHSpace=0, sal_uInt16 nVSpace=0 ) const; }; - SwHTMLWrtTable::SwHTMLWrtTable( const SwTableLines& rLines, long nWidth, sal_uInt32 nBWidth, sal_Bool bRel, sal_uInt16 nLSub, sal_uInt16 nRSub, @@ -237,7 +235,6 @@ static sal_Bool lcl_TableLine_HasTabBorders( const SwTableLine* pLine, sal_Bool return !*pBorders; } - sal_Bool SwHTMLWrtTable::ShouldExpandSub( const SwTableBox *pBox, sal_Bool bExpandedBefore, sal_uInt16 nDepth ) const @@ -257,7 +254,6 @@ sal_Bool SwHTMLWrtTable::ShouldExpandSub( const SwTableBox *pBox, return bExpand; } - // Eine Box als einzelne Zelle schreiben void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, const SwWriteTableCell *pCell, @@ -505,7 +501,6 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, rWrt.bLFPossible = sal_True; } - // Eine Line als Zeilen ausgeben void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt, const SwWriteTableCells& rCells, @@ -566,8 +561,6 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt, HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_tablerow, sal_False ); } - - void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, sal_Bool bTHead, const SwFrmFmt *pFrmFmt, const OUString *pCaption, sal_Bool bTopCaption, @@ -625,7 +618,6 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, pCol = pNextCol; } - // vorhergende Aufzaehlung etc. beenden rWrt.ChangeParaToken( 0 ); @@ -1185,5 +1177,4 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode, return rWrt; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmlvsh.hxx b/sw/source/filter/html/htmlvsh.hxx index d43fc99f0682..0db12f9f6ede 100644 --- a/sw/source/filter/html/htmlvsh.hxx +++ b/sw/source/filter/html/htmlvsh.hxx @@ -23,7 +23,6 @@ #include <calbck.hxx> class SwViewShell; - class SwHTMLViewShellClient : public SwClient { protected: @@ -41,9 +40,6 @@ public: SwViewShell *GetViewShell(); }; - - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index 692474b97d4b..675e6a1b5762 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <ctype.h> #include <stdlib.h> #include <stdio.h> @@ -29,7 +28,6 @@ #include "css1kywd.hxx" #include "parcss1.hxx" - // Loop-Check: Um Endlos-Schleifen zu vermeiden, wird in jeder // Schalife geprueft, ob ein Fortschritt in der Eingabe-Position // stattgefunden hat @@ -56,10 +54,8 @@ #endif - const sal_Int32 MAX_LEN = 1024; - void CSS1Parser::InitRead( const OUString& rIn ) { nlLineNr = 0; @@ -99,13 +95,13 @@ sal_Unicode CSS1Parser::GetNextChar() } // Diese Funktion realisiert den in -// + // http://www.w3.orh/pub/WWW/TR/WD-css1.html // bzw. http://www.w3.orh/pub/WWW/TR/WD-css1-960220.html -// + // beschriebenen Scanner fuer CSS1. Es handelt sich um eine direkte // Umsetzung der dort beschriebenen Lex-Grammatik -// + CSS1Token CSS1Parser::GetNextToken() { CSS1Token nRet = CSS1_NULL; @@ -659,24 +655,23 @@ CSS1Token CSS1Parser::GetNextToken() return nRet; } - // Dies folegenden Funktionen realisieren den in -// + // http://www.w3.orh/pub/WWW/TR/WD-css1.html // bzw. http://www.w3.orh/pub/WWW/TR/WD-css1-960220.html -// + // beschriebenen Parser fuer CSS1. Es handelt sich um eine direkte // Umsetzung der dort beschriebenen Grammatik // stylesheet // : import* rule* -// + // import // : IMPORT_SYM url -// + // url // : STRING -// + void CSS1Parser::ParseStyleSheet() { LOOP_CHECK_DECL @@ -741,7 +736,7 @@ void CSS1Parser::ParseStyleSheet() // rule // : selector [ ',' selector ]* // '{' declaration [ ';' declaration ]* '}' -// + void CSS1Parser::ParseRule() { // selector @@ -818,24 +813,24 @@ void CSS1Parser::ParseRule() // selector // : simple_selector+ [ ':' pseudo_element ]? -// + // simple_selector // : element_name [ DOT_WO_WS class ]? // | DOT_W_WS class // | id_selector -// + // element_name // : IDENT -// + // class // : IDENT -// + // id_selector // : '#' IDENT -// + // pseude_element // : IDENT -// + CSS1Selector *CSS1Parser::ParseSelector() { CSS1Selector *pRoot = 0, *pLast = 0; @@ -985,24 +980,24 @@ CSS1Selector *CSS1Parser::ParseSelector() // declaration // : property ':' expr prio? // | /* empty */ -// + // expression // : term [ operator term ]* -// + // term // : unary_operator? // [ NUMBER | STRING | PERCENTAGE | LENGTH | EMS | EXS | IDENT | // HEXCOLOR | URL | RGB ] -// + // operator // : '/' | ',' | /* empty */ -// + // unary_operator // : '-' | '+' -// + // property // : ident -// + // das Vorzeichen wird nur fuer numerische Werte (ausser PERCENTAGE) // beruecksichtigt und wird auf nValue angewendet! CSS1Expression *CSS1Parser::ParseDeclaration( OUString& rProperty ) @@ -1019,7 +1014,6 @@ CSS1Expression *CSS1Parser::ParseDeclaration( OUString& rProperty ) nToken = GetNextToken(); - // ':' if( CSS1_COLON != nToken ) { @@ -1119,7 +1113,6 @@ CSS1Expression *CSS1Parser::ParseDeclaration( OUString& rProperty ) return pRoot; } - CSS1Parser::CSS1Parser() : nValue(0) , eState(CSS1_PAR_ACCEPTED) @@ -1131,7 +1124,6 @@ CSS1Parser::~CSS1Parser() { } - sal_Bool CSS1Parser::ParseStyleSheet( const OUString& rIn ) { OUString aTmp( rIn ); @@ -1164,7 +1156,6 @@ sal_Bool CSS1Parser::ParseStyleSheet( const OUString& rIn ) return sal_True; } - sal_Bool CSS1Parser::ParseStyleOption( const OUString& rIn ) { if( rIn.isEmpty() ) @@ -1225,7 +1216,6 @@ sal_Bool CSS1Parser::DeclarationParsed( const OUString& /*rProperty*/, return sal_True; } - CSS1Selector::~CSS1Selector() { delete pNext; @@ -1377,7 +1367,6 @@ sal_Bool CSS1Expression::GetColor( Color &rColor ) const ; } - if( bRet && nColor!=SAL_MAX_UINT32 ) { rColor.SetRed( (sal_uInt8)((nColor & 0x00ff0000UL) >> 16) ); diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 83b13fb5e21c..cfc0d6bb465b 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -54,7 +54,6 @@ #include <memory> - using namespace ::com::sun::star; // die Funktionen zum Parsen einer CSS1-Property sind von folgendem Typ: @@ -265,11 +264,8 @@ struct SvxCSS1ItemIds sal_uInt16 nDirection; }; - static SvxCSS1ItemIds aItemIds; - - struct SvxCSS1BorderInfo { Color aColor; @@ -689,7 +685,6 @@ bool SvxCSS1Parser::SelectorParsed( CSS1Selector *pSelector, bool bFirst ) return false; // den Selektor haben wir gespeichert. Loeschen toedlich! } - sal_Bool SvxCSS1Parser::DeclarationParsed( const OUString& rProperty, const CSS1Expression *pExpr ) { @@ -703,7 +698,6 @@ sal_Bool SvxCSS1Parser::DeclarationParsed( const OUString& rProperty, return sal_True; // die Deklaration brauchen wir nicht mehr. Loeschen! } - SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL, sal_uInt16 nMinFixLineSp, sal_uInt16 *pWhichIds, sal_uInt16 nWhichIds ) : CSS1Parser(), @@ -871,7 +865,6 @@ sal_Bool SvxCSS1Parser::ParseStyleOption( const OUString& rIn, return bSuccess; } - sal_Bool SvxCSS1Parser::GetEnum( const CSS1PropertyEnum *pPropTable, const OUString &rValue, sal_uInt16& rEnum ) { @@ -1001,7 +994,6 @@ void SvxCSS1Parser::SetDfltEncoding( rtl_TextEncoding eEnc ) eDfltEnc = eEnc; } - static void ParseCSS1_font_size( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& /*rPropInfo*/, @@ -1064,8 +1056,6 @@ static void ParseCSS1_font_size( const CSS1Expression *pExpr, } } - - static void ParseCSS1_font_family( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& /*rPropInfo*/, @@ -1145,7 +1135,6 @@ static void ParseCSS1_font_family( const CSS1Expression *pExpr, } } - static void ParseCSS1_font_weight( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& /*rPropInfo*/, @@ -1203,7 +1192,6 @@ static void ParseCSS1_font_weight( const CSS1Expression *pExpr, } } - static void ParseCSS1_font_style( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& /*rPropInfo*/, @@ -1273,7 +1261,6 @@ static void ParseCSS1_font_style( const CSS1Expression *pExpr, rItemSet.Put( SvxCaseMapItem( eCaseMap, aItemIds.nCaseMap ) ); } - static void ParseCSS1_font_variant( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& /*rPropInfo*/, @@ -1326,7 +1313,6 @@ static void ParseCSS1_text_transform( const CSS1Expression *pExpr, } } - static void ParseCSS1_color( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& /*rPropInfo*/, @@ -1351,7 +1337,6 @@ static void ParseCSS1_color( const CSS1Expression *pExpr, } } - static void ParseCSS1_column_count( const CSS1Expression *pExpr, SfxItemSet& /*rItemSet*/, SvxCSS1PropertyInfo &rPropInfo, @@ -1369,7 +1354,6 @@ static void ParseCSS1_column_count( const CSS1Expression *pExpr, } } - static void ParseCSS1_direction( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& /*rPropInfo*/, @@ -1395,7 +1379,6 @@ static void ParseCSS1_direction( const CSS1Expression *pExpr, } } - static void MergeHori( SvxGraphicPosition& ePos, SvxGraphicPosition eHori ) { OSL_ENSURE( GPOS_LT==eHori || GPOS_MT==eHori || GPOS_RT==eHori, @@ -1642,7 +1625,6 @@ static void ParseCSS1_background_color( const CSS1Expression *pExpr, } } - static void ParseCSS1_line_height( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& /*rPropInfo*/, @@ -1706,7 +1688,6 @@ static void ParseCSS1_line_height( const CSS1Expression *pExpr, } - static void ParseCSS1_font( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& rPropInfo, @@ -1788,7 +1769,6 @@ static void ParseCSS1_font( const CSS1Expression *pExpr, rItemSet.Put( aWeight ); } - // font-size CSS1Expression aExpr( pExpr->GetType(), pExpr->GetString(), pExpr->GetNumber() ); @@ -1815,7 +1795,6 @@ static void ParseCSS1_font( const CSS1Expression *pExpr, ParseCSS1_font_family( pExpr, rItemSet, rPropInfo, rParser ); } - static void ParseCSS1_letter_spacing( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& /*rPropInfo*/, @@ -1859,7 +1838,6 @@ static void ParseCSS1_letter_spacing( const CSS1Expression *pExpr, } } - static void ParseCSS1_text_decoration( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& /*rPropInfo*/, @@ -1967,7 +1945,6 @@ static void ParseCSS1_text_decoration( const CSS1Expression *pExpr, rItemSet.Put( SvxBlinkItem( bBlinkOn, aItemIds.nBlink ) ); } - static void ParseCSS1_text_align( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& /*rPropInfo*/, @@ -1988,7 +1965,6 @@ static void ParseCSS1_text_align( const CSS1Expression *pExpr, } } - static void ParseCSS1_text_indent( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& rPropInfo, @@ -2040,7 +2016,6 @@ static void ParseCSS1_text_indent( const CSS1Expression *pExpr, } } - static void ParseCSS1_margin_left( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& rPropInfo, @@ -2096,7 +2071,6 @@ static void ParseCSS1_margin_left( const CSS1Expression *pExpr, } } - static void ParseCSS1_margin_right( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& rPropInfo, @@ -2152,7 +2126,6 @@ static void ParseCSS1_margin_right( const CSS1Expression *pExpr, } } - static void ParseCSS1_margin_top( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& rPropInfo, @@ -2211,7 +2184,6 @@ static void ParseCSS1_margin_top( const CSS1Expression *pExpr, } } - static void ParseCSS1_margin_bottom( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& rPropInfo, @@ -2270,7 +2242,6 @@ static void ParseCSS1_margin_bottom( const CSS1Expression *pExpr, } } - static void ParseCSS1_margin( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& rPropInfo, @@ -2411,7 +2382,6 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr, } } - static sal_Bool ParseCSS1_padding_xxx( const CSS1Expression *pExpr, SfxItemSet & /*rItemSet*/, SvxCSS1PropertyInfo& rPropInfo, @@ -2470,7 +2440,6 @@ static sal_Bool ParseCSS1_padding_xxx( const CSS1Expression *pExpr, return bSet; } - static void ParseCSS1_padding_top( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& rPropInfo, @@ -2531,7 +2500,6 @@ static void ParseCSS1_padding( const CSS1Expression *pExpr, } } - static void ParseCSS1_border_xxx( const CSS1Expression *pExpr, SfxItemSet & /*rItemSet*/, SvxCSS1PropertyInfo& rPropInfo, @@ -2675,7 +2643,6 @@ static void ParseCSS1_border_xxx_width( const CSS1Expression *pExpr, pInfo->nNamedWidth = nNWidth; } - static void ParseCSS1_border_top_width( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& rPropInfo, @@ -2776,7 +2743,6 @@ static void ParseCSS1_border_style( const CSS1Expression *pExpr, } } - static void ParseCSS1_border_top( const CSS1Expression *pExpr, SfxItemSet &rItemSet, SvxCSS1PropertyInfo& rPropInfo, @@ -2817,7 +2783,6 @@ static void ParseCSS1_border( const CSS1Expression *pExpr, ParseCSS1_border_xxx( pExpr, rItemSet, rPropInfo, rParser, 0, sal_True ); } - static void ParseCSS1_float( const CSS1Expression *pExpr, SfxItemSet & /*rItemSet*/, SvxCSS1PropertyInfo& rPropInfo, @@ -2833,8 +2798,6 @@ static void ParseCSS1_float( const CSS1Expression *pExpr, } } - - static void ParseCSS1_position( const CSS1Expression *pExpr, SfxItemSet & /*rItemSet*/, SvxCSS1PropertyInfo& rPropInfo, @@ -2850,7 +2813,6 @@ static void ParseCSS1_position( const CSS1Expression *pExpr, } } - static void ParseCSS1_length( const CSS1Expression *pExpr, long& rLength, SvxCSS1LengthType& rLengthType, @@ -2895,7 +2857,6 @@ static void ParseCSS1_length( const CSS1Expression *pExpr, } } - static void ParseCSS1_width( const CSS1Expression *pExpr, SfxItemSet & /*rItemSet*/, SvxCSS1PropertyInfo& rPropInfo, @@ -2928,7 +2889,6 @@ static void ParseCSS1_top( const CSS1Expression *pExpr, ParseCSS1_length( pExpr, rPropInfo.nTop, rPropInfo.eTopType, sal_False ); } - // Feature: PrintExt static void ParseCSS1_size( const CSS1Expression *pExpr, SfxItemSet & /*rItemSet*/, @@ -2981,7 +2941,6 @@ static void ParseCSS1_size( const CSS1Expression *pExpr, // /Feature: PrintExt - // Feature: PrintExt static void ParseCSS1_page_break_xxx( const CSS1Expression *pExpr, @@ -3099,7 +3058,6 @@ static void ParseCSS1_so_language( const CSS1Expression *pExpr, } } - // die Zuordung Property zu parsender Funktion struct CSS1PropEntry { @@ -3114,7 +3072,6 @@ struct CSS1PropEntry #define CSS1_PROP_ENTRY(p) \ { { sCSS1_P_##p }, ParseCSS1_##p } - // die Tabelle mit den Zuordnungen static CSS1PropEntry aCSS1PropFnTab[] = { @@ -3174,7 +3131,6 @@ static CSS1PropEntry aCSS1PropFnTab[] = CSS1_PROP_ENTRY(so_language) }; - static int bSortedPropFns = sal_False; extern "C" diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx index 2de079894110..1ba92df1f8f9 100644 --- a/sw/source/filter/html/svxcss1.hxx +++ b/sw/source/filter/html/svxcss1.hxx @@ -40,7 +40,6 @@ enum SvxCSS1Position SVX_CSS1_POS_END }; - enum SvxCSS1LengthType { SVX_CSS1_LTYPE_NONE, // nichts angegeben @@ -166,7 +165,6 @@ public: SvxCSS1MapEntry( const OUString& rKey, const SfxItemSet& rItemSet, const SvxCSS1PropertyInfo& rProp ); - const SfxItemSet& GetItemSet() const { return aItemSet; } SfxItemSet& GetItemSet() { return aItemSet; } @@ -263,7 +261,6 @@ protected: public: - SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL, sal_uInt16 nMinFixLineSp, @@ -341,5 +338,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx index 1bc5ca6cb499..cdf24be7f927 100644 --- a/sw/source/filter/html/swcss1.hxx +++ b/sw/source/filter/html/swcss1.hxx @@ -35,7 +35,6 @@ class SwPageDesc; // ganz unauffaellig das ein oder andere! Andererseits wird diese // Klasse recht selten benoetigt. Deshalb ein eigener Header. - class SwCSS1Parser : public SvxCSS1Parser { SwDoc *pDoc; @@ -129,7 +128,6 @@ public: sal_Bool SetFmtBreak( SfxItemSet& rItemSet, const SvxCSS1PropertyInfo& rPropInfo ); - static void AddClassName( OUString& rFmtName, const OUString& rClass ); static inline void AddFirstLetterExt( OUString& rFmtName ); @@ -165,7 +163,6 @@ public: virtual void SetDfltEncoding( rtl_TextEncoding eEnc ); }; - inline void SwCSS1Parser::AddFirstLetterExt( OUString& rFmtName ) { rFmtName += ".FL"; // first letter @@ -198,7 +195,6 @@ inline void SwCSS1Parser::SetTDTagStyles() SetTableTxtColl( sal_False ); } - inline void SwCSS1Parser::SetATagStyles() { if( !bLinkCharFmtsSet ) @@ -212,8 +208,6 @@ inline void SwCSS1Parser::SetDelayedStyles() SetATagStyles(); } - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index ab79860ac6ce..8948542bd503 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -19,7 +19,6 @@ #include <config_features.h> - #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/i18n/ScriptType.hpp> @@ -63,7 +62,6 @@ #include <editeng/protitem.hxx> #include <editeng/flstitem.hxx> - #include <frmatr.hxx> #include <charatr.hxx> #include <fmtfld.hxx> @@ -223,12 +221,9 @@ sal_uLong HTMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam, ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR ); } - return nRet; } - - SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn, const OUString& rPath, const OUString& rBaseURL, @@ -889,7 +884,6 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() ) } } - // Wenn die Dokuemnt-SwViewShell noch existiert und eine Action // offen ist (muss bei Abbruch nicht sein), die Action beenden, // uns von der Shell abmelden und schliesslich die alte Shell @@ -1758,7 +1752,6 @@ void SwHTMLParser::NextToken( int nToken ) } break; - case HTML_STRIKE_ON: case HTML_STRIKETHROUGH_ON: { @@ -1799,7 +1792,6 @@ void SwHTMLParser::NextToken( int nToken ) NewStdAttr( HTML_SPAN_ON ); break; - case HTML_ITALIC_OFF: case HTML_BOLD_OFF: case HTML_STRIKE_OFF: @@ -2040,7 +2032,6 @@ void SwHTMLParser::NextToken( int nToken ) aParaAttrs.clear(); } - extern bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 ); static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr, @@ -2380,7 +2371,6 @@ sal_Bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, sal_Bool bUpdateNu } } - if( !pTable && !--nParaCnt ) Show(); @@ -2468,7 +2458,6 @@ void SwHTMLParser::AddParSpace() } } - void SwHTMLParser::Show() { // Hier wird @@ -2648,7 +2637,6 @@ SwViewShell *SwHTMLParser::CheckActionViewShell() return pActionViewShell; } - void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable, _HTMLAttrs *pPostIts ) { @@ -2710,7 +2698,6 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable, aParaAttrs.pop_back(); } - // dann also setzen aSetAttrTab.erase( aSetAttrTab.begin() + n ); @@ -2725,7 +2712,6 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable, continue; //break; } - pCNd = pAttr->nSttPara.GetNode().GetCntntNode(); if( !pCNd ) { @@ -2754,8 +2740,6 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable, } pAttrPam->GetPoint()->nNode = pAttr->nSttPara; - - // durch das Loeschen von BRs kann der Start-Index // auch mal hinter das Ende des Textes zeigen if( pAttr->nSttCntnt > pCNd->Len() ) @@ -3002,7 +2986,6 @@ void SwHTMLParser::NewAttr( _HTMLAttr **ppAttr, const SfxPoolItem& rItem ) (*ppAttr) = new _HTMLAttr( *pPam->GetPoint(), rItem, ppAttr ); } - void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr, sal_Bool bChkEmpty ) { @@ -3046,7 +3029,6 @@ void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr, // nun das Attrubut beenden _HTMLAttr *pNext = pAttr->GetNext(); - sal_Bool bInsert; sal_uInt16 nScriptItem = 0; sal_Bool bScript = sal_False, bFont = sal_False; @@ -3564,7 +3546,6 @@ void SwHTMLParser::EndTag( int nToken ) } } - void SwHTMLParser::NewBasefontAttr() { OUString aId, aStyle, aClass, aLang, aDir; @@ -3806,7 +3787,6 @@ void SwHTMLParser::NewFontAttr( int nToken ) } } - // einen neuen Kontext anlegen _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken) ); @@ -3837,7 +3817,6 @@ void SwHTMLParser::NewFontAttr( int nToken ) aItemSet.Put( aFontCTL ); } - if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) ) DoPositioning( aItemSet, aPropInfo, pCntxt ); @@ -3882,7 +3861,6 @@ void SwHTMLParser::EndFontAttr( int nToken ) aFontStack.erase( aFontStack.begin() + aFontStack.size() - 1 ); } - void SwHTMLParser::NewPara() { if( pPam->GetPoint()->nContent.GetIndex() ) @@ -4006,7 +3984,6 @@ void SwHTMLParser::EndPara( sal_Bool bReal ) nOpenParaToken = 0; } - void SwHTMLParser::NewHeading( int nToken ) { eParaAdjust = SVX_ADJUST_END; @@ -4133,7 +4110,6 @@ void SwHTMLParser::EndHeading() nFontStHeadStart = nFontStMin; } - void SwHTMLParser::NewTxtFmtColl( int nToken, sal_uInt16 nColl ) { OUString aId, aStyle, aClass, aLang, aDir; @@ -4261,7 +4237,6 @@ void SwHTMLParser::EndTxtFmtColl( int nToken ) SetTxtCollAttrs(); } - void SwHTMLParser::NewDefList() { OUString aId, aStyle, aClass, aLang, aDir; @@ -4300,7 +4275,6 @@ void SwHTMLParser::NewDefList() // ein Level mehr nDefListDeep++; - sal_Bool bInDD = sal_False, bNotInDD = sal_False; sal_uInt16 nPos = aContexts.size(); while( !bInDD && !bNotInDD && nPos>nContextStMin ) @@ -4321,7 +4295,6 @@ void SwHTMLParser::NewDefList() } } - // ... und in einem Kontext merken _HTMLAttrContext *pCntxt = new _HTMLAttrContext( HTML_DEFLIST_ON ); @@ -4477,7 +4450,6 @@ void SwHTMLParser::EndDefListItem( int nToken, sal_Bool bSetColl, SetTxtCollAttrs(); } - sal_Bool SwHTMLParser::HasCurrentParaFlys( sal_Bool bNoSurroundOnly, sal_Bool bSurroundOnly ) const { @@ -4548,7 +4520,6 @@ sal_Bool SwHTMLParser::HasCurrentParaFlys( sal_Bool bNoSurroundOnly, return bFound; } - // die speziellen Methoden zum Einfuegen von Objecten const SwFmtColl *SwHTMLParser::GetCurrFmtColl() const @@ -4557,7 +4528,6 @@ const SwFmtColl *SwHTMLParser::GetCurrFmtColl() const return &pCNd->GetAnyFmtColl(); } - void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext ) { SwTxtFmtColl *pCollToSet = 0; // die zu setzende Vorlage @@ -4781,7 +4751,6 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext ) } } - void SwHTMLParser::NewCharFmt( int nToken ) { OUString aId, aStyle, aLang, aDir; @@ -4818,7 +4787,6 @@ void SwHTMLParser::NewCharFmt( int nToken ) SwCharFmt* pCFmt = pCSS1Parser->GetChrFmt( static_cast< sal_uInt16 >(nToken), aClass ); OSL_ENSURE( pCFmt, "keine Zeichenvorlage zu Token gefunden" ); - // Styles parsen (zu Class siehe auch NewPara) if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) ) { @@ -4844,8 +4812,6 @@ void SwHTMLParser::NewCharFmt( int nToken ) PushContext( pCntxt ); } - - void SwHTMLParser::InsertSpacer() { // und es ggf. durch die Optionen veraendern @@ -5057,8 +5023,6 @@ SwTwips SwHTMLParser::GetCurrentBrowseWidth() return aHTMLPageSize.Width(); } - - void SwHTMLParser::InsertIDOption() { OUString aId; @@ -5077,9 +5041,6 @@ void SwHTMLParser::InsertIDOption() InsertBookmark( aId ); } - - - void SwHTMLParser::InsertLineBreak() { // <BR CLEAR=xxx> wird wie folgt behandelt: @@ -5471,7 +5432,6 @@ void SwHTMLParser::ParseMoreMetaOptions() InsertAttr( aFmtFld ); } - _HTMLAttr::_HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem, _HTMLAttr **ppHd ) : nSttPara( rPos.nNode ), diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 878ba65854c9..52e48712868f 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -60,7 +60,6 @@ extern HTMLOptionEnum aHTMLPAlignTable[]; extern HTMLOptionEnum aHTMLImgHAlignTable[]; extern HTMLOptionEnum aHTMLImgVAlignTable[]; - // der Attribut Stack: class _HTMLAttr; @@ -409,9 +408,9 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient sal_uInt32 nScriptStartLineNr; // Zeilennummer eines Script-Blocks sal_uLong nEventId; - sal_uInt16 nBaseFontStMin; // - sal_uInt16 nFontStMin; // - sal_uInt16 nDefListDeep; // + sal_uInt16 nBaseFontStMin; + sal_uInt16 nFontStMin; + sal_uInt16 nDefListDeep; sal_uInt16 nFontStHeadStart; // Elemente im Font-Stack bei <Hn> sal_uInt16 nSBModuleCnt; // Zaehler fuer Basic-Module sal_uInt16 nMissingImgMaps; // Wie viele Image-Maps fehlen noch? @@ -572,7 +571,6 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient short& nIndent ) const; void GetULSpaceFromContext( sal_uInt16 &rUpper, sal_uInt16 &rLower ) const; - void MovePageDescAttrs( SwNode *pSrcNd, sal_uLong nDestIdx, sal_Bool bFmtBreak ); // Behandlung von Tags auf Absatz-Ebene @@ -627,7 +625,6 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient void EndDefListItem( int nToken=0, sal_Bool bSetColl=sal_True, sal_Bool bLastPara=sal_False ); - // Behandlung von Tags auf Zeichen-Ebene // Tags wie <B>, <I> etc behandeln, die ein bestimmtes Attribut @@ -724,7 +721,6 @@ private: // <BODY>-Tag auswerten: Hintergrund-Grafiken und -Farben setzen (htmlgrin.cxx) void InsertBodyOptions(); - // Einfuegen von Links und ::com::sun::star::text::Bookmarks (htmlgrin.cxx) // <A>-Tag auswerten: einen Link bzw. eine ::com::sun::star::text::Bookmark einfuegen @@ -734,14 +730,12 @@ private: // eine ::com::sun::star::text::Bookmark einfuegen void InsertBookmark( const OUString& rName ); - void InsertCommentText( const sal_Char *pTag = 0 ); void InsertComment( const OUString& rName, const sal_Char *pTag = 0 ); // sind im aktuellen Absatz ::com::sun::star::text::Bookmarks vorhanden? sal_Bool HasCurrentParaBookmarks( sal_Bool bIgnoreStack=sal_False ) const; - // Einfuegen von Script/Basic-Elementen // das zueletzt gelsene Basic-Modul parsen (htmlbas.cxx) @@ -771,7 +765,6 @@ private: SvxCSS1PropertyInfo &rPropInfo, const OUString *pLang=0, const OUString *pDir=0 ); - // Inserting Controls and ::com::sun::star::form::Forms (htmlform.cxx) // Insert draw object into document @@ -847,7 +840,6 @@ private: sal_Bool bIsInMulticol = sal_False, sal_Bool bHasToFlow = sal_False ); - // misc ... void ParseMoreMetaOptions(); @@ -906,7 +898,6 @@ public: virtual SvParserState CallParser(); - sal_uInt16 ToTwips( sal_uInt16 nPixel ) const; // for reading asynchronously from SvStream @@ -917,7 +908,6 @@ public: SvKeyValueIterator* ); }; - struct SwPendingStackData { virtual ~SwPendingStackData() {} @@ -1001,8 +991,6 @@ inline void SwHTMLParser::PushContext( _HTMLAttrContext *pCntxt ) aContexts.push_back( pCntxt ); } - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index e21718ad10f8..eb39cfc75ac4 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -124,7 +124,6 @@ SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL ) nDirection = FRMDIR_HORI_LEFT_TOP; } - SwHTMLWriter::~SwHTMLWriter() { delete pNumRuleInfo; @@ -320,7 +319,6 @@ sal_uLong SwHTMLWriter::WriteStream() } } - // Tabelle fuer die freifliegenden Rahmen erzeugen, aber nur wenn // das gesamte Dokument geschrieben wird pHTMLPosFlyFrms = 0; @@ -506,7 +504,6 @@ static bool lcl_html_IsMultiColEnd( const SwHTMLWriter& rHTMLWrt, sal_uLong nInd return bRet; } - static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, const SwSection& rSection, const SwSectionFmt& rFmt, @@ -779,7 +776,6 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam ) bWriteAll = bSaveWriteAll; // wieder auf alten Wert zurueck } - // schreibe die StyleTabelle, algemeine Angaben,Header/Footer/Footnotes static void OutBodyColor( const sal_Char *pTag, const SwFmt *pFmt, SwHTMLWriter& rHWrt ) @@ -1327,7 +1323,6 @@ HTMLSaveData::HTMLSaveData( SwHTMLWriter& rWriter, sal_uLong nStt, rWrt.nDirection = rWrt.GetHTMLDirection( pFrmFmt->GetAttrSet() ); } - HTMLSaveData::~HTMLSaveData() { delete rWrt.pCurPam; // Pam wieder loeschen @@ -1358,11 +1353,9 @@ HTMLSaveData::~HTMLSaveData() } } - void GetHTMLWriter( const OUString&, const OUString& rBaseURL, WriterRef& xRet ) { xRet = new SwHTMLWriter( rBaseURL ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index bb954e5bf615..3c294edae53b 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -93,7 +93,6 @@ const sal_uInt32 HTML_FRMOPT_S_PIXSIZE = 1<<18; const sal_uInt32 HTML_FRMOPT_ID = 1<<19; const sal_uInt32 HTML_FRMOPT_DIR = 1<<20; - const sal_uInt32 HTML_FRMOPTS_GENIMG_ALL = HTML_FRMOPT_ALT | HTML_FRMOPT_SIZE | @@ -210,7 +209,6 @@ public: ~HTMLControls() { DeleteAndDestroyAll(); } }; - typedef std::vector<SwFmtINetFmt*> INetFmts; struct SwHTMLFmtInfo @@ -237,7 +235,6 @@ struct SwHTMLFmtInfo pFmt( pF ), pRefFmt(0), pItemSet( 0 ), nFirstLineIndent(0), bScriptDependent(false) {} - // Konstruktor zum Erstellen der Format-Info SwHTMLFmtInfo( const SwFmt *pFmt, SwDoc *pDoc, SwDoc *pTemlate, sal_Bool bOutStyles, LanguageType eDfltLang=LANGUAGE_DONTKNOW, @@ -604,7 +601,6 @@ struct HTMLSaveData ~HTMLSaveData(); }; - // einige Funktions-Deklarationen Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFmt, sal_Bool bInCntnr ); diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx index 5242b12c237a..1b9d1cac031b 100644 --- a/sw/source/filter/inc/fltini.hxx +++ b/sw/source/filter/inc/fltini.hxx @@ -62,7 +62,6 @@ public: void GetWW8Writer( const OUString&, const OUString&, WriterRef& ); - // Umsetzen der LRSpaces im aktuell importierten Doc. Die Fremd-Filter // liefern immer absolute Werte fuer die Ebenen einer NumRule. Wir // verarbeiten jetzt aber relative Werte bezogen auf das LR-Space-Item. diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 163233239dc4..8222c9f7572d 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -228,7 +228,6 @@ public: virtual void Modify (const SfxPoolItem *pOld, const SfxPoolItem *pNew); }; - class SW_DLLPUBLIC SwFltRedline : public SfxPoolItem { public: @@ -303,7 +302,7 @@ class SW_DLLPUBLIC SwFltTOX : public SfxPoolItem SwTOXBase* pTOXBase; sal_uInt16 nCols; sal_Bool bHadBreakItem; // there was a break item BEFORE insertion of the TOX - sal_Bool bHadPageDescItem; // ... + sal_Bool bHadPageDescItem; public: SwFltTOX(SwTOXBase* pBase, sal_uInt16 _nCols = 0); SwFltTOX(const SwFltTOX&); @@ -343,8 +342,6 @@ public: } }; -/////////////////////////////////////////////////////////////////////////////////////////// -// // hier beginnen die fuer ww1-filter neu erstellten klassen. diese // sollen eine simple oberflaeche fuer die komplexen strukturen des // writers speziell fuer filter sein. soll etwas in den writer gegeben @@ -352,10 +349,9 @@ public: // worden. ausserdem soll moeglich sein das objekt nach vielen // zustaenden der momentanen formatierung zu fragen, sodasz diese der // filter nicht selbst verwalten musz. -// + // den anfang macht eine vorlagen-oberklasse, die einfachen umgang mit // formatvorlagen ermoeglicht: -// class SwFltOutBase { @@ -490,7 +486,6 @@ public: virtual void EndFly(); }; -// // dies nun ist die zauberhafteklasse: intention: alle eins nach dem // andern hinein'pipe'n. wird eine besondere struktur eingelesen, wird // eine klammer geoeffnet (BeginXxx) und nach beendigung geschlossen @@ -500,7 +495,7 @@ public: // beginnt ein neuer absatz oder aehnliches, wird NextXxx genutzt. // hier ist moeglich, Tab, Zeilenumbruch, Absatzende, Seitenumbruch // und Sektionsende einzufuegen. -// + class SwFltShell { SwFltOutDoc* pOutDoc; @@ -526,11 +521,11 @@ class SwFltShell // Fly items: sal_uInt16 nAktStyle; // zur Indizierung pStyleFlyTable -// + SwFltControlStack aStack; SwFltEndStack aEndStack; SwPaM* pPaM; -// + OUString sBaseURL; sal_uInt16 nPageDescOffset; // fuers update der pagedescs rtl_TextEncoding eSrcCharSet; // charset der quelle diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx index 301b8ff2bf5f..e6a2e089706e 100644 --- a/sw/source/filter/inc/rtf.hxx +++ b/sw/source/filter/inc/rtf.hxx @@ -45,5 +45,4 @@ public: #endif // INCLUDED_SW_SOURCE_FILTER_INC_RTF_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/inc/wrt_fn.hxx b/sw/source/filter/inc/wrt_fn.hxx index 71b590de6e0b..6e06756f4c76 100644 --- a/sw/source/filter/inc/wrt_fn.hxx +++ b/sw/source/filter/inc/wrt_fn.hxx @@ -35,7 +35,6 @@ SW_DLLPUBLIC Writer& Out( const SwAttrFnTab, const SfxPoolItem&, Writer& ); SW_DLLPUBLIC Writer& Out_SfxItemSet( const SwAttrFnTab, Writer&, const SfxItemSet&, sal_Bool bDeep, sal_Bool bTstForDefault = sal_True ); - /* Funktionspointer auf die Node-Write-Funktionen */ enum RES_NODE @@ -52,9 +51,6 @@ typedef FnNodeOut SwNodeFnTab[ RES_NODE_END - RES_NODE_BEGIN ]; SW_DLLPUBLIC Writer& Out( const SwNodeFnTab, SwNode&, Writer & rWrt ); - - - #endif // INCLUDED_SW_SOURCE_FILTER_INC_WRT_FN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx index de63e3e691f7..1e4e6463779d 100644 --- a/sw/source/filter/inc/wrtswtbl.hxx +++ b/sw/source/filter/inc/wrtswtbl.hxx @@ -34,18 +34,13 @@ class SvxBrushItem; namespace editeng { class SvxBorderLine; } -//--------------------------------------------------------------------------- // Code aus dem HTML-Filter fuers schreiben von Tabellen -//--------------------------------------------------------------------------- #define COLFUZZY 20 #define ROWFUZZY 20 #define COL_DFLT_WIDTH ((2*COLFUZZY)+1) #define ROW_DFLT_HEIGHT (2*ROWFUZZY)+1 - -//----------------------------------------------------------------------- - class SW_DLLPUBLIC SwWriteTableCell { const SwTableBox *pBox; // SwTableBox der Zelle @@ -61,7 +56,6 @@ class SW_DLLPUBLIC SwWriteTableCell sal_uInt16 nRowSpan; // ueberspannte Zeilen sal_uInt16 nColSpan; // ueberspannte Spalten - bool bPrcWidthOpt; public: @@ -97,9 +91,6 @@ public: typedef boost::ptr_vector<SwWriteTableCell> SwWriteTableCells; - -//----------------------------------------------------------------------- - class SW_DLLPUBLIC SwWriteTableRow { SwWriteTableCells aCells; // Alle Zellen der Rows @@ -168,9 +159,6 @@ public: ~SwWriteTableRows() { DeleteAndDestroyAll(); } }; - -//----------------------------------------------------------------------- - class SW_DLLPUBLIC SwWriteTableCol { sal_uInt32 nPos; // End Position der Spalte @@ -230,8 +218,6 @@ public: ~SwWriteTableCols() { DeleteAndDestroyAll(); } }; -//----------------------------------------------------------------------- - class SW_DLLPUBLIC SwWriteTable { protected: @@ -312,7 +298,6 @@ protected: sal_uInt16 GetLeftSpace( sal_uInt16 nCol ) const; sal_uInt16 GetRightSpace(size_t nCol, sal_uInt16 nColSpan) const; - public: SwWriteTable( const SwTableLines& rLines, long nWidth, sal_uInt32 nBWidth, bool bRel, sal_uInt16 nMaxDepth = USHRT_MAX, @@ -324,9 +309,6 @@ public: const SwWriteTableRows& GetRows() const { return aRows; } }; - - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index bcee1e0a0ae1..aafa1615497e 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -191,7 +191,6 @@ sal_Int32 Writer::FindPos_Bkmk(const SwPosition& rPos) const return -1; } - SwPaM * Writer::NewSwPaM(SwDoc & rDoc, sal_uLong const nStartIdx, sal_uLong const nEndIdx) { @@ -241,7 +240,6 @@ SvStream& Writer::OutULong( SvStream& rStrm, sal_uLong nVal ) return lcl_OutLongExt(rStrm, nVal, false); } - sal_uLong Writer::Write( SwPaM& rPaM, SvStream& rStrm, const OUString* pFName ) { if ( IsStgWriter() ) @@ -385,7 +383,6 @@ void Writer::CreateBookmarkTbl() } } - // search alle Bookmarks in the range and return it in the Array sal_uInt16 Writer::GetBookmarks(const SwCntntNode& rNd, sal_Int32 nStt, sal_Int32 nEnd, std::vector< const ::sw::mark::IMark* >& rArr) diff --git a/sw/source/filter/writer/wrt_fn.cxx b/sw/source/filter/writer/wrt_fn.cxx index d0917733d19f..b83fab140467 100644 --- a/sw/source/filter/writer/wrt_fn.cxx +++ b/sw/source/filter/writer/wrt_fn.cxx @@ -20,14 +20,11 @@ #include <svl/itemiter.hxx> #include <svl/whiter.hxx> - #include "shellio.hxx" #include "wrt_fn.hxx" #include "node.hxx" #include "format.hxx" - - Writer& Out( const SwAttrFnTab pTab, const SfxPoolItem& rHt, Writer & rWrt ) { sal_uInt16 nId = rHt.Which(); @@ -86,8 +83,6 @@ Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt, return rWrt; } - - Writer& Out( const SwNodeFnTab pTab, SwNode& rNode, Writer & rWrt ) { // It must be a CntntNode! diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index 1aa9e9397029..43d38546d596 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -190,7 +190,6 @@ const SvxBrushItem *SwWriteTable::GetLineBrush( const SwTableBox *pBox, return 0; } - void SwWriteTable::MergeBorders( const SvxBorderLine* pBorderLine, bool bTable ) { @@ -222,7 +221,6 @@ void SwWriteTable::MergeBorders( const SvxBorderLine* pBorderLine, nCellSpacing = nDist; } - sal_uInt16 SwWriteTable::MergeBoxBorders( const SwTableBox *pBox, size_t const nRow, size_t const nCol, sal_uInt16 nRowSpan, sal_uInt16 nColSpan, @@ -282,7 +280,6 @@ sal_uInt16 SwWriteTable::MergeBoxBorders( const SwTableBox *pBox, return nBorderMask; } - sal_uInt32 SwWriteTable::GetRawWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) const { sal_uInt32 nWidth = aCols[nCol+nColSpan-1]->GetPos(); @@ -524,7 +521,6 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos, } } - void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, sal_uInt32 nStartCPos, sal_uInt16 nStartCol, long nParentLineHeight, @@ -581,7 +577,6 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, --nOldRow; } - SwWriteTableRow *pRow = aRows[nOldRow]; SwWriteTableRow *pEndRow = aRows[nRow]; if( nLine+1==nNumOfHeaderRows && nParentLineHeight==0 ) @@ -597,7 +592,6 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem )) nHeight = ((SwFmtFrmSize*)pItem)->GetHeight(); - const SvxBrushItem *pBrushItem, *pLineBrush = pParentBrush; if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 672cfbfb2c95..2d23c90d2c27 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <ctype.h> #include <hintids.hxx> #include <hints.hxx> @@ -61,7 +60,6 @@ #include <viewsh.hxx> #include <shellres.hxx> - using namespace com::sun::star; static SwCntntNode* GetCntntNode(SwDoc* pDoc, SwNodeIndex& rIdx, bool bNext) @@ -107,7 +105,6 @@ void SwFltStackEntry::SetEndPos(const SwPosition& rEndPos) m_aPtPos.SetPos(rEndPos); } - bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM& rRegion, bool bCheck, const SwFltPosition &rMkPos, const SwFltPosition &rPtPos, bool bIsParaEnd, sal_uInt16 nWhich) @@ -115,7 +112,7 @@ bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM& rRegion, bool bCheck, // does this range actually contain something? // empty range is allowed if at start of empty paragraph // fields are special: never have range, so leave them - // + // The only position of 0x0D will not be able to make region in the old logic // because it is beyond the length of para...need special consideration here. SwCntntNode *const pCntntNode( @@ -161,7 +158,6 @@ SwFltControlStack::SwFltControlStack(SwDoc* pDo, sal_uLong nFieldFl) { } - SwFltControlStack::~SwFltControlStack() { OSL_ENSURE(maEntries.empty(), "There are still Attributes on the stack"); @@ -236,7 +232,7 @@ void SwFltControlStack::NewAttr(const SwPosition& rPos, const SfxPoolItem& rAttr { //Here we optimize by seeing if there is an attribute uncommited //to the document which - // + //a) has the same value as this attribute //b) is already open, or ends at the same place as where we're starting //from. If so we merge it with this one and elide adding another @@ -440,7 +436,7 @@ static void MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc, // IterateNumrulePiece() looks for the first range valid for Numrules // between rTmpStart and rEnd. -// + // rNds denotes the doc nodes // rEnd denotes the range end, // rTmpStart is an in/out parameter: in: start of range to be searched, @@ -1016,7 +1012,7 @@ SfxPoolItem* SwFltSection::Clone(SfxItemPool*) const // here starts code generated by mdt. this is a shell, if possible, soon for // all filters. the whole trouble of inserting texts and formatting attributes, // manage positions, styles & headers/footers etc. -// + // SwFltShell SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const OUString& rBaseURL, sal_Bool bNew, sal_uLong nFieldFl) : pCurrentPageDesc(0), @@ -1843,7 +1839,6 @@ bool SwFltOutDoc::BeginFly( RndStdIds eAnchor, OSL_ENSURE(pFlySavedPos == NULL, "BeginFly in Fly"); // recursive doesn't work yet pFlySavedPos = new SwPosition(*pPaM->GetPoint()); - SwFmtAnchor aAnchor( eAnchor, 1 ); // If the style contained Fly attributes, use them as defaults now @@ -1979,7 +1974,6 @@ void SwFltShell::SetFlyYPos( short nYPos, sal_Int16 eVRel, SetFlyFrmAttr( SwFmtVertOrient( nYPos, eVAlign, eVRel ) ); } - void SwFltShell::EndFly() { if (!pOut->IsInFly()){ diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx index db40b6a4dd3e..05ecff20ea3a 100644 --- a/sw/source/filter/ww1/w1class.cxx +++ b/sw/source/filter/ww1/w1class.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <rtl/strbuf.hxx> #include <rtl/ustring.hxx> #include <tools/stream.hxx> #include <w1class.hxx> - #ifdef DUMP static const sal_Char* pUnknown = "?"; #define DUMPNAME(s) s @@ -35,8 +33,6 @@ static const sal_Char* pUnknown = "?"; Ww1SingleSprm* Ww1Sprm::aTab[ 256 ]; Ww1SingleSprm* Ww1Sprm::pSingleSprm = 0; - - // Fib Ww1Fib::Ww1Fib( SvStream& _rStream ) : rStream(_rStream) @@ -651,7 +647,7 @@ void Ww1Sprm::InitTab() aTab[ 69] = new Ww1SingleSprmByte(DUMPNAME("sprmCKul")); // 69 chp.kul kul byte aTab[ 70] = new Ww1SingleSprm(3, DUMPNAME("sprmCSizePos")); // 70 chp.hps, chp.hpsPos (see below) 3 bytes aTab[ 71] = new Ww1SingleSprmWord(DUMPNAME("sprmCDxaSpace")); // 71 chp.dxaSpace dxa word - aTab[ 72] = new Ww1SingleSprmWord(DUMPNAME("//")); // 72 // + aTab[ 72] = new Ww1SingleSprmWord(DUMPNAME("//")); // 72 aTab[ 73] = new Ww1SingleSprmByte(DUMPNAME("sprmCIco")); // 73 chp.ico ico byte aTab[ 74] = new Ww1SingleSprmByte(DUMPNAME("sprmCHps")); // 74 chp.hps hps !byte! aTab[ 75] = new Ww1SingleSprmByte(DUMPNAME("sprmCHpsInc")); // 75 chp.hps (see below) byte diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx index 633b13d89434..1508f5a590e3 100644 --- a/sw/source/filter/ww1/w1filter.cxx +++ b/sw/source/filter/ww1/w1filter.cxx @@ -513,7 +513,6 @@ static WWDateTime GetTimeDatePara( const OUString& rForm, return eDT; } - extern void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich, sal_uInt16& rSubType, sal_uLong &rFmt, sal_uInt16 nVersion ); @@ -659,7 +658,6 @@ oncemore: aSubType = rOut.ConvertUStr(aSubType); - // huge pile of shit: the type 'info' can represent one of // types 15 to 31. it contains as formula the actual field // of the doc info. @@ -990,7 +988,7 @@ oncemore: case 42: // nextif command case 43: // skipif command case 44: // number of record - // + case 45: // dde ref case 46: // dde auto ref case 47: // glossary entry diff --git a/sw/source/filter/ww1/w1par.hxx b/sw/source/filter/ww1/w1par.hxx index df5581670e3f..326655777486 100644 --- a/sw/source/filter/ww1/w1par.hxx +++ b/sw/source/filter/ww1/w1par.hxx @@ -30,7 +30,6 @@ public: Ww1Shell(SwDoc&, SwPaM&, const OUString& rBaseURL, sal_Bool bNew, sal_uLong nFieldFlags); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx index db4e093da221..6ce329ad5961 100644 --- a/sw/source/filter/ww1/w1sprm.cxx +++ b/sw/source/filter/ww1/w1sprm.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <tools/solar.h> #include <editeng/paperinf.hxx> @@ -526,7 +525,6 @@ void Ww1SingleSprmTDefTable10::Start( } } - void Ww1SingleSprmTDyaRowHeight::Start( Ww1Shell& rOut, sal_uInt8 /*nId*/, sal_uInt8* pSprm, sal_uInt16 /*nSize*/, Ww1Manager& /*rMan*/) { diff --git a/sw/source/filter/ww1/w1struct.hxx b/sw/source/filter/ww1/w1struct.hxx index a1fa8f9ed000..9e28e0c18696 100644 --- a/sw/source/filter/ww1/w1struct.hxx +++ b/sw/source/filter/ww1/w1struct.hxx @@ -313,7 +313,6 @@ struct W1_FIB sal_uInt16 cbDopGet() { return SVBT16ToShort(cbDop); } - SVBT32 fcSttbfAssoc;// 0x10c offset to STTBF of associated strings. See STTBFASSOC. sal_uLong fcSttbfAssocGet() { return SVBT32ToUInt32(fcSttbfAssoc); } @@ -422,7 +421,7 @@ struct W1_DOP //Document Properties // SVBT16 fExactCWords : 1; sal_Bool fExactCWordsGet() { return 0 != ((fSveFlagsGet() >> 1) & 1); } - // SVBT16 fPagHidden : 1;// + // SVBT16 fPagHidden : 1; sal_Bool fPagHiddenGet() { return 0 != ((fSveFlagsGet() >> 2) & 1); } // SVBT16 fPagResults : 1; @@ -462,7 +461,7 @@ struct W1_DOP //Document Properties SVBT16 dxaTab;// 720 twips default tab width sal_uInt16 dxaTabGet() { return SVBT16ToShort(dxaTab); } - SVBT16 wSpare;// + SVBT16 wSpare; sal_uInt16 wSpareGet() { return SVBT16ToShort(wSpare); } SVBT16 dxaHotZ;// width of hyphenation hot zone measured in twips diff --git a/sw/source/filter/ww8/WW8FFData.cxx b/sw/source/filter/ww8/WW8FFData.cxx index 2aaf2b3317ce..59d011396c1b 100644 --- a/sw/source/filter/ww8/WW8FFData.cxx +++ b/sw/source/filter/ww8/WW8FFData.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WW8FFData.hxx" #include <tools/stream.hxx> #include <doc.hxx> diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index aa39f3d6b33c..b22df4433daf 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <iostream> #include <set> #include <stdio.h> @@ -199,7 +198,7 @@ GridColsPtr WW8TableNodeInfoInner::getGridColsOfRow(AttributeOutputBase & rBase, // or all the rows together if (calculateColumnsFromAllRows) { - // Calculate the width of all the columns based on ALL the rows. + // Calculate the width of all the columns based on ALL the rows. // The difference is that this kind of draws vertical lines, // so that if the rows look like this: // @@ -210,13 +209,13 @@ GridColsPtr WW8TableNodeInfoInner::getGridColsOfRow(AttributeOutputBase & rBase, // ------------------------ // | | | // ------------------------ - // + // then the actual column widths will be broken down like this: // // ------------------------ // | | | | | // ------------------------ - // + // See the example at // http://officeopenxml.com/WPtableGrid.php // Under "Word 2007 Example" diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 4e48125b5b8d..57d4f7ff7863 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1935,7 +1935,6 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co { FastAttributeList* pAttr = pSerializer->createAttrList(); - // Compute val attribute value // Can be one of: // single, double, @@ -6421,7 +6420,6 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox ) return; } - OutputBorderOptions aOutputBorderOptions = lcl_getBoxBorderOptions(); // Check if there is a shadow item const SfxPoolItem* pItem = GetExport().HasItem( RES_SHADOW ); diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 9335b55fe7b4..77bf6afb76c5 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -822,7 +822,6 @@ private: OString fontKey; }; - boost::scoped_ptr<TableReference> m_tableReference; boost::scoped_ptr<TableReference> m_oldTableReference; diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 79077f5c554a..d76890610873 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -451,7 +451,6 @@ void DocxExport::OutputPageSectionBreaks( const SwTxtNode& ) OSL_TRACE( "TODO DocxExport::OutputPageSectionBreaks( const SwTxtNode& )" ); } - void DocxExport::AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) { AttrOutput().SectionBreak( msword::PageBreak, m_pSections->CurrentSectionInfo() ); @@ -760,7 +759,6 @@ void DocxExport::WriteFonts() pFS->endElementNS( XML_w, XML_fonts ); } - void DocxExport::WriteProperties( ) { // Write the core properties @@ -962,7 +960,6 @@ void DocxExport::WriteGlossary() serializer->serialize( uno::Reference< xml::sax::XDocumentHandler >( writer, uno::UNO_QUERY_THROW ), uno::Sequence< beans::StringPair >() ); - sal_Int32 length = glossaryDomList.getLength(); for ( int i =0; i < length; i++) { diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx index 8373fc0070f2..6696ae0da372 100644 --- a/sw/source/filter/ww8/docxexportfilter.cxx +++ b/sw/source/filter/ww8/docxexportfilter.cxx @@ -86,7 +86,6 @@ bool DocxExportFilter::exportDocument() return true; } - // UNO stuff so that the filter is registered #define IMPL_NAME "com.sun.star.comp.Writer.DocxExport" diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 94b598e25efd..d8480db3c9e4 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -731,7 +731,6 @@ void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrmFmt& rFr sax_fastparser::XFastAttributeListRef xDocPrAttrListRef(pDocPrAttrList); pFS->singleElementNS(XML_wp, XML_docPr, xDocPrAttrListRef); - sal_Int32 diagramCount; diagramCount = nAnchorId; diff --git a/sw/source/filter/ww8/fields.cxx b/sw/source/filter/ww8/fields.cxx index 94777aaa71e3..baaa4b0100a2 100644 --- a/sw/source/filter/ww8/fields.cxx +++ b/sw/source/filter/ww8/fields.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fields.hxx" #include <osl/diagnose.h> #include <sal/macros.h> diff --git a/sw/source/filter/ww8/hash_wrap.hxx b/sw/source/filter/ww8/hash_wrap.hxx index b77e74ae630d..a07dd66da62b 100644 --- a/sw/source/filter/ww8/hash_wrap.hxx +++ b/sw/source/filter/ww8/hash_wrap.hxx @@ -29,7 +29,6 @@ namespace ww { /** simple template that manages a hash - @author <a href="mailto:mikeleib@openoffice.org">Michael Leibowitz</a> */ diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index b03f20bc8011..837f890dfb7f 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1904,7 +1904,6 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi m_aRun->append('}'); } - xPropSet->getPropertyValue("StringItemList") >>= aStrSeq; sal_uInt32 nListItems = aStrSeq.getLength(); for (sal_uInt32 i = 0; i < nListItems; i++) diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index f5c6b660f56c..10b99b0f0621 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -470,7 +470,6 @@ void RtfExport::WriteInfo() OutUnicode(OOO_STRING_SVTOOLS_RTF_AUTHOR,xDocProps->getModifiedBy()); OutDateTime(OOO_STRING_SVTOOLS_RTF_REVTIM, xDocProps->getModificationDate()); - OutDateTime(OOO_STRING_SVTOOLS_RTF_PRINTIM, xDocProps->getPrintDate()); } @@ -713,7 +712,6 @@ void RtfExport::ExportDocument_Impl() } Strm().WriteCharPtr( pOut ); - const SwEndNoteInfo& rEndNoteInfo = pDoc->GetEndNoteInfo(); Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_AENDDOC ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT ) diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx index 26083c48b016..01aaefcc4591 100644 --- a/sw/source/filter/ww8/rtfexportfilter.cxx +++ b/sw/source/filter/ww8/rtfexportfilter.cxx @@ -94,7 +94,6 @@ sal_Bool RtfExportFilter::filter( const uno::Sequence< beans::PropertyValue >& a return sal_True; } - void RtfExportFilter::cancel( ) throw (uno::RuntimeException, std::exception) { } @@ -105,9 +104,7 @@ void RtfExportFilter::setSourceDocument( const uno::Reference< lang::XComponent m_xSrcDoc = xDoc; } -////////////////////////////////////////////////////////////////////////// // UNO helpers -////////////////////////////////////////////////////////////////////////// OUString RtfExport_getImplementationName() { diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx index c2588cb4db67..0f06662ef32f 100644 --- a/sw/source/filter/ww8/styles.cxx +++ b/sw/source/filter/ww8/styles.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "../inc/wwstyles.hxx" #include <functional> diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 328bc73c5e0a..2f2d6f94d94d 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/util/XCloseable.hpp> #include <doc.hxx> @@ -54,7 +53,6 @@ using namespace com::sun::star; using namespace nsSwGetPoolIdFromName; - namespace { /* @@ -593,7 +591,6 @@ namespace sw return 0; } - SwNoTxtNode *GetNoTxtNodeFromSwFrmFmt(const SwFrmFmt &rFmt) { const SwNodeIndex *pIndex = rFmt.GetCntnt().GetCntntIdx(); @@ -692,7 +689,6 @@ namespace sw maStack.push_back(new SwFltStackEntry(rPos,rAttr.Clone())); } - class SameOpenRedlineType : public std::unary_function<const SwFltStackEntry*, bool> { @@ -763,7 +759,6 @@ namespace sw delete pEntry; } - bool CompareRedlines::operator()(const SwFltStackEntry *pOneE, const SwFltStackEntry *pTwoE) const { @@ -780,7 +775,6 @@ namespace sw return (pOne->aStamp < pTwo->aStamp) ? true : false; } - RedlineStack::~RedlineStack() { std::sort(maStack.begin(), maStack.end(), CompareRedlines()); diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 88e6e88bdf89..a29a781bc0ce 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -72,7 +72,6 @@ namespace sw /// STL const iterator for ParaStyles typedef PoolItems::const_iterator cPoolItemIter; - /** Make exporting a Writer Frame easy In word all frames are effectively anchored to character or as @@ -150,7 +149,6 @@ namespace sw */ bool IsInline() const; - /** Even if the frame isn't an inline frame, force it to behave as one There are a variety of circumstances where word cannot have @@ -170,7 +168,6 @@ namespace sw const Graphic &GetGraphic() const { return maGrf; } bool HasGraphic() const { return mbForBullet; } - /** Does this sw::Frame refer to the same writer content as another @return @@ -513,7 +510,6 @@ namespace sw */ ParaStyles GetParaStyles(const SwDoc &rDoc); - /** Get a Paragraph Style which fits a given name Its surprisingly tricky to get a style when all you have is a name, @@ -593,7 +589,6 @@ namespace sw return item_cast<T>(SearchPoolItems(rItems, eType)); } - /** Remove properties from an SfxItemSet which a SwFmtCharFmt overrides Given an SfxItemSet and a SwFmtCharFmt remove from the rSet all the @@ -730,7 +725,6 @@ namespace sw */ bool HasPageBreak(const SwNode &rNode); - /** Make a best fit Polygon from a PolyPolygon For custom contours in writer we use a PolyPolygon, while word uses @@ -749,7 +743,6 @@ namespace sw /** Make setting a drawing object's layer in a Writer document easy - Word has the simple concept of a drawing object either in the foreground and in the background. We have an additional complexity that form components live in a separate layer, which seems @@ -856,7 +849,6 @@ namespace sw sal_uInt16 GetSetWhichFromSwDocWhich(const SfxItemSet &rSet, const SwDoc &rDoc, sal_uInt16 nWhich); - /** Make inserting an OLE object into a Writer document easy The rest of Office uses SdrOle2Obj for their OLE objects, Writer diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 07f43f937710..5554666fec49 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -397,7 +397,6 @@ bool WW8Export::MiserableFormFieldExportHack(const SwFrmFmt& rFrmFmt) return bHack; } - void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet) { OUString sSelected; @@ -420,7 +419,6 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet) sName = *pStr; } - OUString sHelp; { // property "Help" does not exist and due to the no-existence an exception is thrown. @@ -998,7 +996,6 @@ const std::vector<sal_uInt32>* WW8_WrPlcTxtBoxes::GetShapeIdArr() const return &aShapeIds; } - sal_uInt32 WW8Export::GetSdrOrdNum( const SwFrmFmt& rFmt ) const { sal_uInt32 nOrdNum; @@ -1440,7 +1437,6 @@ void WinwordAnchoring::WriteData( EscherEx& rEx ) const } } - void WW8Export::CreateEscher() { SfxItemState eBackSet = pDoc->GetPageDesc(0).GetMaster(). @@ -1483,7 +1479,6 @@ void SwEscherEx::WritePictures() Flush(); } - // Output- Routines for Escher Export SwEscherExGlobal::SwEscherExGlobal() @@ -1707,7 +1702,6 @@ void SwBasicEscherEx::WriteGrfAttr(const SwNoTxtNode& rNd, nBrightness = ((SfxInt16Item*)pItem)->GetValue(); } - if (SFX_ITEM_SET == rNd.GetSwAttrSet().GetItemState(RES_GRFATR_DRAWMODE, true, &pItem)) { @@ -1806,7 +1800,6 @@ sal_Int32 SwBasicEscherEx::WriteOLEFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nSh awt::Rectangle aRect; bool bRectIsSet = false; - // TODO/LATER: should the icon size be stored in case of iconified object? if ( xObj.is() && nAspect != embed::Aspects::MSOLE_ICON ) { @@ -3196,7 +3189,6 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb if (!xOleStg.Is()) return false; - OUString sUName; if (!WriteOCXStream( mxModel, xOleStg,xControlModel,aSize,sUName)) return false; diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index ba4bcfad3fd9..b986b0cb7199 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vector> #include <list> #include <utility> @@ -298,7 +297,6 @@ sal_Int32 SwWW8AttrIter::SearchNext( sal_Int32 nStartPos ) } } - if (mrSwFmtDrop.GetWholeWord() && nStartPos <= rNd.GetDropLen(0)) nMinPos = rNd.GetDropLen(0); else if(nStartPos <= mrSwFmtDrop.GetChars()) @@ -735,7 +733,6 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, sal_Int32 /*nPos*/, } aStr += "(\\s\\up "; - if ( g_pBreakIt->GetBreakIter().is() ) nRubyScript = g_pBreakIt->GetBreakIter()->getScriptType( rNode.GetTxt(), *( pRubyTxt->GetStart() ) ); @@ -860,7 +857,6 @@ bool WW8AttributeOutput::StartURL( const OUString &rUrl, const OUString &rTarget bool bBookMarkOnly = AnalyzeURL( rUrl, rTarget, &sURL, &sMark ); - m_rWW8Export.OutputField( 0, ww::eHYPERLINK, sURL, WRITEFIELD_START | WRITEFIELD_CMD_START ); // write the refence to the "picture" structure @@ -1313,7 +1309,6 @@ const SwRedlineData* SwWW8AttrIter::GetRunLevelRedline( sal_Int32 nPos ) return NULL; } - short MSWordExportBase::GetCurrentPageDirection() const { const SwFrmFmt &rFmt = pAktPageDesc @@ -1454,7 +1449,6 @@ SvxBrushItem WW8Export::TrueFrameBgBrush(const SwFrmFmt &rFlyFmt) const return aRet; } - /* Convert characters that need to be converted, the basic replacements and the ridicously complicated title case attribute mapping to hardcoded upper case @@ -2526,7 +2520,6 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) } } - const SfxItemSet* sfxItemSet = NULL; if(const SwpHints* pTxtAttrs = rNode.GetpSwpHints()) { @@ -2632,7 +2625,6 @@ bool MSWordExportBase::NoPageBreakSection( const SfxItemSet* pSet ) return bRet; } - void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode ) { const SwSection& rSection = rSectionNode.GetSection(); @@ -2682,7 +2674,6 @@ void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode ) bStartTOX = true; } - void WW8Export::AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) { pSepx->AppendSep(Fc2Cp(Strm().Tell()), pPageDesc, pFmt, nLnNum); @@ -2940,7 +2931,6 @@ void WW8AttributeOutput::Redline( const SwRedlineData* pRedline ) } } - void MSWordExportBase::OutputContentNode( const SwCntntNode& rNode ) { switch ( rNode.GetNodeType() ) diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index c4b7d6991030..e9ae01b94f45 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <vcl/font.hxx> #include <editeng/fontitem.hxx> @@ -553,7 +552,6 @@ void WW8Export::OutListNamesTab() pFib->lcbSttbListNames = pTableStrm->Tell() - pFib->fcSttbListNames; } - // old WW95-Code void WW8Export::OutputOlst( const SwNumRule& rRule ) @@ -588,7 +586,6 @@ void WW8Export::OutputOlst( const SwNumRule& rRule ) pO->insert( pO->end(), (sal_uInt8*)&aOlst, (sal_uInt8*)&aOlst+sizeof( aOlst ) ); } - void WW8Export::Out_WwNumLvl( sal_uInt8 nWwLevel ) { pO->push_back( 13 ); @@ -824,7 +821,6 @@ void WW8Export::Out_NumRuleAnld( const SwNumRule& rRul, const SwNumFmt& rFmt, OutSprmBytes( (sal_uInt8*)&aSprmAnld, sizeof( aSprmAnld ) ); } - // Return: is it an outline? bool WW8Export::Out_SwNum(const SwTxtNode* pNd) { diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index c84bd023e44f..a50680165916 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <algorithm> #include <functional> @@ -114,10 +113,8 @@ public: void Write( SvStream& rStrm ); }; - // Styles - #define WW8_RESERVED_SLOTS 15 // GetId( SwCharFmt ) for use in text -> zero is not allowed, @@ -136,8 +133,6 @@ sal_uInt16 MSWordExportBase::GetId( const SwTxtFmtColl& rColl ) const return ( nRet != 0xfff ) ? nRet : 0; // Default TxtFmtColl } - - //typedef pFmtT MSWordStyles::MSWordStyles( MSWordExportBase& rExport, bool bListStyles ) : m_rExport( rExport ), @@ -423,7 +418,6 @@ void WW8AttributeOutput::StartStyle( const OUString& rName, StyleType eType, sal //sal_uInt16 : 14; /* unused bits */ } - sal_uInt16 nLen = static_cast< sal_uInt16 >( ( pData - aWW8_STD ) + 1 + ((m_rWW8Export.bWrtWW8 ? 2 : 1 ) * (rName.getLength() + 1)) ); // temporary @@ -725,7 +719,6 @@ const SwNumRule* MSWordStyles::GetSwNumRule(sal_uInt16 nId) const return it->second; } - // Fonts wwFont::wwFont(const OUString &rFamilyName, FontPitch ePitch, FontFamily eFamily, @@ -794,7 +787,7 @@ wwFont::wwFont(const OUString &rFamilyName, FontPitch ePitch, FontFamily eFamily ShortToSVBT16( 400, &maWW8_FFN[2] ); // don't know any better // 400 == FW_NORMAL (windows.h) - // + //#i61927# For unicode fonts like Arial Unicode, Word 97+ sets the chs //to SHIFTJIS presumably to capture that it's a multi-byte encoding font //but Word95 doesn't do this, and sets it to 0 (ANSI), so we should do the @@ -876,7 +869,6 @@ bool operator<(const wwFont &r1, const wwFont &r2) return nRet < 0; } - sal_uInt16 wwFontHelper::GetId(const wwFont &rFont) { sal_uInt16 nRet; @@ -1013,7 +1005,6 @@ void wwFontHelper::WriteFontTable( const RtfAttributeOutput& rAttrOutput ) ::std::bind2nd( ::std::mem_fun( &wwFont::WriteRtf ), &rAttrOutput ) ); } - WW8_WrPlc0::WW8_WrPlc0( sal_uLong nOffset ) : nOfs( nOffset ) { @@ -1035,13 +1026,9 @@ void WW8_WrPlc0::Write( SvStream& rStrm ) } } - - - // class MSWordSections : translate PageDescs into Sections // also deals with header and footer - MSWordSections::MSWordSections( MSWordExportBase& rExport ) : mbDocumentIsProtected( false ) { @@ -1344,7 +1331,6 @@ bool WW8_SepInfo::IsProtected() const return bRet; } - void MSWordSections::CheckForFacinPg( WW8Export& rWrt ) const { // 2 values getting set @@ -1703,7 +1689,6 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt else aSet.Put(rSepInfo.pSectionFmt->GetFmtAttr(RES_COL)); - aSet.Put( aResultLR ); // und raus damit ins WW-File @@ -1980,7 +1965,6 @@ void WW8_WrPlcSepx::WritePlcSed( WW8Export& rWrt ) const rWrt.pFib->lcbPlcfsed = rWrt.pTableStrm->Tell() - nFcStart; } - void WW8_WrPlcSepx::WritePlcHdd( WW8Export& rWrt ) const { // Don't write out the PlcfHdd if ccpHdd is 0: it's a validation failure case. @@ -2040,7 +2024,6 @@ void MSWordExportBase::WriteHeaderFooterText( const SwFmt& rFmt, bool bHeader ) } } - // class WW8_WrPlcFtnEdn : Collect the Footnotes and Endnotes and output their text // and Plcs at the end of the document. // WW8_WrPlcFtnEdn is the class for Footnotes and Endnotes @@ -2546,7 +2529,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp, } // documents layout of WriteShort's below: - // + // SVBT16 ibst; // index into GrpXstAtnOwners // SVBT16 ak; // not used // SVBT16 grfbmc; // not used diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 5c5a25e02132..cfc66805bf47 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <iostream> #include <com/sun/star/embed/ElementModes.hpp> @@ -155,7 +154,6 @@ public: sal_uInt8 *CopyLastSprms(sal_uInt8 &rLen, bool bVer8); }; - // class WW8_WrPc collects all piece entries for one piece class WW8_WrPc { @@ -683,8 +681,6 @@ const SfxPoolItem& MSWordExportBase::GetItem(sal_uInt16 nWhich) const return *pItem; } - - WW8_WrPlc1::WW8_WrPlc1( sal_uInt16 nStructSz ) : nStructSiz( nStructSz ) { @@ -730,7 +726,6 @@ void WW8_WrPlc1::Finish( sal_uLong nLastCp, sal_uLong nSttCp ) } } - void WW8_WrPlc1::Write( SvStream& rStrm ) { sal_uInt32 i; @@ -740,7 +735,6 @@ void WW8_WrPlc1::Write( SvStream& rStrm ) rStrm.Write( pData, (i-1) * nStructSiz ); } - // Class WW8_WrPlcFld for fields bool WW8_WrPlcFld::Write( WW8Export& rWrt ) @@ -827,8 +821,6 @@ void WW8_WrMagicTable::Append( WW8_CP nCp, sal_uLong nData) } } - - void SwWW8Writer::FillCount( SvStream& rStrm, sal_uLong nCount ) { static const sal_uInt32 aNulls[16] = @@ -859,9 +851,6 @@ sal_uLong SwWW8Writer::FillUntil( SvStream& rStrm, sal_uLong nEndPos ) return rStrm.Tell(); } - - - WW8_WrPlcPn::WW8_WrPlcPn( WW8Export& rWr, ePLCFT ePl, WW8_FC nStartFc ) : rWrt(rWr), nFkpStartPage(0), ePlc(ePl), nMark(0) { @@ -981,8 +970,6 @@ void WW8_WrPlcPn::WritePlc() } } - - WW8_WrFkp::WW8_WrFkp(ePLCFT ePl, WW8_FC nStartFc, bool bWrtWW8) : ePlc(ePl), nStartGrp(511), nOldStartGrp(511), nItemSize( ( CHP == ePl ) ? 1 : ( bWrtWW8 ? 13 : 7 )), @@ -1258,7 +1245,6 @@ void WW8_WrPct::AppendPc(WW8_FC nStartFc, bool bIsUnicode) if( bIsUni ) nStartCp >>= 1; // for Unicode: number of characters / 2 - if ( !bIsUnicode ) { nStartFc <<= 1; // Address * 2 @@ -1274,7 +1260,6 @@ void WW8_WrPct::AppendPc(WW8_FC nStartFc, bool bIsUnicode) bIsUni = bIsUnicode; } - void WW8_WrPct::WritePc( WW8Export& rWrt ) { sal_uLong nPctStart; @@ -1290,7 +1275,6 @@ void WW8_WrPct::WritePc( WW8Export& rWrt ) SwWW8Writer::WriteLong( *rWrt.pTableStrm, aIter->GetStartCp() ); - // calculate the last Pos sal_uLong nStartCp = rWrt.pFib->fcMac - nOldFc; if( bIsUni ) @@ -1550,9 +1534,6 @@ void MSWordExportBase::AppendWordBookmark( const OUString& rName ) AppendBookmark( BookmarkToWord( rName ) ); } - - - void WW8_WrtRedlineAuthor::Write( Writer& rWrt ) { WW8Export & rWW8Wrt = *(((SwWW8Writer&)rWrt).m_pExport); @@ -1570,8 +1551,6 @@ sal_uInt16 WW8Export::AddRedlineAuthor( sal_uInt16 nId ) return pRedlAuthors->AddName( SW_MOD()->GetRedlineAuthor( nId ) ); } - - void WW8Export::WriteAsStringTable(const std::vector<OUString>& rStrings, sal_Int32& rfcSttbf, sal_Int32& rlcbSttbf, sal_uInt16 nExtraLen) { @@ -1692,7 +1671,6 @@ void SwWW8Writer::WriteString_xstz(SvStream& rStrm, const OUString& rStr, bool b rStrm.Write(&aBytes[0], aBytes.size()); } - void SwWW8Writer::WriteString8(SvStream& rStrm, const OUString& rStr, bool bAddZero, rtl_TextEncoding eCodeSet) { @@ -3172,7 +3150,6 @@ void WW8Export::ExportDocument_Impl() pPiece = new WW8_WrPct( pFib->fcMin, bWrtWW8 ); pDop = new WW8Dop; - pDop->fRevMarking = 0 != ( nsRedlineMode_t::REDLINE_ON & mnRedlineMode ); pDop->fRMView = 0 != ( nsRedlineMode_t::REDLINE_SHOW_DELETE & mnRedlineMode ); pDop->fRMPrint = pDop->fRMView; @@ -3268,7 +3245,6 @@ void WW8Export::ExportDocument_Impl() delete pFib; GetWriter().SetStream( 0 ); - xWwStrm->SetBufferSize( 0 ); if( bWrtWW8 ) { @@ -3283,7 +3259,6 @@ void WW8Export::ExportDocument_Impl() } } - void WW8Export::PrepareStorage() { sal_uLong nLen; @@ -3495,7 +3470,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL ExportDOC( const OUString& rFltNam xRet = new SwWW8Writer( rFltName, rBaseURL ); } - extern "C" SAL_DLLPUBLIC_EXPORT sal_uLong SAL_CALL GetSaveWarningOfMSVBAStorage_ww8( SfxObjectShell &rDocS ) { return SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( rDocS ); @@ -3536,7 +3510,6 @@ void WW8_WrPlcFtnEdn::WritePlc( WW8Export& rWrt ) const } } - bool WW8_WrPlcAnnotations::WriteTxt( WW8Export& rWrt ) { bool bRet = WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn ); @@ -3620,7 +3593,6 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) const ::sw::mark::IFieldmark* pFieldmark = &rFieldmark; const ::sw::mark::ICheckboxFieldmark* pAsCheckbox = dynamic_cast< const ::sw::mark::ICheckboxFieldmark* >( pFieldmark ); - OSL_ENSURE(rFieldmark.GetFieldname() == ODF_FORMTEXT || rFieldmark.GetFieldname() == ODF_FORMDROPDOWN || rFieldmark.GetFieldname() == ODF_FORMCHECKBOX, "Unknown field type!!!"); @@ -3666,7 +3638,6 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) FFDataHeader() : version( 0xFFFFFFFF ), bits(0), cch(0), hps(0) {} }; - FFDataHeader aFldHeader; aFldHeader.bits |= (type & 0x03); @@ -3704,7 +3675,6 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) const OUString ffentrymcr; const OUString ffexitmcr; - const sal_uInt8 aFldData[] = { 0x44,0, // the start of "next" data @@ -3752,7 +3722,6 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) if ( type ) pDataStrm->WriteUInt16( sal_uInt16(0) ); - SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffformat ), true ); SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffhelptext ), true ); SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffstattext ), true ); diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 071808652113..0dfcfb351683 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -258,7 +258,6 @@ public: const SwFmt& rFmt, sal_uLong& rCpPos, sal_uInt8 nHFFlags, sal_uInt8 nFlag, sal_uInt8 nBreakCode); }; - // class WW8_WrPct to construct the piece table class WW8_WrPct { @@ -817,7 +816,6 @@ protected: virtual void OutputLinkedOLE( const OUString& ) = 0; - /// Output SwSectionNode virtual void OutputSectionNode( const SwSectionNode& ); @@ -984,7 +982,6 @@ private: static void BuildAnlvBase( WW8_ANLV& rAnlv, sal_uInt8*& rpCh, sal_uInt16& rCharLen, const SwNumRule& rRul, const SwNumFmt& rFmt, sal_uInt8 nSwLevel ); - /// Output the numbering table. virtual void WriteNumbering(); diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index bb366dc042d2..7e59a05d9bcd 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/embed/XEmbedPersist.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/ElementModes.hpp> diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index cad1e42a62b0..5fdd2d064f23 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -218,10 +218,8 @@ bool WW8Export::CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich return bRet; } - // Hilfsroutinen fuer Styles - void MSWordExportBase::ExportPoolItemsToCHP( sw::PoolItems &rItems, sal_uInt16 nScript ) { sw::cPoolItemIter aEnd = rItems.end(); @@ -915,7 +913,6 @@ OUString MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const OUString* pNa return BookmarkToWord( sRet ); // #i43956# - encode bookmark accordingly } - /* File CHRATR.HXX: */ void WW8AttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) { @@ -967,7 +964,6 @@ void WW8AttributeOutput::StartRunProperties() m_nFieldResults = pCurrentFields ? pCurrentFields->ResultCount() : 0; } - void WW8AttributeOutput::StartRun( const SwRedlineData* pRedlineData, bool /*bSingleEmptyRun*/ ) { if (pRedlineData) @@ -2207,7 +2203,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) // contents from paragraphs formatted with built-in heading // styles". And afterward fill in any outline styles left // uncovered by that range to the \t flag - // + // i.e. for // Heading 1 // Heading 2 @@ -4586,7 +4582,6 @@ void WW8AttributeOutput::FormatLineNumbering( const SwFmtLineNumber& rNumbering m_rWW8Export.pO->push_back( rNumbering.IsCount() ? 0 : 1 ); } - /* File PARATR.HXX */ void WW8AttributeOutput::ParaLineSpacing_Impl( short nSpace, short nMulti ) @@ -4841,7 +4836,6 @@ void WW8AttributeOutput::ParaWidows( const SvxWidowsItem& rWidows ) m_rWW8Export.pO->push_back( rWidows.GetValue() ? 1 : 0 ); } - class SwWW8WrTabu { sal_uInt8* pDel; // DelArray @@ -5134,8 +5128,6 @@ void WW8AttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStops ) } } - - void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt ) { // FIXME maybe use 'item_cast', like 'item_cast<SvxCharHiddenItem>( rHt )'? diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index d365f3cab25b..64a4e3cd2870 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/urlobj.hxx> #include <svl/urihelper.hxx> #include <rtl/tencinfo.h> @@ -33,7 +32,6 @@ #include "ww8glsy.hxx" #include "ww8par.hxx" - WW8Glossary::WW8Glossary(SvStorageStreamRef &refStrm, sal_uInt8 nVersion, SvStorage *pStg) : pGlossary(0), rStrm(refStrm), xStg(pStg), nStrings(0) @@ -188,7 +186,6 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, return bRet; } - bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile ) { bool bRet=false; @@ -238,7 +235,6 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile ) return bRet; } - bool WW8GlossaryFib::IsGlossaryFib() { // fGlsy will indicate whether this has AutoText or not diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index ecd41d12b80f..ae10e905b9c1 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -1167,7 +1167,6 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj, return pFlyFmt; } - bool SwWW8ImplReader::TxbxChainContainsRealText(sal_uInt16 nTxBxS, long& rStartCp, long& rEndCp) { @@ -1177,7 +1176,6 @@ bool SwWW8ImplReader::TxbxChainContainsRealText(sal_uInt16 nTxBxS, long& rStartC return bContainsText; } - // TextBoxes only for Ver67 !! SdrObject* SwWW8ImplReader::ReadTxtBox( WW8_DPHEAD* pHd, const WW8_DO* pDo, SfxAllItemSet &rSet) @@ -1276,7 +1274,6 @@ SdrObject* SwWW8ImplReader::ReadCaptionBox( WW8_DPHEAD* pHd, const WW8_DO* pDo, return pObj; } - SdrObject *SwWW8ImplReader::ReadGroup( WW8_DPHEAD* pHd, const WW8_DO* pDo, SfxAllItemSet &rSet) { @@ -1600,7 +1597,6 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj, rFlySet.Put( *pPoolItem ); } - // jetzt die Umrandung berechnen und die Box bauen: Das Mass wird fuer die // Rahmen-GROESSE benoetigt! SvxBoxItem aBox(sw::util::ItemGet<SvxBoxItem>(rFlySet, RES_BOX)); @@ -1853,7 +1849,6 @@ void SwWW8ImplReader::AdjustLRWrapForWordMargins( } } - void SwWW8ImplReader::AdjustULWrapForWordMargins( const SvxMSDffImportRec &rRecord, SvxULSpaceItem &rUL) { @@ -2188,7 +2183,6 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord, text::HoriOrientation::RIGHT // outside }; - // generic vertical Adjustment static const sal_Int16 aVertOriTab[ nCntYAlign ] = { @@ -2280,7 +2274,6 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord, eHoriRel = text::RelOrientation::PAGE_PRINT_AREA; } - // Writer honours this wrap distance when aligned as "left" or "right", // Word doesn't. Writer doesn't honour it when its "from left". if (eHoriOri == text::HoriOrientation::LEFT) @@ -2428,7 +2421,6 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) if (!pMSDffManager->GetModel()) pMSDffManager->SetModel(pDrawModel, 1440); - Rectangle aRect(pF->nXaLeft, pF->nYaTop, pF->nXaRight, pF->nYaBottom); SvxMSDffImportData aData( aRect ); @@ -2562,7 +2554,6 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) aFlySet.Put( aFollowTextFlow ); } - // #i21847# // Some shapes are set to *hidden*, don't import those ones. if (pRecord->bHidden) @@ -2829,7 +2820,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject, { // The Text is not read into SdrTextObj! Rather insert a frame and // insert the text from nStartCp to nEndCp. - // + // More attributes can be used in a frame compared to the // Edit-Engine, and it can contain field, OLEs or graphics... Rectangle aInnerDist(pRecord->nDxTextLeft, pRecord->nDyTextTop, @@ -2842,7 +2833,6 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject, MatchSdrItemsIntoFlySet( rpObject, rFlySet, pRecord->eLineStyle, pRecord->eLineDashing, pRecord->eShapeType, aInnerDist ); - SdrTextObj *pSdrTextObj = PTR_CAST(SdrTextObj, rpObject); if (pSdrTextObj && pSdrTextObj->IsVerticalWriting()) rFlySet.Put(SvxFrameDirectionItem(FRMDIR_VERT_TOP_RIGHT, RES_FRAMEDIR)); diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index dbdfd7916c6e..b56df4c10638 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <iterator> #include <hintids.hxx> #include <svl/urihelper.hxx> @@ -379,7 +378,6 @@ SwFlyFrmFmt* SwWW8ImplReader::MakeGrafNotInCntnt(const WW8PicDesc& rPD, return pFlyFmt; } - // MakeGrafInCntnt fuegt zeichengebundene Grafiken ein SwFrmFmt* SwWW8ImplReader::MakeGrafInCntnt(const WW8_PIC& rPic, const WW8PicDesc& rPD, const Graphic* pGraph, const OUString& rFileName, @@ -491,7 +489,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, { // Soeben haben wir einen Grafik-Link ins Doc inserted. // Wir muessen ihn jetzt noch Positioniern und Skalieren. - // + WW8PicDesc aPD( aPic ); WW8FlySet aFlySet( *this, pPaM, aPic, aPD.nWidth, aPD.nHeight ); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 8e715c5a0699..dc20084dd647 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -271,7 +271,6 @@ void SwWW8ImplReader::ReadEmbeddedData( SvMemoryStream& rStrm, SwDocShell* pDocS sal_uInt8 aGuid[16]; sal_uInt32 nFlags(0); - rStrm.Read(aGuid, 16); rStrm.SeekRel( 4 ); rStrm.ReadUInt32( nFlags ); @@ -642,7 +641,6 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, maShapeRecords.Current()->nRecLen, pImpRec->pClientDataBuffer, pImpRec->nClientDataLen ); - // process user (== Winword) defined parameters in 0xF122 record // #i84783# - set special value to determine, if property is provided or not. pImpRec->nLayoutInTableCell = 0xFFFFFFFF; @@ -1835,9 +1833,7 @@ void SwWW8ImplReader::ImportDop() xDocuProps->setPrintDate(uDT); } - // // COMPATIBILITY FLAGS START - // // #i78951# - remember the unknown compatability options // so as to export them out @@ -1919,9 +1915,7 @@ void SwWW8ImplReader::ImportDop() rDoc.set(IDocumentSettingAccess::TAB_OVER_MARGIN, true); rDoc.set(IDocumentSettingAccess::SURROUND_TEXT_WRAP_SMALL, true); - // // COMPATIBILITY FLAGS END - // // Import magic doptypography information, if its there if (pWwFib->nFib > 105) @@ -2037,7 +2031,6 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) : pRdr->pTableDesc = 0; pRdr->nAktColl = 0; - pRdr->pCtrlStck = new SwWW8FltControlStack(&pRdr->rDoc, pRdr->nFieldFlags, *pRdr); @@ -2611,18 +2604,18 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp) // All other sprms then refer to that APO and not to the normal text // surrounding it. // The same holds true for a Table (sprm 24 (0x2416)) and Anls (sprm 13). -// + // WW: Table in APO is possible (Both Start-Ends occur at the same time) // WW: APO in Table not possible -// + // This mean that of a Table is the content of a APO, the APO start needs // to be edited first, so that the Table remains in the APO and not the // other way around. // At the End, however, we need to edit the Table End first as the APO // must end after that Table (or else we never find the APO End). -// + // The same holds true for Fly / Anl, Tab / Anl, Fly / Tab / Anl. -// + // If the Table is within an APO the TabRowEnd Area misses the // APO settings. // To not end the APO there, we do not call ProcessApo @@ -3186,24 +3179,24 @@ namespace // Microsoft Word basically categorizes text into East Asian, Complex, ASCII, // NonEastAsian/HighAnsi, with some shared characters and some properties to // hint as to which way to bias those shared characters. -// + // That's four categories, we however have three categories. Given that problem // here we would ideally find out "what would word do" to see what font/language // word would assign to characters based on the unicode range they fall into and // hack the word one onto the range we use. However it's unclear what word's // categorization is. So we don't do that here yet. -// + // Additional to the categorization, when word encounters weak text for ambigious // chars it uses idcthint to indicate which way to bias. We don't have a idcthint // feature in writer. -// + // So what we currently do here then is to split our text into non-weak/weak // sections and uses word's idcthint to determine what font it would use and // force that on for the segment. Following what we *do* know about word's // categorization, we know that the range 0x0020 and 0x007F is sprmCRgFtc0 in // word, something we map to LATIN, so we consider all weaks chars in that range // to auto-bias to LATIN. -// + // See https://bugs.libreoffice.org/show_bug.cgi?id=34319 for an example // // TO-DO: revisit this after the fix of #i119612# which retains the @@ -3827,8 +3820,8 @@ bool SwWW8ImplReader::IsParaEndInCPs(sal_Int32 nStart, sal_Int32 nEnd,bool bSdOD for (cp_vector::const_reverse_iterator aItr = maEndParaPos.rbegin(); aItr!= maEndParaPos.rend(); ++aItr) { //Revised 2012.8.16,to the 0x0D,the attribute will have two situations - //*********within***********exact******// - //*********but also sample with only left and the position of 0x0d is the edge of the right side***********// + //*********within***********exact****** + //*********but also sample with only left and the position of 0x0d is the edge of the right side*********** if ( bSdOD && ( (nStart < *aItr && nEnd > *aItr) || ( nStart == nEnd && *aItr == nStart)) ) return true; else if ( !bSdOD && (nStart < *aItr && nEnd >= *aItr) ) @@ -4220,7 +4213,6 @@ void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection, if(mrReader.pWDop->fUseBackGroundInAllmodes) // #i56806# Make sure mrReader is initialized mrReader.GrafikCtor(); - if (mrReader.pWDop->fUseBackGroundInAllmodes && mrReader.pMSDffManager) { Rectangle aRect(0, 0, 100, 100); // A dummy, we don't care about the size @@ -5643,7 +5635,6 @@ sal_uLong SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGlos aDecryptMain.Write(pIn, nUnencryptedHdr); delete [] pIn; - pTempTable = MakeTemp(aDecryptTable); DecryptRC4(aCtx, *pTableStream, aDecryptTable); pTableStream = &aDecryptTable; diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index ba6ec2325c7a..cbb85631e152 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -134,9 +134,7 @@ using namespace msfilter::util; // Zusatz-Filter-Flags, gueltig ab Winword 8 #define WW8FL_NO_FLY_FOR_TXBX 1 -//----------------------------------------- // Listen-Manager (ab Ver8) -//----------------------------------------- struct WW8LFOInfo; @@ -320,9 +318,8 @@ public: rtl_TextEncoding GetCJKCharSet() const; }; -//----------------------------------------- // Stack -//----------------------------------------- + class SwWW8FltControlStack : public SwFltControlStack { private: @@ -470,7 +467,6 @@ template< typename ReturnType, typename Type > inline ReturnType ulimit_cast( Type nValue, ReturnType nMax ) { return static_cast< ReturnType >( ::std::min< Type >( nValue, nMax ) ); } - template< typename ReturnType, typename Type > inline ReturnType ulimit_cast( Type nValue ) { return ulimit_cast( nValue, ::std::numeric_limits< ReturnType >::max() ); } @@ -552,10 +548,8 @@ class WW8FieldEntry ::sw::mark::IFieldmark::parameter_map_t& getParameters(); }; - -//----------------------------------------- // Mini-Merker fuer einige Flags -//----------------------------------------- + class WW8ReaderSave { private: @@ -606,10 +600,8 @@ private: void SetShade(ColorData nFore, ColorData nBack, sal_uInt16 nIndex); }; - -//----------------------------------------- // Formulas -//----------------------------------------- + enum SwWw8ControlType { WW8_CT_EDIT, @@ -761,7 +753,6 @@ protected: virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pObj ); }; - class wwSection { public: @@ -881,12 +872,12 @@ public: //Various writer elements like frames start off containing a blank paragraph, //sometimes this paragraph turns out to be extraneous, e.g. the frame should //only contain a table with no trailing paragraph. -// + //We want to remove these extra paragraphs, but removing them during the parse //is problematic, because we don't want to remove any paragraphs that are still //addressed by property entries in a SwFltControlStack which have not yet been //committed to the document. -// + //Safest thing is to not delete SwTxtNodes from a document during import, and //remove these extraneous paragraphs at the end after all SwFltControlStack are //destroyed. @@ -1037,9 +1028,8 @@ struct WW8TabBandDesc enum wwDIR {wwTOP = 0, wwLEFT = 1, wwBOTTOM = 2, wwRIGHT = 3}; }; -//----------------------------------------- // Storage-Reader -//----------------------------------------- + typedef std::set<WW8_CP> cp_set; typedef std::vector<WW8_CP> cp_vector; @@ -1272,11 +1262,9 @@ private: sal_Unicode cSymbol; // aktuell einzulesendes Symbolzeichen - sal_uInt8 nWantedVersion; // urspruenglich vom Writer // angeforderte WW-Doc-Version - sal_uInt8 nSwNumLevel; // LevelNummer fuer Outline / Nummerierung sal_uInt8 nWwNumType; // Gliederung / Nummerg / Aufzaehlg sal_uInt8 nListLevel; @@ -1357,7 +1345,6 @@ private: cp_vector maEndParaPos; WW8_CP maCurrAttrCP; bool mbOnLoadingMain:1; -//--------------------------------------------- const SprmReadInfo& GetSprmReadInfo(sal_uInt16 nId) const; @@ -1535,7 +1522,7 @@ private: // Nummerierungen / Aufzaehlungen ( Autonumbered List Data Descriptor ) // Liste: ANLD ( Autonumbered List Data Descriptor ) // eine Ebene: ANLV ( Autonumber Level Descriptor ) -// + // Chg7-8: // Listen sind in WW8 eigene Strukturen, die ueber folgende drei Tabellen // verwaltet werden: rglst, hpllfo und hsttbListNames @@ -1769,7 +1756,6 @@ public: // eigentlich private, geht aber leider nur public // change properties of content (e.g. char formatting) void Read_CPropRMark(sal_uInt16 , const sal_uInt8* pData, short nLen); // complex! - void Read_TabRowEnd( sal_uInt16, const sal_uInt8* pData, short nLen ); void Read_TabCellEnd( sal_uInt16, const sal_uInt8* pData, short nLen ); bool ParseTabPos(WW8_TablePos *aTabPos, WW8PLCFx_Cp_FKP* pPap); @@ -1860,7 +1846,6 @@ public: // eigentlich private, geht aber leider nur public eF_ResT Read_F_Shape(WW8FieldDesc* pF, OUString& rStr); eF_ResT Read_F_HTMLControl( WW8FieldDesc* pF, OUString& rStr); - void DeleteFormImpl(); short ImportSprm( const sal_uInt8* pPos, sal_uInt16 nId = 0 ); diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index ef260cbefbfc..c5ac5b875b9a 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -476,7 +476,6 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd, This sort of mindbending inconsistency is surely why frames are deprecated in word 97 onwards and hidden away from the user - #i1532# & #i5379# If we are already a table in a frame then we must grab the para properties to see if we are still in that frame. @@ -555,10 +554,8 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd, return aRet; } - // helper methods for outline, numbering and bullets - static void SetBaseAnlv(SwNumFmt &rNum, WW8_ANLV &rAV, sal_uInt8 nSwLevel ) { static const SvxExtNumType eNumA[8] = { SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER, @@ -701,7 +698,6 @@ void SwWW8ImplReader::SetAnld(SwNumRule* pNumR, WW8_ANLD* pAD, sal_uInt8 nSwLeve pNumR->Set(nSwLevel, aNF); } - // chapter numbering and bullets // Chapter numbering happens in the style definition. @@ -808,10 +804,8 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor } } - // Numbering / Bullets - // SetNumOlst() carries the Numrules for this cell to SwNumFmt. // For this the info is fetched from OLST and not from ANLD ( see later ) // ( only for outline inside text; Bullets / numbering use ANLDs ) @@ -2516,9 +2510,9 @@ void WW8TabDesc::MergeCells() for( short i = 0; i < pActBand->nWwCols; i++ ) { WW8SelBoxInfo* pActMGroup = 0; - // + // start a new merge group if appropriate - // + OSL_ENSURE(nRow < (sal_uInt16)pTabLines->size(), "Too few lines, table ended early"); if (nRow >= (sal_uInt16)pTabLines->size()) @@ -2569,7 +2563,6 @@ void WW8TabDesc::MergeCells() } } - if (bMerge) { short nX1 = pActBand->nCenter[ i ]; @@ -2709,14 +2702,13 @@ void WW8TabDesc::FinishSwTable() } } - // browse aMergeGroups, detect the index of the first fitting group or -1 otherwise -// + // Parameter: nXcenter = center position of asking box // nWidth = width of asking box // bExact = flag, if box has to fit into group // or only has to touch -// + WW8SelBoxInfo* WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact) { if( !aMergeGroups.empty() ) @@ -2740,16 +2732,16 @@ WW8SelBoxInfo* WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact) nGrX1 = rActGroup.nGroupXStart - nToleranz; nGrX2 = rActGroup.nGroupXStart +rActGroup.nGroupWidth + nToleranz; - // + // If box fits report success - // + if( ( nX1 > nGrX1 ) && ( nX2 < nGrX2 ) ) { return &rActGroup; } - // + // does the box share areas with the group? - // + if( !bExact ) { // successful if nX1 *or* nX2 are inside the group @@ -2932,7 +2924,6 @@ void WW8TabDesc::SetTabBorders(SwTableBox* pBox, short nWwIdx) if( nWwIdx < 0 || nWwIdx >= pActBand->nWwCols ) return; // faked cells -> no border - SvxBoxItem aFmtBox( RES_BOX ); if (pActBand->pTCs) // neither Cell Border nor Default Border defined ? { @@ -3547,10 +3538,8 @@ const SwFmt* SwWW8ImplReader::GetStyleWithOrgWWName( OUString& rName ) const return pRet; } - // class WW8RStyle - const sal_uInt8* WW8RStyle::HasParaSprm( sal_uInt16 nId ) const { if( !pParaSprms || !nSprmsLen ) @@ -3834,7 +3823,7 @@ void WW8RStyle::Import1Style( sal_uInt16 nNr ) return; rSI.bImported = true; // set flag now to avoid endless loops - // + // valid and not NUL and not yet imported if( rSI.nBase < cstd && !pIo->vColl[rSI.nBase].bImported ) @@ -4427,7 +4416,7 @@ void WW8RStyle::Import() // via WW-UI so this does not matter. // This could be done by: // if( bNew ) rDoc.SetDefault( pDefCharFmt->GetAttrSet() ); - // + // for e.g. tables an always valid Std-Style is necessary if( pIo->StyleExists(0) && !pIo->vColl.empty() && diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx index e44b01344c92..713eccfeea24 100644 --- a/sw/source/filter/ww8/ww8par2.hxx +++ b/sw/source/filter/ww8/ww8par2.hxx @@ -44,7 +44,6 @@ private: SfxItemSet aChrSet,aParSet; }; - struct WW8SwFlyPara { SwFlyFrmFmt* pFlyFmt; diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index ec596336fcb9..69af98e27301 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svl/itemiter.hxx> #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> @@ -88,10 +87,8 @@ using namespace sw::util; using namespace sw::types; using namespace sw::mark; - // UNO-Controls - //cmc, OCX i.e. word 97 form controls eF_ResT SwWW8ImplReader::Read_F_OCX( WW8FieldDesc*, OUString& ) { @@ -317,14 +314,11 @@ void SwWW8ImplReader::DeleteFormImpl() delete pFormImpl, pFormImpl = 0; } - // WW8ListManager oeffentliche Methoden stehen ganz am Ende //------------------------- ============ --------------- ============ -------- +// Hilfs-Deklarationen - -// Hilfs-Deklarationen /////////////////////////////////////////////////////// -// // Style Id's for each level typedef sal_uInt16 WW8aIdSty[WW8ListManager::nMaxLevel]; // Zeichenattribute aus GrpprlChpx @@ -393,8 +387,8 @@ struct WW8LFOLVL nStartAt(1), nLevel(0), bStartAt(1), bFormat(0) {} }; -// in den ListenInfos zu speichernde Daten /////////////////////////////////// -// +// in den ListenInfos zu speichernde Daten + struct WW8LSTInfo // sortiert nach nIdLst (in WW8 verwendete Listen-Id) { std::vector<ww::bytes> maParaSprms; @@ -419,8 +413,8 @@ struct WW8LSTInfo // sortiert nach nIdLst (in WW8 verwendete Listen-Id) }; -// in den ListenFormatOverrideInfos zu speichernde Daten ///////////////////// -// +// in den ListenFormatOverrideInfos zu speichernde Daten + struct WW8LFOInfo // unsortiert, d.h. Reihenfolge genau wie im WW8 Stream { std::vector<ww::bytes> maParaSprms; @@ -458,10 +452,7 @@ WW8LFOInfo::WW8LFOInfo(const WW8LFO& rLFO) { } - - -// Hilfs-Methoden //////////////////////////////////////////////////////////// -// +// Hilfs-Methoden // finden der Sprm-Parameter-Daten, falls Sprm im Grpprl enthalten sal_uInt8* WW8ListManager::GrpprlHasSprm(sal_uInt16 nId, sal_uInt8& rSprms, @@ -518,9 +509,9 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet, OUString sPrefix; OUString sPostfix; WW8LVL aLVL; - // + // 1. LVLF einlesen - // + memset(&aLVL, 0, sizeof( aLVL )); rSt.ReadInt32( aLVL.nStartAt ); rSt.ReadUChar( aLVL.nNFC ); @@ -554,9 +545,8 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet, rSt.SeekRel( 2 ); if( 0 != rSt.GetError()) return false; - // // 2. ggfs. PAPx einlesen und nach Einzug-Werten suchen - // + short nTabPos = 0; // #i86652# - read tab setting if( aLVL.nLenGrpprlPapx ) { @@ -651,9 +641,9 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet, } } } - // + // 3. ggfs. CHPx einlesen und - // + sal_uInt16 nWitchPicIsBullet = USHRT_MAX; bool bIsPicBullet = false; @@ -710,14 +700,13 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet, rReader.SetToggleAttrFlags(nOldFlags1); rReader.SetToggleBiDiAttrFlags(nOldFlags2); } - // + // 4. den Nummerierungsstring einlesen: ergibt Prefix und Postfix - // + OUString sNumString(read_uInt16_PascalString(rSt)); - // // 5. gelesene Werte in Writer Syntax umwandeln - // + if( 0 <= aLVL.nStartAt ) nStartNo = (sal_uInt16)aLVL.nStartAt; @@ -1031,9 +1020,8 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule, // merken rCharFmt[ nLevel ] = pFmt; - // // Style an das NumFormat haengen - // + aNumFmt.SetCharFmt( pFmt ); } //Ensure the default char fmt is initialized for any level of num ruler if no customized attr @@ -1051,9 +1039,9 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule, aNumFmt.SetCharFmt( pFmt ); } } - // + // ggfs. Bullet Font an das NumFormat haengen - // + if( SVX_NUM_CHAR_SPECIAL == aNumFmt.GetNumberingType() ) { SwCharFmt* pFmt = aNumFmt.GetCharFmt(); @@ -1073,9 +1061,9 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule, } aNumFmt.SetBulletFont( &aFont ); } - // + // und wieder rein in die NumRule - // + rNumRule.Set(nLevel, aNumFmt); } @@ -1101,8 +1089,8 @@ SwNumRule* WW8ListManager::GetNumRule(size_t i) return 0; } -// oeffentliche Methoden ///////////////////////////////////////////////////// -// +// oeffentliche Methoden + WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) : maSprmParser(rReader_.GetFib().GetFIBVersion()), rReader(rReader_), rDoc(rReader.GetDoc()), rFib(rReader.GetFib()), rSt(rSt_), @@ -1119,9 +1107,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) nLastLFOPosition = USHRT_MAX; long nOriginalPos = rSt.Tell(); - // + // 1. PLCF LST auslesen und die Listen Vorlagen im Writer anlegen - // + bool bOk = checkSeek(rSt, rFib.fcPlcfLst); if (!bOk) @@ -1137,9 +1125,8 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) if (!bOk) return; - // // 1.1 alle LST einlesen - // + for (sal_uInt16 nList=0; nList < nListCount; ++nList) { if (nRemainingPlcfLst < cbLSTF) @@ -1148,9 +1135,8 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) WW8LST aLST; memset(&aLST, 0, sizeof( aLST )); - // // 1.1.1 Daten einlesen - // + rSt.ReadUInt32( aLST.nIdLst ); rSt.ReadUInt32( aLST.nTplC ); for (sal_uInt16 nLevel = 0; nLevel < nMaxLevel; ++nLevel) @@ -1191,18 +1177,17 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) nRemainingPlcfLst -= cbLSTF; } - // // 1.2 alle LVL aller aLST einlesen - // + sal_uInt16 nLSTInfos = static_cast< sal_uInt16 >(maLSTInfos.size()); for (sal_uInt16 nList = 0; nList < nLSTInfos; ++nList) { WW8LSTInfo* pListInfo = maLSTInfos[nList]; if( !pListInfo || !pListInfo->pNumRule ) break; SwNumRule& rMyNumRule = *pListInfo->pNumRule; - // + // 1.2.1 betreffende(n) LVL(s) fuer diese aLST einlesen - // + sal_uInt16 nLvlCount = static_cast< sal_uInt16 >(pListInfo->bSimpleList ? nMinLevel : nMaxLevel); std::deque<bool> aNotReallyThere; aNotReallyThere.resize(nMaxLevel); @@ -1221,26 +1206,25 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) } if( !bLVLOk ) break; - // + // 1.2.2 die ItemPools mit den CHPx Einstellungen der verschiedenen // Level miteinander vergleichen und ggfs. Style(s) erzeugen - // + for (sal_uInt8 nLevel = 0; nLevel < nLvlCount; ++nLevel) { bool bDummy; AdjustLVL( nLevel, rMyNumRule, pListInfo->aItemSet, pListInfo->aCharFmt, bDummy ); } - // + // 1.2.3 ItemPools leeren und loeschen - // + for (sal_uInt8 nLevel = 0; nLevel < nLvlCount; ++nLevel) delete pListInfo->aItemSet[ nLevel ]; } - // // 2. PLF LFO auslesen und speichern - // + bOk = checkSeek(rSt, rFib.fcPlfLfo); if (!bOk) @@ -1253,9 +1237,8 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) if (!bOk) return; - // // 2.1 alle LFO einlesen - // + for (sal_uInt16 nLfo = 0; nLfo < nLfoCount; ++nLfo) { bOk = false; @@ -1301,9 +1284,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) if( bOk ) { - // + // 2.2 fuer alle LFO die zugehoerigen LFOLVL einlesen - // + size_t nLFOInfos = pLFOInfos.size(); for (size_t nLfo = 0; nLfo < nLFOInfos; ++nLfo) { @@ -1315,9 +1298,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) WW8LSTInfo* pParentListInfo = GetLSTByListId(rLFOInfo.nIdLst); if (!pParentListInfo) break; - // + // 2.2.1 eine neue NumRule fuer diese Liste anlegen - // + SwNumRule* pParentNumRule = rLFOInfo.pNumRule; OSL_ENSURE(pParentNumRule, "ww: Impossible lists, please report"); if( !pParentNumRule ) @@ -1327,7 +1310,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) const OUString sPrefix("WW8NumSt" + OUString::number( nLfo + 1 )); // jetzt dem pNumRule seinen RICHTIGEN Wert zuweisen !!! // (bis dahin war hier die Parent NumRule vermerkt ) - // + // Dazu erst mal nachsehen, ob ein Style diesen LFO // referenziert: if( USHRT_MAX > rReader.StyleUsingLFO( nLfo ) ) @@ -1344,10 +1327,10 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) rLFOInfo.pNumRule = rDoc.GetNumRuleTbl()[ nRul ]; rLFOInfo.pNumRule->SetAutoRule(true); // = default } - // + // 2.2.2 alle LFOLVL (und ggfs. LVL) fuer die neue NumRule // einlesen - // + WW8aISet aItemSet; // Zeichenattribute aus GrpprlChpx WW8aCFmt aCharFmt; // Zeichen Style Pointer memset(&aItemSet, 0, sizeof( aItemSet )); @@ -1375,9 +1358,8 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) WW8LFOLVL aLFOLVL; bLVLOk = false; - // // 2.2.2.1 den LFOLVL einlesen - // + rSt.ReadInt32( aLFOLVL.nStartAt ); sal_uInt8 aBits1(0); rSt.ReadUChar( aBits1 ); @@ -1400,9 +1382,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) aLFOLVL.bStartAt = true; else aLFOLVL.bStartAt = false; - // + // 2.2.2.2 eventuell auch den zugehoerigen LVL einlesen - // + SwNumFmt aNumFmt( rLFOInfo.pNumRule->Get(aLFOLVL.nLevel)); if (aBits1 & 0x20) @@ -1424,9 +1406,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) aNumFmt.SetStart( writer_cast<sal_uInt16>(aLFOLVL.nStartAt)); } - // + // 2.2.2.3 das NumFmt in die NumRule aufnehmen - // + rLFOInfo.pNumRule->Set(aLFOLVL.nLevel, aNumFmt); } bLVLOk = true; @@ -1436,9 +1418,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) } if( !bLVLOk ) break; - // + // 2.2.3 die LVL der neuen NumRule anpassen - // + sal_uInt16 aFlagsNewCharFmt = 0; bool bNewCharFmtCreated = false; for (sal_uInt8 nLevel = 0; nLevel < rLFOInfo.nLfoLvl; ++nLevel) @@ -1448,9 +1430,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) if( bNewCharFmtCreated ) aFlagsNewCharFmt += (1 << nLevel); } - // + // 2.2.4 ItemPools leeren und loeschen - // + for (sal_uInt8 nLevel = 0; nLevel < rLFOInfo.nLfoLvl; ++nLevel) delete aItemSet[ nLevel ]; bOk = true; @@ -1639,7 +1621,6 @@ SwNumRule* WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition, return pRet; } - // SwWW8ImplReader: anhaengen einer Liste an einen Style oder Absatz bool SwWW8ImplReader::SetTxtFmtCollAndListLevel(const SwPaM& rRg, @@ -2087,10 +2068,8 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData, } } - // ------------------------- Reading Controls ------------------------ - bool SwWW8ImplReader::ImportFormulaControl(WW8FormulaControl &aFormula, WW8_CP nStart, SwWw8ControlType nWhich ) { diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index a71732c9a7b8..04e72c34c073 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -165,7 +165,6 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp, rWMF.SetPrefMapMode( MapMode( MAP_100TH_MM ) ); - // MetaFile auf neue Groesse skalieren und // neue Groesse am MetaFile setzen Size aOldSiz( rWMF.GetPrefSize() ); @@ -353,7 +352,6 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, SvStorageRef xSrc1 = xSrc0->OpenSotStorage( aSrcStgName, STREAM_READWRITE| STREAM_SHARE_DENYALL ); - if (pGrf) { rGraph = *pGrf; @@ -380,7 +378,6 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, } } // StorageStreams wieder zu - Rectangle aRect(0, 0, nX, nY); if (pFlySet) diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 4c92ef1f324e..f085353f0b27 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -91,10 +91,8 @@ using namespace sw::mark; using namespace std; // #i24377# using namespace nsSwDocInfoSubType; - // Bookmarks - namespace { // #120879# - helper method to identify a bookmark name to match the internal TOC bookmark naming convention @@ -218,10 +216,8 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*) return 0; } - // general help methods to separate parameters - /// translate FieldParameter names into the system character set and /// at the same time, douple backslashes are converted into single ones OUString SwWW8ImplReader::ConvertFFileName(const OUString& rOrg) @@ -317,7 +313,6 @@ OUString FindPara( const OUString& rStr, sal_Unicode cToken, sal_Unicode cToken2 return rStr.copy( n, n2-n ); } - static SvxExtNumType GetNumTypeFromName(const OUString& rStr, bool bAllowPageDesc = false) { @@ -452,7 +447,6 @@ short SwWW8ImplReader::GetTimeDatePara(OUString& rStr, sal_uInt32& rFormat, return nNumFmtType; } - // Felder // Am Ende des Einlesens entsprechende Felder updaten ( z.Zt. die Referenzen ) @@ -683,7 +677,6 @@ void WW8FieldEntry::SetBookmarkCode(OUString bookmarkCode) msMarkCode = bookmarkCode; } - ::sw::mark::IFieldmark::parameter_map_t& WW8FieldEntry::getParameters() { return maParams; @@ -755,10 +748,8 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes) &SwWW8ImplReader::Read_F_ANumber, // 54 0, - 0, // 56 - &SwWW8ImplReader::Read_F_Symbol, // 57 &SwWW8ImplReader::Read_F_Embedd, // 58 &SwWW8ImplReader::Read_F_DBField, // 59 @@ -956,10 +947,8 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes) } } - // Felder Taggen - // MakeTagString() gibt als Returnwert die Position des ersten // CR / Zeilenende / Seitenumbruch in pText und wandelt auch nur bis dort // Wenn keins dieser Sonderzeichen enthalten ist, wird 0 zurueckgeliefert. @@ -1069,7 +1058,6 @@ long SwWW8ImplReader::Read_F_Tag( WW8FieldDesc* pF ) nL = pSBase->WW8ReadString( *pStrm, sFTxt, pPlcxMan->GetCpOfs() + nStart, nL, eStructCharSet); - OUString aTagText; MakeTagString( aTagText, sFTxt ); InsertTagField( pF->nId, aTagText ); @@ -1078,10 +1066,8 @@ long SwWW8ImplReader::Read_F_Tag( WW8FieldDesc* pF ) return pF->nLen; } - // normal fields - eF_ResT SwWW8ImplReader::Read_F_Input( WW8FieldDesc* pF, OUString& rStr ) { OUString aDef; @@ -2650,10 +2636,8 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam) } } - // "table of ..." fields - static void lcl_toxMatchACSwitch( SwWW8ImplReader& /*rReader*/, SwDoc& rDoc, SwTOXBase& rBase, diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 15f5094b8aec..7815f3681b8c 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -21,7 +21,6 @@ #include <svl/itemiter.hxx> #include <rtl/tencinfo.h> - #include <hintids.hxx> #include <editeng/lspcitem.hxx> #include <editeng/wrlmitem.hxx> @@ -105,18 +104,14 @@ using namespace sw::types; using namespace ::com::sun::star; using namespace nsHdFtFlags; - // diverses - #define MM_250 1417 // WW-Default fuer Hor. Seitenraender: 2.5 cm #define MM_200 1134 // WW-Default fuer u.Seitenrand: 2.0 cm - static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRC* brc, WW8PLCFx_Cp_FKP* pPap, const WW8RStyle* pSty = 0, const WW8PLCFx_SEPX* pSep = 0); - ColorData SwWW8ImplReader::GetCol(sal_uInt8 nIco) { static const ColorData eSwWW8ColA[] = @@ -1194,10 +1189,8 @@ void SwWW8ImplReader::CopyPageDescHdFt(const SwPageDesc* pOrgPageDesc, } } - // Hilfsroutinen fuer Grafiken und Apos und Tabellen - static bool _SetWW8_BRC(bool bVer67, WW8_BRC& rVar, const sal_uInt8* pS) { if( pS ) @@ -1387,7 +1380,6 @@ bool SwWW8ImplReader::SetBorder(SvxBoxItem& rBox, const WW8_BRC* pbrc, return bChange; } - bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow, const short *pSizeArray, const WW8_BRC& aRightBrc) const { @@ -1431,7 +1423,6 @@ void SwWW8ImplReader::GetBorderDistance(const WW8_BRC* pbrc, } } - bool SwWW8ImplReader::SetFlyBordersShadow(SfxItemSet& rFlySet, const WW8_BRC *pbrc, short *pSizeArray) const { @@ -1454,7 +1445,6 @@ bool SwWW8ImplReader::SetFlyBordersShadow(SfxItemSet& rFlySet, return bShadowed; } - // APOs // fuer Berechnung der minimalen FrameSize @@ -1657,7 +1647,6 @@ void WW8FlyPara::ReadFull(sal_uInt8 nOrigSp29, SwWW8ImplReader* pIo) }while( false ); // Block zum rausspringen } - // Read fuer Apo-Defs in Styledefs void WW8FlyPara::Read(sal_uInt8 nOrigSp29, WW8RStyle* pStyle) { @@ -2203,7 +2192,7 @@ SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrmFmt *pFlyFmt, if (aIdx == aEnd && pNd && pNd->GetTxt().isEmpty()) { //An extra pre-created by writer unused paragraph - // + //delete after import is complete rather than now //to avoid the complication of managing uncommitted //ctrlstack properties that refer to it. @@ -3197,7 +3186,6 @@ void SwWW8ImplReader::Read_Underline( sal_uInt16, const sal_uInt8* pData, short // 6 = thick, 7 = dash, 8 = dot(not used) // 9 = dotdash 10 = dotdotdash 11 = wave - // pruefe auf Sonderfall "fett+unterstrichen" bool bAlsoBold = /*( 6 == b )*/ false; // erst mal ggfs. *bold* einschalten! @@ -3672,8 +3660,6 @@ void SwWW8ImplReader::Read_FontSize( sal_uInt16 nId, const sal_uInt8* pData, sho } } - - void SwWW8ImplReader::Read_CharSet(sal_uInt16 , const sal_uInt8* pData, short nLen) { if( nLen < 0 ) @@ -3749,7 +3735,6 @@ void SwWW8ImplReader::Read_CColl( sal_uInt16, const sal_uInt8* pData, short nLen nCharFmt = (short) nId; } - /* enger oder weiter als normal: */ @@ -3842,7 +3827,6 @@ void SwWW8ImplReader::Read_CharHighlight(sal_uInt16, const sal_uInt8* pData, sho } } - /*************************************************************************** # Absatz - Attribute #**************************************************************************/ @@ -4056,7 +4040,7 @@ void SwWW8ImplReader::Read_LineSpace( sal_uInt16, const sal_uInt8* pData, short // 0.2*Zeilenabstand "nach". // Bei "Mindestens" sind es 1*Zeilenabstand "vor" und 0*Zeilenabstand "nach". // Bei Mehrfach sind es 0 "vor" und min( 0cm, FontSize*(nFach-1) ) "nach". -// + // SW hat auch einen impliziten Zeilenabstand. er betraegt bei "mindestens" // 1*Zeilenabstand "vor" und 0 "nach" // bei proportional betraegt er min( 0cm, FontSize*(nFach-1) ) sowohl "vor" @@ -4572,7 +4556,6 @@ void SwWW8Shade::SetShade(ColorData nFore, ColorData nBack, sal_uInt16 nIndex) 975 // 61 [available in DOC, not available in DOCX] };// 62 - //NO auto for shading so Foreground: Auto = Black if (nFore == COL_AUTO) nFore = COL_BLACK; @@ -4582,7 +4565,6 @@ void SwWW8Shade::SetShade(ColorData nFore, ColorData nBack, sal_uInt16 nIndex) if (nUseBack == COL_AUTO) nUseBack = COL_WHITE; - if( nIndex >= sizeof( eMSGrayScale ) / sizeof ( eMSGrayScale[ 0 ] ) ) nIndex = 0; @@ -4789,7 +4771,6 @@ void SwWW8ImplReader::Read_CharBorder(sal_uInt16 /*nId*/, const sal_uInt8* pData } } - } void SwWW8ImplReader::Read_Hyphenation( sal_uInt16, const sal_uInt8* pData, short nLen ) @@ -4961,7 +4942,6 @@ bool SwWW8ImplReader::ParseTabPos(WW8_TablePos *pTabPos, WW8PLCFx_Cp_FKP* pPap) # ( ausser OLST ) #**************************************************************************/ - long SwWW8ImplReader::ImportExtSprm(WW8PLCFManResult* pRes) { /************************************************************************* @@ -6143,10 +6123,8 @@ const wwSprmDispatcher *GetWW8SprmDispatcher() return &aSprmSrch; } - // Hilfsroutinen : SPRM finden - const SprmReadInfo& SwWW8ImplReader::GetSprmReadInfo(sal_uInt16 nId) const { ww::WordVersion eVersion = pWwFib->GetFIBVersion(); @@ -6171,7 +6149,6 @@ const SprmReadInfo& SwWW8ImplReader::GetSprmReadInfo(sal_uInt16 nId) const return *pFound; } - // Hilfsroutinen : SPRMs void SwWW8ImplReader::EndSprm( sal_uInt16 nId ) diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 743eec85b73d..617f21d2306d 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -260,7 +260,6 @@ const wwSprmSearcher *wwSprmParser::GetWW2SprmSearcher() return &aSprmSrch; }; - const wwSprmSearcher *wwSprmParser::GetWW6SprmSearcher() { //double lock me @@ -1034,10 +1033,10 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p) if( nSprmListIdx ) { // process Sprm Id Matching as explained in MS Documentation - // + // ''Property Modifier(variant 1) (PRM)'' // see file: s62f39.htm - // + // Since isprm is 7 bits, rgsprmPrm can hold 0x80 entries. static const sal_uInt16 aSprmId[0x80] = { @@ -1219,7 +1218,6 @@ WW8_FC WW8PLCFx_PCD::AktPieceStartCp2Fc( WW8_CP nCp ) return nFC + (nCp - nCpStart) * (bIsUnicode ? 2 : 1); } - void WW8PLCFx_PCD::AktPieceFc2Cp( WW8_CP& rStartPos, WW8_CP& rEndPos, const WW8ScannerBase *pSBase ) { @@ -1786,7 +1784,6 @@ static bool WW8SkipField(WW8PLCFspecial& rPLCF) if( !rPLCF.Get( nP, pData ) ) return false; - while((((sal_uInt8*)pData)[0] & 0x1f ) == 0x13 ) { // still new (nested) beginnings ? @@ -2373,7 +2370,6 @@ sal_Int32 WW8PLCFpcd_Iter::Where() const return rPLCF.pPLCF_PosArray[nIdx]; } - bool WW8PLCFx_Fc_FKP::WW8Fkp::Entry::operator< (const WW8PLCFx_Fc_FKP::WW8Fkp::Entry& rSecond) const { @@ -2756,7 +2752,6 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::HasSprm(sal_uInt16 nId, return !rResult.empty(); } - void WW8PLCFx::GetSprms( WW8PLCFxDesc* p ) { OSL_ENSURE( !this, "Called wrong GetSprms" ); @@ -2796,7 +2791,6 @@ public: {return mnPo == pFkp->GetFilePos();} }; - bool WW8PLCFx_Fc_FKP::NewFkp() { WW8_CP nPLCFStart, nPLCFEnd; @@ -3534,7 +3528,6 @@ const sal_uInt8* WW8PLCFx_SEPX::HasSprm( sal_uInt16 nId, sal_uInt8 n2nd ) const return 0; // Sprm not found } - WW8PLCFx_SubDoc::WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp, long nFcRef, long nLenRef, long nFcTxt, long nLenTxt, long nStruct) @@ -5020,8 +5013,6 @@ void WW8PLCFxDesc::Restore( const WW8PLCFxSave1& rSave ) } } - - namespace { sal_uInt32 Readcb(SvStream& rSt, ww::WordVersion eVer) @@ -5193,7 +5184,7 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset) rSt.ReadUChar( envr ); rSt.ReadUChar( aVer8Bits1 ); // unter Ver67 nur leeres Reservefeld // Inhalt von aVer8Bits1 - // + // sal_uInt8 fMac :1; // sal_uInt8 fEmptySpecial :1; // sal_uInt8 fLoadOverridePage :1; @@ -5512,7 +5503,6 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset) } } - WW8Fib::WW8Fib(sal_uInt8 nVer, bool bDot) { memset(this, 0, sizeof(*this)); @@ -6121,10 +6111,6 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, OUString* pString, short* pcbStd ) return pStd; } - - - - struct WW8_FFN_Ver6 : public WW8_FFN_BASE { // ab Ver6 @@ -6421,13 +6407,8 @@ const WW8_FFN* WW8Fonts::GetFont( sal_uInt16 nNum ) const return &pFontA[ nNum ]; } - - - - - // Suche zu einem Header / Footer den Index in der WW-Liste von Headern / Footern -// + // Pferdefuesse bei WinWord6 und -7: // 1) Am Anfang des Einlesens muss WWPLCF_HdFt mit Fib und Dop konstruiert werden // 2) Der Haupttext muss sequentiell ueber alle Sections gelesen werden @@ -6510,10 +6491,8 @@ void WW8PLCF_HdFt::UpdateIndex( sal_uInt8 grpfIhdt ) nIdxOffset++; } - // WW8Dop - WW8Dop::WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize) : bUseThaiLineBreakingRules(false) { memset( &nDataStart, 0, (&nDataEnd - &nDataStart) ); @@ -6582,7 +6561,6 @@ WW8Dop::WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize) fLockRev = 0 != ( a8Bit & 0x40 ); fEmbedFonts = 0 != ( a8Bit & 0x80 ); - a8Bit = Get_Byte( pData ); // 8 0x08 copts_fNoTabForInd = 0 != ( a8Bit & 0x01 ); copts_fNoSpaceRaiseLower = 0 != ( a8Bit & 0x02 ); @@ -7013,7 +6991,6 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const if( fEmbedFonts ) a8Bit |= 0x80; Set_UInt8( pData, a8Bit ); - a8Bit = 0; // 8 0x08 if( copts_fNoTabForInd ) a8Bit |= 0x01; if( copts_fNoSpaceRaiseLower ) a8Bit |= 0x02; @@ -7238,7 +7215,6 @@ sal_uInt16 WW8DopTypography::GetConvertedLang() const return nLang; } - // Sprms sal_uInt16 wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm) diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index d83790bd727e..aecadb718195 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -1251,7 +1251,6 @@ public: sal_uInt32 lcbDop; // 0x154 count of bytes of document properties. // cbDOP is 84 when nFib < 103 - WW8_FC fcSttbfAssoc; // 0x158 offset to STTBF of associated strings. See STTBFASSOC. sal_Int32 lcbSttbfAssoc; // 0x15C @@ -1320,7 +1319,6 @@ public: WW8_FC fcPlcfpgdEdn; // 0x1EA offset to PLCF of page boundaries in the endnote subdoc. sal_Int32 lcbPlcfpgdEdn; // 0x1EE - WW8_FC fcDggInfo; // offset in table stream of the office art object table data. // The format of office art object table data is found in a separate document. // war in Ver67 nur leere Reserve @@ -1488,7 +1486,7 @@ public: */ // Initialisier-Dummy: sal_uInt8 nDataStart; - //------------------------- + bool fFacingPages : 1; // 1 when facing pages should be printed bool fWidowControl : 1; //a: orig 97 docs say @@ -1500,9 +1498,9 @@ public: sal_uInt16 grfSuppression : 2; // 0 Default line suppression storage; 0= form letter line suppression; 1= no line suppression; default=0 sal_uInt16 fpc : 2; // 1 footnote position code: 0 as endnotes, 1 at bottom of page, 2 immediately beneath text sal_uInt16 : 1; // 0 unused - //------------------------- + sal_uInt16 grpfIhdt : 8; // 0 specification of document headers and footers. See explanation under Headers and Footers topic. - //------------------------- + sal_uInt16 rncFtn : 2; // 0 restart index for footnotes, 0 don't restart note numbering, 1 section, 2 page sal_uInt16 nFtn : 14; // 1 initial footnote number for document bool fOutlineDirtySave : 1; // when 1, indicates that information in the hPLCFpad should be refreshed since outline has been dirtied @@ -1517,7 +1515,7 @@ public: bool fRevMarking : 1; // when 1, Word will mark revisions as the document is edited bool fBackup : 1; // always make backup when document saved when 1. bool fExactCWords : 1; - bool fPagHidden : 1; // + bool fPagHidden : 1; bool fPagResults : 1; bool fLockAtn : 1; // when 1, annotations are locked for editing bool fMirrorMargins : 1; // swap margins on left/right pages when 1. @@ -1547,7 +1545,7 @@ public: bool copts_fExpShRtn : 1; // when 1, expand character spaces on the line ending SHIFT+RETURN // #i56856# sal_Int16 dxaTab; // 720 twips - default tab width - sal_uInt16 wSpare; // + sal_uInt16 wSpare; sal_uInt16 dxaHotZ; // width of hyphenation hot zone measured in twips sal_uInt16 cConsecHypLim; // number of lines allowed to have consecutive hyphens sal_uInt16 wSpare2; // reserved diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index 603eaa23e2b4..52d68fc51a98 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -143,7 +143,6 @@ struct Word2CHPX } }; - typedef sal_Int16 WW8_PN; typedef sal_Int32 WW8_FC; typedef sal_Int32 WW8_CP; @@ -227,8 +226,6 @@ struct WW8_FFN : public WW8_FFN_BASE // font does not exist on this system. }; - - struct WW8_BRCVer6 // alter Border Code { SVBT16 aBits1; @@ -331,16 +328,12 @@ struct WW8_DOGRID short dxaGrid; // width of each grid square short dyaGrid; // height of each grid square - - /* a c h t u n g : es duerfen keine solchen Bitfelder ueber einen eingelesenes Byte-Array gelegt werden!! stattdessen ist ein aBits1 darueber zu legen, das mit & auszulesen ist GRUND: Compiler auf Intel und Sparc sortieren die Bits unterschiedlich */ - - short dyGridDisplay:7; // the number of grid squares (in the y direction) // between each gridline drawn on the screen. 0 means // don't display any gridlines in the y direction. @@ -460,7 +453,6 @@ struct WW8_TCell // hiermit wird weitergearbeitet (entspricht weitestgehend d }; // cbTC (count of bytes of a TC) is 18(decimal), 12(hex). - struct WW8_TCellVer6 // wird aus der Datei gelesen { sal_uInt8 aBits1Ver6; @@ -485,7 +477,6 @@ struct WW8_TCellVer8 // wird aus der Datei gelesen }; // cbTC (count of bytes of a TC) is 20(decimal), 14(hex). - struct WW8_SHD // struct SHD fehlt in der Beschreibung { private: @@ -619,7 +610,6 @@ struct WW8_DPHEAD SVBT16 dya; // 0xa }; - struct WW8_DP_LINETYPE { SVBT32 lnpc; // LiNe Property Color -- RGB color value @@ -661,7 +651,7 @@ struct WW8_DP_LINE { // WW8_DPHEAD dphead; // 0 Common header for a drawing primitive SVBT16 xaStart; // starting point for line - SVBT16 yaStart; // + SVBT16 yaStart; SVBT16 xaEnd; // ending point for line SVBT16 yaEnd; WW8_DP_LINETYPE aLnt; @@ -768,7 +758,7 @@ struct WW8_ATRD // fuer die 8-Version struct WW8_ATRDEXTRA { - // --- Extended bit since Word 2002 --- // + // --- Extended bit since Word 2002 --- SVBT32 dttm; SVBT16 bf; @@ -853,7 +843,6 @@ public: enum FSPAOrient {RelPgMargin, RelPageBorder, RelText}; }; - struct WW8_FSPA_SHADOW // alle Member an gleicher Position und Groesse, { // wegen: pF = (WW8_FSPA*)pFS; SVBT32 nSpId; diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx index 74e726a5256f..d0482e95e49a 100644 --- a/sw/source/filter/ww8/ww8toolbar.hxx +++ b/sw/source/filter/ww8/ww8toolbar.hxx @@ -149,7 +149,7 @@ class SwCTBWrapper : public Tcg255SubStruct sal_Int32 cbDTBC; - std::vector< SwTBC > rtbdc; // + std::vector< SwTBC > rtbdc; std::vector< Customization > rCustomizations; // array of Customizations std::vector< sal_Int16 > dropDownMenuIndices; // array of indexes of Customization toolbars that are dropped by a menu SwCTBWrapper(const SwCTBWrapper&); diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index 3c230fda29d6..089e7c3c8b1d 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -424,7 +424,6 @@ void XMLRedlineImportHelper::Add( pInfo->aDateTime = rDateTime; pInfo->bMergeLastParagraph = bMergeLastPara; - // ad 3) if (aRedlineMap.end() == aRedlineMap.find(rId)) { @@ -578,7 +577,6 @@ void XMLRedlineImportHelper::AdjustStartNodeCursor( // else: can't find redline -> ignore } - inline bool XMLRedlineImportHelper::IsReady(RedlineInfo* pRedline) { // we can insert a redline if we have start & end, and we don't @@ -622,7 +620,6 @@ void XMLRedlineImportHelper::InsertIntoDocument(RedlineInfo* pRedlineInfo) aPaM.DeleteMark(); } - // cover three cases: // 1) empty redlines (no range, no content) // 2) check for: diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 25e8d73fe9db..cd88b8f95af6 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -481,7 +481,6 @@ static void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SwDoc& _rDoc ) } } - sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, const OUString & rName ) { // Get service factory diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 587ff082a345..64876fa4e820 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/container/XIndexContainer.hpp> @@ -369,7 +368,6 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, sErrFile = "styles.xml"; } - if( !bOrganizerMode && !bErr ) { if( !WriteThroughComponent( diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index 130f036c886c..bfba14f14ae3 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } - class SwXMLWriter : public StgWriter { sal_uInt32 _Write( const com::sun::star::uno::Reference < com::sun::star::task::XStatusIndicator>&, const OUString& ); @@ -91,7 +90,6 @@ private: ::com::sun::star::beans::PropertyValue> & rMediaDesc ); }; - #endif // INCLUDED_SW_SOURCE_FILTER_XML_WRTXML_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx index a077b7200bfa..84c4fcb1d420 100644 --- a/sw/source/filter/xml/xmlbrsh.cxx +++ b/sw/source/filter/xml/xmlbrsh.cxx @@ -197,7 +197,6 @@ SwXMLBrushItemExport::~SwXMLBrushItemExport() { } - void SwXMLBrushItemExport::exportXML( const SvxBrushItem& rItem ) { GetExport().CheckAttrList(); diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 73e03fdfd006..a07a142671a5 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -308,7 +307,6 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) pDoc->SetRedlineMode( (RedlineMode_t)(nRedlineMode )); } - if( pGraphicResolver ) SvXMLGraphicHelper::Destroy( pGraphicResolver ); if( pEmbeddedResolver ) @@ -343,7 +341,6 @@ SwXMLExport::~SwXMLExport() _FinitItemExport(); } - void SwXMLExport::_ExportFontDecls() { GetFontAutoStylePool(); // make sure the pool is created @@ -451,7 +448,6 @@ void SwXMLExport::SetBodyAttributes() } } - void SwXMLExport::_ExportContent() { // export forms @@ -507,12 +503,8 @@ void SwXMLExport::_ExportContent() GetTextParagraphExport()->exportText( xText, bShowProgress ); } - - -// // uno component registration // helper functions for export service(s) -// // OOo OUString SAL_CALL SwXMLExportOOO_getImplementationName() throw() diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index 3a4d07b79d8c..0414747767a9 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -75,7 +75,6 @@ class SwXMLExport : public SvXMLExport SwXMLTableInfo_Impl& rTblInfo, sal_Bool bTop=sal_False ); - void ExportFmt( const SwFmt& rFmt, enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ); void ExportTableFmt( const SwFrmFmt& rFmt, sal_uInt32 nAbsWidth ); diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 53013664cc18..47d0deea5cbe 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -568,7 +568,6 @@ bool SvXMLExportItemMapper::QueryXMLValue( sal_uInt16 nLeftDist = pBox->GetDistance( BOX_LINE_LEFT ); sal_uInt16 nRightDist = pBox->GetDistance( BOX_LINE_RIGHT ); - // check if we need to export it switch( nMemberId ) { diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx index 16ff8283db34..a017fffb19ef 100644 --- a/sw/source/filter/xml/xmlexpit.hxx +++ b/sw/source/filter/xml/xmlexpit.hxx @@ -38,7 +38,6 @@ class SvXMLAttributeList; class SvXMLNamespaceMap; class SvXMLExport; - class SvXMLExportItemMapper { protected: @@ -62,7 +61,6 @@ protected: sal_uInt16 nFlags, const SfxItemSet *pSet ) const; - void exportElementItems( SvXMLExport& rExport, const SvXMLUnitConverter& rUnitConverter, const SfxItemSet &rSet, @@ -92,7 +90,6 @@ public: const SvXMLNamespaceMap& rNamespaceMap, const SfxItemSet *pSet = NULL ) const; - /** this method is called for every item that has the MID_SW_FLAG_NO_ITEM_EXPORT flag set */ virtual void handleNoItem( SvXMLAttributeList& rAttrList, diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 6e025f4b7c93..8d2386ee93ca 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -50,7 +50,6 @@ #include <unotxdoc.hxx> #include <docsh.hxx> - using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -827,7 +826,6 @@ SvXMLStyleContext *SwXMLStylesContext_Impl::CreateDefaultStyleStyleChildContext( return pStyle; } - SwXMLStylesContext_Impl::SwXMLStylesContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index 3aa03025311f..03e7b9c5a00d 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -38,7 +38,6 @@ #include "xmlexp.hxx" #include <SwStyleNameMapper.hxx> - using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; @@ -46,7 +45,6 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::lang; using namespace ::xmloff::token; - void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily ) { // <style:style ...> @@ -64,7 +62,6 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily ) if( bEncoded ) AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY_NAME, rFmt.GetName() ); - if( eFamily != XML_TOKEN_INVALID ) AddAttribute( XML_NAMESPACE_STYLE, XML_FAMILY, eFamily ); @@ -162,7 +159,6 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily ) } } - void SwXMLExport::_ExportStyles( bool bUsed ) { SvXMLExport::_ExportStyles( bUsed ); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 69d09da91881..738caaffd491 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -239,7 +239,6 @@ SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext( if( !pContext ) pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); - return pContext; } @@ -508,7 +507,6 @@ void SwXMLImport::startDocument() // this method will modify the document directly -> lock SolarMutex SolarMutexGuard aGuard; - Reference< XPropertySet > xImportInfo( getImportInfo() ); Reference< XPropertySetInfo > xPropertySetInfo; if( xImportInfo.is() ) @@ -724,7 +722,6 @@ void SwXMLImport::endDocument( void ) if( HasShapeImport() ) ClearShapeImport(); - SwDoc *pDoc = 0; if( (getImportFlags() & IMPORT_CONTENT) != 0 && !IsStylesOnlyMode() ) { @@ -1446,7 +1443,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC } } - void SwXMLImport::SetDocumentSpecificSettings( const OUString& _rSettingsGroupName, const Sequence< PropertyValue>& _rSettings ) diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index ee77cadc73e0..3f1a920ca728 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -93,7 +93,6 @@ class SwXMLImport: public SvXMLImport void setBlockMode(); void setOrganizerMode(); - protected: // This method is called after the namespace map has been updated, but diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 3bdac75eac22..4bf2c1d1aeff 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -248,8 +248,6 @@ struct BoxHolder : private boost::noncopyable } }; - - // put an XML-string value into an item bool SvXMLImportItemMapper::PutXMLValue( SfxPoolItem& rItem, diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx index 219ae8dba848..d93026aa1867 100644 --- a/sw/source/filter/xml/xmlimpit.hxx +++ b/sw/source/filter/xml/xmlimpit.hxx @@ -22,11 +22,9 @@ #include <limits.h> #include <tools/solar.h> - #include <com/sun/star/xml/sax/XAttributeList.hpp> #include "xmlitmap.hxx" - class SvXMLUnitConverter; class SfxPoolItem; class SfxItemSet; @@ -75,7 +73,6 @@ public: virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ); inline SvXMLItemMapEntriesRef getMapEntries() const; - /** This method is called for every item that should be set based upon an XML attribute value. */ static bool PutXMLValue( @@ -91,7 +88,6 @@ SvXMLImportItemMapper::getMapEntries() const return mrMapEntries; } - #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLIMPIT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx index 2d0670c9a160..4e2ccdc55bad 100644 --- a/sw/source/filter/xml/xmlitem.hxx +++ b/sw/source/filter/xml/xmlitem.hxx @@ -25,7 +25,6 @@ #include <limits.h> #include <xmloff/xmlictxt.hxx> - class SfxItemSet; class SvXMLImportItemMapper; class SvXMLUnitConverter; @@ -63,7 +62,6 @@ public: const SvXMLItemMapEntry& rEntry, const SvXMLUnitConverter& rUnitConv ); - }; #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLITEM_HXX diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index 86d9a3e66888..dec2c5c33a14 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -174,7 +174,6 @@ bool SwXMLImportTableItemMapper_Impl::handleSpecialItem( return bRet; } - bool SwXMLImportTableItemMapper_Impl::handleNoItem( SvXMLItemMapEntry const& rEntry, SfxItemSet & rSet, diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index e1a383bbebac..97d21b816030 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -78,7 +78,6 @@ const struct SvXMLEnumMapEntry psXML_NamedBorderWidths[] = }; // mapping tables to map external xml input to internal box line widths - const sal_uInt16 aBorderWidths[] = { DEF_LINE_WIDTH_0, @@ -176,7 +175,6 @@ bool sw_frmitems_setXMLBorder( SvxBorderLine*& rpLine, if( !rpLine ) rpLine = new SvxBorderLine; - if( ( bHasWidth && (USHRT_MAX != nNamedWidth || (nWidth != rpLine->GetWidth() ) ) ) || ( bHasStyle && @@ -314,7 +312,6 @@ void sw_frmitems_MergeXMLVertPos( SvxGraphicPosition& ePos, } } - const struct SvXMLEnumMapEntry psXML_BreakType[] = { { XML_AUTO, 0 }, diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx index 79b121a2773a..8ffb42f0f918 100644 --- a/sw/source/filter/xml/xmlmeta.cxx +++ b/sw/source/filter/xml/xmlmeta.cxx @@ -33,8 +33,6 @@ #include "xmlimp.hxx" #include "xmlexp.hxx" - - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 1cb94ad7a20f..0cdf40156588 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -69,7 +69,6 @@ class SwXMLTableColumn_Impl : public SwWriteTableCol public: - SwXMLTableColumn_Impl( sal_uInt32 nPosition ) : SwWriteTableCol( nPosition ), nRelWidth( 0UL ) @@ -268,7 +267,6 @@ bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt, continue; } - if( pFrmSize && ( pFrmSize->GetHeightSizeType() != pTestFrmSize->GetHeightSizeType() || pFrmSize->GetHeight() != pTestFrmSize->GetHeight() ) ) @@ -472,7 +470,6 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt, return bInsert; } - class SwXMLTableInfo_Impl { const SwTable *pTable; @@ -504,9 +501,6 @@ inline void SwXMLTableInfo_Impl::SetBaseSection( bBaseSectionValid = true; } - - - void SwXMLExport::ExportTableColumnStyle( const SwXMLTableColumn_Impl& rCol ) { // <style:style ...> @@ -656,7 +650,6 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines, else nCPos = pLines->GetWidth(); - // Und ihren Index sal_uInt16 nOldCol = nCol; SwXMLTableColumn_Impl aCol( nCPos ); diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index cae6695e3521..42060375c4e0 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1275,9 +1275,6 @@ public: } }; - - - typedef boost::ptr_vector<SwXMLTableRow_Impl> SwXMLTableRows_Impl; const SwXMLTableCell_Impl *SwXMLTableContext::GetCell( sal_uInt32 nRow, @@ -2807,7 +2804,6 @@ void SwXMLTableContext::MakeTable() pFrmFmt->SetFmtAttr( aSize ); pFrmFmt->UnlockModify(); - for( sal_uInt16 i=0; i<pRows->size(); i++ ) (*pRows)[i].Dispose(); diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index 2ea2d650f514..109c089dc872 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -76,7 +76,6 @@ public: OUString& rStreamName ) const; }; - #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index a7863ce2668a..fbded3791dce 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.src @@ -284,9 +284,9 @@ String STR_DOC_STAT Text [ en-US ] = "Statistics" ; }; - // ---------------------------- + // Statusbar-titles - // ---------------------------- + String STR_STATSTR_W4WREAD { diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index 67519b0ad7f9..50acd4ada9e2 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cstdarg> #include <hintids.hxx> @@ -407,7 +406,6 @@ void SwModule::InsertEnv( SfxRequest& rReq ) sal_False, &nPos ); - pSh->ChgPageDesc( nPos, *pDesc); pSh->ChgCurPageDesc(*pDesc); diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index a031f86e9cca..60ad48006403 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -91,7 +91,6 @@ #include <com/sun/star/sdbc/XDataSource.hpp> #include <swabstdlg.hxx> - #include <vcl/status.hxx> #include "salhelper/simplereferenceobject.hxx" @@ -101,7 +100,6 @@ using namespace ::com::sun::star; - // Slotmaps for the application's methods // here are the SlotID's being included @@ -869,8 +867,6 @@ const SwMasterUsrPref *SwModule::GetUsrPref(sal_Bool bWeb) const return bWeb ? pWebUsrPref : pUsrPref; } - - void NewXForms( SfxRequest& rReq ) { // copied & excerpted from SwModule::InsertLab(..) diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index 829e3df9c305..4118e705b98c 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cstdarg> #include <hintids.hxx> @@ -249,7 +248,6 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel) rFmt.SetFmtAttr(SwFmtFooter(sal_Bool(sal_False))); aDesc.ChgFooterShare(sal_False); - aDesc.SetUseOn(nsUseOnPage::PD_ALL); // Site numbering // Set page size diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index 2e4636d8890a..3658dfa6c0d1 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -19,7 +19,6 @@ #include <cmdid.h> - #include <com/sun/star/i18n/ScriptType.hpp> #include <hintids.hxx> @@ -257,7 +256,6 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SfxBindings *pBindings = pAppView ? &pAppView->GetViewFrame()->GetBindings() : NULL; - // Interpret the page Documentview if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_DOCDISP, false, &pItem )) { @@ -410,7 +408,6 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) aViewOpt.SetCursorInProtectedArea(((const SfxBoolItem*)pItem)->GetValue()); } - // set elements for the current view and shell ApplyUsrPref( aViewOpt, pAppView, bTextDialog? VIEWOPT_DEST_TEXT : VIEWOPT_DEST_WEB); } diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 1994054386be..875e91cc965b 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> @@ -116,7 +115,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::script; using namespace ::com::sun::star::container; - SFX_IMPL_INTERFACE( SwDocShell, SfxObjectShell, SW_RES(0) ) { } @@ -753,7 +751,6 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) return !IsError( nErrno ); } - // Hands off // do not yet activate, must deliver TRUE sal_Bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor ) @@ -833,7 +830,6 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup, EnableSetModified( sal_True ); } - void SwDocShell::SetVisArea( const Rectangle &rRect ) { Rectangle aRect( rRect ); @@ -858,7 +854,6 @@ void SwDocShell::SetVisArea( const Rectangle &rRect ) SfxObjectShell::SetVisArea( aRect ); } - Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect ) const { if ( nAspect == ASPECT_THUMBNAIL ) @@ -930,7 +925,6 @@ sal_uInt16 SwDocShell::GetHiddenInformationState( sal_uInt16 nStates ) return nState; } - void SwDocShell::GetState(SfxItemSet& rSet) { SfxWhichIter aIter(rSet); @@ -1079,7 +1073,6 @@ SfxStyleSheetBasePool* SwDocShell::GetStyleSheetPool() return mxBasePool.get(); } - void SwDocShell::SetView(SwView* pVw) { if ( 0 != (pView = pVw) ) @@ -1088,7 +1081,6 @@ void SwDocShell::SetView(SwView* pVw) pWrtShell = 0; } - void SwDocShell::PrepareReload() { ::DelAllGrfCacheEntries( pDoc ); @@ -1181,7 +1173,6 @@ void SwDocShell::CalcLayoutForOLEObjects() } } - // #i42634# Overwrites SfxObjectShell::UpdateLinks // This new function is necessary to trigger update of links in docs // read by the binary filter: @@ -1264,19 +1255,16 @@ const ::sfx2::IXmlIdRegistry* SwDocShell::GetXmlIdRegistry() const return pDoc ? &pDoc->GetXmlIdRegistry() : 0; } - bool SwDocShell::IsChangeRecording() const { return (pWrtShell->GetRedlineMode() & nsRedlineMode_t::REDLINE_ON) != 0; } - bool SwDocShell::HasChangeRecordProtection() const { return pWrtShell->getIDocumentRedlineAccess()->GetRedlinePassword().getLength() > 0; } - void SwDocShell::SetChangeRecording( bool bActivate ) { sal_uInt16 nOn = bActivate ? nsRedlineMode_t::REDLINE_ON : 0; @@ -1284,7 +1272,6 @@ void SwDocShell::SetChangeRecording( bool bActivate ) pWrtShell->SetRedlineModeAndCheckInsMode( (nMode & ~nsRedlineMode_t::REDLINE_ON) | nOn); } - bool SwDocShell::SetProtectionPassword( const OUString &rNewPassword ) { const SfxAllItemSet aSet( GetPool() ); @@ -1318,7 +1305,6 @@ bool SwDocShell::SetProtectionPassword( const OUString &rNewPassword ) return bRes; } - bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) { bool bRes = false; diff --git a/sw/source/ui/app/docshdrw.cxx b/sw/source/ui/app/docshdrw.cxx index c9319cb5579d..12f31e8006ed 100644 --- a/sw/source/ui/app/docshdrw.cxx +++ b/sw/source/ui/app/docshdrw.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <svx/svxids.hrc> #include <svl/stritem.hxx> diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index 99558f62c1e0..968ec591f168 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <svx/dialogs.hrc> @@ -105,7 +104,6 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) else if( ISA( SwGlobalDocShell ) ) GetDoc()->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); // Globaldokument - if ( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) SwTransferable::InitOle( this, *pDoc ); @@ -608,7 +606,6 @@ sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium ) return bRet; } - void SwDocShell::SubInitNew() { OSL_ENSURE( !mxBasePool.is(), "who hasn't destroyed their Pool?" ); diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index 5927ef04d4de..b52bcd971f01 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svl/smplhint.hxx> #include <hintids.hxx> #include <svl/itemiter.hxx> @@ -287,7 +286,6 @@ static const SwNumRule* lcl_FindNumRule( SwDoc& rDoc, return pRule; } - static sal_uInt16 lcl_FindName(const SwPoolFmtList& rLst, SfxStyleFamily eFam, const OUString& rName) { @@ -399,7 +397,6 @@ SwDocStyleSheet::SwDocStyleSheet( SwDoc& rDocument, nHelpId = UCHAR_MAX; } - SwDocStyleSheet::SwDocStyleSheet( const SwDocStyleSheet& rOrg) : SfxStyleSheetBase(rOrg), pCharFmt(rOrg.pCharFmt), @@ -413,7 +410,6 @@ SwDocStyleSheet::SwDocStyleSheet( const SwDocStyleSheet& rOrg) : { } - SwDocStyleSheet::~SwDocStyleSheet() { } @@ -703,7 +699,6 @@ bool SwDocStyleSheet::HasParentSupport() const return bRet; } - bool SwDocStyleSheet::HasClearParentSupport() const { bool bRet = false; @@ -880,7 +875,6 @@ OUString SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) return SfxStyleSheetBase::GetDescription(eUnit); } - OUString SwDocStyleSheet::GetDescription() { return GetDescription(SFX_MAPUNIT_CM); @@ -1609,7 +1603,6 @@ static void lcl_DeleteInfoStyles( sal_uInt16 nFamily, std::vector<void*>& rArr, } break; - case SFX_STYLE_FAMILY_PSEUDO: { std::deque<SwNumRule*> aDelArr; @@ -1977,7 +1970,6 @@ bool SwDocStyleSheet::IsUsed() const return rDoc.IsUsed( *pMod ); } - sal_uLong SwDocStyleSheet::GetHelpId( OUString& rFile ) { sal_uInt16 nId = 0; @@ -2077,7 +2069,6 @@ sal_uLong SwDocStyleSheet::GetHelpId( OUString& rFile ) return nId; } - void SwDocStyleSheet::SetHelpId( const OUString& r, sal_uLong nId ) { sal_uInt8 nFileId = static_cast< sal_uInt8 >(rDoc.SetDocPattern( r )); @@ -2148,14 +2139,12 @@ SfxStyleSheetBase& SwDocStyleSheetPool::Make( const OUString& rName, return *mxStyleSheet.get(); } - SfxStyleSheetBase* SwDocStyleSheetPool::Create( const SfxStyleSheetBase& /*rOrg*/) { OSL_ENSURE(!this , "Create im SW-Stylesheet-Pool geht nicht" ); return NULL; } - SfxStyleSheetBase* SwDocStyleSheetPool::Create( const OUString &, SfxStyleFamily, sal_uInt16 ) { @@ -2327,7 +2316,6 @@ void SwDocStyleSheetPool::Remove( SfxStyleSheetBase* pStyle) Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *pStyle ) ); } - bool SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam, const OUString &rStyle, const OUString &rParent ) { diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx index 304862f8da62..98b2e4b623b7 100644 --- a/sw/source/ui/app/mainwn.cxx +++ b/sw/source/ui/app/mainwn.cxx @@ -48,7 +48,6 @@ static SwProgress *lcl_SwFindProgress( SwDocShell *pDocShell ) return 0; } - void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue, SwDocShell *pDocShell ) { @@ -79,7 +78,6 @@ void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue, } } - void SetProgressState( long nPosition, SwDocShell *pDocShell ) { if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() ) @@ -90,7 +88,6 @@ void SetProgressState( long nPosition, SwDocShell *pDocShell ) } } - void EndProgress( SwDocShell *pDocShell ) { if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() ) @@ -121,7 +118,6 @@ void EndProgress( SwDocShell *pDocShell ) } } - void SetProgressText( sal_uInt16 nId, SwDocShell *pDocShell ) { if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() ) @@ -132,7 +128,6 @@ void SetProgressText( sal_uInt16 nId, SwDocShell *pDocShell ) } } - void RescheduleProgress( SwDocShell *pDocShell ) { if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() ) diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx index 7469e6cdb0e1..a0401dd70c5b 100644 --- a/sw/source/ui/app/swmodul1.cxx +++ b/sw/source/ui/app/swmodul1.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <boost/scoped_ptr.hpp> #include <hintids.hxx> @@ -69,7 +68,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::view; using namespace ::com::sun::star::lang; - static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, SwViewShell* pSh ) { // in FrameSets the actual visibility can differ from the ViewOption's setting diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx index e5231a6368c3..115ab46da5cf 100644 --- a/sw/source/ui/app/swmodule.cxx +++ b/sw/source/ui/app/swmodule.cxx @@ -143,7 +143,6 @@ bool bNoInterrupt = false; using namespace com::sun::star; - TYPEINIT1( SwModule, SfxModule ); using namespace ::com::sun::star; @@ -268,7 +267,6 @@ void SwDLL::RegisterInterfaces() SwPagePreview::RegisterInterface( pMod ); SwSrcView::RegisterInterface( pMod ); - SwBaseShell::RegisterInterface(pMod); SwTextShell::RegisterInterface(pMod); SwTableShell::RegisterInterface(pMod); @@ -407,8 +405,6 @@ void SwDLL::RegisterControls() ::sfx2::TaskPaneWrapper::RegisterChildWindow(0, pMod); } - - /************************************************************************* |* |* Load Module (only dummy for linking of the DLL) diff --git a/sw/source/ui/app/swwait.cxx b/sw/source/ui/app/swwait.cxx index 9ac290efffdf..f25f27209b1b 100644 --- a/sw/source/ui/app/swwait.cxx +++ b/sw/source/ui/app/swwait.cxx @@ -24,7 +24,6 @@ #include <sfx2/dispatch.hxx> #include <vcl/window.hxx> - SwWait::SwWait( SwDocShell &rDocShell, const bool bLockUnlockDispatcher ) diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx index df8f5ecb089c..d3d1936aea04 100644 --- a/sw/source/ui/cctrl/actctrl.cxx +++ b/sw/source/ui/cctrl/actctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <comphelper/string.hxx> #include <vcl/builder.hxx> #include "actctrl.hxx" @@ -27,7 +26,6 @@ void NumEditAction::Action() aActionLink.Call( this ); } - bool NumEditAction::Notify( NotifyEvent& rNEvt ) { bool nHandled = false; diff --git a/sw/source/ui/cctrl/popbox.cxx b/sw/source/ui/cctrl/popbox.cxx index ba4bd707c36b..4ebf98d738df 100644 --- a/sw/source/ui/cctrl/popbox.cxx +++ b/sw/source/ui/cctrl/popbox.cxx @@ -60,5 +60,4 @@ sal_Int8 SwHelpToolBox::ExecuteDrop( const ExecuteDropEvent& rEvt ) return ((SwNavigationPI*)GetParent())->ExecuteDrop( rEvt ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/cctrl/swlbox.cxx b/sw/source/ui/cctrl/swlbox.cxx index f3b9e09d1651..66092eab9da5 100644 --- a/sw/source/ui/cctrl/swlbox.cxx +++ b/sw/source/ui/cctrl/swlbox.cxx @@ -22,7 +22,6 @@ #include <swtypes.hxx> #include <swlbox.hxx> - // Description: ListboxElement SwBoxEntry::SwBoxEntry() : bModified(sal_False), diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index e345a6f78a13..19a77d549dd0 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -155,7 +155,6 @@ SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) m_pPageNumBox->SetClickHdl(LINK(this,SwBreakDlg,PageNumHdl)); m_pPageNumEdit->SetModifyHdl(LINK(this,SwBreakDlg,PageNumModifyHdl)); - // Insert page description to Listbox const sal_uInt16 nCount = rSh.GetPageDescCnt(); sal_uInt16 i; diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx index 51ed002e0e46..726c66974f13 100644 --- a/sw/source/ui/chrdlg/ccoll.cxx +++ b/sw/source/ui/chrdlg/ccoll.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "cmdid.h" #include "swmodule.hxx" #include "view.hxx" @@ -100,7 +99,6 @@ OUString GetCommandContextByIndex( sal_Int16 nIndex ) // Globals ****************************************************************** - const CommandStruct SwCondCollItem::aCmds[] = { { PARA_IN_TABLEHEAD, 0 }, @@ -133,14 +131,12 @@ const CommandStruct SwCondCollItem::aCmds[] = { PARA_IN_LIST, 9 } }; - TYPEINIT1_AUTOFACTORY(SwCondCollItem, SfxPoolItem) /**************************************************************************** Item for the transport of the condition table ****************************************************************************/ - SwCondCollItem::SwCondCollItem(sal_uInt16 _nWhich ) : SfxPoolItem(_nWhich) { diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 084b7c7521df..220023a1404b 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -307,5 +307,4 @@ IMPL_LINK_NOARG(SwCharURLPage, EventHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 2e2c83bfb463..a525fafe1b36 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -50,7 +50,6 @@ #include "chrdlg.hrc" - using namespace css; using namespace css::uno; using namespace css::lang; @@ -187,7 +186,6 @@ void SwDropCapsPict::InitPrinter( void ) Create Default-String from character-count (A, AB, ABC, ...) ****************************************************************************/ - OUString GetDefaultString(sal_uInt16 nChars) { OUString aStr; @@ -668,7 +666,6 @@ void SwDropCapsPage::Reset(const SfxItemSet &rSet) Page: CheckBox's Click-Handler ****************************************************************************/ - IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl) { sal_Bool bChecked = m_pDropCapsBox->IsChecked(); @@ -703,7 +700,6 @@ IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl) Page: CheckBox's Click-Handler ****************************************************************************/ - IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl) { m_pDropCapsField->Enable( !m_pWholeWordCB->IsChecked() ); @@ -720,7 +716,6 @@ IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl) Page: SpinFields' Modify-Handler ****************************************************************************/ - IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit ) { OUString sPreview; @@ -780,7 +775,6 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit ) Page: Template-Box' Select-Handler. *****************************************************************************/ - IMPL_LINK_NOARG_INLINE_START(SwDropCapsPage, SelectHdl) { m_pPict->UpdatePaintSettings(); @@ -841,7 +835,4 @@ void SwDropCapsPage::FillSet( SfxItemSet &rSet ) } } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index d3526c205c95..b1febbde90c3 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -33,7 +33,6 @@ #include <app.hrc> - // Globals ****************************************************************** static sal_uInt16 aPageRg[] = { @@ -301,5 +300,4 @@ IMPL_LINK( SwParagraphNumTabPage, StyleHdl_Impl, ListBox*, pBox ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 5be8280731a1..761e7f780e5d 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -157,12 +157,10 @@ SwParaDlg::SwParaDlg(Window *pParent, SetCurPageId(sDefPage); } - SwParaDlg::~SwParaDlg() { } - void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) { SwWrtShell& rSh = rView.GetWrtShell(); @@ -245,6 +243,4 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index d0d6091905bc..2cf644655bea 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -126,7 +126,6 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) Page: Dtor ****************************************************************************/ - SwCondCollPage::~SwCondCollPage() { for(sal_uInt16 i = 0; i < m_pFilterLB->GetEntryCount(); ++i) @@ -134,7 +133,6 @@ SwCondCollPage::~SwCondCollPage() } - int SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) { if( _pSet ) @@ -147,7 +145,6 @@ int SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) Page: Factory ****************************************************************************/ - SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet &rSet) { return new SwCondCollPage(pParent, rSet); @@ -157,7 +154,6 @@ SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet &rSet) Page: FillItemSet-Overload ****************************************************************************/ - sal_Bool SwCondCollPage::FillItemSet(SfxItemSet &rSet) { sal_Bool bModified = sal_True; @@ -175,7 +171,6 @@ sal_Bool SwCondCollPage::FillItemSet(SfxItemSet &rSet) Page: Reset-Overload ****************************************************************************/ - void SwCondCollPage::Reset(const SfxItemSet &/*rSet*/) { if(bNewTemplate) diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx index a87f40e89e4d..76e1a0907b2f 100644 --- a/sw/source/ui/config/caption.cxx +++ b/sw/source/ui/config/caption.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <osl/diagnose.h> #include "numrule.hxx" @@ -72,8 +71,6 @@ bool InsCaptionOpt::operator==( const InsCaptionOpt& rOpt ) const aOleId == rOpt.aOleId); // So that identical Ole-IDs can't be added multiple // times, don't compare against anything else. - } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx index 1e5437a81679..7272f6c7000f 100644 --- a/sw/source/ui/config/cfgitems.cxx +++ b/sw/source/ui/config/cfgitems.cxx @@ -22,7 +22,6 @@ #include <svx/svxids.hrc> #include <editeng/svxenum.hxx> - #include "viewopt.hxx" #include "swtypes.hxx" #include "cmdid.h" @@ -309,7 +308,6 @@ void SwShadowCursorItem::operator=( const SwShadowCursorItem& rCpy ) SetMode( rCpy.GetMode() ); } - void SwShadowCursorItem::FillViewOptions( SwViewOption& rVOpt ) const { rVOpt.SetShadowCursor( bOn ); @@ -357,6 +355,4 @@ bool SwTestItem::operator==( const SfxPoolItem& rAttr ) const #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/dbconfig.cxx b/sw/source/ui/config/dbconfig.cxx index ac732a81811d..19f802df42d5 100644 --- a/sw/source/ui/config/dbconfig.cxx +++ b/sw/source/ui/config/dbconfig.cxx @@ -117,5 +117,4 @@ const SwDBData& SwDBConfig::GetBibliographySource() void SwDBConfig::Commit() {} void SwDBConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx index 8fc5e8c8dd64..35d84ab36034 100644 --- a/sw/source/ui/config/fontcfg.cxx +++ b/sw/source/ui/config/fontcfg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <fontcfg.hxx> #include <i18nlangtag/mslangid.hxx> #include <vcl/outdev.hxx> diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 4d7a3d0a16b2..b2aebf9d3a2b 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -107,7 +107,6 @@ class SwAuthenticationSettingsDialog : public SfxModalDialog DECL_LINK( CheckBoxHdl_Impl, CheckBox*); DECL_LINK(RadioButtonHdl_Impl, void *); - public: SwAuthenticationSettingsDialog(SwMailConfigPage* pParent, SwMailMergeConfigItem& rItem); ~SwAuthenticationSettingsDialog(); @@ -230,7 +229,6 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare m_sCompleted = m_pResult1->GetText(); m_sFailed = m_pResult2->GetText(); - SfxImageManager* pManager = SfxImageManager::GetImageManager( SW_MOD() ); m_aFailedImg = pManager->GetImage(FN_FORMULA_CANCEL); m_aCompletedImg = pManager->GetImage(FN_FORMULA_APPLY); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index c03f5ee71b04..838fe3c8825c 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -436,7 +436,6 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) ::FillCharStyleListBox( *m_pCharStyleLB, pSh->GetView().GetDocShell(), true, true ); } - nCount = pMgr->GetFormatCount(TYP_SEQFLD, false); for ( i = 0; i < nCount; ++i ) { diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 4b4340d66076..cd88ff2ed640 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -66,7 +66,6 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> - using namespace ::com::sun::star; /*-------------------------------------------------------- @@ -235,7 +234,6 @@ sal_Bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) aElem.bVertRulerRight = m_pVRulerRightCBox->IsChecked(); aElem.bSmoothScroll = m_pSmoothCBox->IsChecked(); - sal_Bool bRet = !pOldAttr || aElem != *pOldAttr; if(bRet) bRet = 0 != rSet.Put(aElem); @@ -885,7 +883,6 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet) nListHeight = (sal_Int32)rFontHeightList.GetHeight(); bListHeightDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); - pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_LABEL); bLabelDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); const SvxFontItem& rFontCP = !nFontGroup ? pColl->GetFont() : @@ -1056,7 +1053,6 @@ IMPL_LINK( SwStdFontTabPage, LoseFocusHdl, ComboBox*, pBox ) return 0; } - void SwStdFontTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt16Item, SID_FONTMODE_TYPE, false); @@ -1333,7 +1329,6 @@ SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet& return new SwShdwCrsrOptionsTabPage( pParent, rSet ); } - void SwShdwCrsrOptionsTabPage::PageCreated( SfxAllItemSet aSet ) { SFX_ITEMSET_ARG (&aSet,pWrtSh,SwWrtShellItem,SID_WRT_SHELL,false); @@ -1341,7 +1336,6 @@ void SwShdwCrsrOptionsTabPage::PageCreated( SfxAllItemSet aSet ) SetWrtShell(pWrtSh->GetValue()); } - sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) { SwShadowCursorItem aOpt; @@ -2221,8 +2215,6 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) rExampleWin.Invalidate(); } - - SwCompareOptionsTabPage::SwCompareOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent,"OptComparison","modules/swriter/ui/optcomparison.ui", rSet ) { @@ -2441,9 +2433,6 @@ IMPL_LINK_NOARG_INLINE_START(SwTestTabPage, AutoClickHdl) } IMPL_LINK_NOARG_INLINE_END(SwTestTabPage, AutoClickHdl) - #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/ui/config/prtopt.cxx index ca075300dfbe..ac3251b0d145 100644 --- a/sw/source/ui/config/prtopt.cxx +++ b/sw/source/ui/config/prtopt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/configmgr.hxx> #include <prtopt.hxx> #include <osl/diagnose.h> @@ -26,7 +25,6 @@ #include <unomid.h> - using namespace utl; using namespace com::sun::star::uno; @@ -130,7 +128,6 @@ SwPrintOptions::~SwPrintOptions() { } - void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} void SwPrintOptions::Commit() @@ -175,7 +172,4 @@ void SwPrintOptions::Commit() PutProperties(aNames, aValues); } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index aa6fb9f8087f..8871d2b15bc7 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <svl/urihelper.hxx> #include <osl/thread.h> @@ -40,7 +39,6 @@ using namespace ::com::sun::star; - #define VERSION_30B ((sal_uInt16)250) #define VERSION_31B ((sal_uInt16)326) #define VERSION_40A ((sal_uInt16)364) @@ -49,7 +47,6 @@ using namespace ::com::sun::star; #define CHAPTER_FILENAME "chapter.cfg" - // SwNumRulesWithName ---------------------------------------------------- // PUBLIC METHODES ------------------------------------------------------- /*------------------------------------------------------------------------ diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx index e848580314c2..7c47d4518486 100644 --- a/sw/source/ui/config/usrpref.cxx +++ b/sw/source/ui/config/usrpref.cxx @@ -37,8 +37,6 @@ using namespace utl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - - void SwMasterUsrPref::SetUsrPref(const SwViewOption &rCopy) { *((SwViewOption*)this) = rCopy; @@ -100,7 +98,6 @@ Sequence<OUString> SwContentViewConfig::GetPropertyNames() "Update/Field", // 17 "Update/Chart" // 18 - }; const int nCount = bWeb ? 12 : 19; Sequence<OUString> aNames(nCount); @@ -592,5 +589,4 @@ void SwWebColorConfig::Load() } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 83ef2e8a3412..688e99829e64 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -250,7 +250,6 @@ SwViewOption::SwViewOption(const SwViewOption& rVOpt) #endif } - SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt ) { // #114856# Formular view @@ -292,7 +291,6 @@ SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt ) return *this; } - SwViewOption::~SwViewOption() { } diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index f91e22d17f3c..4037f748d740 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -416,7 +416,6 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton) } xStore->storeAsURL(sTmpName, Sequence< PropertyValue >()); - uno::Reference<XNamingService> xNaming(m_xDBContext, UNO_QUERY); xNaming->registerObject( sFind, xNewInstance ); //now insert the new source into the ListBox diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index c9d8cf152956..7d8205a72582 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -27,7 +27,6 @@ #include <swdbdata.hxx> #include "sharedconnection.hxx" - namespace com{namespace sun{namespace star{ namespace container{ class XNameAccess; diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index cdb0354d8881..1f4f99cd8c20 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -41,7 +41,6 @@ #include <helpid.h> #include <unomid.h> - using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index bd5b36392a18..199e67ed6eb7 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -158,7 +158,6 @@ struct _DB_Column } }; - struct _DB_ColumnConfigData { SwInsDBColumns aDBColumns; @@ -1026,7 +1025,6 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, sal_Bool bIsAutoUpdateCells = rSh.IsAutoUpdateCells(); rSh.SetAutoUpdateCells( sal_False ); - if( m_pCbTableHeadon->IsChecked() ) { for( n = 0; n < nCols; ++n ) @@ -1230,7 +1228,6 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, GetFldType( 0, RES_DBNEXTSETFLD ), OUString("1"), aEmptyOUStr, aDBData ); - bool bSetCrsr = true; sal_uInt16 n = 0, nCols = aColArr.size(); ::sw::mark::IMark* pMark = NULL; @@ -1256,7 +1253,6 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, if(bBreak) break; - for( n = 0; n < nCols; ++n ) { _DB_Column* pDBCol = &aColArr[ n ]; @@ -1733,7 +1729,6 @@ void SwInsertDBColAutoPilot::Load() pInsDBColumn->nUsrNumFmt = rNFmtr.GetEntryKey( pInsDBColumn->sUsrNumFmt, pInsDBColumn->eUsrNumFmtLng ); - pNewData->aDBColumns.insert(pInsDBColumn); } sal_Int32 n = 0; diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 8023f22a128d..2905c6799529 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -155,7 +155,6 @@ const sal_Char cDataSourceName[] = "DataSourceName"; const sal_Char cSelection[] = "Selection"; const sal_Char cActiveConnection[] = "ActiveConnection"; - // Use nameless namespace to avoid to rubbish the global namespace namespace @@ -1820,7 +1819,6 @@ sal_Bool SwNewDBMgr::GetColumnCnt(const OUString& rSourceName, const OUString& r return bRet; } - // reads the column data at the current position sal_Bool SwNewDBMgr::GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage, OUString &rResult, double *pNumber, sal_uInt32 * /*pFormat*/) @@ -2067,7 +2065,6 @@ sal_uInt32 SwNewDBMgr::GetSelectedRecordId( return nRet; } - // close all data sources - after fields were updated void SwNewDBMgr::CloseAll(sal_Bool bIncludingMerge) { @@ -2674,7 +2671,6 @@ uno::Reference<XResultSet> SwNewDBMgr::createCursor(const OUString& _sDataSource return xResultSet; } - // merge all data into one resulting document and return the number of merged documents sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig, SwView& rSourceView ) @@ -2759,13 +2755,11 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig, bool bPageStylesWithHeaderFooter = rMaster.GetHeader().IsActive() || rMaster.GetFooter().IsActive(); - // copy compatibility options lcl_CopyCompatibilityOptions( rSourceShell, *pTargetShell); // #72821# copy dynamic defaults lcl_CopyDynamicDefaults( *rSourceShell.GetDoc(), *pTargetShell->GetDoc() ); - long nStartRow, nEndRow; sal_uLong nDocNo = 1; sal_Int32 nDocCount = 0; diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index cb2e0f5579fd..7eb15a02c677 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sot/formats.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/ui/dbui/dbui.cxx index fd45bbca5f06..8247f5c8bfe0 100644 --- a/sw/source/ui/dbui/dbui.cxx +++ b/sw/source/ui/dbui/dbui.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "wrtsh.hxx" #include "dbui.hrc" diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx index 8ddda2de4f6a..48761c615d2b 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.cxx +++ b/sw/source/ui/dbui/mailmergechildwindow.cxx @@ -125,7 +125,6 @@ struct SwSendMailDialog_Impl uno::Reference< mail::XMailService > xConnectedInMailService; Timer aRemoveTimer; - SwSendMailDialog_Impl() : nCurrentDescriptor(0), nDocumentCount(0) @@ -307,7 +306,6 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf m_aStopPB.SetClickHdl(LINK( this, SwSendMailDialog, StopHdl_Impl)); m_aClosePB.SetClickHdl(LINK( this, SwSendMailDialog, CloseHdl_Impl)); - Size aLBSize(m_aStatusLB.GetSizePixel()); m_aStatusHB.SetSizePixel(aLBSize); Size aHeadSize(m_aStatusHB.CalcWindowSizePixel()); @@ -665,5 +663,4 @@ void SwSendMailDialog::AllMailsSent() m_aStopPB.Enable(false); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index c25d09ce3c4b..26e60f2537f4 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; - namespace SwMailMergeHelper { @@ -167,7 +166,6 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer( return xSmtpServer; } - } //namespace SwBoldFixedInfo::SwBoldFixedInfo(Window* pParent, const ResId& rResId) : diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 25880d41e879..cd3cb79f4c0d 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -1367,7 +1367,6 @@ void AddressMultiLineEdit::SetText( const OUString& rStr ) } } - // Insert the new entry in front of the entry at the beginning of the selection void AddressMultiLineEdit::InsertNewEntry( const OUString& rStr ) { diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 4451bae26997..e46c1203d2e3 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -296,5 +296,4 @@ public: }; #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx index 05fa5155ae9a..ad8a2393adec 100644 --- a/sw/source/ui/dbui/mmconfigitem.cxx +++ b/sw/source/ui/dbui/mmconfigitem.cxx @@ -149,7 +149,6 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem sal_Bool bIsGreetingLineInMail_LastUserSetting; sal_Bool bIsGreetingLine_LastUserSetting; - const Sequence< OUString>& GetPropertyNames(); public: @@ -503,7 +502,7 @@ void SwMailMergeConfigItem_Impl::Commit() { switch(nProp) { - case 0: pValues[nProp] <<= bIsOutputToLetter; break;// + case 0: pValues[nProp] <<= bIsOutputToLetter; break; case 1: pValues[nProp] <<= bIncludeCountry; break; case 2: pValues[nProp] <<= sExcludeCountry; break; case 3: pValues[nProp] <<= GetAddressBlocks(sal_True); break; @@ -1239,7 +1238,6 @@ Sequence< OUString> SwMailMergeConfigItem::GetColumnAssignment( return aRet; } - // returns the name that is assigned as e-mail column of the current data base OUString SwMailMergeConfigItem::GetAssignedColumn(sal_uInt32 nColumn) const { diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index f869b14bfa5f..feed6f6aeb04 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -145,7 +145,6 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, PushButton*, pButton) xFltMgr->setCurrentFilter( pFlt->GetUIName() ) ; } - pFlt = aIter.Next(); } diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index 41c0df0f9c98..88381a2429b5 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -57,5 +57,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 5b2752825c5d..037da8c6e999 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -302,7 +302,6 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent) m_aPrevSetIB.SetClickHdl(aDataLink); m_aNextSetIB.SetClickHdl(aDataLink); - SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem(); m_aGreetingLineCB.Check(rConfig.IsGreetingLine(sal_False)); m_aPersonalizedCB.Check(rConfig.IsIndividualGreeting(sal_False)); diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index f5216a8a86b7..93d3abdf0a9d 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -158,5 +158,4 @@ public: }; #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 71df56b64526..3dd2016cf303 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -334,7 +334,7 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame( const OUString* pAssignment = aAssignment.getConstArray(); if(aAssignment.getLength() > MM_PART_COUNTRY && !aAssignment[MM_PART_COUNTRY].isEmpty()) sCountryColumn = aAssignment[MM_PART_COUNTRY]; - // + OUString sHideParagraphsExpression; SwAddressIterator aIter(aBlocks[0]); while(aIter.HasMore()) diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index 3ff1f0d3d21c..10c772eb81c2 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -98,5 +98,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmmergepage.hxx b/sw/source/ui/dbui/mmmergepage.hxx index 3c6e9b6c6e06..d9624e862f2e 100644 --- a/sw/source/ui/dbui/mmmergepage.hxx +++ b/sw/source/ui/dbui/mmmergepage.hxx @@ -55,8 +55,6 @@ public: }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index b18aa7a0473c..8a5c7756e035 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -110,7 +110,6 @@ class SwMailMergeOutputPage : public svt::OWizardPage OUString m_sCC; OUString m_sBCC; - DECL_LINK(OutputTypeHdl_Impl, RadioButton*); DECL_LINK(CopyToHdl_Impl, PushButton*); DECL_LINK(SaveStartHdl_Impl, PushButton* ); @@ -142,7 +141,6 @@ struct SwMailDescriptor OUString sBodyMimeType; OUString sBodyContent; - OUString sCC; OUString sBCC; }; @@ -221,5 +219,4 @@ public: }; #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 2265b3b19054..aae6621816c0 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -58,5 +58,4 @@ IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index 75f7077109d9..218d158c4422 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <swabstdlg.hxx> - #include <mmpreparemergepage.hrc> #include <unomid.h> diff --git a/sw/source/ui/dbui/mmpreparemergepage.hxx b/sw/source/ui/dbui/mmpreparemergepage.hxx index 4a89e6c04f7c..34b7c8ce2873 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.hxx +++ b/sw/source/ui/dbui/mmpreparemergepage.hxx @@ -44,7 +44,6 @@ class SwMailMergePrepareMergePage : public svt::OWizardPage FixedInfo m_aEditFI; PushButton m_aEditPB; - SwMailMergeWizard* m_pWizard; DECL_LINK(EditDocumentHdl_Impl, void *); @@ -62,5 +61,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx index 3f513397769b..9fdc6a3ce930 100644 --- a/sw/source/ui/dbui/swdbtoolsclient.cxx +++ b/sw/source/ui/dbui/swdbtoolsclient.cxx @@ -34,9 +34,8 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdb; -//==================================================================== //= SwDbtoolsClient -//==================================================================== + namespace { diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx index d99365d1573f..a9a7c503a3e3 100644 --- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <SwSpellDialogChildWindow.hxx> #include <vcl/msgbox.hxx> #include <editeng/svxacorr.hxx> @@ -49,7 +48,6 @@ #include <dialog.hrc> #include <cmdid.h> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; @@ -58,7 +56,6 @@ using namespace ::com::sun::star::beans; SFX_IMPL_CHILDWINDOW_WITHID(SwSpellDialogChildWindow, FN_SPELL_GRAMMAR_DIALOG) - #define SPELL_START_BODY 0 // body text area #define SPELL_START_OTHER 1 // frame, footnote, header, footer #define SPELL_START_DRAWTEXT 2 // started in a draw text object @@ -169,7 +166,6 @@ SwSpellDialogChildWindow::~SwSpellDialogChildWindow () delete m_pSpellState; } - SfxChildWinInfo SwSpellDialogChildWindow::GetInfo (void) const { SfxChildWinInfo aInfo = svx::SpellDialogChildWindow::GetInfo(); @@ -177,7 +173,6 @@ SfxChildWinInfo SwSpellDialogChildWindow::GetInfo (void) const return aInfo; } - svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck) { svx::SpellPortions aRet; diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index ef45dbaf969a..10615365e400 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -41,7 +41,6 @@ #include "vcl/metric.hxx" - using namespace ::com::sun::star; const sal_Unicode cDialogExtraDataClose = '}'; @@ -209,7 +208,6 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, delete pPrt; } - } else { @@ -236,12 +234,10 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, m_pCR_RB->SaveValue(); } - SwAsciiFilterDlg::~SwAsciiFilterDlg() { } - void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions ) { sal_uLong nCCode = m_pCharSetLB->GetSelectTextEncoding(); @@ -388,5 +384,4 @@ IMPL_LINK( SwAsciiFilterDlg, LineEndHdl, RadioButton*, pBtn ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index d66984a6c4f8..28f390506b93 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -71,7 +71,6 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) } - SwDocStatPage::~SwDocStatPage() { } diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index 6ccdf87274f5..0adc59500e23 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -106,7 +106,6 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) return aItem; } - bool SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh, SvxMacroItem*& rpINetItem ) { diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx index a7f0fdb7e84b..4085c67717f9 100644 --- a/sw/source/ui/dialog/regionsw.cxx +++ b/sw/source/ui/dialog/regionsw.cxx @@ -156,7 +156,6 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq) pSet->GetItemState(FN_PARAM_3, true, &pItem)) aSub = ((const SfxStringItem *)pItem)->GetValue(); - if(!aFile.isEmpty() || !aSub.isEmpty()) { OUString sLinkFileName = OUString(sfx2::cTokenSeparator); diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 0b5e06c74349..6cf39d75ecb6 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -719,7 +719,6 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg(SwView& return new VclAbstractDialog_Impl(pDlg); } - SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString* pFmtStr) { diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 12c3b0e1856b..55eb36eb93c1 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -368,7 +368,6 @@ public: virtual sal_uInt16 GetRestartPage() const; }; -//------------------------------------------------------------------------ //AbstractDialogFactory_Impl implementations class SwAbstractDialogFactory_Impl : public SwAbstractDialogFactory { diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 597fc6020489..a5a5f4e05270 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -184,7 +184,6 @@ public: { m_TempPasswd = rPasswd; } }; - SectRepr::SectRepr( sal_uInt16 nPos, SwSection& rSect ) : m_SectionData( rSect ) , m_Brush( RES_BACKGROUND ) @@ -237,7 +236,6 @@ void SectRepr::SetFile( const OUString& rFile ) } } - void SectRepr::SetFilter( const OUString& rFilter ) { OUString sNewFile; @@ -282,7 +280,6 @@ void SectRepr::SetSubRegion(const OUString& rSubRegion) } } - OUString SectRepr::GetFile() const { OUString sLinkFile( m_SectionData.GetLinkFileName() ); @@ -303,7 +300,6 @@ OUString SectRepr::GetFile() const return sLinkFile; } - OUString SectRepr::GetSubRegion() const { OUString sLinkFile( m_SectionData.GetLinkFileName() ); @@ -1837,8 +1833,6 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil return 0; } - - // numbering format conversion: // ListBox - format - enum-value // 0 - A, B, C, ... - 0 diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index fc584fc37e11..9190766c50ea 100644 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -60,7 +60,6 @@ using namespace ::com::sun::star; - const short RET_EDIT = 100; // PUBLIC METHODS ------------------------------------------------------- @@ -73,7 +72,6 @@ struct TextBlockInfo_Impl typedef boost::ptr_vector<TextBlockInfo_Impl> TextBlockInfoArr; SV_IMPL_REF( SwDocShell ) - // Dialog for edit templates void SwGlossaryHdl::GlossaryDlg() { @@ -256,7 +254,6 @@ sal_Bool SwGlossaryHdl::DelGroup(const OUString &rGrpName) return sal_False; } - // ask for number of autotexts sal_uInt16 SwGlossaryHdl::GetGlossaryCnt() { @@ -674,7 +671,6 @@ sal_Bool SwGlossaryHdl::Rename(const OUString& rOldShort, const OUString& rNewSh return bRet; } - sal_Bool SwGlossaryHdl::IsReadOnly( const OUString* pGrpNm ) const { SwTextBlocks *pGlossary = 0; @@ -692,7 +688,6 @@ sal_Bool SwGlossaryHdl::IsReadOnly( const OUString* pGrpNm ) const return bRet; } - sal_Bool SwGlossaryHdl::IsOld() const { SwTextBlocks *pGlossary = pCurGrp ? pCurGrp diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 22d183c949d9..085115cdf1fd 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -125,7 +125,6 @@ extern bool bFrmDrag; extern bool bDDINetAttr; extern bool bExecuteDrag; - #define OLESIZE 11905 - 2 * lMinBorder, 6 * MM50 #define SWTRANSFER_OBJECTTYPE_DRAWMODEL 0x00000001 @@ -268,7 +267,6 @@ SwTransferable::~SwTransferable() delete pTargetURL; delete pBkmk; - eBufferType = TRNSFR_NONE; Application::GetSolarMutex().release(); @@ -692,7 +690,6 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream, } break; - case SWTRANSFER_OBJECTTYPE_DDE: { xStream->SetBufferSize( 1024 ); @@ -1279,7 +1276,6 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, OSL_ENSURE( pPt, "EXCHG_OUT_ACTION_MOVE_PRIVATE: what should happen here?" ); break; - case EXCHG_IN_ACTION_MOVE: case EXCHG_IN_ACTION_COPY: case EXCHG_IN_ACTION_LINK: @@ -2111,7 +2107,6 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData, pTyp = rWrtShell.InsertFldType( aType ); } - SwDDEFieldType* pDDETyp = (SwDDEFieldType*)pTyp; OUString aExpand; diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/ui/docvw/AnnotationWin.cxx index 9eed5b537e4c..4d8215efd400 100644 --- a/sw/source/ui/docvw/AnnotationWin.cxx +++ b/sw/source/ui/docvw/AnnotationWin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <AnnotationWin.hxx> #include <AnnotationMenuButton.hxx> @@ -54,7 +53,6 @@ #include <boost/scoped_ptr.hpp> - namespace sw { namespace annotation { SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin, diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index 048b18a57636..b68c59a194d8 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -123,7 +123,6 @@ namespace } } - SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, const SwPageFrm* pPageFrm, bool bHeader ) : MenuButton( pEditWin, WB_DIALOGCONTROL ), SwFrameControl( pEditWin, pPageFrm ), @@ -415,7 +414,6 @@ void SwHeaderFooterWin::ExecuteCommand( sal_uInt16 nSlot ) if ( m_bIsHeader ) pHFFmt = const_cast< SwFrmFmt* >( rMaster.GetHeader().GetHeaderFmt() ); - SfxItemPool* pPool = pHFFmt->GetAttrSet().GetPool(); SfxItemSet aSet( *pPool, RES_BACKGROUND, RES_BACKGROUND, diff --git a/sw/source/ui/docvw/OverlayRanges.cxx b/sw/source/ui/docvw/OverlayRanges.cxx index 3f470a124330..7b44a9b3bdb9 100755 --- a/sw/source/ui/docvw/OverlayRanges.cxx +++ b/sw/source/ui/docvw/OverlayRanges.cxx @@ -29,8 +29,6 @@ #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// - namespace { // combine ranges geometrically to a single, ORed polygon @@ -158,7 +156,6 @@ namespace sw } } - void OverlayRanges::ShowSolidBorder() { if ( !mbShowSolidBorder ) diff --git a/sw/source/ui/docvw/OverlayRanges.hxx b/sw/source/ui/docvw/OverlayRanges.hxx index 34708c2e27a4..ccbe668211aa 100755 --- a/sw/source/ui/docvw/OverlayRanges.hxx +++ b/sw/source/ui/docvw/OverlayRanges.hxx @@ -27,8 +27,6 @@ class SwView; -////////////////////////////////////////////////////////////////////////////// - namespace sw { namespace overlay @@ -75,8 +73,6 @@ namespace sw } // end of namespace overlay } // end of namespace sw -////////////////////////////////////////////////////////////////////////////// - #endif //_SW_OVERLAY_OVERLAYRANGES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx index 22f333b60a59..82f078c445db 100644 --- a/sw/source/ui/docvw/PostItMgr.cxx +++ b/sw/source/ui/docvw/PostItMgr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PostItMgr.hxx" #include <postithelper.hxx> @@ -61,7 +60,6 @@ #include <sfx2/event.hxx> #include <svl/srchitem.hxx> - #include <svl/languageoptions.hxx> #include <svtools/langtab.hxx> #include <svl/smplhint.hxx> @@ -796,7 +794,6 @@ void SwPostItMgr::LayoutPostIts() CheckForRemovedPostIts(); } - // notes scrollbar is otherwise not drawn correctly for some cases // scrollbar area is enough if (bUpdate) @@ -1252,7 +1249,6 @@ void SwPostItMgr::Hide() } } - void SwPostItMgr::Show() { for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i) @@ -1486,7 +1482,6 @@ Rectangle SwPostItMgr::GetTopScrollRect(const unsigned long aPage) const return Rectangle(aPointTop,aSize); } - //IMPORTANT: if you change the rects here, also change SwPageFrm::PaintNotesSidebar() bool SwPostItMgr::ScrollbarHit(const unsigned long aPage,const Point &aPoint) { @@ -1569,7 +1564,6 @@ void SwPostItMgr::CorrectPositions() } } - bool SwPostItMgr::ShowNotes() const { // we only want to see notes if Options - Writer - View - Notes is ticked diff --git a/sw/source/ui/docvw/ShadowOverlayObject.cxx b/sw/source/ui/docvw/ShadowOverlayObject.cxx index 1440c8d8ed98..efb1a5d68e27 100644 --- a/sw/source/ui/docvw/ShadowOverlayObject.cxx +++ b/sw/source/ui/docvw/ShadowOverlayObject.cxx @@ -31,7 +31,7 @@ namespace sw { namespace sidebarwindows { // helper SwPostItShadowPrimitive -// + // Used to allow view-dependent primitive definition. For that purpose, the // initially created primitive (this one) always has to be view-independent, // but the decomposition is made view-dependent. Very simple primitive which diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx index 54cc3b2653f3..a6d39d067b9f 100644 --- a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx @@ -34,7 +34,6 @@ namespace sw { namespace sidebarwindows { - // declaration and implementation of <SvxEditSource> // for <::accessibiliy::AccessibleTextHelper> instance class SidebarTextEditSource : public SvxEditSource, diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index 742c116e09b1..f05fd724c485 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <SidebarWin.hxx> #include <SidebarWinAcc.hxx> #include <PostItMgr.hxx> @@ -325,7 +324,6 @@ void SwSidebarWin::InitControls() mpMetadataDate->SetSettings(aSettings); } - SwDocShell* aShell = mrView.GetDocShell(); mpOutliner = new Outliner(&aShell->GetPool(),OUTLINERMODE_TEXTOBJECT); aShell->GetDoc()->SetCalcFieldValueHdl( mpOutliner ); @@ -954,7 +952,6 @@ void SwSidebarWin::DeactivatePostIt() if ( !Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) GetOutlinerView()->SetBackgroundColor(COL_TRANSPARENT); - if ( !IsProtected() && Engine()->GetEditEngine().GetText().isEmpty() ) { mnEventId = Application::PostUserEvent( LINK( this, SwSidebarWin, DeleteHdl), 0 ); @@ -1124,7 +1121,6 @@ IMPL_LINK_NOARG(SwSidebarWin, DeleteHdl) return 0; } - void SwSidebarWin::ResetAttributes() { mpOutlinerView->RemoveAttribsKeepLanguages(true); diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx index dd3bdf287812..da9d0fb9cc4e 100644 --- a/sw/source/ui/docvw/edtdd.cxx +++ b/sw/source/ui/docvw/edtdd.cxx @@ -19,7 +19,6 @@ #include <hintids.hxx> - #include <svx/svdview.hxx> #include <editeng/outliner.hxx> #include <svx/svdobj.hxx> @@ -58,7 +57,6 @@ void SwEditWin::StartDDTimer() bDDTimerStarted = true; } - void SwEditWin::StopDDTimer(SwWrtShell *pSh, const Point &rPt) { m_aTimer.Stop(); @@ -154,7 +152,6 @@ void SwEditWin::DragFinished() m_bIsInDrag = sal_False; } - void SwEditWin::DropCleanup() { SwWrtShell &rSh = m_rView.GetWrtShell(); @@ -183,7 +180,6 @@ void SwEditWin::CleanupDropUserMarker() } } - //exhibition hack (MA,MBA) void SwView::SelectShellForDrop() { @@ -234,7 +230,6 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt ) nUserOpt, m_nDropFormat, nEventAction, 0, &rEvt.maDropEvent.Transferable ); - TransferableDataHelper aData( rEvt.maDropEvent.Transferable ); nRet = rEvt.mnAction; if( !SwTransferable::PasteData( aData, rSh, m_nDropAction, m_nDropFormat, @@ -247,7 +242,6 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } - sal_uInt16 SwEditWin::GetDropDestination( const Point& rPixPnt, SdrObject ** ppObj ) { SwWrtShell &rSh = m_rView.GetWrtShell(); @@ -481,7 +475,6 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt ) return DND_ACTION_NONE; } - IMPL_LINK_NOARG(SwEditWin, DDHandler) { bDDTimerStarted = false; diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index ad0f5927803a..10794255f42b 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -699,8 +699,6 @@ void SwEditWin::StopInsFrm() m_nInsFrmColCount = 1; } - - sal_Bool SwEditWin::IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCrsr ) const { const SvtCTLOptions& rCTLOptions = SW_MOD()->GetCTLOptions(); @@ -773,18 +771,18 @@ static sal_uInt16 lcl_isNonDefaultLanguage(LanguageType eBufferLanguage, SwView& // wants to use the language reported from the system, // except if we knew that it was explicitly switched (thus // the check for "bInputLangeSwitched"). - // + // The language reported by the system could be just the // system default language that the user is not even aware // of, because no language selection tool is installed at // all. In this case the OOo language should get preference // as it might have been selected by the user explicitly. - // + // Usually this case happens if the OOo language is // different to the system language but the system keyboard // is still suitable for the OOo language (e.g. writing // English texts with a German keyboard). - // + // For non-latin keyboards overwriting the attribute is // still valid. We do this for kyrillic and greek ATM. In // future versions of OOo this should be replaced by a @@ -834,9 +832,8 @@ void SwEditWin::FlushInBuffer() uno::Reference < i18n::XExtendedInputSequenceChecker > xISC = pCheckIt->xCheck; if ( xISC.is() && IsInputSequenceCheckingRequired( m_aInBuffer, *rSh.GetCrsr() ) ) { - // + // apply (Thai) input sequence checking/correction - // rSh.Push(); // push current cursor to stack @@ -2583,7 +2580,6 @@ KEYINPUT_CHECKTABLE_INSDEL: case KS_CellTopSmall: rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_TOP, pModOpt->GetTblVMove() ); break; case KS_CellBottomSmall: rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_BOTTOM, pModOpt->GetTblVMove() ); break; - case KS_InsDel_ColLeftBig: rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_COL_LEFT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHInsert() ); break; case KS_InsDel_ColRightBig: rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_COL_RIGHT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHInsert() ); break; case KS_InsDel_ColLeftSmall: rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_COL_LEFT, pModOpt->GetTblHInsert() ); break; @@ -2861,7 +2857,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) // Is the cursor in a part like similar to the one we clicked on? For example, // if the cursor is in a header and we click on an empty header... don't change anything to // keep consistent behaviour due to header edit mode (and the same for the footer as well). - // + // Otherwise, we hide the header/footer control if a separator is shown, and vice versa. if ( !( bWasInHeader && eControl == Header ) && !( bWasInFooter && eControl == Footer ) ) @@ -2903,7 +2899,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) } } - if ( IsChainMode() ) { SetChainMode( sal_False ); @@ -6001,7 +5996,6 @@ void SwEditWin::ShowAutoTextCorrectQuickHelp( m_pQuickHlpData->FillStrArr( rSh, rWord ); } - if( !m_pQuickHlpData->m_aHelpStrings.empty() ) { m_pQuickHlpData->SortAndFilter(rWord); diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index 81413b89351c..f2779a03262e 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -95,7 +95,6 @@ static OUString lcl_GetRedlineHelp( const SwRangeRedline& rRedl, sal_Bool bBallo return sBuf.makeStringAndClear(); } - void SwEditWin::RequestHelp(const HelpEvent &rEvt) { SwWrtShell &rSh = m_rView.GetWrtShell(); diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx index 36ea5e4d49f2..a860d484df12 100644 --- a/sw/source/ui/docvw/edtwin3.cxx +++ b/sw/source/ui/docvw/edtwin3.cxx @@ -35,8 +35,6 @@ #include <frmatr.hxx> #include <editeng/frmdiritem.hxx> - - // Core-Notify void ScrollMDI( SwViewShell* pVwSh, const SwRect &rRect, sal_uInt16 nRangeX, sal_uInt16 nRangeY) diff --git a/sw/source/ui/docvw/frmsidebarwincontainer.cxx b/sw/source/ui/docvw/frmsidebarwincontainer.cxx index cf64e176528f..3760f9778446 100644 --- a/sw/source/ui/docvw/frmsidebarwincontainer.cxx +++ b/sw/source/ui/docvw/frmsidebarwincontainer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <frmsidebarwincontainer.hxx> #include <map> diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx index 024f3f2b6faa..bbed8b0a7589 100644 --- a/sw/source/ui/docvw/romenu.cxx +++ b/sw/source/ui/docvw/romenu.cxx @@ -80,7 +80,6 @@ void SwReadOnlyPopup::Check( sal_uInt16 nMID, sal_uInt16 nSID, SfxDispatcher &rD delete _pItem; } - SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) : PopupMenu( SW_RES(MN_READONLY_POPUP) ), rView ( rV ), diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index bae8278ca52f..65c6f25c02c5 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -72,13 +72,12 @@ static void lcl_Highlight(const OUString& rSource, SwTextPortions& aPortionList) const sal_Unicode cLF = 0x0a; const sal_Unicode cCR = 0x0d; - const sal_uInt16 nStrLen = rSource.getLength(); sal_uInt16 nInsert = 0; // number of inserted portions sal_uInt16 nActPos = 0; // position, where '<' was found sal_uInt16 nOffset = 0; // Offset of nActPos to '<' sal_uInt16 nPortStart = USHRT_MAX; // for the TextPortion - sal_uInt16 nPortEnd = 0; // + sal_uInt16 nPortEnd = 0; SwTextPortion aText; while(nActPos < nStrLen) { @@ -722,7 +721,7 @@ void SwSrcEditWindow::ImpDoHighlight( const OUString& rSource, sal_uInt16 nLineO r.eType != svtools::HTMLUNKNOWN) r.eType = svtools::HTMLUNKNOWN; Color aColor((ColorData)SW_MOD()->GetColorConfig().GetColorValue((svtools::ColorConfigEntry)r.eType).nColor); - sal_uInt16 nLine = nLineOff+r.nLine; // + sal_uInt16 nLine = nLineOff+r.nLine; pTextEngine->SetAttrib( TextAttribFontColor( aColor ), nLine, r.nStart, r.nEnd+1, true ); } } diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index bc1ee30302a8..468f273fb14e 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -524,6 +524,4 @@ void SwEnvFmtPage::Reset(const SfxItemSet& rSet) DELETEZ(GetParentSwEnvDlg()->pAddresseeSet); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index a71c710a02b5..8629d5f8deb7 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -73,5 +73,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index d6475903b588..6bdbe02f6e31 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -44,8 +44,6 @@ using namespace utl; using namespace ::com::sun::star::uno; - - TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem ); SW_DLLPUBLIC OUString MakeSender() diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index ef04fa76ff74..f9abd95b55ab 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::rtl; - //impl in envimg.cxx extern SW_DLLPUBLIC OUString MakeSender(); @@ -353,5 +352,4 @@ void SwEnvPage::Reset(const SfxItemSet& rSet) m_pSenderBox->GetClickHdl().Call(m_pSenderBox); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 32d4defdad6c..6134474a7a6c 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_ENVELP_ENVPRT_HXX #define INCLUDED_SW_SOURCE_UI_ENVELP_ENVPRT_HXX - #include <sfx2/tabdlg.hxx> #include <vcl/toolbox.hxx> #include <vcl/field.hxx> @@ -29,8 +28,6 @@ #include <vcl/button.hxx> #include <svtools/stdctrl.hxx> - - #include "envimg.hxx" class SwEnvDlg; diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 3a64309f1e0a..839bd7ff657a 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -38,7 +38,6 @@ //impl in envimg.cxx extern SW_DLLPUBLIC OUString MakeSender(); - void SwLabRec::SetFromItem( const SwLabItem& rItem ) { lHDist = rItem.lHDist; @@ -878,6 +877,4 @@ void SwBusinessDataPage::Reset(const SfxItemSet& rSet) m_pMailED->SetText(aItem.aCompMail); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx index 9fe33ee3724d..8630ea098465 100644 --- a/sw/source/ui/envelp/labelcfg.cxx +++ b/sw/source/ui/envelp/labelcfg.cxx @@ -355,5 +355,4 @@ void SwLabelConfig::SaveLabel( const OUString& rManufacturer, m_aLabels[rManufacturer][rType].m_bPredefined = false; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index 4d0d8fed4b1f..669d5135c534 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -30,7 +30,6 @@ #include <unomid.h> #include <unoprnms.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; @@ -234,7 +233,7 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel, } catch (const uno::RuntimeException&) { - // + } uno::Reference< container::XEnumerationAccess > xFldAcc = xFlds->getTextFields(); diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 92a2475c832b..bae7395f7694 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -39,7 +39,6 @@ using namespace utl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; - #define ROUND(x) ((sal_uInt16) ((x) + .5)) SwLabPreview::SwLabPreview(Window* pParent) diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx index c381b764e0a9..a2006b87dda9 100644 --- a/sw/source/ui/envelp/labimg.cxx +++ b/sw/source/ui/envelp/labimg.cxx @@ -32,7 +32,6 @@ using namespace utl; using namespace ::com::sun::star::uno; - SwLabItem::SwLabItem() : SfxPoolItem(FN_LABEL), diff --git a/sw/source/ui/envelp/labimp.hxx b/sw/source/ui/envelp/labimp.hxx index bef8f983fb68..5d4d17d7cfb3 100644 --- a/sw/source/ui/envelp/labimp.hxx +++ b/sw/source/ui/envelp/labimp.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_ENVELP_LABIMP_HXX #define INCLUDED_SW_SOURCE_UI_ENVELP_LABIMP_HXX - #include <sfx2/tabdlg.hxx> #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> @@ -101,7 +100,6 @@ public: sal_Bool bCont; }; - class SwLabRecs : public std::vector<SwLabRec*> { public: ~SwLabRecs() diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 0132db7f26cd..1821a2877ebc 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -26,7 +26,6 @@ #include <svtools/stdctrl.hxx> #include <sfx2/tabdlg.hxx> - class SwLabDlg; class SwLabItem; @@ -71,5 +70,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index b3d90b7d084a..bc38910ff376 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -77,7 +77,6 @@ using namespace ::com::sun::star::form; using namespace ::com::sun::star::view; using namespace ::com::sun::star::ui::dialogs; - struct SwMailMergeDlg_Impl { uno::Reference<runtime::XFormController> xFController; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 3a8b10b19726..e853f4479d08 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -94,7 +94,6 @@ class SwVisitingCardPage : public SfxTabPage SwOneExampleFrame* pExampleFrame; ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextContainer2 > m_xAutoText; - DECL_LINK( AutoTextSelectHdl, void* ); DECL_LINK( FrameControlInitializedHdl, void* ); diff --git a/sw/source/ui/envelp/syncbtn.cxx b/sw/source/ui/envelp/syncbtn.cxx index 8dfe8332291e..b3882f011b8e 100644 --- a/sw/source/ui/envelp/syncbtn.cxx +++ b/sw/source/ui/envelp/syncbtn.cxx @@ -79,5 +79,4 @@ IMPL_LINK_NOARG(SwSyncBtnDlg, BtnHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index ebb6ae19af07..1eb7e5107a52 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; - /*-------------------------------------------------------------------- Description: edit insert-field --------------------------------------------------------------------*/ @@ -56,7 +55,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog(Window *pParent, SwWrtShell &rS, } if( RES_DROPDOWN == pField->GetTyp()->Which() ) { - // + pDropField = (SwDropDownField*)pField; OUString sTitle = GetText(); sTitle += pDropField->GetPar2(); diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx index 1bb07a7bec3e..aa4021b2614f 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.cxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <FldRefTreeListBox.hxx> #include <helpid.h> diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 4115bc6f12be..f304d9077206 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::uno; - /*-------------------------------------------------------------------- Description: edit insert-field --------------------------------------------------------------------*/ diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 8ccfe3bea86d..2874f4e65697 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -83,7 +83,6 @@ public: void SetWrtShell(SwWrtShell& rSh); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 53ac270281f5..78ccac188032 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -472,6 +472,4 @@ void SwFldDokInfPage::FillUserData() SetUserData(sData); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index cd37f9366c2a..8e5727cd4033 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -71,7 +71,6 @@ public: virtual void FillUserData(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index 39f016842f63..522599524996 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -73,7 +73,6 @@ public: virtual void FillUserData(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 71491a805d7d..053ea40fe929 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -37,7 +37,6 @@ #include <fldedt.hxx> #include <crsskip.hxx> - #include <cmdid.h> #include <helpid.h> #include <globals.hrc> diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 101f58f35740..6c172a2cf846 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; - SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet) : SwFldPage(pParent, "FldFuncPage", "modules/swriter/ui/fldfuncpage.ui", rCoreSet) diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 9f38cefc784c..2923fd2c7fd6 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -95,7 +95,6 @@ public: virtual void FillUserData(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 72615a1989ae..d4a0b5c4fb09 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cmdid.h> #include <hintids.hxx> #include <svl/stritem.hxx> @@ -236,7 +235,6 @@ SwFldMgr::SwFldMgr(SwWrtShell* pSh ) : GetCurFld(); } - SwFldMgr::~SwFldMgr() { } @@ -282,7 +280,6 @@ sal_uInt16 SwFldMgr::GetFldTypeCount(sal_uInt16 nResId) const return pSh ? pSh->GetFldTypeCount(nResId) : 0; } - SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, sal_uInt16 nId) const { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); @@ -290,7 +287,6 @@ SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, sal_uInt16 nId) const return pSh ? pSh->GetFldType(nId, nResId) : 0; } - SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, const OUString& rName) const { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); @@ -298,7 +294,6 @@ SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, const OUString& rName) cons return pSh ? pSh->GetFldType(nResId, rName) : 0; } - /*-------------------------------------------------------------------- Description: determine current field --------------------------------------------------------------------*/ @@ -344,7 +339,6 @@ SwField* SwFldMgr::GetCurFld() Description: provide group range --------------------------------------------------------------------*/ - const SwFldGroupRgn& SwFldMgr::GetGroupRange(sal_Bool bHtmlMode, sal_uInt16 nGrpId) const { static SwFldGroupRgn const aRanges[] = @@ -407,14 +401,12 @@ sal_uInt16 SwFldMgr::GetGroup(sal_Bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 ACCESS over TYP_.... --------------------------------------------------------------------*/ - sal_uInt16 SwFldMgr::GetTypeId(sal_uInt16 nPos) { OSL_ENSURE(nPos < ::GetPackCount(), "forbidden Pos"); return aSwFlds[ nPos ].nTypeId; } - OUString SwFldMgr::GetTypeStr(sal_uInt16 nPos) { OSL_ENSURE(nPos < ::GetPackCount(), "forbidden TypeId"); @@ -440,7 +432,6 @@ OUString SwFldMgr::GetTypeStr(sal_uInt16 nPos) Description: determine Pos in the list --------------------------------------------------------------------*/ - sal_uInt16 SwFldMgr::GetPos(sal_uInt16 nTypeId) { switch( nTypeId ) @@ -571,7 +562,6 @@ bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill) ACCESS over TYP_.... --------------------------------------------------------------------*/ - sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, sal_Bool bHtmlMode) const { OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId"); @@ -628,7 +618,6 @@ sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, sal_Bool b Description: determine FormatString to a type --------------------------------------------------------------------*/ - OUString SwFldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const { OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId"); @@ -771,7 +760,6 @@ sal_uInt16 SwFldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const Description: Traveling --------------------------------------------------------------------*/ - sal_Bool SwFldMgr::GoNextPrev( sal_Bool bNext, SwFieldType* pTyp ) { SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); @@ -802,7 +790,6 @@ sal_Bool SwFldMgr::GoNextPrev( sal_Bool bNext, SwFieldType* pTyp ) Description: insert field types --------------------------------------------------------------------*/ - void SwFldMgr::InsertFldType(SwFieldType& rType) { SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); @@ -815,7 +802,6 @@ void SwFldMgr::InsertFldType(SwFieldType& rType) Description: determine current TypeId --------------------------------------------------------------------*/ - sal_uInt16 SwFldMgr::GetCurTypeId() const { return pCurFld ? pCurFld->GetTypeId() : USHRT_MAX; @@ -825,7 +811,6 @@ sal_uInt16 SwFldMgr::GetCurTypeId() const Description: Over string insert field or update --------------------------------------------------------------------*/ - sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData) { @@ -1395,7 +1380,6 @@ sal_Bool SwFldMgr::InsertFld( } OSL_ENSURE(pFld, "field not available"); - //the auto language flag has to be set prior to the language! pFld->SetAutomaticLanguage(rData.bIsAutomaticLanguage); sal_uInt16 nLang = GetCurrLanguage(); @@ -1431,7 +1415,6 @@ sal_Bool SwFldMgr::InsertFld( Description: fields update --------------------------------------------------------------------*/ - void SwFldMgr::UpdateCurFld(sal_uLong nFormat, const OUString& rPar1, const OUString& rPar2, diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index 226a3f8d8e6c..364dad36c7ad 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -90,7 +90,6 @@ public: virtual sal_uInt16 GetGroup() = 0; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index ccd742513f85..dbfd35cfc660 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -152,7 +152,6 @@ sal_uInt16 SwFldRefPage::GetSavedSelectedPos() const return mnSavedSelectedPos; } - void SwFldRefPage::Reset(const SfxItemSet& ) { if (!IsFldEdit()) diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index fb88d16f5dcc..453ca8ada11b 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -89,7 +89,6 @@ public: virtual void FillUserData(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 32b3ab1410dd..9fa310f42093 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -46,12 +46,10 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> - /*-------------------------------------------------------------------- Description: carrier of the dialog --------------------------------------------------------------------*/ - SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) : SfxTabDialog(pParent, "FieldDialog", "modules/swriter/ui/fielddialog.ui") , m_pChildWin(pCW) @@ -207,7 +205,6 @@ IMPL_LINK_NOARG(SwFldDlg, CancelHdl) return 0; } - /*-------------------------------------------------------------------- Description: newly initialise dialog after Doc-Switch --------------------------------------------------------------------*/ @@ -342,5 +339,4 @@ void SwFldDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src index 0660727f15d8..a564a8e36180 100644 --- a/sw/source/ui/fldui/fldui.src +++ b/sw/source/ui/fldui/fldui.src @@ -24,9 +24,9 @@ /*-------------------------------------------------------------------- Description: strings for the types --------------------------------------------------------------------*/ - // + // range document - // + String STR_DATEFLD { Text [ en-US ] = "Date" ; @@ -67,9 +67,9 @@ String STR_EXTUSERFLD { Text [ en-US ] = "Sender" ; }; - // + // range functions - // + String STR_SETFLD { Text [ en-US ] = "Set variable" ; @@ -134,9 +134,9 @@ String STR_DROPDOWN { Text [ en-US ] = "Input list" ; }; - // + // range references - // + String STR_SETREFFLD { Text [ en-US ] = "Set Reference" ; @@ -145,9 +145,9 @@ String STR_GETREFFLD { Text [ en-US ] = "Insert Reference" ; }; - // + // range database - // + String STR_DBFLD { Text [ en-US ] = "Mail merge fields" ; @@ -176,9 +176,9 @@ String STR_HIDDENTXTFLD { Text [ en-US ] = "Hidden text" ; }; - // + // range user fields - // + String STR_USERFLD { Text [ en-US ] = "User Field" ; @@ -199,9 +199,9 @@ String STR_HIDDENPARAFLD { Text [ en-US ] = "Hidden Paragraph" ; }; - // + // range DocumentInfo - // + String STR_DOCINFOFLD { Text [ en-US ] = "DocInformation" ; @@ -225,9 +225,9 @@ String FLD_TIME_FIX { Text [ en-US ] = "Time (fixed)" ; }; - // + // SubCmd Statistic - // + String FLD_STAT_TABLE { Text [ en-US ] = "Tables" ; @@ -257,7 +257,7 @@ String FLD_STAT_PAGE Text [ en-US ] = "Pages" ; }; // SubCmd DDETypes - // + String FMT_DDE_HOT { Text [ en-US ] = "DDE automatic" ; diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 7e90bec09d6f..a400560258c2 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -825,7 +825,6 @@ IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl) break; } - // check buttons switch (nTypeId) { diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index 2d85f0ae2254..295a6d42f896 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -102,7 +102,6 @@ public: virtual void FillUserData(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index 66c8982ced13..2ebbb9880035 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -63,7 +63,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, OUString aStr; if( RES_INPUTFLD == pField->GetTyp()->Which() ) { // it is an input field - // + pInpFld = (SwInputField*)pField; m_pLabelED->SetText( pInpFld->GetPar2() ); sal_uInt16 nSubType = pInpFld->GetSubType(); @@ -157,12 +157,10 @@ void SwFldInputDlg::Apply() rSh.EndAllAction(); } - IMPL_LINK_NOARG(SwFldInputDlg, NextHdl) { EndDialog(RET_OK); return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 42f3fc5552e8..fad10ca8b6b3 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -36,15 +36,12 @@ #include <fldui.hrc> #include <globals.hrc> - using namespace ::com::sun::star; // static ---------------------------------------------------------------- // class SwJavaEditDialog ------------------------------------------------ - - SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) : SvxStandardDialog(pParent, "InsertScriptDialog", "modules/swriter/ui/insertscript.ui"), diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx index 5a033d1a8542..000a5b75a54c 100644 --- a/sw/source/ui/fldui/xfldui.cxx +++ b/sw/source/ui/fldui/xfldui.cxx @@ -33,7 +33,6 @@ #include <view.hxx> #include <swmodule.hxx> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -42,13 +41,10 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::beans; - - // This file contains all routines of the fldui directory, which must compile // with exceptions. So we can reduce the code of the other files, which don't // need any exception handling. - /*-------------------------------------------------------------------- Description: Is the database field numeric? remark: in case of error sal_True is returned @@ -169,5 +165,4 @@ sal_Bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQry return bNumeric; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx index 1714d1c8cee4..3137ec7565c5 100644 --- a/sw/source/ui/frmdlg/colex.cxx +++ b/sw/source/ui/frmdlg/colex.cxx @@ -21,7 +21,6 @@ #include "hintids.hxx" #include <algorithm> - #include <svl/eitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> @@ -94,7 +93,6 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet ) SetBottom( 0 ); } - // evaluate header-attributes const SfxPoolItem* pItem; if( SFX_ITEM_SET == rSet.GetItemState( pPool->GetWhich( SID_ATTR_PAGE_HEADERSET), diff --git a/sw/source/ui/frmdlg/colmgr.cxx b/sw/source/ui/frmdlg/colmgr.cxx index 9710f0e8ddd2..8ea5563eb474 100644 --- a/sw/source/ui/frmdlg/colmgr.cxx +++ b/sw/source/ui/frmdlg/colmgr.cxx @@ -24,7 +24,6 @@ #include "frmfmt.hxx" #include "colmgr.hxx" - // private methods /*------------------------------------------------------------------------ Description: set column width to current width diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index b851e939950d..c09a075027d9 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -140,7 +140,6 @@ SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) pColPgSet = pFrameSet; } - const SwPageDesc* pPageDesc = rWrtShell.GetSelectedPageDescs(); if( pPageDesc ) { @@ -648,7 +647,7 @@ sal_Bool SwColumnPage::FillItemSet(SfxItemSet &rSet) m_pCLNrEdt->GetDownHdl().Call(m_pCLNrEdt); // set in ItemSet setzen // the current settings are already present - // + const SfxPoolItem* pOldItem; const SwFmtCol& rCol = pColMgr->GetColumns(); if(0 == (pOldItem = GetOldItem( rSet, RES_COL )) || diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 428c9207d9b2..bff0ab286aa9 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -79,7 +79,7 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, m_bHTMLMode = static_cast< sal_Bool >(nHtmlMode & HTMLMODE_ON); // example font for both example TabPages - // + if(pStr) { SetText(GetText() + SW_RESSTR(STR_COLL_HEADER) + *pStr + OUString(')')); diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx index f1a11406a11c..07f6149e0011 100644 --- a/sw/source/ui/frmdlg/frmmgr.cxx +++ b/sw/source/ui/frmdlg/frmmgr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "cmdid.h" #include "hintids.hxx" diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 10dfa30f8f3b..8c98fd6214bd 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -828,7 +828,6 @@ void SwFrmPage::setOptimalRelWidth() m_pHoriRelationLB->Clear(); } - SwFrmPage::~SwFrmPage() { } @@ -2368,7 +2367,6 @@ void SwFrmPage::SetFormatUsed(sal_Bool bFmt) } } - void SwFrmPage::EnableVerticalPositioning( bool bEnable ) { m_bAllowVertPositioning = bEnable; @@ -2380,7 +2378,6 @@ void SwFrmPage::EnableVerticalPositioning( bool bEnable ) m_pVertRelationLB->Enable( bEnable ); } - SwGrfExtPage::SwGrfExtPage(Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "PicturePage", "modules/swriter/ui/picturepage.ui", rSet) diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 2e6bec7f258b..741b4526e73c 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -31,7 +31,6 @@ #include <fmtfollowtextflow.hxx> #include <svx/swframevalidation.hxx> - #include "cmdid.h" #include "uitool.hxx" #include "wrtsh.hxx" @@ -494,7 +493,6 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) m_pWrapOutsideCB->Hide(); m_pIdealWrapRB->Enable( false ); - m_pWrapTransparentCB->Enable( false ); m_pNoWrapRB->Enable( FLY_AT_PARA == nAnchorId ); m_pWrapParallelRB->Enable( false ); diff --git a/sw/source/ui/globdoc/globdoc.cxx b/sw/source/ui/globdoc/globdoc.cxx index 4fcdfeda25f5..1d72d5c16e0e 100644 --- a/sw/source/ui/globdoc/globdoc.cxx +++ b/sw/source/ui/globdoc/globdoc.cxx @@ -28,8 +28,6 @@ #include "globdoc.hrc" #include "cfgid.h" - - // Description: Register all filters TYPEINIT1(SwGlobalDocShell, SwDocShell); @@ -72,6 +70,4 @@ void SwGlobalDocShell::FillClass( SvGlobalName * pClassName, *pUserName = SW_RESSTR(STR_HUMAN_SWGLOBDOC_NAME); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/SwXFilterOptions.hxx b/sw/source/ui/inc/SwXFilterOptions.hxx index 8e50e3eab40c..8e39c494f529 100644 --- a/sw/source/ui/inc/SwXFilterOptions.hxx +++ b/sw/source/ui/inc/SwXFilterOptions.hxx @@ -98,5 +98,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx index 8d775917ffde..0111eb1de37d 100644 --- a/sw/source/ui/inc/actctrl.hxx +++ b/sw/source/ui/inc/actctrl.hxx @@ -40,7 +40,6 @@ public: const Link& GetActionHdl() const { return aActionLink; } }; - /* -------------------------------------------------- * Edit that doesn't accept spaces * --------------------------------------------------*/ diff --git a/sw/source/ui/inc/annotsh.hxx b/sw/source/ui/inc/annotsh.hxx index 5872c956d239..7592d441b29a 100644 --- a/sw/source/ui/inc/annotsh.hxx +++ b/sw/source/ui/inc/annotsh.hxx @@ -65,7 +65,6 @@ public: void ExecSearch(SfxRequest&, sal_Bool bNoMessage = sal_False); void StateSearch(SfxItemSet &); - virtual ::svl::IUndoManager* GetUndoManager(); }; diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/ui/inc/ascfldlg.hxx index faf18d8b3347..040485fedc08 100644 --- a/sw/source/ui/inc/ascfldlg.hxx +++ b/sw/source/ui/inc/ascfldlg.hxx @@ -57,8 +57,6 @@ public: void FillOptions( SwAsciiOptions& rOptions ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/autoedit.hxx b/sw/source/ui/inc/autoedit.hxx index 385f0d952567..94d81b771527 100644 --- a/sw/source/ui/inc/autoedit.hxx +++ b/sw/source/ui/inc/autoedit.hxx @@ -21,7 +21,6 @@ #include <vcl/edit.hxx> - class AutoEdit : public Edit { public: @@ -33,9 +32,6 @@ protected: // Implementation in autocorr.cxx - - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/ui/inc/basesh.hxx index bc2e4e5a028b..9875221d4c72 100644 --- a/sw/source/ui/inc/basesh.hxx +++ b/sw/source/ui/inc/basesh.hxx @@ -110,7 +110,6 @@ public: static FlyMode GetFrmMode() { return eFrameMode; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/bookctrl.hxx b/sw/source/ui/inc/bookctrl.hxx index 42ad20fa6218..a8ce181fd7fc 100644 --- a/sw/source/ui/inc/bookctrl.hxx +++ b/sw/source/ui/inc/bookctrl.hxx @@ -42,7 +42,6 @@ private: OUString sPageNumber; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx index 89d369689dec..5f91f6f24fae 100644 --- a/sw/source/ui/inc/caption.hxx +++ b/sw/source/ui/inc/caption.hxx @@ -95,5 +95,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx index e78f85057a2b..fbcafa3c228c 100644 --- a/sw/source/ui/inc/cfgitems.hxx +++ b/sw/source/ui/inc/cfgitems.hxx @@ -60,7 +60,6 @@ class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem Color aIndexBackgrndCol; - public: TYPEINFO(); SwDocDisplayItem( sal_uInt16 nWhich = FN_PARAM_DOCDISP ); @@ -69,7 +68,6 @@ public: SwDocDisplayItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool operator==( const SfxPoolItem& ) const; void operator=( const SwDocDisplayItem& ); @@ -106,7 +104,6 @@ public: SwElemItem(const SwElemItem& rElemItem); SwElemItem(const SwViewOption& rVOpt, sal_uInt16 nWhich); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool operator==( const SfxPoolItem& ) const; void operator=( const SwElemItem& ); @@ -137,7 +134,6 @@ public: const OUString &GetFax() const { return sFaxName; } void SetFax( const OUString& rFax) { sFaxName = rFax; } - sal_Bool IsPrintProspect() const { return bPrintProspect; } sal_Bool IsPrintProspectRTL() const { return bPrintProspectRTL; } void SetPrintProspect(sal_Bool bFlag ){ bPrintProspect = bFlag; } @@ -175,7 +171,6 @@ public: SwShadowCursorItem( const SwShadowCursorItem& rElemItem ); SwShadowCursorItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool operator==( const SfxPoolItem& ) const; void operator=( const SwShadowCursorItem& ); diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx index ea8e127a4b57..4e8e31acce58 100644 --- a/sw/source/ui/inc/changedb.hxx +++ b/sw/source/ui/inc/changedb.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_CHANGEDB_HXX #define INCLUDED_SW_SOURCE_UI_INC_CHANGEDB_HXX - #include <vcl/bitmap.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> diff --git a/sw/source/ui/inc/chartins.hxx b/sw/source/ui/inc/chartins.hxx index e2402197c8eb..848653cf45f0 100644 --- a/sw/source/ui/inc/chartins.hxx +++ b/sw/source/ui/inc/chartins.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_CHARTINS_HXX #define INCLUDED_SW_SOURCE_UI_INC_CHARTINS_HXX - Point SwGetChartDialogPos( const Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart ); void SwInsertChart( Window *pParent, SfxBindings *pBindings ); diff --git a/sw/source/ui/inc/chldwrap.hxx b/sw/source/ui/inc/chldwrap.hxx index bec1c65438ee..41f771acc2f9 100644 --- a/sw/source/ui/inc/chldwrap.hxx +++ b/sw/source/ui/inc/chldwrap.hxx @@ -42,7 +42,6 @@ public: inline void SetOldDocShell(SwDocShell *pDcSh) { m_pDocSh = pDcSh; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/colmgr.hxx b/sw/source/ui/inc/colmgr.hxx index c69fb5c2b1a7..b3f73001005a 100644 --- a/sw/source/ui/inc/colmgr.hxx +++ b/sw/source/ui/inc/colmgr.hxx @@ -31,7 +31,6 @@ public: SwColMgr(const SfxItemSet &rSet, sal_uInt16 nActWidth = USHRT_MAX); ~SwColMgr(); - inline sal_uInt16 GetCount() const; void SetCount(sal_uInt16 nCount, sal_uInt16 nGutterWidth); sal_uInt16 GetGutterWidth(sal_uInt16 nPos = USHRT_MAX) const; @@ -65,7 +64,6 @@ public: void SetActualWidth(sal_uInt16 nW); sal_uInt16 GetActualSize() const { return nWidth; } - private: SwFmtCol aFmtCol; diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx index 004b34d0dfb1..2593a35be19c 100644 --- a/sw/source/ui/inc/column.hxx +++ b/sw/source/ui/inc/column.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_COLUMN_HXX #define INCLUDED_SW_SOURCE_UI_INC_COLUMN_HXX - #include <vcl/fixed.hxx> #include <vcl/field.hxx> #include <vcl/image.hxx> @@ -61,7 +60,6 @@ class SwColumnDlg : public SfxModalDialog bool bSelSectionChanged : 1; bool bFrameChanged : 1; - DECL_LINK(ObjectHdl, ListBox*); DECL_LINK(OkHdl, void *); diff --git a/sw/source/ui/inc/conarc.hxx b/sw/source/ui/inc/conarc.hxx index 9eb6fa87f3da..354a625468f2 100644 --- a/sw/source/ui/inc/conarc.hxx +++ b/sw/source/ui/inc/conarc.hxx @@ -43,8 +43,6 @@ public: virtual void Deactivate(); }; - - #endif // INCLUDED_SW_SOURCE_UI_INC_CONARC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/conform.hxx b/sw/source/ui/inc/conform.hxx index 11adb4f045bf..a1226a21f25e 100644 --- a/sw/source/ui/inc/conform.hxx +++ b/sw/source/ui/inc/conform.hxx @@ -33,8 +33,6 @@ public: virtual void CreateDefaultObject(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/conpoly.hxx b/sw/source/ui/inc/conpoly.hxx index 48066efde70d..d91c38e0dd6b 100644 --- a/sw/source/ui/inc/conpoly.hxx +++ b/sw/source/ui/inc/conpoly.hxx @@ -42,7 +42,6 @@ public: virtual void Activate(const sal_uInt16 nSlotId); // activate function }; - #endif // INCLUDED_SW_SOURCE_UI_INC_CONPOLY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/conrect.hxx b/sw/source/ui/inc/conrect.hxx index 9811f9e1215e..4791935d37ce 100644 --- a/sw/source/ui/inc/conrect.hxx +++ b/sw/source/ui/inc/conrect.hxx @@ -46,8 +46,6 @@ class ConstRectangle : public SwDrawBase virtual void Activate(const sal_uInt16 nSlotId); // activate function }; - - #endif // INCLUDED_SW_SOURCE_UI_INC_CONRECT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx index 5ddd8f41fe44..2700bd261e83 100644 --- a/sw/source/ui/inc/content.hxx +++ b/sw/source/ui/inc/content.hxx @@ -31,9 +31,7 @@ class SwTxtINetFmt; class SwTOXBase; class SwRangeRedline; -//---------------------------------------------------------------------------- // helper classes -//---------------------------------------------------------------------------- class SwPopup : public PopupMenu { @@ -49,8 +47,6 @@ public: }; -//---------------------------------------------------------------------------- - class SwOutlineContent : public SwContent { sal_uInt16 nOutlinePos; @@ -71,7 +67,6 @@ class SwOutlineContent : public SwContent bool IsMoveable(){return bIsMoveable;}; }; -//---------------------------------------------------------------------------- class SwRegionContent : public SwContent { @@ -86,7 +81,6 @@ class SwRegionContent : public SwContent nRegionLevel(nLevel){} sal_uInt8 GetRegionLevel() const {return nRegionLevel;} }; -//---------------------------------------------------------------------------- class SwURLFieldContent : public SwContent { @@ -107,7 +101,6 @@ public: const SwTxtINetFmt* GetINetAttr() { return pINetAttr; } }; -//---------------------------------------------------------------------------- class SwPostItContent : public SwContent { const SwFmtFld* pFld; @@ -139,8 +132,6 @@ public: bool IsPostIt() {return mbPostIt; } }; -//---------------------------------------------------------------------------- - class SwGraphicContent : public SwContent { OUString sLink; @@ -153,7 +144,6 @@ public: const OUString& GetLink() const {return sLink;} }; -//---------------------------------------------------------------------------- class SwTOXBaseContent : public SwContent { const SwTOXBase* pBase; @@ -171,7 +161,6 @@ public: GetMember. It is reloaded after Invalidate() only if the content should be read again. */ -//---------------------------------------------------------------------------- class SwContentType : public SwTypeNumber { @@ -183,7 +172,7 @@ class SwContentType : public SwTypeNumber sal_uInt16 nMemberCount; // content count sal_uInt16 nContentType; // content type's Id sal_uInt8 nOutlineLevel; - bool bDataValid : 1; // + bool bDataValid : 1; bool bEdit: 1; // can this type be edited? bool bDelete: 1; // can this type be deleted? protected: diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx index 254f13c61413..d51152a344e7 100644 --- a/sw/source/ui/inc/conttree.hxx +++ b/sw/source/ui/inc/conttree.hxx @@ -43,9 +43,6 @@ class SdrObject; #define EDIT_MODE_DELETE 4 #define EDIT_MODE_RENAME 5 -//---------------------------------------------------------------------------- -//---------------------------------------------------------------------------- - class SwContentTree : public SvTreeListBox { ImageList aEntryImages; @@ -201,10 +198,7 @@ public: virtual sal_Int32 GetEntryRealChildrenNum( SvTreeListEntry* pEntry ) const; }; - -//---------------------------------------------------------------------------- // TreeListBox for global documents -//---------------------------------------------------------------------------- class SwLBoxString : public SvLBoxString { @@ -231,7 +225,7 @@ private: ImageList aEntryImages; - SwWrtShell* pActiveShell; // + SwWrtShell* pActiveShell; SvTreeListEntry* pEmphasisEntry; // Drag'n Drop emphasis SvTreeListEntry* pDDSource; // source for Drag'n Drop SwGlblDocContents* pSwGlblDocContents; // array with sorted content diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx index 5f4c5073a43e..e9f17a60e6e7 100644 --- a/sw/source/ui/inc/convert.hxx +++ b/sw/source/ui/inc/convert.hxx @@ -69,7 +69,6 @@ public: SwTableAutoFmt const*& prTAFmt ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/ui/inc/cption.hxx index d1128efeae5d..578efcdb8e1c 100644 --- a/sw/source/ui/inc/cption.hxx +++ b/sw/source/ui/inc/cption.hxx @@ -32,7 +32,6 @@ #include <vcl/button.hxx> #include <actctrl.hxx> - #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -59,7 +58,6 @@ public: virtual bool PreNotify( NotifyEvent& rNEvt ); }; - class SwCaptionDialog : public SvxStandardDialog { Edit* m_pTextEdit; @@ -112,5 +110,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx index 6622e7ed6409..4d271dd41e2a 100644 --- a/sw/source/ui/inc/dbinsdlg.hxx +++ b/sw/source/ui/inc/dbinsdlg.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_DBINSDLG_HXX #define INCLUDED_SW_SOURCE_UI_INC_DBINSDLG_HXX - #include <vcl/button.hxx> #include <vcl/group.hxx> #include <vcl/fixed.hxx> @@ -86,7 +85,6 @@ public: ~SwInsDBColumns() { DeleteAndDestroyAll(); } }; - class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem { RadioButton* m_pRbAsTable; diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/ui/inc/dbui.hxx index 94e261459149..7105b2ec0199 100644 --- a/sw/source/ui/inc/dbui.hxx +++ b/sw/source/ui/inc/dbui.hxx @@ -24,7 +24,6 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> - class SW_DLLPUBLIC PrintMonitor: public ModelessDialog { public: diff --git a/sw/source/ui/inc/drawbase.hxx b/sw/source/ui/inc/drawbase.hxx index e3abd3824408..98c111dc2a6a 100644 --- a/sw/source/ui/inc/drawbase.hxx +++ b/sw/source/ui/inc/drawbase.hxx @@ -74,8 +74,6 @@ public: virtual bool doConstructOrthogonal() const; }; - - #endif // INCLUDED_SW_SOURCE_UI_INC_DRAWBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/drwbassh.hxx b/sw/source/ui/inc/drwbassh.hxx index c7e75dbee3a3..7bb62ad9076c 100644 --- a/sw/source/ui/inc/drwbassh.hxx +++ b/sw/source/ui/inc/drwbassh.hxx @@ -51,7 +51,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/dselect.hxx b/sw/source/ui/inc/dselect.hxx index c31cfb4e2822..d3905bc27e57 100644 --- a/sw/source/ui/inc/dselect.hxx +++ b/sw/source/ui/inc/dselect.hxx @@ -38,8 +38,6 @@ class DrawSelection : public SwDrawBase virtual void Activate(const sal_uInt16 nSlotId); // activate function }; - - #endif // INCLUDED_SW_SOURCE_UI_INC_DSELECT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index 3d16206d9112..7b6c807a6223 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -28,7 +28,6 @@ #include <svtools/transfer.hxx> #include <swevent.hxx> - class SwWrtShell; class SwView; class SwRect; @@ -125,8 +124,8 @@ friend void PageNumNotify( SwViewShell* pVwSh, m_bIsInDrag : 1, // don't execute StartExecuteDrag twice m_bOldIdle : 1, // to stop to idle m_bOldIdleSet : 1, // during QeueryDrop - m_bTblInsDelMode : 1, // - m_bTblIsInsMode : 1, // + m_bTblInsDelMode : 1, + m_bTblIsInsMode : 1, m_bChainMode : 1, // connect frames m_bWasShdwCrsr : 1, // ShadowCrsr was on in MouseButtonDown m_bLockInput : 1, // lock while calc panel is active @@ -194,7 +193,6 @@ protected: virtual void GetFocus(); virtual void LoseFocus(); - virtual void MouseMove(const MouseEvent& rMEvt); virtual void MouseButtonDown(const MouseEvent& rMEvt); virtual void MouseButtonUp(const MouseEvent& rMEvt); @@ -240,7 +238,6 @@ public: void StopInsFrm(); sal_uInt16 GetFrmColCount() const {return m_nInsFrmColCount;} // column number for interactive frame - void SetChainMode( sal_Bool bOn ); sal_Bool IsChainMode() const { return m_bChainMode; } diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx index da04b9153ed2..62c4210cae3a 100644 --- a/sw/source/ui/inc/fldmgr.hxx +++ b/sw/source/ui/inc/fldmgr.hxx @@ -167,7 +167,6 @@ public: // organise RefMark with names bool CanInsertRefMark( const OUString& rStr ); - // access to field types via ResId sal_uInt16 GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX) const; SwFieldType* GetFldType(sal_uInt16 nResId, sal_uInt16 nId = 0) const; @@ -202,7 +201,7 @@ public: // turn off evaluation of expression fields for insertation // of many expressino fields (see labels) - // + inline void SetEvalExpFlds(sal_Bool bEval); void EvalExpFlds(SwWrtShell* pSh = NULL); }; diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx index fd8873f8d061..49f536e8f48e 100644 --- a/sw/source/ui/inc/fontcfg.hxx +++ b/sw/source/ui/inc/fontcfg.hxx @@ -53,7 +53,6 @@ #define FONTSIZE_CJK_DEFAULT 210 #define FONTSIZE_OUTLINE 280 - class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem { OUString sDefaultFonts[DEF_FONT_COUNT]; @@ -110,5 +109,4 @@ public: }; #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/formatclipboard.hxx b/sw/source/ui/inc/formatclipboard.hxx index 10cf0b86dd5d..9d9335a32147 100644 --- a/sw/source/ui/inc/formatclipboard.hxx +++ b/sw/source/ui/inc/formatclipboard.hxx @@ -27,7 +27,6 @@ // header for class SfxStyleSheetBasePool #include <svl/style.hxx> -//----------------------------------------------------------------------------- /** This class acts as data container and execution class for the format paintbrush feature in writer. */ diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index b033f5132985..b9dfbb5b87bc 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -133,7 +133,6 @@ class SwFrmPage: public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet *pSet); - DECL_LINK(RangeModifyHdl, void *); DECL_LINK(AnchorTypeHdl, void *); DECL_LINK( PosHdl, ListBox * ); @@ -256,7 +255,6 @@ class SwFrmURLPage : public SfxTabPage DECL_LINK(InsertFileHdl, void *); - SwFrmURLPage(Window *pParent, const SfxItemSet &rSet); ~SwFrmURLPage(); diff --git a/sw/source/ui/inc/globdoc.hrc b/sw/source/ui/inc/globdoc.hrc index 8ad3e18b4e29..8c954b379294 100644 --- a/sw/source/ui/inc/globdoc.hrc +++ b/sw/source/ui/inc/globdoc.hrc @@ -30,7 +30,7 @@ #define MN_GLOBAL_TEXT_POPUPMENU (RC_GLOBDOC_BEGIN + 63) -// ------------------------------------------------------------------------ + #define GLOBDOC_ACT_END MN_GLOBAL_TEXT_POPUPMENU diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/ui/inc/glosdoc.hxx index 80a1c3af3f9d..a5213b1179a1 100644 --- a/sw/source/ui/inc/glosdoc.hxx +++ b/sw/source/ui/inc/glosdoc.hxx @@ -130,7 +130,6 @@ public: std::vector<OUString> const& GetPathArray() const { return m_PathArr; } }; - #endif // INCLUDED_SW_SOURCE_UI_INC_GLOSDOC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx index 82a5dce5bc03..fb47656da3f2 100644 --- a/sw/source/ui/inc/gloslst.hxx +++ b/sw/source/ui/inc/gloslst.hxx @@ -43,7 +43,6 @@ struct AutoTextGroup } }; - typedef std::vector<AutoTextGroup*> AutoTextGroups; class SwGlossaryList : public AutoTimer @@ -80,9 +79,4 @@ public: #endif - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx index c65db5a531f3..98f441620528 100644 --- a/sw/source/ui/inc/glossary.hxx +++ b/sw/source/ui/inc/glossary.hxx @@ -51,8 +51,6 @@ class Menu; const short RET_EDIT = 100; -//------------------------------------------------------------------ - class SwGlTreeListBox : public SvTreeListBox { const OUString sReadonly; @@ -84,7 +82,6 @@ public: void Clear(); }; -//------------------------------------------------------------------ class SwOneExampleFrame; class SwGlossaryDlg : public SvxStandardDialog { @@ -116,7 +113,6 @@ class SwGlossaryDlg : public SvxStandardDialog OUString sResumeShortName; sal_Bool bResume; - const sal_Bool bSelection : 1; sal_Bool bReadOnly : 1; sal_Bool bIsOld : 1; @@ -139,7 +135,6 @@ class SwGlossaryDlg : public SvxStandardDialog DECL_LINK( CheckBoxHdl, CheckBox * ); DECL_LINK( PreviewLoadedHdl, void * ); - virtual void Apply(); void Init(); SvTreeListEntry* DoesBlockExist(const OUString& sBlock, const OUString& rShort); diff --git a/sw/source/ui/inc/glshell.hxx b/sw/source/ui/inc/glshell.hxx index 9a804a6c8d71..9e9513d22b77 100644 --- a/sw/source/ui/inc/glshell.hxx +++ b/sw/source/ui/inc/glshell.hxx @@ -50,7 +50,6 @@ public: const OUString& GetShortName(){return aShortName;} }; - class SwWebGlosDocShell : public SwWebDocShell { OUString aLongName; diff --git a/sw/source/ui/inc/imaildsplistener.hxx b/sw/source/ui/inc/imaildsplistener.hxx index 7a563eed9421..5b7e329df0d7 100644 --- a/sw/source/ui/inc/imaildsplistener.hxx +++ b/sw/source/ui/inc/imaildsplistener.hxx @@ -23,7 +23,6 @@ #include "com/sun/star/mail/XMailMessage.hpp" #include <salhelper/refobj.hxx> - class MailDispatcher; /** diff --git a/sw/source/ui/inc/initui.hxx b/sw/source/ui/inc/initui.hxx index 7b39f2b48084..9d95043d3a19 100644 --- a/sw/source/ui/inc/initui.hxx +++ b/sw/source/ui/inc/initui.hxx @@ -61,7 +61,6 @@ extern void _FinitUI(); extern void _InitSpell(); extern void _FinitSpell(); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/ui/inc/inpdlg.hxx index 01f2f0c4032f..d96c59f484ad 100644 --- a/sw/source/ui/inc/inpdlg.hxx +++ b/sw/source/ui/inc/inpdlg.hxx @@ -58,7 +58,6 @@ public: SwField* pField, sal_Bool bNextButton = sal_False ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx index 879a3e3d56ab..2278f51c23d4 100644 --- a/sw/source/ui/inc/inputwin.hxx +++ b/sw/source/ui/inc/inputwin.hxx @@ -30,7 +30,6 @@ class SwWrtShell; class SwView; class SfxDispatcher; -//======================================================================== class InputEdit : public Edit { public: @@ -44,8 +43,6 @@ protected: virtual void KeyInput( const KeyEvent& ); }; -//======================================================================== - class SwInputWindow : public ToolBox { friend class InputEdit; @@ -117,8 +114,6 @@ public: }; -//================================================================== - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx index 63b1fc495158..e8046d6079a1 100644 --- a/sw/source/ui/inc/instable.hxx +++ b/sw/source/ui/inc/instable.hxx @@ -32,7 +32,6 @@ class SwTableAutoFmt; class SwView; struct SwInsertTableOptions; - class SwInsTableDlg : public SfxModalDialog { TableNameEdit* m_pNameEdit; diff --git a/sw/source/ui/inc/mailconfigpage.hxx b/sw/source/ui/inc/mailconfigpage.hxx index 92f40772fe94..2de39fd89704 100644 --- a/sw/source/ui/inc/mailconfigpage.hxx +++ b/sw/source/ui/inc/mailconfigpage.hxx @@ -54,7 +54,6 @@ class SwMailConfigPage : public SfxTabPage DECL_LINK(AuthenticationHdl, void *); DECL_LINK(TestHdl, void *); - public: SwMailConfigPage( Window* pParent, const SfxItemSet& rSet ); ~SwMailConfigPage(); diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx index cd62d2df0ab8..c59bfda286f8 100644 --- a/sw/source/ui/inc/mailmrge.hxx +++ b/sw/source/ui/inc/mailmrge.hxx @@ -115,7 +115,6 @@ class SwMailMergeDlg : public SvxStandardDialog Size m_aDialogSize; OUString m_sSaveFilter; - DECL_LINK( ButtonHdl, Button* pBtn ); DECL_LINK(InsertPathHdl, void *); DECL_LINK(AttachFileHdl, void *); diff --git a/sw/source/ui/inc/mergetbl.hxx b/sw/source/ui/inc/mergetbl.hxx index 8cea9ca892a7..3926c21b7376 100644 --- a/sw/source/ui/inc/mergetbl.hxx +++ b/sw/source/ui/inc/mergetbl.hxx @@ -24,7 +24,6 @@ #include <vcl/fixed.hxx> #include <svx/stddlg.hxx> - class SwMergeTblDlg : public SvxStandardDialog { RadioButton* m_pMergePrevRB; @@ -39,5 +38,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/mmconfigitem.hxx b/sw/source/ui/inc/mmconfigitem.hxx index b5c751d3ae70..8e53939f4bf8 100644 --- a/sw/source/ui/inc/mmconfigitem.hxx +++ b/sw/source/ui/inc/mmconfigitem.hxx @@ -255,7 +255,6 @@ public: void SetSelectedPrinter(const OUString& rSet ) {m_sSelectedPrinter = rSet;} - SwView* GetTargetView(); void SetTargetView(SwView* pView); diff --git a/sw/source/ui/inc/multmrk.hxx b/sw/source/ui/inc/multmrk.hxx index 774fb9c9ae58..b98192765931 100644 --- a/sw/source/ui/inc/multmrk.hxx +++ b/sw/source/ui/inc/multmrk.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_MULTMRK_HXX #define INCLUDED_SW_SOURCE_UI_INC_MULTMRK_HXX - #include <svx/stddlg.hxx> #include <vcl/fixed.hxx> #include <svtools/stdctrl.hxx> @@ -49,7 +48,6 @@ public: ~SwMultiTOXMarkDlg(); }; - #endif // INCLUDED_SW_SOURCE_UI_INC_MULTMRK_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/navicfg.hxx b/sw/source/ui/inc/navicfg.hxx index c99ba4c95443..77a14d667166 100644 --- a/sw/source/ui/inc/navicfg.hxx +++ b/sw/source/ui/inc/navicfg.hxx @@ -58,7 +58,6 @@ public: } } - sal_Int32 GetOutlineLevel()const {return nOutlineLevel;} void SetOutlineLevel(sal_Int32 nSet){ if(nOutlineLevel != nSet) @@ -77,7 +76,6 @@ public: } } - sal_Int32 GetActiveBlock()const {return nActiveBlock;} void SetActiveBlock(sal_Int32 nSet){ if(nActiveBlock != nSet) diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx index 8bcd7c78991b..04a6c269c706 100644 --- a/sw/source/ui/inc/navipi.hxx +++ b/sw/source/ui/inc/navipi.hxx @@ -133,7 +133,6 @@ protected: virtual void Resize(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - // release ObjectShellLock early enough for app end virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); diff --git a/sw/source/ui/inc/navmgr.hxx b/sw/source/ui/inc/navmgr.hxx index 49fdc9a7f90f..0ef4af93a1f6 100644 --- a/sw/source/ui/inc/navmgr.hxx +++ b/sw/source/ui/inc/navmgr.hxx @@ -19,7 +19,6 @@ class SwWrtShell; struct SwPosition; class SwUnoCrsr; - class SwNavigationMgr { private: diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx index 4e0e96b2dcde..67d107588265 100644 --- a/sw/source/ui/inc/num.hxx +++ b/sw/source/ui/inc/num.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_NUM_HXX #define INCLUDED_SW_SOURCE_UI_INC_NUM_HXX - #include <sfx2/tabdlg.hxx> #include <vcl/menubtn.hxx> #include <vcl/field.hxx> diff --git a/sw/source/ui/inc/numberingtypelistbox.hxx b/sw/source/ui/inc/numberingtypelistbox.hxx index 812ecf4856a8..661252fb8e84 100644 --- a/sw/source/ui/inc/numberingtypelistbox.hxx +++ b/sw/source/ui/inc/numberingtypelistbox.hxx @@ -46,7 +46,6 @@ public: sal_Bool SelectNumberingType(sal_Int16 nType); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/numfmtlb.hxx b/sw/source/ui/inc/numfmtlb.hxx index e8b8cbb37ccc..d6facd3da9b5 100644 --- a/sw/source/ui/inc/numfmtlb.hxx +++ b/sw/source/ui/inc/numfmtlb.hxx @@ -68,7 +68,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx index 2ea9cea19958..71602d8fc33c 100644 --- a/sw/source/ui/inc/numpara.hxx +++ b/sw/source/ui/inc/numpara.hxx @@ -19,14 +19,12 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_NUMPARA_HXX #define INCLUDED_SW_SOURCE_UI_INC_NUMPARA_HXX - #include <sfx2/tabdlg.hxx> #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> #include <vcl/button.hxx> - /* --- class SwParagraphNumTabPage ---------------------------------------- with this TabPage numbering settings at the paragraph / paragraph style are performed. @@ -83,7 +81,6 @@ public: ListBox& GetStyleBox() {return *m_pNumberStyleLB;}; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/numprevw.hxx b/sw/source/ui/inc/numprevw.hxx index ab1bbbcaa6c9..71374d899261 100644 --- a/sw/source/ui/inc/numprevw.hxx +++ b/sw/source/ui/inc/numprevw.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_NUMPREVW_HXX #define INCLUDED_SW_SOURCE_UI_INC_NUMPREVW_HXX - #include <vcl/window.hxx> class SwNumRule; @@ -69,5 +68,4 @@ class NumberingPreview : public Window #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/olesh.hxx b/sw/source/ui/inc/olesh.hxx index 504fa13c6a8d..f9b6108a8edf 100644 --- a/sw/source/ui/inc/olesh.hxx +++ b/sw/source/ui/inc/olesh.hxx @@ -32,10 +32,4 @@ public: #endif - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/olmenu.hxx b/sw/source/ui/inc/olmenu.hxx index c245e208ae24..288413d5d746 100644 --- a/sw/source/ui/inc/olmenu.hxx +++ b/sw/source/ui/inc/olmenu.hxx @@ -31,7 +31,6 @@ #include <map> #include <vector> - class SwWrtShell; class SW_DLLPUBLIC SwSpellPopup : public PopupMenu diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index 3e196e2eae28..802b06092eed 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -118,7 +118,6 @@ class SwAddPrinterTabPage : public SfxTabPage DECL_LINK(AutoClickHdl, void *); DECL_LINK(SelectHdl, void *); - SwAddPrinterTabPage( Window* pParent, const SfxItemSet& rSet ); public: @@ -231,7 +230,6 @@ class SwTableOptionsTabPage : public SfxTabPage DECL_LINK(CheckBoxHdl, void *); - SwTableOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SwTableOptionsTabPage(); @@ -280,7 +278,6 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage SwWrtShell * m_pWrtShell; - SwShdwCrsrOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SwShdwCrsrOptionsTabPage(); diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx index 5afe786fd903..6d54f977108d 100644 --- a/sw/source/ui/inc/outline.hxx +++ b/sw/source/ui/inc/outline.hxx @@ -21,7 +21,6 @@ #include <sfx2/tabdlg.hxx> - #include <vcl/menu.hxx> #include <vcl/button.hxx> diff --git a/sw/source/ui/inc/popbox.hxx b/sw/source/ui/inc/popbox.hxx index 51508c72fcfe..e085886eaa81 100644 --- a/sw/source/ui/inc/popbox.hxx +++ b/sw/source/ui/inc/popbox.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_POPBOX_HXX #define INCLUDED_SW_SOURCE_UI_INC_POPBOX_HXX - #include <vcl/toolbox.hxx> #include <svtools/transfer.hxx> @@ -53,7 +52,6 @@ inline void SwHelpToolBox::SetRightClickLink(const Link &rLink) { aRightClickLink = rLink; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx index ef127fc22388..de42c7930541 100644 --- a/sw/source/ui/inc/pview.hxx +++ b/sw/source/ui/inc/pview.hxx @@ -189,7 +189,6 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * ); SAL_DLLPRIVATE bool ChgPage( int eMvMode, int bUpdateScrollbar = sal_True ); - SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False ); SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const; diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx index 1d460a599cd5..2ee42bdef5c6 100644 --- a/sw/source/ui/inc/redlndlg.hxx +++ b/sw/source/ui/inc/redlndlg.hxx @@ -58,11 +58,9 @@ typedef boost::ptr_vector<SwRedlineDataParent> SwRedlineDataParentArr; class SwRedlineDataParentSortArr : public o3tl::sorted_vector<SwRedlineDataParent*, o3tl::less_ptr_to<SwRedlineDataParent> > {}; - typedef SwRedlineDataChild* SwRedlineDataChildPtr; typedef boost::ptr_vector<SwRedlineDataChild> SwRedlineDataChildArr; - typedef SvTreeListEntry* SvLBoxEntryPtr; typedef std::vector<SvLBoxEntryPtr> SvLBoxEntryArr; @@ -159,8 +157,6 @@ public: virtual sal_Bool ReInitDlg(SwDocShell *pDocSh); }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index bc44e02813e2..44a9fa642684 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -102,7 +102,6 @@ class SwEditRegionDlg : public SfxModalDialog sal_Bool bDontCheckPasswd :1; sal_Bool bWeb :1; - Image BuildBitmap(sal_Bool bProtect,sal_Bool bHidden); void RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pEntry); @@ -227,7 +226,6 @@ class SwSectionFtnEndTabPage : public SfxTabPage FixedText* pEndSuffixFT; Edit* pEndSuffixED; - DECL_LINK( FootEndHdl, CheckBox * ); void ResetState( sal_Bool bFtn, const SwFmtFtnEndAtTxtEnd& ); diff --git a/sw/source/ui/inc/scroll.hxx b/sw/source/ui/inc/scroll.hxx index 4c100703daae..ba0f66b33398 100644 --- a/sw/source/ui/inc/scroll.hxx +++ b/sw/source/ui/inc/scroll.hxx @@ -54,8 +54,6 @@ public: ~SwScrollbar(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/shdwcrsr.hxx b/sw/source/ui/inc/shdwcrsr.hxx index 5e52cd6f06cd..5fb1d9684162 100644 --- a/sw/source/ui/inc/shdwcrsr.hxx +++ b/sw/source/ui/inc/shdwcrsr.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_SHDWCRSR_HXX #define INCLUDED_SW_SOURCE_UI_INC_SHDWCRSR_HXX - #include <tools/gen.hxx> #include <tools/color.hxx> #include <limits.h> @@ -53,8 +52,6 @@ public: Rectangle GetRect() const; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/splittbl.hxx b/sw/source/ui/inc/splittbl.hxx index 1048c380e26f..522f1d65cab4 100644 --- a/sw/source/ui/inc/splittbl.hxx +++ b/sw/source/ui/inc/splittbl.hxx @@ -46,5 +46,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx index 40d42ee51558..c490dc4d6193 100644 --- a/sw/source/ui/inc/srcedtw.hxx +++ b/sw/source/ui/inc/srcedtw.hxx @@ -58,7 +58,6 @@ public: }; -//------------------------------------------------------------ typedef std::set<sal_uInt16> SyntaxLineSet; class SwSrcEditWindow : public Window, public SfxListener diff --git a/sw/source/ui/inc/srcview.hxx b/sw/source/ui/inc/srcview.hxx index 9e404e66c54c..ba91f8732278 100644 --- a/sw/source/ui/inc/srcview.hxx +++ b/sw/source/ui/inc/srcview.hxx @@ -43,21 +43,18 @@ class SwSrcView: public SfxViewShell // for read-only switching virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - protected: sal_uInt16 StartSearchAndReplace(const SvxSearchItem& rItem, sal_Bool bFromStart, sal_Bool bApi, sal_Bool bRecursive = sal_False); - public: SFX_DECL_VIEWFACTORY(SwSrcView); SFX_DECL_INTERFACE(SW_SRC_VIEWSHELL) TYPEINFO(); - SwSrcView(SfxViewFrame* pFrame, SfxViewShell*); ~SwSrcView(); @@ -69,8 +66,6 @@ public: sal_Bool IsModified() {return aEditWin.IsModified();} - - void Execute(SfxRequest&); void GetState(SfxItemSet&); diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/ui/inc/swcont.hxx index ce9566f8c18c..4c9294907b79 100644 --- a/sw/source/ui/inc/swcont.hxx +++ b/sw/source/ui/inc/swcont.hxx @@ -51,9 +51,6 @@ class SwContentType; #define REGION_MODE_LINK 1 #define REGION_MODE_EMBEDDED 2 -//---------------------------------------------------------------------------- -//---------------------------------------------------------------------------- - //mini rtti class SwTypeNumber { @@ -65,7 +62,6 @@ class SwTypeNumber sal_uInt8 GetTypeId() const; }; -//---------------------------------------------------------------------------- class SwContent : public SwTypeNumber { diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx index 04bd14066f98..d68a9daac07a 100644 --- a/sw/source/ui/inc/swdtflvr.hxx +++ b/sw/source/ui/inc/swdtflvr.hxx @@ -52,7 +52,6 @@ namespace nsTransferBufferType const sal_uInt16 TRNSFR_DRAWING = 0x0081; // drawing is internal too! } - class SW_DLLPUBLIC SwTransferable : public TransferableHelper { friend class SwView_Impl; @@ -209,7 +208,6 @@ public: virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx index de24d86ff303..1dfc4f2597a4 100644 --- a/sw/source/ui/inc/swrenamexnameddlg.hxx +++ b/sw/source/ui/inc/swrenamexnameddlg.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_SWRENAMEXNAMEDDLG_HXX #define INCLUDED_SW_SOURCE_UI_INC_SWRENAMEXNAMEDDLG_HXX - #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> diff --git a/sw/source/ui/inc/swtablerep.hxx b/sw/source/ui/inc/swtablerep.hxx index 908fff827287..7f92bc0bc26b 100644 --- a/sw/source/ui/inc/swtablerep.hxx +++ b/sw/source/ui/inc/swtablerep.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_SWTABLEREP_HXX #define INCLUDED_SW_SOURCE_UI_INC_SWTABLEREP_HXX - #include <sfx2/tabdlg.hxx> #include "swdllapi.h" #include "swtypes.hxx" diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/ui/inc/swuiccoll.hxx index b7516d998192..d63d7ee99243 100644 --- a/sw/source/ui/inc/swuiccoll.hxx +++ b/sw/source/ui/inc/swuiccoll.hxx @@ -47,7 +47,6 @@ class SwCondCollPage : public SfxTabPage sal_Bool bNewTemplate; - SwCondCollPage(Window *pParent, const SfxItemSet &rSet); virtual ~SwCondCollPage(); @@ -71,8 +70,6 @@ public: void SetCollection( SwFmt* pFormat, sal_Bool bNew ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx index 24f6dee18390..1986936f86f3 100644 --- a/sw/source/ui/inc/swuicnttab.hxx +++ b/sw/source/ui/inc/swuicnttab.hxx @@ -74,8 +74,8 @@ class SwMultiTOXTabDialog : public SfxTabDialog SwOneExampleFrame* pExampleFrame; - SwTOXDescription** pDescArr; // - SwForm** pFormArr; // + SwTOXDescription** pDescArr; + SwForm** pFormArr; SwIndexSections_Impl** pxIndexSectionsArr; SwTOXBase* pParamTOXBase; diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx index 21b215105325..e552586e353b 100644 --- a/sw/source/ui/inc/swuiidxmrk.hxx +++ b/sw/source/ui/inc/swuiidxmrk.hxx @@ -78,7 +78,6 @@ class SwIndexMarkPane CheckBox* m_pSearchCaseSensitiveCB; CheckBox* m_pSearchCaseWordOnlyCB; - PushButton* m_pOKBT; CloseButton* m_pCloseBT; PushButton* m_pDelBT; @@ -143,7 +142,6 @@ public: Dialog &GetDialog() { return m_rDialog; } - ~SwIndexMarkPane(); void ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark = 0); diff --git a/sw/source/ui/inc/swwrtshitem.hxx b/sw/source/ui/inc/swwrtshitem.hxx index 1cf1431732ec..ba498ea7c41f 100644 --- a/sw/source/ui/inc/swwrtshitem.hxx +++ b/sw/source/ui/inc/swwrtshitem.hxx @@ -33,7 +33,6 @@ public: SwWrtShellItem( sal_uInt16 nWhich , SwWrtShell* pWrtSh); SwWrtShellItem( const SwWrtShellItem& ); - virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; diff --git a/sw/source/ui/inc/syncbtn.hxx b/sw/source/ui/inc/syncbtn.hxx index b06c5671cf9a..468821ff2b58 100644 --- a/sw/source/ui/inc/syncbtn.hxx +++ b/sw/source/ui/inc/syncbtn.hxx @@ -48,7 +48,6 @@ public: SFX_DECL_CHILDWINDOW( SwSyncChildWin ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tabledlg.hxx b/sw/source/ui/inc/tabledlg.hxx index 288e925e9ff8..d18be07670dc 100644 --- a/sw/source/ui/inc/tabledlg.hxx +++ b/sw/source/ui/inc/tabledlg.hxx @@ -21,7 +21,6 @@ #include <sfx2/tabdlg.hxx> - #include "swtypes.hxx" #include "swtablerep.hxx" @@ -45,7 +44,6 @@ public: const SfxItemSet* pItemSet, SwWrtShell* pSh ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tautofmt.hxx b/sw/source/ui/inc/tautofmt.hxx index 9e16028e8a3b..5aac7016a944 100644 --- a/sw/source/ui/inc/tautofmt.hxx +++ b/sw/source/ui/inc/tautofmt.hxx @@ -35,12 +35,8 @@ class AutoFmtPreview; class SwTableAutoFmtTbl; class SwWrtShell; -//------------------------------------------------------------------------ - enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; -//======================================================================== - class SwAutoFormatDlg : public SfxModalDialog { ListBox* m_pLbFormat; @@ -64,7 +60,6 @@ class SwAutoFormatDlg : public SfxModalDialog OUString aStrInvalidFmt; AutoFmtPreview* m_pWndPreview; - //------------------------ SwWrtShell* pShell; SwTableAutoFmtTbl* pTableTbl; sal_uInt8 nIndex; @@ -72,10 +67,9 @@ class SwAutoFormatDlg : public SfxModalDialog sal_Bool bCoreDataChanged : 1; sal_Bool bSetAutoFmt : 1; - void Init( const SwTableAutoFmt* pSelFmt ); void UpdateChecks( const SwTableAutoFmt&, sal_Bool bEnableBtn ); - //------------------------ + DECL_LINK( CheckHdl, Button * ); DECL_LINK(OkHdl, void *); DECL_LINK( AddHdl, void * ); @@ -92,7 +86,6 @@ public: void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const; }; - #endif // SW_AUTOFMT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tblctrl.hxx b/sw/source/ui/inc/tblctrl.hxx index e511a0f59c29..fbf66057e2ae 100644 --- a/sw/source/ui/inc/tblctrl.hxx +++ b/sw/source/ui/inc/tblctrl.hxx @@ -19,14 +19,8 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_TBLCTRL_HXX #define INCLUDED_SW_SOURCE_UI_INC_TBLCTRL_HXX - #include <sfx2/tbxctrl.hxx> - -//---------------------------------------------------------------------------- -// -//---------------------------------------------------------------------------- - class SwTableOptimizeCtrl : public SfxToolBoxControl { @@ -41,10 +35,6 @@ public: }; -// -//---------------------------------------------------------------------------- - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/toxmgr.hxx b/sw/source/ui/inc/toxmgr.hxx index 273ab7c0787d..86b2d7f5ecc5 100644 --- a/sw/source/ui/inc/toxmgr.hxx +++ b/sw/source/ui/inc/toxmgr.hxx @@ -245,7 +245,6 @@ public: {delete pTOUName; pTOUName = new OUString(rSet);} const OUString* GetTOUName() const {return pTOUName;} - void SetPhoneticReadingOfAltStr(const OUString& rSet) {delete pPhoneticReadingOfAltStr; pPhoneticReadingOfAltStr = new OUString(rSet);} const OUString* GetPhoneticReadingOfAltStr() const { return pPhoneticReadingOfAltStr; } @@ -271,14 +270,12 @@ public: // single argument ctors shall be explicit. explicit SwTOXMgr(SwWrtShell* pShell); - // // methods for directory marks - // + void InsertTOXMark(const SwTOXMarkDescription& rDesc); void UpdateTOXMark(const SwTOXMarkDescription& rDesc); - void DeleteTOXMark(); void NextTOXMark(sal_Bool bSame=sal_False); void PrevTOXMark(sal_Bool bSame=sal_False); @@ -290,9 +287,8 @@ public: SwTOXMark* GetCurTOXMark(); void SetCurTOXMark(sal_uInt16 nId); - // // methods for directories - // + sal_Bool UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0); const SwTOXType* GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const; diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx index 345828ef8a85..075dbf626708 100644 --- a/sw/source/ui/inc/uivwimp.hxx +++ b/sw/source/ui/inc/uivwimp.hxx @@ -160,7 +160,6 @@ public: return m_bEditingPositionSet; } - void StartDocumentInserter( const OUString& rFactory, const Link& rEndDialogHdl ); SfxMedium* CreateMedium(); void InitRequest( const SfxRequest& rRequest ); diff --git a/sw/source/ui/inc/unoatxt.hxx b/sw/source/ui/inc/unoatxt.hxx index b0a27da7afad..3a27de5d55e7 100644 --- a/sw/source/ui/inc/unoatxt.hxx +++ b/sw/source/ui/inc/unoatxt.hxx @@ -110,7 +110,6 @@ protected: public: SwXAutoTextGroup(const OUString& rName, SwGlossaries* pGloss); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel @@ -153,7 +152,6 @@ public: virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - // void Invalidate(); }; @@ -242,7 +240,6 @@ public: const OUString& GetEntryName() {return sEntryName;} }; - /** Implement the XNameAccess for the AutoText events */ class SwAutoTextEventDescriptor : public SvBaseEventDescriptor { @@ -281,7 +278,6 @@ protected: ::com::sun::star::uno::RuntimeException); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx index 1a004ed2d893..f5992c1e0465 100644 --- a/sw/source/ui/inc/unodispatch.hxx +++ b/sw/source/ui/inc/unodispatch.hxx @@ -87,7 +87,7 @@ public: // view destroyed void Invalidate(); }; -//--------------------------------------------------------------------------------------------------------------------- + struct StatusStruct_Impl { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener> xListener; diff --git a/sw/source/ui/inc/unomailmerge.hxx b/sw/source/ui/inc/unomailmerge.hxx index f66a616c02c4..211c2cbfe41b 100644 --- a/sw/source/ui/inc/unomailmerge.hxx +++ b/sw/source/ui/inc/unomailmerge.hxx @@ -24,7 +24,6 @@ #include <cppuhelper/interfacecontainer.hxx> #include <unotools/configitem.hxx> - #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -57,9 +56,6 @@ namespace com { namespace sun { namespace star { }}} - -/////////////////////////////////////////////////////////////////////////// - // uses templates from <cppuhelper/interfacecontainer.h> // and <unotools/configitem.hxx> @@ -75,8 +71,6 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar PropHashType_Impl > OPropertyListenerContainerHelper; -//////////////////////////////////////////////////////////// - class SwNewDBMgr; class MailMergeExecuteFinalizer; @@ -152,7 +146,6 @@ protected: public: SwXMailMerge(); - void LaunchMailMergeEvent( const com::sun::star::text::MailMergeEvent &rData ) const; // XJob @@ -189,14 +182,10 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; - extern com::sun::star::uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMailMerge_getImplementationName() throw(); extern com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( com::sun::star::uno::Exception ); -//////////////////////////////////////////////////////////// - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/unomod.hxx b/sw/source/ui/inc/unomod.hxx index c0ee901688da..1d1c8823eb7c 100644 --- a/sw/source/ui/inc/unomod.hxx +++ b/sw/source/ui/inc/unomod.hxx @@ -53,7 +53,6 @@ protected: public: SwXModule(); - //XViewSettings virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); @@ -105,7 +104,6 @@ protected: public: SwXPrintSettings( SwXPrintSettingsType eType, SwDoc * pDoc = NULL ); - //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); @@ -149,7 +147,6 @@ protected: public: SwXViewSettings(sal_Bool bWeb, SwView* pView); - //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx index d5c76cf3fbf5..0b85820a62bb 100644 --- a/sw/source/ui/inc/unotools.hxx +++ b/sw/source/ui/inc/unotools.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_UNOTOOLS_HXX #define INCLUDED_SW_SOURCE_UI_INC_UNOTOOLS_HXX - #include <vcl/button.hxx> #include <vcl/edit.hxx> #include <vcl/dialog.hxx> diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx index f88a5e410906..76f370ca1eba 100644 --- a/sw/source/ui/inc/unotxvw.hxx +++ b/sw/source/ui/inc/unotxvw.hxx @@ -67,7 +67,6 @@ class SwXTextView : ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > * pxViewSettings; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > * pxTextViewCursor; - SdrObject* GetControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xToFill ); @@ -77,7 +76,6 @@ protected: public: SwXTextView(SwView* pSwView); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( ) throw(); virtual void SAL_CALL release( ) throw(); diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/ui/inc/usrpref.hxx index 946b3d2d1e63..9169166c5a6b 100644 --- a/sw/source/ui/inc/usrpref.hxx +++ b/sw/source/ui/inc/usrpref.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_USRPREF_HXX #define INCLUDED_SW_SOURCE_UI_INC_USRPREF_HXX - - #include <unotools/configitem.hxx> #include <fldupde.hxx> #include "viewopt.hxx" diff --git a/sw/source/ui/inc/utlui.hrc b/sw/source/ui/inc/utlui.hrc index 992c66c3c029..774a0b868231 100644 --- a/sw/source/ui/inc/utlui.hrc +++ b/sw/source/ui/inc/utlui.hrc @@ -26,7 +26,7 @@ #define RID_SW_SHELLRES (RC_UTLUI_BEGIN + 1) #define RID_STR_SYSTEM (RC_UTLUI_BEGIN + 2) -// ------------------------------------------------------------------------ + // Strings in NumberFormatter-Listbox #define STR_DEFINE_NUMBERFORMAT (RC_UTLUI_BEGIN + 4) diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index f1d656e0847f..91733d3da373 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -172,7 +172,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell static SearchAttrItemList* m_pSrchList; static SearchAttrItemList* m_pReplList; - SvxHtmlOptions m_aHTMLOpt; Timer m_aTimer; // for delayed ChgLnks during an action OUString m_aPageStr; // status view, current page @@ -199,7 +198,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SwView_Impl *m_pViewImpl; // Impl-data for UNO + Basic - SwScrollbar *m_pHScrollbar, // MDI control elements *m_pVScrollbar; @@ -549,7 +547,6 @@ public: void GetState(SfxItemSet&); void StateStatusLine(SfxItemSet&); - // functions for drawing void SetDrawFuncPtr(SwDrawBase* pFuncPtr); inline SwDrawBase* GetDrawFuncPtr(/*sal_Bool bBuf = sal_False*/) const { return m_pDrawActual; } diff --git a/sw/source/ui/inc/web.hrc b/sw/source/ui/inc/web.hrc index 63540b8670cd..aef47e9d2bb1 100644 --- a/sw/source/ui/inc/web.hrc +++ b/sw/source/ui/inc/web.hrc @@ -34,7 +34,7 @@ #define RID_WEBOLE_TOOLBOX (RC_WEB_BEGIN + 11) #define STR_WRITER_WEBDOC_FULLTYPE (RC_WEB_BEGIN + 12) -// ------------------------------------------------------------------------ + #define WEB_ACT_END STR_WRITER_WEBDOC_FULLTYPE diff --git a/sw/source/ui/inc/wformsh.hxx b/sw/source/ui/inc/wformsh.hxx index 02f3d29b7a79..aac9f9f69c94 100644 --- a/sw/source/ui/inc/wformsh.hxx +++ b/sw/source/ui/inc/wformsh.hxx @@ -31,8 +31,6 @@ public: TYPEINFO(); }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wfrmsh.hxx b/sw/source/ui/inc/wfrmsh.hxx index 82ce2d384d22..68f7edcab86b 100644 --- a/sw/source/ui/inc/wfrmsh.hxx +++ b/sw/source/ui/inc/wfrmsh.hxx @@ -22,7 +22,6 @@ #include "frmsh.hxx" - class SwWebFrameShell: public SwFrameShell { @@ -36,6 +35,4 @@ public: #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wgrfsh.hxx b/sw/source/ui/inc/wgrfsh.hxx index d86341f3be5d..45682ac74554 100644 --- a/sw/source/ui/inc/wgrfsh.hxx +++ b/sw/source/ui/inc/wgrfsh.hxx @@ -31,8 +31,6 @@ public: TYPEINFO(); }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wolesh.hxx b/sw/source/ui/inc/wolesh.hxx index 5f5d6ca1ab8d..bf9dcad60718 100644 --- a/sw/source/ui/inc/wolesh.hxx +++ b/sw/source/ui/inc/wolesh.hxx @@ -32,10 +32,4 @@ public: #endif - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx index 6098865bd362..eef6332e01db 100644 --- a/sw/source/ui/inc/workctrl.hxx +++ b/sw/source/ui/inc/workctrl.hxx @@ -52,12 +52,6 @@ class SwView; #define NID_TABLE_FORMULA_ERROR 20019 #define NID_COUNT 20 - - -//---------------------------------------------------------------------------- -// -//---------------------------------------------------------------------------- - class SwTbxInsertCtrl : public SfxToolBoxControl { sal_uInt16 nLastSlotId; @@ -80,16 +74,11 @@ public: virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception); }; -//---------------------------------------------------------------------------- -// -//---------------------------------------------------------------------------- - class SwTbxAutoTextCtrl : public SfxToolBoxControl { PopupMenu* pPopup; SwView* pView; - void DelPopup(); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -111,7 +100,6 @@ class SwTbxFieldCtrl : public SfxToolBoxControl PopupMenu* pPopup; SwView* pView; - void DelPopup(); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -128,12 +116,6 @@ public: DECL_LINK(PopupHdl, PopupMenu*); }; - - -//---------------------------------------------------------------------------- -// -//---------------------------------------------------------------------------- - class SwScrollNaviToolBox : public ToolBox { virtual void MouseButtonUp( const MouseEvent& rMEvt ); @@ -171,9 +153,7 @@ public: void GrabFocus(){aToolBox.GrabFocus();} }; -//---------------------------------------------------------------------------- // ImageButtons have to set the HelpText themselves if needed -//---------------------------------------------------------------------------- class SwHlpImageButton : public ImageButton { @@ -202,6 +182,4 @@ public: }; #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx index 211bb0961095..322b0530a749 100644 --- a/sw/source/ui/inc/wrap.hxx +++ b/sw/source/ui/inc/wrap.hxx @@ -39,7 +39,6 @@ public: SwWrtShell* GetWrtShell() { return pWrtShell; } }; - /*-------------------------------------------------------------------- Description: circulation TabPage --------------------------------------------------------------------*/ @@ -115,5 +114,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index 8ec265c3773e..fbcdecaecf19 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -51,7 +51,6 @@ namespace com { namespace sun { namespace star { namespace util { struct SearchOptions; } } } } - typedef sal_Int32 SelectionType; namespace nsSelectionType { @@ -448,7 +447,6 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); // link for inserting ranges via Drag&Drop/Clipboard DECL_STATIC_LINK( SwWrtShell, InsertRegionDialog, SwSectionData* ); - // ctor, the first one is a kind of a controlled copy ctor for more views of a document SwWrtShell( SwWrtShell&, Window *pWin, SwView &rShell); SwWrtShell( SwDoc& rDoc, Window *pWin, SwView &rShell, @@ -523,7 +521,6 @@ private: lOffset(lOff) { - } } *pCrsrStack; diff --git a/sw/source/ui/inc/wtextsh.hxx b/sw/source/ui/inc/wtextsh.hxx index 79ff56e06869..3a236f7ce307 100644 --- a/sw/source/ui/inc/wtextsh.hxx +++ b/sw/source/ui/inc/wtextsh.hxx @@ -22,7 +22,6 @@ #include "textsh.hxx" - class SwWebTextShell: public SwTextShell { @@ -36,6 +35,4 @@ public: #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/zoomctrl.hxx b/sw/source/ui/inc/zoomctrl.hxx index c30af120b12c..89818fdf4f72 100644 --- a/sw/source/ui/inc/zoomctrl.hxx +++ b/sw/source/ui/inc/zoomctrl.hxx @@ -38,8 +38,6 @@ public: }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index b7e9e05ba4a6..72ed20c9dcac 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -52,7 +52,6 @@ #include <swuicnttab.hxx> #include <unomid.h> - using namespace ::com::sun::star; using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; @@ -385,7 +384,6 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( OSL_ENSURE(aFormatAccess.getValueType() == ::getCppuType((uno::Reference<container::XIndexReplace>*)0), "wrong property type"); - uno::Reference< container::XIndexReplace > xFormatAccess; aFormatAccess >>= xFormatAccess; uno::Any aLevelProp(&aSequPropVals, ::getCppuType((uno::Sequence<beans::PropertyValues>*)0)); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 5d7a07b3d5b7..a0a1823e9b54 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -163,7 +163,6 @@ class SwEntryBrowseBox : public SwEntryBrowseBox_Base long nCurrentRow; bool bModified; - void SetModified() {bModified = true;} protected: @@ -566,7 +565,6 @@ public: void setColSizes(); }; - SwIndexTreeLB::SwIndexTreeLB(SvSimpleTableContainer& rParent, WinBits nBits) : SvSimpleTable(rParent, nBits) { @@ -711,7 +709,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent, } } // now the other styles - // + const SwTxtFmtColl *pColl = 0; const sal_uInt16 nSz = rWrtSh.GetTxtFmtCollCount(); @@ -2265,7 +2263,7 @@ IMPL_LINK_NOARG(SwTOXEntryTabPage, AllLevelsHdl) OUString sNewToken = m_pTokenWIN->GetPattern(); for(sal_uInt16 i = 1; i < m_pCurrentForm->GetFormMax(); i++) m_pCurrentForm->SetPattern(i, sNewToken); - // + ModifyHdl(this); } return 0; @@ -4102,7 +4100,6 @@ sal_Bool SwEntryBrowseBox::IsModified()const if(bModified) return sal_True; - //check if the current controller is modified sal_uInt16 nCol = GetCurColumnId(); ::svt::CellController* pController; diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index 6959487a008f..a3b147289712 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -24,7 +24,6 @@ #include "index.hrc" - SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(Window* pParent, SwTOXMgr& rTOXMgr) : SvxStandardDialog(pParent, "SelectIndexDialog", "modules/swriter/ui/selectindexdialog.ui") @@ -57,7 +56,6 @@ IMPL_LINK_INLINE_START( SwMultiTOXMarkDlg, SelectHdl, ListBox *, pBox ) } IMPL_LINK_INLINE_END( SwMultiTOXMarkDlg, SelectHdl, ListBox *, pBox ) - void SwMultiTOXMarkDlg::Apply() { rMgr.SetCurTOXMark(nPos); @@ -67,9 +65,6 @@ void SwMultiTOXMarkDlg::Apply() overload dtor --------------------------------------------------*/ - SwMultiTOXMarkDlg::~SwMultiTOXMarkDlg() {} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 23e67afed334..58d415077614 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -62,7 +62,6 @@ #include <unomid.h> - #define POS_CONTENT 0 #define POS_INDEX 1 @@ -454,7 +453,6 @@ static void lcl_SelectSameStrings(SwWrtShell& rSh, sal_Bool bWordOnly, sal_Bool (FindRanges)(FND_IN_SELALL|FND_IN_BODYONLY), sal_False ); } - void SwIndexMarkPane::InsertMark() { sal_uInt16 nPos = m_pTypeDCB->GetEntryPos(m_pTypeDCB->GetSelectEntry()); @@ -1519,7 +1517,6 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, pIdentifierBox->SetSelectHdl(LINK(this, SwCreateAuthEntryDlg_Impl, IdentifierHdl)); - const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) rSh.GetFldType(RES_AUTHORITY, OUString()); if(pFType) diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx index 4336fbf2c8fe..62875171feaf 100644 --- a/sw/source/ui/index/toxmgr.cxx +++ b/sw/source/ui/index/toxmgr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <wrtsh.hxx> #include <shellres.hxx> #include <swwait.hxx> @@ -33,7 +32,6 @@ Description: handle indexes with TOXMgr --------------------------------------------------------------------*/ - SwTOXMgr::SwTOXMgr(SwWrtShell* pShell): pSh(pShell) { @@ -45,13 +43,11 @@ SwTOXMgr::SwTOXMgr(SwWrtShell* pShell): Description: handle current TOXMarks --------------------------------------------------------------------*/ - sal_uInt16 SwTOXMgr::GetTOXMarks() { return pSh->GetCurTOXMarks(aCurMarks); } - SwTOXMark* SwTOXMgr::GetTOXMark(sal_uInt16 nId) { if(!aCurMarks.empty()) @@ -59,7 +55,6 @@ SwTOXMark* SwTOXMgr::GetTOXMark(sal_uInt16 nId) return 0; } - void SwTOXMgr::DeleteTOXMark() { SwTOXMark* pNext = 0; @@ -163,7 +158,6 @@ void SwTOXMgr::InsertTOXMark(const SwTOXMarkDescription& rDesc) Description: Update of TOXMarks --------------------------------------------------------------------*/ - void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc) { OSL_ENSURE(pCurTOXMark, "no current TOXMark"); @@ -237,12 +231,10 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc) } } - /*-------------------------------------------------------------------- Description: determine UserTypeID --------------------------------------------------------------------*/ - sal_uInt16 SwTOXMgr::GetUserTypeID(const OUString& rStr) { sal_uInt16 nSize = pSh->GetTOXTypeCount(TOX_USER); @@ -261,7 +253,6 @@ sal_uInt16 SwTOXMgr::GetUserTypeID(const OUString& rStr) Description: traveling between TOXMarks --------------------------------------------------------------------*/ - void SwTOXMgr::NextTOXMark(sal_Bool bSame) { OSL_ENSURE(pCurTOXMark, "no current TOXMark"); @@ -272,7 +263,6 @@ void SwTOXMgr::NextTOXMark(sal_Bool bSame) } } - void SwTOXMgr::PrevTOXMark(sal_Bool bSame) { OSL_ENSURE(pCurTOXMark, "no current TOXMark"); @@ -425,7 +415,6 @@ sal_Bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc, break; } - OSL_ENSURE(pNewTOX, "no TOXBase created!" ); if(!pNewTOX) return sal_False; @@ -533,6 +522,4 @@ void SwTOXDescription::ApplyTo(SwTOXBase& rTOXBase) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx index 21e0aba383ed..b5d1950f24f3 100644 --- a/sw/source/ui/lingu/hhcwrp.cxx +++ b/sw/source/ui/lingu/hhcwrp.cxx @@ -55,7 +55,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::i18n; -////////////////////////////////////////////////////////////////////// // Description: Turn off frame/object shell if applicable static void lcl_ActivateTextShell( SwWrtShell & rWrtSh ) @@ -64,8 +63,6 @@ static void lcl_ActivateTextShell( SwWrtShell & rWrtSh ) rWrtSh.EnterStdMode(); } -////////////////////////////////////////////////////////////////////// - class SwKeepConversionDirectionStateContext { public: @@ -83,8 +80,6 @@ public: } }; -////////////////////////////////////////////////////////////////////// - SwHHCWrapper::SwHHCWrapper( SwView* pSwView, const uno::Reference< uno::XComponentContext >& rxContext, @@ -117,7 +112,6 @@ SwHHCWrapper::SwHHCWrapper( { } - SwHHCWrapper::~SwHHCWrapper() { delete m_pConvArgs; @@ -153,7 +147,7 @@ SwHHCWrapper::~SwHHCWrapper() //!! Note: This also effects the default language of text boxes (EditEngine/EditView) !! pDoc->SetDefault( SvxLanguageItem( nTargetLang, RES_CHRATR_CJK_LANGUAGE ) ); - // + const Font *pFont = GetTargetFont(); if (pFont) { @@ -166,7 +160,6 @@ SwHHCWrapper::~SwHHCWrapper() } } - void SwHHCWrapper::GetNextPortion( OUString& rNextPortion, LanguageType& rLangOfPortion, @@ -185,7 +178,6 @@ void SwHHCWrapper::GetNextPortion( m_nLastPos = pCrsr->Start()->nContent.GetIndex(); } - void SwHHCWrapper::SelectNewUnit_impl( sal_Int32 nUnitStart, sal_Int32 nUnitEnd ) { SwPaM *pCrsr = m_rWrtShell.GetCrsr(); @@ -203,7 +195,6 @@ void SwHHCWrapper::SelectNewUnit_impl( sal_Int32 nUnitStart, sal_Int32 nUnitEnd m_rWrtShell.EndSelect(); } - void SwHHCWrapper::HandleNewUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd ) { @@ -221,7 +212,6 @@ void SwHHCWrapper::HandleNewUnit( m_rWrtShell.EndAllAction(); } - void SwHHCWrapper::ChangeText( const OUString &rNewText, const OUString& rOrigText, const uno::Sequence< sal_Int32 > *pOffsets, @@ -331,7 +321,6 @@ void SwHHCWrapper::ChangeText( const OUString &rNewText, } } - void SwHHCWrapper::ChangeText_impl( const OUString &rNewText, bool bKeepAttributes ) { if (bKeepAttributes) @@ -376,7 +365,6 @@ void SwHHCWrapper::ChangeText_impl( const OUString &rNewText, bool bKeepAttribut } } - void SwHHCWrapper::ReplaceUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, const OUString& rOrigText, @@ -535,13 +523,11 @@ void SwHHCWrapper::ReplaceUnit( m_rWrtShell.EndAllAction(); } - bool SwHHCWrapper::HasRubySupport() const { return true; } - void SwHHCWrapper::Convert() { OSL_ENSURE( m_pConvArgs == 0, "NULL pointer expected" ); @@ -550,7 +536,6 @@ void SwHHCWrapper::Convert() SwPosition* pSttPos = pCrsr->Start(); SwPosition* pEndPos = pCrsr->End(); - if (pSttPos->nNode.GetNode().IsTxtNode() && pEndPos->nNode.GetNode().IsTxtNode()) { @@ -640,7 +625,6 @@ void SwHHCWrapper::Convert() ConvEnd_impl( m_pConvArgs ); } - bool SwHHCWrapper::ConvNext_impl( ) { //! modified version of SvxSpellWrapper::SpellNext @@ -682,7 +666,6 @@ bool SwHHCWrapper::ConvNext_impl( ) return bGoOn; } - bool SwHHCWrapper::FindConvText_impl() { //! modified version of SvxSpellWrapper::FindSpellError @@ -709,26 +692,22 @@ bool SwHHCWrapper::FindConvText_impl() return bFound; } - bool SwHHCWrapper::HasOtherCnt_impl() { return m_bIsSelection ? false : m_rWrtShell.HasOtherCnt(); } - void SwHHCWrapper::ConvStart_impl( SwConversionArgs /* [out] */ *pConversionArgs, SvxSpellArea eArea ) { SetDrawObj( SVX_SPELL_OTHER == eArea ); m_pView->SpellStart( eArea, m_bStartDone, m_bEndDone, /* [out] */ pConversionArgs ); } - void SwHHCWrapper::ConvEnd_impl( SwConversionArgs *pConversionArgs ) { m_pView->SpellEnd( pConversionArgs ); } - bool SwHHCWrapper::ConvContinue_impl( SwConversionArgs *pConversionArgs ) { bool bProgress = !m_bIsDrawObj && !m_bIsSelection; @@ -738,6 +717,4 @@ bool SwHHCWrapper::ConvContinue_impl( SwConversionArgs *pConversionArgs ) return !pConversionArgs->aConvText.isEmpty(); } -////////////////////////////////////////////////////////////////////// - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx index 1b228e5dc877..73de46c7aeb8 100644 --- a/sw/source/ui/lingu/hyp.cxx +++ b/sw/source/ui/lingu/hyp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "initui.hxx" #include "view.hxx" #include "edtwin.hxx" @@ -62,7 +61,6 @@ SwHyphWrapper::SwHyphWrapper( SwView* pVw, SetHyphen(); } - void SwHyphWrapper::SpellStart( SvxSpellArea eSpell ) { if( SVX_SPELL_OTHER == eSpell && nPageCount ) @@ -74,8 +72,6 @@ void SwHyphWrapper::SpellStart( SvxSpellArea eSpell ) pView->HyphStart( eSpell ); } - - bool SwHyphWrapper::SpellContinue() { // for automatic separation, make actions visible only at the end @@ -101,14 +97,12 @@ bool SwHyphWrapper::SpellContinue() return GetLast().is(); } - void SwHyphWrapper::SpellEnd() { PSH->HyphEnd(); SvxSpellWrapper::SpellEnd(); } - bool SwHyphWrapper::SpellMore() { PSH->Push(); @@ -117,8 +111,6 @@ bool SwHyphWrapper::SpellMore() return false; } - - void SwHyphWrapper::InsertHyphen( const sal_uInt16 nPos ) { if( nPos) @@ -129,7 +121,6 @@ void SwHyphWrapper::InsertHyphen( const sal_uInt16 nPos ) PSH->HyphIgnore(); } - SwHyphWrapper::~SwHyphWrapper() { if( nPageCount ) diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index c2591a4966ac..f5909da430d1 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -93,12 +93,10 @@ #include <com/sun/star/system/SystemShellExecute.hpp> #include <com/sun/star/frame/theUICommandDescription.hpp> - using namespace ::com::sun::star; extern void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq ); - /// @returns : the language for the selected text that is set for the /// specified attribute (script type). /// If there are more than one languages used LANGUAGE_DONTKNOW will be returned. @@ -197,7 +195,6 @@ void SwSpellPopup::fillLangPopupMenu( } } - sal_uInt16 nItemId = nLangItemIdStart; std::set< OUString >::const_iterator it; for (it = aLangItems.begin(); it != aLangItems.end(); ++it) @@ -267,7 +264,6 @@ OUString RetrieveLabelFromCommand( const OUString& aCmdURL ) return aLabel; } - SwSpellPopup::SwSpellPopup( SwWrtShell* pWrtSh, const uno::Reference< linguistic2::XSpellAlternatives > &xAlt, @@ -414,7 +410,7 @@ SwSpellPopup::SwSpellPopup( EnableItem( MN_ADD_TO_DIC_SINGLE, ((nItemId - MN_DICTIONARIES_START) == 1)?sal_True:sal_False ); //ADD NEW LANGUAGE MENU ITEM - /////////////////////////////////////////////////////////////////////////// + OUString aScriptTypesInUse( OUString::number( pWrtSh->GetScriptType() ) ); SvtLanguageTable aLanguageTable; @@ -453,14 +449,10 @@ SwSpellPopup::SwSpellPopup( SetItemImage( MN_SPELLING_DLG, rImg ); } - ////////////////////////////////////////////////////////////////////////////////// - checkRedline(); RemoveDisabledEntries( true, true ); } - - SwSpellPopup::SwSpellPopup( SwWrtShell *pWrtSh, const linguistic2::ProofreadingResult &rResult, @@ -568,7 +560,7 @@ m_aInfo16( SW_RES(IMG_INFO_16) ) EnableItem( MN_ADD_TO_DIC_SINGLE, false ); //ADD NEW LANGUAGE MENU ITEM - /////////////////////////////////////////////////////////////////////////// + OUString aScriptTypesInUse( OUString::number( pWrtSh->GetScriptType() ) ); SvtLanguageTable aLanguageTable; @@ -607,8 +599,6 @@ m_aInfo16( SW_RES(IMG_INFO_16) ) SetItemImage( MN_SPELLING_DLG, rImg ); } - ////////////////////////////////////////////////////////////////////////////////// - checkRedline(); RemoveDisabledEntries( true, true ); } diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx index 7c3de8257ec4..3a05a06b3328 100644 --- a/sw/source/ui/lingu/sdrhhcwrap.cxx +++ b/sw/source/ui/lingu/sdrhhcwrap.cxx @@ -44,8 +44,6 @@ using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////// - SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, LanguageType nSourceLanguage, LanguageType nTargetLanguage, const Font* pTargetFnt, @@ -78,7 +76,6 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, // Hack: all SdrTextObj attributes should be transferred to EditEngine pOutlView->SetBackgroundColor( Color( COL_WHITE ) ); - InsertView( pOutlView ); Point aPoint( 0, 0 ); Rectangle aRect( aPoint, aSize ); @@ -101,13 +98,11 @@ SdrHHCWrapper::~SdrHHCWrapper() delete pOutlView; } - void SdrHHCWrapper::StartTextConversion() { pOutlView->StartTextConversion( nSourceLang, nTargetLang, pTargetFont, nOptions, bIsInteractive, true ); } - bool SdrHHCWrapper::ConvertNextDocument() { bool bNextDoc = false; @@ -177,6 +172,4 @@ bool SdrHHCWrapper::ConvertNextDocument() return bNextDoc; } -////////////////////////////////////////////////////////////////////// - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/lingu/sdrhhcwrap.hxx b/sw/source/ui/lingu/sdrhhcwrap.hxx index c416124c04e1..d6befe334b44 100644 --- a/sw/source/ui/lingu/sdrhhcwrap.hxx +++ b/sw/source/ui/lingu/sdrhhcwrap.hxx @@ -25,8 +25,6 @@ class SwView; class SdrTextObj; class OutlinerView; -////////////////////////////////////////////////////////////////////// - class SdrHHCWrapper : public SdrOutliner { // modified version of SdrSpeller @@ -53,8 +51,6 @@ public: void StartTextConversion(); }; -////////////////////////////////////////////////////////////////////// - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index c242903023d1..0367f40b75a5 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -22,7 +22,6 @@ #include <svl/stritem.hxx> #include <vcl/msgbox.hxx> - #include "view.hxx" #include "basesh.hxx" #include "wrtsh.hxx" @@ -58,7 +57,6 @@ IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox ) InfoBox(this, sWarning).Execute(); } - } m_pOkBtn->Enable(!bSelEntries); // new text mark diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index f6e888b7b7ba..7c8ee93a2e22 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -68,10 +68,6 @@ IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn ) return 0; } - - - - SwEndNoteOptionPage::SwEndNoteOptionPage(Window *pParent, bool bEN, const SfxItemSet &rSet) : SfxTabPage(pParent, @@ -255,8 +251,6 @@ void SwEndNoteOptionPage::SelectNumbering(int eNum) NumCountHdl(m_pNumCountBox); } - - int SwEndNoteOptionPage::GetNumbering() const { const sal_uInt16 nPos = m_pNumCountBox->GetSelectEntryPos(); @@ -281,7 +275,6 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell ) page. In this case all kinds of numbering can be used. ------------------------------------------------------------------------*/ - IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl) { const SwFtnNum eNum = (const SwFtnNum)GetNumbering(); @@ -317,7 +310,6 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl) numbering can be used. ------------------------------------------------------------------------*/ - IMPL_LINK_NOARG_INLINE_START(SwEndNoteOptionPage, PosChapterHdl) { if ( !bPosDoc ) @@ -418,10 +410,4 @@ SfxTabPage *SwFootNoteOptionPage::Create(Window *pParent, const SfxItemSet &rSet return new SwFootNoteOptionPage( pParent, rSet ); } - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx index 34b98d15c8d1..4236067c95a8 100644 --- a/sw/source/ui/misc/glosdoc.cxx +++ b/sw/source/ui/misc/glosdoc.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <algorithm> #include <com/sun/star/container/XNamed.hpp> #include <unotools/transliterationwrapper.hxx> - #ifndef __RSC //autogen #include <tools/errinf.hxx> #endif diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx index 6614161eca54..c3776ceb852a 100644 --- a/sw/source/ui/misc/glshell.cxx +++ b/sw/source/ui/misc/glshell.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/frame/XTitle.hpp> #include <svl/eitem.hxx> diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index ad9dfc90b04f..fab6f1749104 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -66,7 +66,6 @@ class SwEndNoteOptionPage : public SfxTabPage DECL_LINK(PosChapterHdl, void *); DECL_LINK(NumCountHdl, void *); - public: SwEndNoteOptionPage( Window *pParent, bool bEndNote, const SfxItemSet &rSet ); @@ -88,8 +87,6 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index b66e726d2546..376c600fdee9 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -104,7 +104,6 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent, m_pStandardPB->SetAccessibleRelationMemberOf(m_pPositionFrame->get_label_widget()); - m_pRelativeCB->Check(); m_pAlignLB->SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl)); m_pAlign2LB->SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl)); diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx index 79162c16f8aa..abf041025090 100644 --- a/sw/source/ui/misc/numberingtypelistbox.cxx +++ b/sw/source/ui/misc/numberingtypelistbox.cxx @@ -30,7 +30,6 @@ using namespace com::sun::star; - struct SwNumberingTypeListBox_Impl { uno::Reference<text::XNumberingTypeInfo> xInfo; diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 15a0e8e39183..372b6526b2da 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -41,7 +41,6 @@ #include <globals.hrc> #include <misc.hrc> - using namespace ::com::sun::star; static sal_uInt16 aPageRg[] = { @@ -60,7 +59,6 @@ IMPL_LINK_NOARG_INLINE_START(SwFootNotePage, HeightPage) } IMPL_LINK_NOARG_INLINE_END(SwFootNotePage, HeightPage) - IMPL_LINK_NOARG_INLINE_START(SwFootNotePage, HeightMetric) { m_pMaxHeightEdit->Enable(); @@ -242,7 +240,6 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet) m_pLineColorBox->SelectEntryPos( nSelPos ); m_pLineTypeBox->SetColor( pFtnInfo->GetLineColor() ); - // position m_pLinePosBox->SelectEntryPos( static_cast< sal_uInt16 >(pFtnInfo->GetAdj()) ); diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index 9feb5670c7ee..f6ceee69026d 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -1056,7 +1056,6 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) const SwRangeRedline &rRedline = pSh->GetRedline(nPos); - /* enable again once we have redline comments in the margin sComment = rRedline.GetComment(); if ( !sComment.Len() ) @@ -1208,5 +1207,4 @@ void SwRedlineAcceptDlg::FillInfo(OUString &rExtraData) const rExtraData += ")"; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/ui/misc/swruler.cxx index 2063af43f5b2..1ba770fd6a42 100644 --- a/sw/source/ui/misc/swruler.cxx +++ b/sw/source/ui/misc/swruler.cxx @@ -62,7 +62,6 @@ void SwCommentRuler::Paint( const Rectangle& rRect ) DrawCommentControl(); } - void SwCommentRuler::DrawCommentControl() { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx index 658dbd49a0c1..de3eddb8fe3d 100644 --- a/sw/source/ui/ribbar/drawbase.cxx +++ b/sw/source/ui/ribbar/drawbase.cxx @@ -452,7 +452,7 @@ void SwDrawBase::Deactivate() } // Process keyboard events -// + // If a KeyEvent is processed then the return value is sal_True, otherwise // Sal_False. @@ -537,7 +537,7 @@ sal_Bool SwDrawBase::KeyInput(const KeyEvent& rKEvt) } // Process keyboard events -// + // If a KeyEvent is processed then the return value is sal_True, otherwise // Sal_False. diff --git a/sw/source/ui/ribbar/dselect.cxx b/sw/source/ui/ribbar/dselect.cxx index 6d21a80b19ec..91ad444ccf0b 100644 --- a/sw/source/ui/ribbar/dselect.cxx +++ b/sw/source/ui/ribbar/dselect.cxx @@ -32,7 +32,7 @@ DrawSelection::DrawSelection(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* } // Process keyboard events -// + // If a KeyEvent is processed then the return value is sal_True, otherwise // Sal_False. diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx index da6ea417948b..aa1f46ab5598 100644 --- a/sw/source/ui/ribbar/inputwin.cxx +++ b/sw/source/ui/ribbar/inputwin.cxx @@ -453,7 +453,6 @@ IMPL_LINK( SwInputWindow, SelTblCellsNotify, SwWrtShell *, pCaller ) return 0; } - void SwInputWindow::SetFormula( const OUString& rFormula, sal_Bool bDelFlag ) { OUString sEdit('='); @@ -487,7 +486,6 @@ IMPL_LINK_NOARG(SwInputWindow, ModifyHdl) return 0; } - void SwInputWindow::DelBoxCntnt() { if( bIsTable ) @@ -629,7 +627,6 @@ SwInputChild::~SwInputChild() pDispatch->Lock(sal_False); } - SfxChildWinInfo SwInputChild::GetInfo() const { SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \ diff --git a/sw/source/ui/ribbar/tblctrl.cxx b/sw/source/ui/ribbar/tblctrl.cxx index 9ee21f30bf4d..2649d74e6951 100644 --- a/sw/source/ui/ribbar/tblctrl.cxx +++ b/sw/source/ui/ribbar/tblctrl.cxx @@ -26,7 +26,6 @@ #include "swtypes.hxx" #include "tblctrl.hxx" - SFX_IMPL_TOOLBOX_CONTROL( SwTableOptimizeCtrl, SfxUInt16Item ); SwTableOptimizeCtrl::SwTableOptimizeCtrl( diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx index 055318378f1d..e90b3ab9905e 100644 --- a/sw/source/ui/ribbar/tbxanchr.cxx +++ b/sw/source/ui/ribbar/tbxanchr.cxx @@ -26,7 +26,6 @@ #include <vcl/toolbox.hxx> #include <sfx2/mnumgr.hxx> - #include "cmdid.h" #include "docsh.hxx" #include "swtypes.hxx" @@ -37,8 +36,6 @@ #include "ribbar.hrc" #include "tbxanchr.hxx" - - SFX_IMPL_TOOLBOX_CONTROL(SwTbxAnchor, SfxUInt16Item); SwTbxAnchor::SwTbxAnchor( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : @@ -117,7 +114,6 @@ void SwTbxAnchor::Click() if (nActAnchorId) aPopMenu.CheckItem(nActAnchorId); - sal_uInt16 nSlotId = aPopMenu.Execute(&GetToolBox(), aRect); GetToolBox().EndSelection(); diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index a4c2037bd5d5..e1d58875f9ba 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -136,7 +136,6 @@ SfxPopupWindowType SwTbxInsertCtrl::GetPopupWindowType() const return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK; } - void SwTbxInsertCtrl::Select( sal_Bool /*bMod1*/ ) { if( nLastSlotId ) @@ -398,7 +397,6 @@ void SwTbxFieldCtrl::DelPopup() } } - // Navigation-Popup // determine the order of the toolbox items static sal_uInt16 aNavigationInsertIds[ NAVI_ENTRIES ] = diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 3247ce98972c..d1e69591744f 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> @@ -519,14 +518,12 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) aDlgAttr.Put(aEditAttr); - aDlgAttr.Put( SvxHyphenZoneItem( false, RES_PARATR_HYPHENZONE) ); aDlgAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) ); aDlgAttr.Put( SvxFmtSplitItem( true, RES_PARATR_SPLIT ) ); aDlgAttr.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) ); aDlgAttr.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) ); - SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); @@ -1069,7 +1066,6 @@ void SwAnnotationShell::StateInsert(SfxItemSet &rSet) } } - void SwAnnotationShell::NoteExec(SfxRequest &rReq) { SwPostItMgr* pPostItMgr = rView.GetPostItMgr(); diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 7ce08aa87c2a..797f9dee8749 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sot/factory.hxx> #include <hintids.hxx> #include <svl/urihelper.hxx> @@ -137,7 +136,6 @@ static sal_uInt8 nFooterPos; SvxIMapDlgChildWindow::GetChildWindowId() )-> \ GetWindow() ) ) - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -1818,9 +1816,9 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot ) break; case FN_WRAP_ANCHOR_ONLY: aWrap.SetAnchorOnly(!aWrap.IsAnchorOnly()); - // + // keep previous wrapping - // + // switch to wrap SURROUND_PARALLEL, if previous wrap is SURROUND_NONE if ( nOldSurround != SURROUND_NONE ) { @@ -2451,7 +2449,6 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - // Table cell(s) selected? if ( rSh.IsTableMode() ) { diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/ui/shells/drawdlg.cxx index 9553699b83e1..9ba12d925938 100644 --- a/sw/source/ui/shells/drawdlg.cxx +++ b/sw/source/ui/shells/drawdlg.cxx @@ -160,7 +160,6 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq) break; } - if (pDoc->IsChanged()) GetShell().SetModified(); else diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx index 49612e5458ed..117db5a8c69e 100644 --- a/sw/source/ui/shells/drformsh.cxx +++ b/sw/source/ui/shells/drformsh.cxx @@ -55,7 +55,6 @@ #include <unomid.h> - using namespace ::com::sun::star; SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAWFORM)) @@ -64,10 +63,8 @@ SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAWFO SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX)); } - TYPEINIT1(SwDrawFormShell, SwDrawBaseShell) - void SwDrawFormShell::Execute(SfxRequest &rReq) { SwWrtShell &rSh = GetShell(); @@ -142,7 +139,6 @@ void SwDrawFormShell::Execute(SfxRequest &rReq) xPropSet->setPropertyValue( "TargetFrame", aTmp ); } - form::FormButtonType eButtonType = form::FormButtonType_URL; aTmp.setValue( &eButtonType, ::getCppuType((const form::FormButtonType*)0)); xPropSet->setPropertyValue( "ButtonType", aTmp ); diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 30d88e9b7c81..24abc785cf6e 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp> #include <comphelper/processfactory.hxx> @@ -994,7 +993,6 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet) const bool bCopy = (aSel.nStartPara != aSel.nEndPara) || (aSel.nStartPos != aSel.nEndPos); - SfxWhichIter aIter(rSet); sal_uInt16 nWhich = aIter.FirstWhich(); diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index 4b7ddb2db810..350c4f62c06a 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <i18nlangtag/lang.h> #include <svl/slstitm.hxx> diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx index f28c80e13457..8342502e12ae 100644 --- a/sw/source/ui/shells/langhelper.cxx +++ b/sw/source/ui/shells/langhelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <vcl/window.hxx> @@ -229,7 +228,6 @@ namespace SwLangHelper return bRestoreSelection; } - void SetLanguage( SwWrtShell &rWrtSh, const OUString &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet ) { SetLanguage( rWrtSh, 0 , ESelection(), rLangText, bIsForSelection, rCoreSet ); @@ -406,7 +404,6 @@ namespace SwLangHelper } } - /// @returns : the language for the selected text that is set for the /// specified attribute (script type). /// If there are more than one languages used LANGUAGE_DONTKNOW will be returned. @@ -588,7 +585,6 @@ namespace SwLangHelper return aText; } - void SelectPara( EditView &rEditView, const ESelection &rCurSel ) { ESelection aParaSel( rCurSel.nStartPara, 0, rCurSel.nStartPara, EE_TEXTPOS_ALL ); diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index 8f2935489dc6..ae32351c3db8 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -57,7 +57,6 @@ SFX_IMPL_INTERFACE(SwListShell, SwBaseShell, SW_RES(STR_SHELLNAME_LIST)) SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_NUM_TOOLBOX)); } - TYPEINIT1(SwListShell,SwBaseShell) // #i35572# Functionality of Numbering/Bullet toolbar diff --git a/sw/source/ui/shells/navsh.cxx b/sw/source/ui/shells/navsh.cxx index 012d919b8d20..c5a9199daa32 100644 --- a/sw/source/ui/shells/navsh.cxx +++ b/sw/source/ui/shells/navsh.cxx @@ -29,7 +29,6 @@ #include <unomid.h> #include "navmgr.hxx" - SFX_IMPL_INTERFACE(SwNavigationShell, SwBaseShell, SW_RES(STR_SHELLNAME_NAVIGATION)) { } diff --git a/sw/source/ui/shells/olesh.cxx b/sw/source/ui/shells/olesh.cxx index b4f32cec4a81..6014c2fd725a 100644 --- a/sw/source/ui/shells/olesh.cxx +++ b/sw/source/ui/shells/olesh.cxx @@ -33,19 +33,16 @@ #include <popup.hrc> #include <shells.hrc> - #define SwOleShell #include <sfx2/msg.hxx> #include <swslots.hxx> - SFX_IMPL_INTERFACE(SwOleShell, SwFrameShell, SW_RES(STR_SHELLNAME_OBJECT)) { SFX_POPUPMENU_REGISTRATION(SW_RES(MN_OLE_POPUPMENU)); SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_OLE_TOOLBOX)); } - SwOleShell::SwOleShell(SwView &_rView) : SwFrameShell(_rView) diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index 1fdb41990d25..ed66709a37e5 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.cxx @@ -99,7 +99,6 @@ #include <svx/xftshxy.hxx> #include <svx/grafctrl.hxx> - #include <fmtornt.hxx> #include <paratr.hxx> #include <fmtinfmt.hxx> @@ -137,6 +136,4 @@ #include <sfx2/msg.hxx> #include "swslots.hxx" - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 53b2d3a28ef6..5b60dafb9d50 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -384,14 +384,12 @@ void ItemSetToTableParam( const SfxItemSet& rSet, if(eOrient != text::HoriOrientation::NONE) ((SfxItemSet&)rSet).ClearItem( SID_ATTR_LRSPACE ); - if(pRep->HasColsChanged()) { bTabCols = true; } } - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_HEADLINE, false, &pItem)) rSh.SetRowsToRepeat( ((SfxUInt16Item*)pItem)->GetValue() ); @@ -497,7 +495,6 @@ void SwTableShell::Execute(SfxRequest &rReq) aInfo.SetTable( true ); aInfo.SetValid( VALID_DISABLE, false ); - // The attributes of all lines will be read and the strongest wins. const SvxBorderLine* pBorderLine; SvxBorderLine aBorderLine; diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx index 394855361d36..fcc12affcb9c 100644 --- a/sw/source/ui/shells/textdrw.cxx +++ b/sw/source/ui/shells/textdrw.cxx @@ -79,7 +79,6 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, uno::Reference< beans::XPropertySet > xPropSet(xControlModel, uno::UNO_QUERY); - uno::Any aTmp; aTmp <<= OUString(rTxt); @@ -99,7 +98,6 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, xPropSet->setPropertyValue( "TargetFrame", aTmp ); } - form::FormButtonType eButtonType = form::FormButtonType_URL; aTmp.setValue( &eButtonType, ::getCppuType((const form::FormButtonType*)0)); xPropSet->setPropertyValue( "ButtonType", aTmp ); diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 2c3c5e8734b3..5b336ff25aee 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <crsskip.hxx> #include <hintids.hxx> diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx index 2b8b4197bf57..05d9fc295c67 100644 --- a/sw/source/ui/shells/textidx.cxx +++ b/sw/source/ui/shells/textidx.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <vcl/msgbox.hxx> #include <sfx2/request.hxx> @@ -235,7 +234,6 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet) rSet.Put(SfxBoolItem(FN_INSERT_IDX_ENTRY_DLG, 0 != pIdxMrk)); - SwField* pField = rSh.GetCurFld(); if(bInReadonly) diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 20107080d00d..7cbe020572f3 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -1568,7 +1568,6 @@ void SwTextShell::GetState( SfxItemSet &rSet ) } break; - case FN_INSERT_BREAK: if ( rSh.HasReadonlySel() && !rSh.CrsrInsideInputFld() ) @@ -1577,7 +1576,6 @@ void SwTextShell::GetState( SfxItemSet &rSet ) } break; - case FN_INSERT_BREAK_DLG: case FN_INSERT_COLUMN_BREAK: case FN_INSERT_PAGEBREAK: diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index 0c1df19d6d21..47d7e9312acb 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -58,9 +58,6 @@ const sal_uInt32 nFontInc = 40; // 2pt const sal_uInt32 nFontMaxSz = 19998; // 999.9pt - - - void SwTextShell::ExecCharAttr(SfxRequest &rReq) { SwWrtShell &rSh = GetShell(); @@ -76,7 +73,6 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq) Get( nWhich )).GetValue() ? STATE_ON : STATE_OFF; } - SfxItemSet aSet( GetPool(), RES_CHRATR_BEGIN, RES_CHRATR_END-1 ); if (STATE_TOGGLE == eState) rSh.GetCurAttr( aSet ); @@ -168,7 +164,6 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq) } } - void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq) { sal_uInt16 nSlot = rReq.GetSlot(); @@ -492,8 +487,6 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq) } } - - void SwTextShell::GetAttrState(SfxItemSet &rSet) { SwWrtShell &rSh = GetShell(); diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index 551814569ad1..bffbfc2c3583 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -293,7 +293,6 @@ void SwTextShell::ExecSetNumber(SfxRequest &rReq) } } - switch(rReq.GetSlot()) { case FN_SVX_SET_NUMBER: diff --git a/sw/source/ui/sidebar/PageColumnControl.cxx b/sw/source/ui/sidebar/PageColumnControl.cxx index 3c148c0b87ec..f2a5f3857bee 100644 --- a/sw/source/ui/sidebar/PageColumnControl.cxx +++ b/sw/source/ui/sidebar/PageColumnControl.cxx @@ -75,13 +75,11 @@ PageColumnControl::PageColumnControl( FreeResource(); } - PageColumnControl::~PageColumnControl(void) { delete mpColumnValueSet; } - IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl) { mpColumnValueSet->SetNoSelection(); @@ -107,7 +105,6 @@ IMPL_LINK(PageColumnControl, MoreButtonClickHdl_Impl, void *, EMPTYARG) return 0; } - } } // end of namespace sw::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/sidebar/PageColumnControl.hxx b/sw/source/ui/sidebar/PageColumnControl.hxx index caa3836419c2..875bea370fd7 100644 --- a/sw/source/ui/sidebar/PageColumnControl.hxx +++ b/sw/source/ui/sidebar/PageColumnControl.hxx @@ -34,7 +34,6 @@ namespace sw { namespace sidebar { class PagePropertyPanel; - class PageColumnControl : public ::svx::sidebar::PopupControl { diff --git a/sw/source/ui/sidebar/PageMarginControl.cxx b/sw/source/ui/sidebar/PageMarginControl.cxx index 2d33467de0d8..717a18554f9c 100644 --- a/sw/source/ui/sidebar/PageMarginControl.cxx +++ b/sw/source/ui/sidebar/PageMarginControl.cxx @@ -32,7 +32,6 @@ #define SWPAGE_DOWN_GVALUE "Sw_Page_Down" #define SWPAGE_MIRROR_GVALUE "Sw_Page_Mirrored" - namespace sw { namespace sidebar { PageMarginControl::PageMarginControl( @@ -128,7 +127,6 @@ PageMarginControl::PageMarginControl( FreeResource(); } - PageMarginControl::~PageMarginControl(void) { delete mpMarginValueSet; @@ -136,7 +134,6 @@ PageMarginControl::~PageMarginControl(void) StoreUserCustomValues(); } - void PageMarginControl::SetMetricFieldMaxValues( const Size aPageSize ) { const long nML = maLeftMarginEdit.Denormalize( maLeftMarginEdit.GetValue(FUNIT_TWIP) ); @@ -164,7 +161,6 @@ void PageMarginControl::SetMetricFieldMaxValues( const Size aPageSize ) maBottomMarginEdit.SetMax(maTopMarginEdit.Normalize(nMax), FUNIT_TWIP); } - void PageMarginControl::FillValueSet( const bool bLandscape, const bool bUserCustomValuesAvailable ) @@ -259,7 +255,6 @@ void PageMarginControl::FillValueSet( SW_RESSTR(STR_LCVALUE), &aHelpText ); } - void PageMarginControl::SelectValueSetItem() { const long cTolerance = 5; @@ -305,7 +300,6 @@ void PageMarginControl::SelectValueSetItem() mpMarginValueSet->StartSelection(); }; - IMPL_LINK(PageMarginControl, ImplMarginHdl, void *, pControl) { if ( pControl == mpMarginValueSet ) @@ -385,7 +379,6 @@ IMPL_LINK(PageMarginControl, ImplMarginHdl, void *, pControl) return 0; } - IMPL_LINK( PageMarginControl, ModifyLRMarginHdl, MetricField *, EMPTYARG ) { mpMarginValueSet->SetNoSelection(); @@ -414,7 +407,6 @@ IMPL_LINK( PageMarginControl, ModifyULMarginHdl, MetricField *, EMPTYARG ) return 0; } - bool PageMarginControl::GetUserCustomValues() { bool bUserCustomValuesAvailable = false; @@ -517,7 +509,6 @@ void PageMarginControl::StoreUserCustomValues() aWinOpt5.SetUserData( aSeq ); } - } } // end of namespace sw::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/sidebar/PageMarginControl.hxx b/sw/source/ui/sidebar/PageMarginControl.hxx index 60d5666b7177..f32e8846329c 100644 --- a/sw/source/ui/sidebar/PageMarginControl.hxx +++ b/sw/source/ui/sidebar/PageMarginControl.hxx @@ -36,7 +36,6 @@ #define SWPAGE_WIDE_VALUE2 2880 #define SWPAGE_WIDE_VALUE3 1800 - namespace svx { namespace sidebar { class ValueSetWithTextControl; } } @@ -47,7 +46,6 @@ namespace sw { namespace sidebar { class PagePropertyPanel; - class PageMarginControl : public ::svx::sidebar::PopupControl { diff --git a/sw/source/ui/sidebar/PageOrientationControl.cxx b/sw/source/ui/sidebar/PageOrientationControl.cxx index 27eb8a9be3af..2dbf8bf8762a 100644 --- a/sw/source/ui/sidebar/PageOrientationControl.cxx +++ b/sw/source/ui/sidebar/PageOrientationControl.cxx @@ -61,13 +61,11 @@ PageOrientationControl::PageOrientationControl( FreeResource(); } - PageOrientationControl::~PageOrientationControl(void) { delete mpOrientationValueSet; } - IMPL_LINK(PageOrientationControl, ImplOrientationHdl, void *, pControl) { mpOrientationValueSet->SetNoSelection(); @@ -87,7 +85,6 @@ IMPL_LINK(PageOrientationControl, ImplOrientationHdl, void *, pControl) return 0; } - } } // end of namespace sw::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/sidebar/PageOrientationControl.hxx b/sw/source/ui/sidebar/PageOrientationControl.hxx index a9a9b5e6b883..a4cfe4249376 100644 --- a/sw/source/ui/sidebar/PageOrientationControl.hxx +++ b/sw/source/ui/sidebar/PageOrientationControl.hxx @@ -29,7 +29,6 @@ namespace sw { namespace sidebar { class PagePropertyPanel; - class PageOrientationControl : public ::svx::sidebar::PopupControl { diff --git a/sw/source/ui/sidebar/PagePropertyPanel.cxx b/sw/source/ui/sidebar/PagePropertyPanel.cxx index 23d5a95066fc..156a1cb03429 100644 --- a/sw/source/ui/sidebar/PagePropertyPanel.cxx +++ b/sw/source/ui/sidebar/PagePropertyPanel.cxx @@ -77,7 +77,6 @@ namespace { } } - namespace sw { namespace sidebar { PagePropertyPanel* PagePropertyPanel::Create ( @@ -263,13 +262,11 @@ void PagePropertyPanel::Initialize() mpBindings->Update( SID_ATTR_PAGE_SIZE ); } - ::svx::sidebar::PopupControl* PagePropertyPanel::CreatePageOrientationControl( ::svx::sidebar::PopupContainer* pParent ) { return new PageOrientationControl( pParent, *this , mpPageItem->IsLandscape() ); } - IMPL_LINK( PagePropertyPanel, ClickOrientationHdl, ToolBox*, pToolBox ) { maOrientationPopup.Show( *pToolBox ); @@ -277,7 +274,6 @@ IMPL_LINK( PagePropertyPanel, ClickOrientationHdl, ToolBox*, pToolBox ) return 0L; } - void PagePropertyPanel::ExecuteOrientationChange( const sal_Bool bLandscape ) { StartUndo(); @@ -336,15 +332,11 @@ void PagePropertyPanel::ExecuteOrientationChange( const sal_Bool bLandscape ) EndUndo(); } - void PagePropertyPanel::ClosePageOrientationPopup() { maOrientationPopup.Hide(); } - - - ::svx::sidebar::PopupControl* PagePropertyPanel::CreatePageMarginControl( ::svx::sidebar::PopupContainer* pParent ) { return new PageMarginControl( @@ -359,7 +351,6 @@ void PagePropertyPanel::ClosePageOrientationPopup() meUnit ); } - void PagePropertyPanel::ExecuteMarginLRChange( const long nPageLeftMargin, const long nPageRightMargin ) @@ -378,14 +369,12 @@ void PagePropertyPanel::ExecuteMarginULChange( GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE_ULSPACE, SFX_CALLMODE_RECORD, mpPageULMarginItem.get(), 0L ); } - void PagePropertyPanel::ExecutePageLayoutChange( const bool bMirrored ) { mpPageItem->SetPageUsage( bMirrored ? SVX_PAGE_MIRROR : SVX_PAGE_ALL ); GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE, SFX_CALLMODE_RECORD, mpPageItem.get(), 0L ); } - IMPL_LINK( PagePropertyPanel, ClickMarginHdl, ToolBox*, pToolBox ) { maMarginPopup.Show( *pToolBox ); @@ -393,15 +382,11 @@ IMPL_LINK( PagePropertyPanel, ClickMarginHdl, ToolBox*, pToolBox ) return 0L; } - void PagePropertyPanel::ClosePageMarginPopup() { maMarginPopup.Hide(); } - - - ::svx::sidebar::PopupControl* PagePropertyPanel::CreatePageSizeControl( ::svx::sidebar::PopupContainer* pParent ) { return new PageSizeControl( @@ -412,7 +397,6 @@ void PagePropertyPanel::ClosePageMarginPopup() meFUnit ); } - void PagePropertyPanel::ExecuteSizeChange( const Paper ePaper ) { Size aPageSize = SvxPaperInfo::GetPaperSize( ePaper, (MapUnit)(meUnit) ); @@ -425,7 +409,6 @@ void PagePropertyPanel::ExecuteSizeChange( const Paper ePaper ) mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_SIZE, SFX_CALLMODE_RECORD, mpPageSizeItem.get(), 0L ); } - IMPL_LINK( PagePropertyPanel, ClickSizeHdl, ToolBox*, pToolBox ) { maSizePopup.Show( *pToolBox ); @@ -433,15 +416,11 @@ IMPL_LINK( PagePropertyPanel, ClickSizeHdl, ToolBox*, pToolBox ) return 0L; } - void PagePropertyPanel::ClosePageSizePopup() { maSizePopup.Hide(); } - - - ::svx::sidebar::PopupControl* PagePropertyPanel::CreatePageColumnControl( ::svx::sidebar::PopupContainer* pParent ) { return new PageColumnControl( @@ -451,14 +430,12 @@ void PagePropertyPanel::ClosePageSizePopup() mpPageItem->IsLandscape() ); } - void PagePropertyPanel::ExecuteColumnChange( const sal_uInt16 nColumnType ) { mpPageColumnTypeItem->SetValue( nColumnType ); mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_COLUMN, SFX_CALLMODE_RECORD, mpPageColumnTypeItem.get(), 0L ); } - IMPL_LINK( PagePropertyPanel, ClickColumnHdl, ToolBox*, pToolBox ) { maColumnPopup.Show( *pToolBox ); @@ -466,15 +443,11 @@ IMPL_LINK( PagePropertyPanel, ClickColumnHdl, ToolBox*, pToolBox ) return 0L; } - void PagePropertyPanel::ClosePageColumnPopup() { maColumnPopup.Hide(); } - - - void PagePropertyPanel::NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, @@ -551,7 +524,6 @@ void PagePropertyPanel::NotifyItemUpdate( } } - void PagePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem* pState ) { meFUnit = FUNIT_NONE; @@ -582,9 +554,6 @@ void PagePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem* pSt } } - - - void PagePropertyPanel::ChangeMarginImage() { if ( mpPageLRMarginItem.get() == 0 || @@ -629,7 +598,6 @@ void PagePropertyPanel::ChangeMarginImage() mpToolBoxMargin->SetItemImage( nIdMargin, mpPageItem->IsLandscape() ? mImgMarginCustom_L : mImgMarginCustom ); } - void PagePropertyPanel::ChangeSizeImage() { if ( mpPageSizeItem.get() == 0 || @@ -693,7 +661,6 @@ void PagePropertyPanel::ChangeSizeImage() } } - void PagePropertyPanel::ChangeColumnImage( const sal_uInt16 nColumnType ) { if ( mpPageItem.get() == 0 ) @@ -750,7 +717,6 @@ void PagePropertyPanel::ChangeColumnImage( const sal_uInt16 nColumnType ) } } - void PagePropertyPanel::StartUndo() { if ( mxUndoManager.is() ) @@ -759,7 +725,6 @@ void PagePropertyPanel::StartUndo() } } - void PagePropertyPanel::EndUndo() { if ( mxUndoManager.is() ) diff --git a/sw/source/ui/sidebar/PagePropertyPanel.hrc b/sw/source/ui/sidebar/PagePropertyPanel.hrc index f7bc210275ad..0f827f0d84fe 100644 --- a/sw/source/ui/sidebar/PagePropertyPanel.hrc +++ b/sw/source/ui/sidebar/PagePropertyPanel.hrc @@ -130,7 +130,7 @@ #define FLD_BOTTOM_MARGIN 116 #define IMG_CUSTOM_DIS 121 -// + #define STR_MARGIN_TOOLTIP_LEFT 122 #define STR_MARGIN_TOOLTIP_RIGHT 123 #define STR_MARGIN_TOOLTIP_INNER 124 diff --git a/sw/source/ui/sidebar/PagePropertyPanel.hxx b/sw/source/ui/sidebar/PagePropertyPanel.hxx index b457a438c5e5..d7b6e57153e0 100644 --- a/sw/source/ui/sidebar/PagePropertyPanel.hxx +++ b/sw/source/ui/sidebar/PagePropertyPanel.hxx @@ -73,7 +73,6 @@ namespace sw { namespace sidebar { return mpBindings; } - ::svx::sidebar::PopupControl* CreatePageOrientationControl( ::svx::sidebar::PopupContainer* pParent ); void ExecuteOrientationChange( const sal_Bool bLandscape ); void ClosePageOrientationPopup(); diff --git a/sw/source/ui/sidebar/PageSizeControl.cxx b/sw/source/ui/sidebar/PageSizeControl.cxx index 4a21d344dd09..038e033235f2 100644 --- a/sw/source/ui/sidebar/PageSizeControl.cxx +++ b/sw/source/ui/sidebar/PageSizeControl.cxx @@ -141,13 +141,11 @@ PageSizeControl::PageSizeControl( FreeResource(); } - PageSizeControl::~PageSizeControl(void) { delete mpSizeValueSet; } - IMPL_LINK(PageSizeControl, ImplSizeHdl, void *, pControl) { mpSizeValueSet->SetNoSelection(); @@ -174,7 +172,6 @@ IMPL_LINK(PageSizeControl, MoreButtonClickHdl_Impl, void *, EMPTYARG) return 0; } - } } // end of namespace sw::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/sidebar/PageSizeControl.hxx b/sw/source/ui/sidebar/PageSizeControl.hxx index 09cc12166a61..e1f0313a3649 100644 --- a/sw/source/ui/sidebar/PageSizeControl.hxx +++ b/sw/source/ui/sidebar/PageSizeControl.hxx @@ -37,7 +37,6 @@ namespace sw { namespace sidebar { class PagePropertyPanel; - class PageSizeControl : public ::svx::sidebar::PopupControl { diff --git a/sw/source/ui/sidebar/SwPanelFactory.cxx b/sw/source/ui/sidebar/SwPanelFactory.cxx index 258ea5d7f7e1..18220cdbdf80 100644 --- a/sw/source/ui/sidebar/SwPanelFactory.cxx +++ b/sw/source/ui/sidebar/SwPanelFactory.cxx @@ -68,12 +68,10 @@ SwPanelFactory::SwPanelFactory (void) { } - SwPanelFactory::~SwPanelFactory (void) { } - Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement ( const ::rtl::OUString& rsResourceURL, const ::cssu::Sequence<css::beans::PropertyValue>& rArguments) diff --git a/sw/source/ui/sidebar/WrapPropertyPanel.cxx b/sw/source/ui/sidebar/WrapPropertyPanel.cxx index 490a748300ee..6d4e8526f6fc 100644 --- a/sw/source/ui/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/ui/sidebar/WrapPropertyPanel.cxx @@ -60,7 +60,6 @@ WrapPropertyPanel* WrapPropertyPanel::Create ( pBindings); } - WrapPropertyPanel::WrapPropertyPanel( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, @@ -88,12 +87,10 @@ WrapPropertyPanel::WrapPropertyPanel( Initialize(); } - WrapPropertyPanel::~WrapPropertyPanel() { } - void WrapPropertyPanel::Initialize() { Link aLink = LINK(this, WrapPropertyPanel, WrapTypeHdl); @@ -147,7 +144,6 @@ void WrapPropertyPanel::Initialize() mpBindings->Update( FN_FRAME_WRAP_IDEAL ); } - IMPL_LINK(WrapPropertyPanel, WrapTypeHdl, void *, EMPTYARG) { sal_uInt16 nSlot = 0; @@ -181,7 +177,6 @@ IMPL_LINK(WrapPropertyPanel, WrapTypeHdl, void *, EMPTYARG) return 0; } - void WrapPropertyPanel::NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index d0b4ed317a00..1b956dd04582 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -567,7 +567,6 @@ void SwFormatTablePage::Reset( const SfxItemSet& ) } - void SwFormatTablePage::ActivatePage( const SfxItemSet& rSet ) { OSL_ENSURE(pTblData, "table data not available?"); @@ -615,7 +614,6 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) SwTwips lLeft = static_cast< SwTwips >(m_aLeftMF.DenormalizePercent(m_aLeftMF.GetValue( FUNIT_TWIP ))); SwTwips lRight = static_cast< SwTwips >(m_aRightMF.DenormalizePercent(m_aRightMF.GetValue( FUNIT_TWIP ))); - if( m_aLeftMF.GetText() != m_aLeftMF.GetSavedValue() || m_aRightMF.GetText() != m_aRightMF.GetSavedValue() ) { @@ -755,14 +753,12 @@ SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet) { }; - SfxTabPage* SwTableColumnPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwTableColumnPage( pParent, rAttrSet ); }; - void SwTableColumnPage::Reset( const SfxItemSet& ) { const SfxItemSet& rSet = GetItemSet(); @@ -911,7 +907,6 @@ IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox ) return 0; }; - sal_Bool SwTableColumnPage::FillItemSet( SfxItemSet& ) { for( sal_uInt16 i = 0; i < MET_FIELDS; i++ ) @@ -1350,11 +1345,9 @@ sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) if(TriState(m_pSplitRowCB->IsChecked()) != m_pSplitRowCB->GetSavedValue()) bModified |= 0 != rSet.Put( SwFmtRowSplit( m_pSplitRowCB->IsChecked())); - const SvxFmtBreakItem* pBreak = (const SvxFmtBreakItem*)GetOldItem( rSet, RES_BREAK ); const SwFmtPageDesc* pDesc = (const SwFmtPageDesc*) GetOldItem( rSet, RES_PAGEDESC ); - sal_Bool bState = m_pPageCollCB->IsChecked(); //If we have a page style, then there's no break diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx index 24b6ee83d238..17a708c7b3e3 100644 --- a/sw/source/ui/table/tablepg.hxx +++ b/sw/source/ui/table/tablepg.hxx @@ -169,7 +169,6 @@ class SwTextFlowPage : public SfxTabPage sal_Bool bPageBreak; sal_Bool bHtmlMode; - DECL_LINK(PageBreakHdl_Impl, void *); DECL_LINK(ApplyCollClickHdl_Impl, void *); DECL_LINK( PageBreakPosHdl_Impl, RadioButton* ); @@ -178,7 +177,6 @@ class SwTextFlowPage : public SfxTabPage DECL_LINK( SplitRowHdl_Impl, TriStateBox* ); DECL_LINK( HeadLineCBClickHdl, void* p = 0 ); - SwTextFlowPage( Window* pParent, const SfxItemSet& rSet ); ~SwTextFlowPage(); diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 680cc726d5a5..4ef7254dafdb 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -112,7 +112,6 @@ private: Edit* m_pEdInput; // Edit obtains the focus. }; - SwStringInputDlg::SwStringInputDlg(Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault) : ModalDialog(pParent, "StringInputDialog", "modules/swriter/ui/stringinput.ui") @@ -129,7 +128,6 @@ OUString SwStringInputDlg::GetInputString() const return m_pEdInput->GetText(); } - SwStringInputDlg::~SwStringInputDlg() { } @@ -251,7 +249,6 @@ void SwAutoFormatDlg::FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const delete rToFill, rToFill = 0; } - // Handler: IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn ) diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx index 1ac159852224..b6dd3f5167c6 100644 --- a/sw/source/ui/uiview/formatclipboard.cxx +++ b/sw/source/ui/uiview/formatclipboard.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "formatclipboard.hxx" - #include <svx/svxids.hrc> #include <cmdid.h> #include <charfmt.hxx> diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index e2dd9dbfa500..50aa5e1bd92a 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/objface.hxx> #include <vcl/timer.hxx> #include <vcl/field.hxx> @@ -1105,7 +1104,6 @@ void SwPagePreview::Init(const SwViewOption * pPrefs) SwEditShell* pESh = (SwEditShell*)GetViewShell(); sal_Bool bIsModified = pESh->IsModified(); - SwViewOption aOpt( *pPrefs ); aOpt.SetPagePreview(sal_True); aOpt.SetTab( sal_False ); diff --git a/sw/source/ui/uiview/scroll.cxx b/sw/source/ui/uiview/scroll.cxx index 176ba6f18965..92ba2e43060a 100644 --- a/sw/source/ui/uiview/scroll.cxx +++ b/sw/source/ui/uiview/scroll.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "swtypes.hxx" #include "swrect.hxx" #include "scroll.hxx" #define SCROLL_LINE_SIZE 250 - SwScrollbar::SwScrollbar( Window *pWin, sal_Bool bHoriz ) : ScrollBar( pWin, WinBits( WB_3DLOOK | WB_HIDE | ( bHoriz ? WB_HSCROLL : WB_VSCROLL) ) ), @@ -38,7 +36,6 @@ SwScrollbar::SwScrollbar( Window *pWin, sal_Bool bHoriz ) : EnableRTL( false ); } - SwScrollbar::~SwScrollbar() {} // Will be called after a change of the document size diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index a2b0660e8780..c31d1111c41d 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <com/sun/star/util/SearchOptions.hpp> #include <com/sun/star/util/SearchFlags.hpp> @@ -96,7 +95,6 @@ using namespace ::com::sun::star::ui::dialogs; using namespace ::sfx2; using ::com::sun::star::util::SearchOptions; - #define SWSRCVIEWFLAGS ( SFX_VIEW_CAN_PRINT|\ SFX_VIEW_NO_NEWWINDOW ) @@ -153,7 +151,6 @@ static void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt1 Point( nXLeft, nYTop ), Size( nXRight-nXLeft, aSz.Height() - nYTop - BMARGPRN + nBorder ) ) ); - long nY = TMARGPRN-2*nBorder; Point aPos( nLeftMargin, nY ); rOutDev.DrawText( aPos, rTitle ); @@ -170,7 +167,6 @@ static void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt1 rOutDev.DrawText( aPos, aPageStr ); } - nY = TMARGPRN-nBorder; rOutDev.DrawLine( Point( nXLeft, nY ), Point( nXRight, nY ) ); @@ -626,7 +622,6 @@ sal_uInt16 SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, bNotFoundMessage = true; } - if(!bApi) { if(bNotFoundMessage) @@ -857,7 +852,6 @@ void SwSrcView::Load(SwDocShell* pDocShell) pInStream->Seek(0); pInStream->SetStreamCharSet( eDestEnc ); - aEditWin.Read(*pInStream); } } @@ -876,5 +870,4 @@ void SwSrcView::Load(SwDocShell* pDocShell) aEditWin.GetOutWin()->GrabFocus(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx index 3c0f75f0447d..6c6c1911d74e 100644 --- a/sw/source/ui/uiview/uivwimp.cxx +++ b/sw/source/ui/uiview/uivwimp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cmdid.h> #include "globals.hrc" @@ -303,5 +302,4 @@ void SwClipboardChangeListener::AddRemoveListener( sal_Bool bAdd ) pView->AddRemoveClipboardListener( Reference< XClipboardListener >( this ), bAdd ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 23c6b18d8c1a..868ae5d5e18b 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -224,10 +224,8 @@ IMPL_LINK_NOARG(SwView, FormControlActivated) void SwView::SelectShell() { - // Attention: Maintain the SelectShell for the WebView additionally - if(m_bInDtor) return; // Decision if the UpdateTable has to be called diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index aa10ea327808..5363d04bebf9 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hintids.hxx" #include <vcl/graph.hxx> #include <svx/galbrws.hxx> @@ -436,7 +435,6 @@ void SwView::ExecViewOptions(SfxRequest &rReq) pOpt->SetSmoothScroll( bFlag ); break; - case FN_VLINEAL: if( STATE_TOGGLE == eState ) bFlag = !pOpt->IsViewVRuler(); diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx index b7eb3654678d..40e001c6fa4f 100644 --- a/sw/source/ui/uiview/view1.cxx +++ b/sw/source/ui/uiview/view1.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <svx/ruler.hxx> diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 58a25d8d8ff7..9133455ca429 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -315,7 +315,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq ) } // pool formats - // + const ::std::vector<OUString>& rFrmPoolArr( SwStyleNameMapper::GetFrmFmtUINameArray()); for( i = 0; i < rFrmPoolArr.size(); ++i ) @@ -690,7 +690,7 @@ void SwView::Execute(SfxRequest &rReq) // FN_REDLINE_PREV_CHANGE leaves the selection point at the start of the redline. // In such cases, SelNextRedline (which starts searching from the selection point) // immediately finds the current redline and advances the selection point to its end. - // + // This behavior means that PREV_CHANGE followed by NEXT_CHANGE would not change // the current redline, so we detect it and select the next redline again. if (pCurrent && pCurrent == pNext) @@ -713,7 +713,7 @@ void SwView::Execute(SfxRequest &rReq) // In such cases, SelPrevRedline (which starts searching from the selection point) // immediately finds the current redline and advances the selection point to its // start. - // + // This behavior means that NEXT_CHANGE followed by PREV_CHANGE would not change // the current redline, so we detect it and move to the previous redline again. if (initialCursorStart == *pPrev->Start()) @@ -1232,7 +1232,6 @@ void SwView::Execute(SfxRequest &rReq) } break; - default: OSL_ENSURE(!this, "wrong dispatcher"); return; diff --git a/sw/source/ui/uiview/viewcoll.cxx b/sw/source/ui/uiview/viewcoll.cxx index be4cbf3b2b2e..1c87105ba737 100644 --- a/sw/source/ui/uiview/viewcoll.cxx +++ b/sw/source/ui/uiview/viewcoll.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "cmdid.h" #include "uiitems.hxx" #include <vcl/window.hxx> @@ -78,6 +77,4 @@ void SwView::ExecColl(SfxRequest &rReq) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uiview/viewdlg2.cxx b/sw/source/ui/uiview/viewdlg2.cxx index b029a9bcef61..af466021ead5 100644 --- a/sw/source/ui/uiview/viewdlg2.cxx +++ b/sw/source/ui/uiview/viewdlg2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objface.hxx> diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx index b0aa5335ecda..0e9849c797c4 100644 --- a/sw/source/ui/uiview/viewdraw.cxx +++ b/sw/source/ui/uiview/viewdraw.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hintids.hxx" #include <svl/aeitem.hxx> #include <svl/itempool.hxx> diff --git a/sw/source/ui/uiview/viewfunc.hxx b/sw/source/ui/uiview/viewfunc.hxx index e2eb9c32c396..6036509db172 100644 --- a/sw/source/ui/uiview/viewfunc.hxx +++ b/sw/source/ui/uiview/viewfunc.hxx @@ -48,7 +48,6 @@ void ViewResizePixel( const Window &rRef, SvxRuler* pHRuler = 0, sal_Bool bVRulerRight = sal_False ); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index da993813e2d4..45b2f12d5fb9 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -447,7 +447,6 @@ void SwView::HyphenateDocument() Reference< XLinguProperties > xProp( ::GetLinguPropertySet() ); - m_pWrtShell->StartUndo(UNDO_INSATTR); // valid later sal_Bool bHyphSpecial = xProp.is() ? xProp->getIsHyphSpecial() : sal_False; @@ -735,7 +734,6 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) uno::Sequence< beans::PropertyValue > aArgs; xDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 ); - if (xDispatch.is()) { // Execute dispatch asynchronously @@ -777,7 +775,6 @@ sal_Bool SwView::ExecSmartTagPopup( const Point& rPt ) m_pWrtShell->LockView( sal_True ); m_pWrtShell->Push(); - // get word that was clicked on // This data structure maps a smart tag type string to the property bag SwRect aToFill; diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index 57c62941973f..4ff2f9443fea 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string> #include "hintids.hxx" diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index e428ac7173a7..119e03e05d91 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -163,7 +163,6 @@ void SwView::DocSzChgd(const Size &rSz) extern int bDocSzUpdated; - m_aDocSz = rSz; if( !m_pWrtShell || m_aVisArea.IsEmpty() ) // no shell -> no change @@ -340,9 +339,9 @@ void SwView::CheckVisArea() } /// Calculate the visible range. -// + // OUT Point *pPt: new position of the visible area -// + // IN Rectangle &rRect: Rectangle, which should be located // within the new visible area. // sal_uInt16 nRange optional accurate indication of the diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index d51956b4e98e..5a1e30fd6d69 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string> #include <boost/scoped_ptr.hpp> @@ -438,7 +437,6 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage) } } - sal_Bool SwView::SearchAndWrap(sal_Bool bApi) { SwSearchOptions aOpts( m_pWrtShell, m_pSrchItem->GetBackward() ); @@ -533,7 +531,6 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi) return m_bFound; } - sal_Bool SwView::SearchAll(sal_uInt16* pFound) { SwWait aWait( *GetDocShell(), true ); @@ -561,7 +558,6 @@ sal_Bool SwView::SearchAll(sal_uInt16* pFound) return m_bFound; } - void SwView::Replace() { SwWait aWait( *GetDocShell(), true ); @@ -716,9 +712,8 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions& rOptions ) DELETEZ( pReplSet ); // the attributes } - // // build SearchOptions to be used - // + SearchOptions aSearchOpt( m_pSrchItem->GetSearchOptions() ); aSearchOpt.Locale = GetAppLanguageTag().getLocale(); if( !bDoReplace ) diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx index e32db0bb3049..6314f4784007 100644 --- a/sw/source/ui/uiview/viewstat.cxx +++ b/sw/source/ui/uiview/viewstat.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <com/sun/star/linguistic2/XThesaurus.hpp> #include <com/sun/star/uno/Sequence.hxx> diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index 18893ed2d300..e0bc61098195 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -1839,7 +1839,6 @@ void SwView::StateTabWin(SfxItemSet& rSet) // Right is only the margin now. aRectangle.Right() = 0; - } } else if ( ((nFrmType & FRMTYPE_TABLE) || IsTabColFromDoc()) && diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index 068b27a64fa2..48f68dbe6dfd 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <osl/mutex.hxx> #include <sfx2/sfxbasecontroller.hxx> #include <SwXDocumentSettings.hxx> @@ -45,7 +44,6 @@ #include "cfgitems.hxx" #include "prtopt.hxx" - using namespace comphelper; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -278,7 +276,7 @@ uno::Sequence< uno::Type > SAL_CALL SwXDocumentSettings::getTypes( ) pBaseTypes[0] = ::getCppuType((Reference< XPropertySet >*)0); pBaseTypes[1] = ::getCppuType((Reference< XPropertyState >*)0); pBaseTypes[2] = ::getCppuType((Reference< XMultiPropertySet >*)0); - // + pBaseTypes[3] = ::getCppuType((Reference< XServiceInfo >*)0); pBaseTypes[4] = ::getCppuType((Reference< XTypeProvider >*)0); @@ -306,7 +304,6 @@ void SwXDocumentSettings::_preSetValues () throw UnknownPropertyException(); } - void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, const uno::Any &rValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException ) { @@ -1254,5 +1251,4 @@ Sequence< OUString > SAL_CALL SwXDocumentSettings::getSupportedServiceNames( ) return aSeq; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uno/SwXDocumentSettings.hxx b/sw/source/ui/uno/SwXDocumentSettings.hxx index 76c4bddb2bc8..49edf23964a0 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.hxx +++ b/sw/source/ui/uno/SwXDocumentSettings.hxx @@ -27,7 +27,6 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/implbase5.hxx> - class SwXTextDocument; class SwDocShell; class SwDoc; @@ -69,7 +68,6 @@ protected: public: SwXDocumentSettings( SwXTextDocument* pModel ); - // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); diff --git a/sw/source/ui/uno/detreg.cxx b/sw/source/ui/uno/detreg.cxx index 9d6fd6ea451d..d6d6208d8c9e 100644 --- a/sw/source/ui/uno/detreg.cxx +++ b/sw/source/ui/uno/detreg.cxx @@ -63,6 +63,4 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL swd_component_getFactory( } } // extern "C" - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx index 1e8c48ff4cf0..802d45c40f4b 100644 --- a/sw/source/ui/uno/dlelstnr.cxx +++ b/sw/source/ui/uno/dlelstnr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp> #include <com/sun/star/linguistic2/XDictionaryList.hpp> diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index ac1ca77f59c7..6547a85b0b74 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -415,7 +415,6 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor lDescriptor[nIndexOfDocumentTitle].Value <<= aDocumentTitle; } - return aTypeName; } diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx index 5611027c46bd..ba58458f4292 100644 --- a/sw/source/ui/uno/swdetect.hxx +++ b/sw/source/ui/uno/swdetect.hxx @@ -65,9 +65,7 @@ public: SFX_DECL_XSERVICEINFO_NOFACTORY - //---------------------------------------------------------------------------------- // XExtendedFilterDetect - //---------------------------------------------------------------------------------- virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ); }; diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index d444c12edb72..3b381151a758 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -51,7 +51,6 @@ #include <boost/scoped_ptr.hpp> - SV_IMPL_REF ( SwDocShell ) using namespace ::com::sun::star; diff --git a/sw/source/ui/uno/unodefaults.hxx b/sw/source/ui/uno/unodefaults.hxx index 1006b0eaba70..dc4a160596ed 100644 --- a/sw/source/ui/uno/unodefaults.hxx +++ b/sw/source/ui/uno/unodefaults.hxx @@ -37,5 +37,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx index b17c276e2c8f..9815c9f3b424 100644 --- a/sw/source/ui/uno/unodispatch.cxx +++ b/sw/source/ui/uno/unodispatch.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/svapp.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> @@ -30,10 +29,8 @@ #include "wrtsh.hxx" #include "dbmgr.hxx" - using namespace ::com::sun::star; - static const char* cURLFormLetter = ".uno:DataSourceBrowser/FormLetter"; static const char* cURLInsertContent = ".uno:DataSourceBrowser/InsertContent";//data into fields static const char* cURLInsertColumns = ".uno:DataSourceBrowser/InsertColumns";//data into text @@ -294,7 +291,6 @@ void SwXDispatch::addStatusListener( aEvent.IsEnabled = !rData.sDataSource.isEmpty(); } - xControl->statusChanged( aEvent ); StatusListenerList::iterator aListIter = m_aListenerList.begin(); diff --git a/sw/source/ui/uno/unodoc.cxx b/sw/source/ui/uno/unodoc.cxx index 60f31baaa639..94c2f8570561 100644 --- a/sw/source/ui/uno/unodoc.cxx +++ b/sw/source/ui/uno/unodoc.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; -//============================================================ // com.sun.star.comp.Writer.TextDocument uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() throw() @@ -57,7 +56,6 @@ uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance( return uno::Reference< uno::XInterface >( pShell->GetModel() ); } -//============================================================ // com.sun.star.comp.Writer.WebDocument uno::Sequence< OUString > SAL_CALL SwWebDocument_getSupportedServiceNames() throw() @@ -86,7 +84,6 @@ uno::Reference< uno::XInterface > SAL_CALL SwWebDocument_createInstance( return uno::Reference< uno::XInterface >( pShell->GetModel() ); } -//============================================================ // com.sun.star.comp.Writer.GlobalDocument uno::Sequence< OUString > SAL_CALL SwGlobalDocument_getSupportedServiceNames() throw() diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx index f2c71a4fb8cb..c8b3252df75b 100644 --- a/sw/source/ui/uno/unofreg.cxx +++ b/sw/source/ui/uno/unofreg.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; - // module extern uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwUnoModule_getImplementationName() throw(); diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 6d23b1b24a80..8e80738003e2 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -622,9 +622,8 @@ uno::Any SAL_CALL SwXMailMerge::execute( throw IllegalArgumentException("Either the ResultSet or DataSourceName and DataCommand must be set.", static_cast < cppu::OWeakObject * > ( this ), 0 ); } - // // build ResultSet from DataSourceName, DataCommand and DataCommandType - // + Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); if (xMgr.is()) { @@ -859,7 +858,6 @@ void SwXMailMerge::launchEvent( const PropertyChangeEvent &rEvt ) const } } - uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXMailMerge::getPropertySetInfo( ) throw (RuntimeException, std::exception) { @@ -1126,7 +1124,6 @@ void SAL_CALL SwXMailMerge::removeVetoableChangeListener( OSL_FAIL("not implemented"); } - void SAL_CALL SwXMailMerge::dispose() throw(RuntimeException, std::exception) { diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index c56f64a5a74c..ba9293248b9a 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -799,12 +799,10 @@ void SwXViewSettings::_postSetValues () SW_MOD()->ApplyRulerMetric( (FieldUnit)eVRulerUnit, sal_False, bWeb ); } - SW_MOD()->ApplyUsrPref( *mpViewOption, pView, pView ? VIEWOPT_DEST_VIEW_ONLY : bWeb ? VIEWOPT_DEST_WEB : VIEWOPT_DEST_TEXT ); - delete mpViewOption; mpViewOption = NULL; } diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 122e4829ac62..6a6ce86d52f6 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <osl/mutex.hxx> #include <vcl/image.hxx> #include <vcl/virdev.hxx> @@ -2613,9 +2612,8 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( const sal_Int32 nPageCount = pViewShell->GetPageCount(); - // // get number of pages to be rendered - // + const bool bPrintProspect = m_pPrintUIOptions->getBoolValue( "PrintProspect", false ); if (bPrintProspect) { @@ -2883,7 +2881,7 @@ SfxViewShell * SwXTextDocument::GuessViewShell( { // #130810# SfxViewShell::Current() / SfxViewShell::GetObjectShell() // must not be used (see comment from MBA) - // + SfxViewShell *pView = 0; SwView *pSwView = 0; SwPagePreview *pSwPagePreview = 0; @@ -3008,11 +3006,11 @@ void SAL_CALL SwXTextDocument::render( pVwSh->SetPDFExportOption( sal_True ); // #i12836# enhanced pdf export - // + // First, we have to export hyperlinks, notes, and outline to pdf. // During this process, additional information required for tagging // the pdf file are collected, which are evaulated during painting. - // + SwWrtShell* pWrtShell = pView->IsA(aSwViewTypeId) ? ((SwView*)pView)->GetWrtShellPtr() : 0; @@ -3030,11 +3028,11 @@ void SAL_CALL SwXTextDocument::render( pVwSh->PrintOrPDFExport( pOut, rSwPrtOptions, nRenderer ); // #i35176# - // + // After printing the last page, we take care for the links coming // from the EditEngine. The links are generated during the painting // process, but the destinations are still missing. - // + if (bIsPDFExport && bLastPage && pWrtShell) { SwEnhancedPDFExportHelper aHelper( *pWrtShell, *pOut, aPageRange, bIsSkipEmptyPages, true ); @@ -3143,7 +3141,6 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages( { SolarMutexGuard aGuard; - // possible canonical values for nScriptTypes // any bit wise combination is allowed const sal_Int16 nLatin = 0x001; diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index 0a8f518423b3..c7e9c4ee4883 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "viscrs.hxx" #include <sfx2/frame.hxx> #include <sfx2/printer.hxx> @@ -87,7 +86,6 @@ using namespace ::com::sun::star::frame; using ::com::sun::star::util::URL; using comphelper::HelperBaseNoState; - SwXTextView::SwXTextView(SwView* pSwView) : SfxBaseController(pSwView), m_SelChangedListeners(m_aMutex), diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 3cc57ef8779b..6c3889384182 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -814,7 +814,6 @@ SfxItemPresentation SwFmtRowSplit::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } - SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation ( SfxItemPresentation ePres, diff --git a/sw/source/ui/utlui/condedit.cxx b/sw/source/ui/utlui/condedit.cxx index 0f4ae0ba6dc5..5aa7ff1abb0b 100644 --- a/sw/source/ui/utlui/condedit.cxx +++ b/sw/source/ui/utlui/condedit.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sot/formats.hxx> #include <condedit.hxx> @@ -88,5 +87,4 @@ sal_Int8 ConditionEdit::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 2dae88aa6641..c31c650911eb 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -2756,7 +2756,6 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) break; } - bViewHasChanged = true; } } diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index f803de5a1248..2065d9370230 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -95,26 +95,26 @@ using namespace ::com::sun::star::uno; const SfxObjectShell* SwGlobalTree::pShowShell = 0; static const char* aHelpForMenu[] = { - 0, // + 0, HID_GLBLTREE_UPDATE, //CTX_UPDATE HID_GLBLTREE_INSERT, //CTX_INSERT HID_GLBLTREE_EDIT, //CTX_EDIT HID_GLBLTREE_DEL, //CTX_DELETE HID_GLBLTREE_EDIT_LINK, //CTX_EDIT_LINK - 0, // - 0, // - 0, // - 0, // + 0, + 0, + 0, + 0, HID_GLBLTREE_INS_IDX, //CTX_INSERT_ANY_INDEX HID_GLBLTREE_INS_FILE, //CTX_INSERT_FILE HID_GLBLTREE_INS_NEW_FILE, //CTX_INSERT_NEW_FILE HID_GLBLTREE_INS_TEXT, //CTX_INSERT_TEXT - 0, // - 0, // - 0, // - 0, // - 0, // - 0, // + 0, + 0, + 0, + 0, + 0, + 0, HID_GLBLTREE_UPD_SEL, //CTX_UPDATE_SEL HID_GLBLTREE_UPD_IDX, //CTX_UPDATE_INDEX HID_GLBLTREE_UPD_LINK, //CTX_UPDATE_LINK @@ -348,7 +348,6 @@ PopupMenu* SwGlobalTree::CreateContextMenu() pSubPop1->InsertItem(CTX_INSERT_TEXT, aContextStrings[ST_TEXT - ST_GLOBAL_CONTEXT_FIRST]); pSubPop1->SetHelpId(CTX_INSERT_TEXT, aHelpForMenu[CTX_INSERT_TEXT]); - pPop->InsertItem(CTX_UPDATE, aContextStrings[ST_UPDATE - ST_GLOBAL_CONTEXT_FIRST]); pPop->SetHelpId(CTX_UPDATE, aHelpForMenu[CTX_UPDATE]); pPop->InsertItem(CTX_EDIT, aContextStrings[ST_EDIT_CONTENT - ST_GLOBAL_CONTEXT_FIRST]); @@ -375,7 +374,6 @@ PopupMenu* SwGlobalTree::CreateContextMenu() pPop->EnableItem(CTX_EDIT, 0 != (nEnableFlags & ENABLE_EDIT)); pPop->EnableItem(CTX_DELETE, 0 != (nEnableFlags & ENABLE_DELETE)); - pPop->SetPopupMenu( CTX_INSERT, pSubPop1 ); pPop->SetPopupMenu( CTX_UPDATE, pSubPop2 ); } diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx index fabf1197952c..518a1ed02b5d 100644 --- a/sw/source/ui/utlui/gloslst.cxx +++ b/sw/source/ui/utlui/gloslst.cxx @@ -42,7 +42,6 @@ #define GLOS_TIMEOUT 30000 // update every 30 seconds #define FIND_MAX_GLOS 20 - struct TripleString { OUString sGroup; @@ -416,5 +415,4 @@ void SwGlossaryList::ClearGroups() bFilled = false; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index 785ffc4d6a22..1a745a735392 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -251,7 +251,6 @@ OUString ShellResource::GetPageDescName(sal_uInt16 nNo, PageNameMode eMode) return sRet.replaceFirst( "$(ARG1)", OUString::number( nNo )); } - SwGlossaries* GetGlossaries() { if (!pGlossaries) diff --git a/sw/source/ui/utlui/initui.src b/sw/source/ui/utlui/initui.src index c1663fe5dcfa..81e47ff75eaa 100644 --- a/sw/source/ui/utlui/initui.src +++ b/sw/source/ui/utlui/initui.src @@ -143,7 +143,7 @@ Resource RID_SW_SHELLRES }; // SubType DocInfo - // + String FLD_DOCINFO_TITEL { Text [ en-US ] = "Title" ; diff --git a/sw/source/ui/utlui/navicfg.cxx b/sw/source/ui/utlui/navicfg.cxx index b4e545fa6f77..975a08876fb9 100644 --- a/sw/source/ui/utlui/navicfg.cxx +++ b/sw/source/ui/utlui/navicfg.cxx @@ -116,5 +116,4 @@ void SwNavigationConfig::Commit() void SwNavigationConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index a7f38a4c0c16..9dbb33e41893 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -139,7 +139,6 @@ IMPL_LINK( SwNavigationPI, DocListBoxSelectHdl, ListBox *, pBox ) aContentTree.ShowHiddenShell(): aContentTree.ShowActualView(); - } else { @@ -730,7 +729,6 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, aStatusArr[3] = SW_RESSTR(ST_ACTIVE_VIEW); FreeResource(); - const Size& rOutSize = GetOutputSizePixel(); nZoomIn = (short)rOutSize.Height(); @@ -1082,7 +1080,6 @@ void SwNavigationPI::UpdateListBox() sEntry += ")"; aDocListBox.InsertEntry(sEntry); - if (pConstView && pView == pConstView) nConstPos = nCount; diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx index 99427622e656..ecd4dee197d5 100644 --- a/sw/source/ui/utlui/numfmtlb.cxx +++ b/sw/source/ui/utlui/numfmtlb.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - // STATIC DATA /** diff --git a/sw/source/ui/utlui/prcntfld.cxx b/sw/source/ui/utlui/prcntfld.cxx index 1523fe512582..cd4863753d10 100644 --- a/sw/source/ui/utlui/prcntfld.cxx +++ b/sw/source/ui/utlui/prcntfld.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "prcntfld.hxx" PercentField::PercentField() diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 2e0a8312b9c9..08db8a790b1c 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -49,7 +49,6 @@ #include "swrenamexnameddlg.hxx" - using namespace ::com::sun::star; SwRenameXNamedDlg::SwRenameXNamedDlg( Window* pWin, diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx index 6e39e0f688b2..a4a59ffc5370 100644 --- a/sw/source/ui/utlui/tmplctrl.cxx +++ b/sw/source/ui/utlui/tmplctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svl/style.hxx> #include <vcl/menu.hxx> #include <svl/stritem.hxx> diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 9a4603ac46ef..206b86451a63 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -73,7 +73,7 @@ #include <charfmt.hxx> #include <SwStyleNameMapper.hxx> // 50 cm 28350 -// + #define MAXHEIGHT 28350 #define MAXWIDTH 28350 @@ -196,7 +196,6 @@ void ConvertAttrGenToChar(SfxItemSet& rSet, const sal_uInt8 nMode) } } - // Fill header footer void FillHdFt(SwFrmFmt* pFmt, const SfxItemSet& rSet) @@ -358,7 +357,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) } // Footnotes - // + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_FTN_INFO, false, &pItem ) ) rPageDesc.SetFtnInfo( ((SwPageFtnInfoItem*)pItem)->GetPageFtnInfo() ); @@ -435,7 +434,6 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) aBoxInfo.SetValid( VALID_DISABLE ); rSet.Put( aBoxInfo ); - SfxStringItem aFollow(SID_ATTR_PAGE_EXT1, OUString()); if(rPageDesc.GetFollow()) aFollow.SetValue(rPageDesc.GetFollow()->GetName()); @@ -568,7 +566,6 @@ sal_uInt16 GetTabDist(const SvxTabStopItem& rTabs) return nDefDist; } - // Inquire if in the set is a Sfx-PageDesc combination present and return it. void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet ) { diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx index 8273264b2316..6d9b90cc88b6 100644 --- a/sw/source/ui/utlui/unotools.cxx +++ b/sw/source/ui/utlui/unotools.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <swtypes.hxx> #include <globals.hrc> #include <misc.hrc> @@ -179,7 +178,7 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > xViewProps, //turn off scrollbars //turn back on online mode if that's what we want //which subverts the (dodgy/buggy) scrollbar setting - // + //To reproduce this problem, in edit->autotext and click through //the examples and see if the preview gets a horizontal scrollbar uno::Any aFalseSet(uno::makeAny(sal_False)); diff --git a/sw/source/ui/utlui/zoomctrl.cxx b/sw/source/ui/utlui/zoomctrl.cxx index 5e82fed05ad2..ac592474eb80 100644 --- a/sw/source/ui/utlui/zoomctrl.cxx +++ b/sw/source/ui/utlui/zoomctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hintids.hxx" #include <vcl/status.hxx> diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx index 8880d03c7f97..f1fbdc8b0359 100644 --- a/sw/source/ui/vba/service.cxx +++ b/sw/source/ui/vba/service.cxx @@ -21,9 +21,8 @@ #include "com/sun/star/registry/XRegistryKey.hpp" #include "comphelper/servicedecl.hxx" -// ============================================================================= // component exports -// ============================================================================= + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx index 5e928afed2bd..e6bf8707b043 100644 --- a/sw/source/ui/vba/vbaautotextentry.cxx +++ b/sw/source/ui/vba/vbaautotextentry.cxx @@ -93,7 +93,6 @@ SwVbaAutoTextEntry::getServiceNames() return aServiceNames; } - SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : SwVbaAutoTextEntries_BASE( xParent, xContext, xIndexAccess ), mxAutoTextEntryAccess( xIndexAccess ) { } diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx index 5e07936138d4..6d7975fa3932 100644 --- a/sw/source/ui/vba/vbaautotextentry.hxx +++ b/sw/source/ui/vba/vbaautotextentry.hxx @@ -46,7 +46,6 @@ public: virtual css::uno::Sequence<OUString> getServiceNames(); }; - /* class SwVbaAutoTextEntries */ typedef CollTestImplHelper< ooo::vba::word::XAutoTextEntries > SwVbaAutoTextEntries_BASE; diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 90bd3e0847ad..33ac997c4226 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; - typedef ::cppu::WeakImplHelper1<container::XIndexAccess > RangeBorders_Base; typedef InheritedHelperInterfaceImpl1<word::XBorder > SwVbaBorder_Base; diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index d46e20b67ee5..4963ba7578f1 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -393,7 +393,6 @@ public: } }; - typedef boost::unordered_map< sal_Int32, DocPropInfo > MSOIndexToOODocPropInfo; class BuiltInIndexHelper @@ -441,7 +440,6 @@ public: MSOIndexToOODocPropInfo& getDocPropInfoMap() { return m_docPropInfoMap; } }; - typedef InheritedHelperInterfaceImpl1< ooo::vba::XDocumentProperty > SwVbaDocumentProperty_BASE; class SwVbaBuiltInDocumentProperty : public SwVbaDocumentProperty_BASE @@ -486,7 +484,6 @@ public: }; - SwVbaCustomDocumentProperty::SwVbaCustomDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ) : SwVbaBuiltInDocumentProperty( xParent, xContext, rInfo ) { } @@ -882,7 +879,6 @@ public: }; - SwVbaCustomDocumentProperties::SwVbaCustomDocumentProperties( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaBuiltinDocumentProperties( xParent, xContext, xModel ) { // replace the m_xIndexAccess implementation ( we need a virtual init ) diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx index be2af5b3dc3e..83eda1d9fec0 100644 --- a/sw/source/ui/vba/vbadocuments.hxx +++ b/sw/source/ui/vba/vbadocuments.hxx @@ -19,14 +19,12 @@ #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENTS_HXX #define INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENTS_HXX - #include <vbahelper/vbacollectionimpl.hxx> #include <ooo/vba/word/XDocuments.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <vbahelper/vbadocumentsbase.hxx> #include "wordvbahelper.hxx" - typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::word::XDocuments > SwVbaDocuments_BASE; class SwVbaDocuments : public SwVbaDocuments_BASE diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx index 2e0e533be8a3..257c829b9c48 100644 --- a/sw/source/ui/vba/vbaeventshelper.cxx +++ b/sw/source/ui/vba/vbaeventshelper.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::script::vba::VBAEventId; using namespace ::ooo::vba; -// ============================================================================ - SwVbaEventsHelper::SwVbaEventsHelper( uno::Sequence< css::uno::Any > const& aArgs, uno::Reference< uno::XComponentContext > const& xContext ) : VbaEventsHelperBase( aArgs, xContext ) { @@ -82,8 +80,6 @@ OUString SwVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& / return OUString( "ThisDocument" ); } -// ============================================================================ - namespace vbaeventshelper { namespace sdecl = comphelper::service_decl; @@ -94,6 +90,4 @@ extern sdecl::ServiceDecl const serviceDecl( "com.sun.star.document.vba.VBATextEventProcessor" ); } -// ============================================================================ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbaeventshelper.hxx b/sw/source/ui/vba/vbaeventshelper.hxx index 0093cf916e8f..8927a978f121 100644 --- a/sw/source/ui/vba/vbaeventshelper.hxx +++ b/sw/source/ui/vba/vbaeventshelper.hxx @@ -22,8 +22,6 @@ #include <vbahelper/vbaeventshelperbase.hxx> -// ============================================================================ - class SwVbaEventsHelper : public VbaEventsHelperBase { public: @@ -39,8 +37,6 @@ protected: virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); }; -// ============================================================================ - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 91ea2546e17a..5c7122d36ebe 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -116,7 +116,6 @@ SwVbaReadFieldParams::~SwVbaReadFieldParams() { } - OUString SwVbaReadFieldParams::GetResult() const { return (-1 == nFnd) @@ -161,9 +160,9 @@ long SwVbaReadFieldParams::SkipToNextToken() // FindNextPara is searching for the next Backslash-Parameter or the next string // until blank or the next "\" or until the closing quotation mark // or until the string end of pStr. -// + // Output ppNext (if ppNext != 0) beginning of the search for the next parameter or 0 -// + // Return value: 0 if String-End reached, otherwise begin of the paramater or the string sal_Int32 SwVbaReadFieldParams::FindNextStringPiece(const sal_Int32 nStart) diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index f0ffd6bd9c77..fd2922f44ba5 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -232,5 +232,4 @@ SwVbaFont::getServiceNames() return aServiceNames; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index 7c6308784eaa..a996dd795d62 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -30,10 +30,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::ooo::vba; - -// ============================================================================= // SwVbaGlobals -// ============================================================================= SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, "WordDocumentContext" ) { @@ -52,9 +49,8 @@ SwVbaGlobals::~SwVbaGlobals() OSL_TRACE("SwVbaGlobals::~SwVbaGlobals"); } -// ============================================================================= // XGlobals -// ============================================================================= + uno::Reference<word::XApplication > SwVbaGlobals::getApplication() throw (uno::RuntimeException) { diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index 6fcafddd35a2..92df9b43825c 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -31,10 +31,7 @@ #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbaglobalbase.hxx> -// ============================================================================= // class SwVbaGlobals -// ============================================================================= - typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::word::XGlobals > SwVbaGlobals_BASE; diff --git a/sw/source/ui/vba/vbalistformat.hxx b/sw/source/ui/vba/vbalistformat.hxx index 1143921198ca..12762c77b9b7 100644 --- a/sw/source/ui/vba/vbalistformat.hxx +++ b/sw/source/ui/vba/vbalistformat.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/text/XTextRange.hpp> #include "vbalisthelper.hxx" - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListFormat > SwVbaListFormat_BASE; class SwVbaListFormat : public SwVbaListFormat_BASE diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx index 540df4c2514a..720c4691ceeb 100644 --- a/sw/source/ui/vba/vbalistgallery.hxx +++ b/sw/source/ui/vba/vbalistgallery.hxx @@ -24,7 +24,6 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XTextDocument.hpp> - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListGallery > SwVbaListGallery_BASE; class SwVbaListGallery : public SwVbaListGallery_BASE diff --git a/sw/source/ui/vba/vbalisthelper.hxx b/sw/source/ui/vba/vbalisthelper.hxx index 3eb38b86d642..24f2bf56125d 100644 --- a/sw/source/ui/vba/vbalisthelper.hxx +++ b/sw/source/ui/vba/vbalisthelper.hxx @@ -15,7 +15,6 @@ #include <com/sun/star/text/XTextDocument.hpp> #include <boost/shared_ptr.hpp> - class SwVbaListHelper; typedef ::boost::shared_ptr< SwVbaListHelper > SwVbaListHelperRef; diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx index f3b6d9c937b6..9f850fe9030a 100644 --- a/sw/source/ui/vba/vbalistlevel.hxx +++ b/sw/source/ui/vba/vbalistlevel.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/text/XTextDocument.hpp> #include "vbalisthelper.hxx" - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListLevel > SwVbaListLevel_BASE; class SwVbaListLevel : public SwVbaListLevel_BASE diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx index c3d2d23f8ba5..f4285eda59af 100644 --- a/sw/source/ui/vba/vbalistlevels.hxx +++ b/sw/source/ui/vba/vbalistlevels.hxx @@ -24,7 +24,6 @@ #include <vbahelper/vbahelperinterface.hxx> #include "vbalisthelper.hxx" - typedef CollTestImplHelper< ooo::vba::word::XListLevels > SwVbaListLevels_BASE; class SwVbaListLevels : public SwVbaListLevels_BASE diff --git a/sw/source/ui/vba/vbalisttemplate.hxx b/sw/source/ui/vba/vbalisttemplate.hxx index 8c6f6ecaf87e..a9b831e6adf9 100644 --- a/sw/source/ui/vba/vbalisttemplate.hxx +++ b/sw/source/ui/vba/vbalisttemplate.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/text/XTextDocument.hpp> #include "vbalisthelper.hxx" - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListTemplate > SwVbaListTemplate_BASE; class SwVbaListTemplate : public SwVbaListTemplate_BASE diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx index 22f28c0a75c0..7ae4a74de57f 100644 --- a/sw/source/ui/vba/vbaparagraph.hxx +++ b/sw/source/ui/vba/vbaparagraph.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/text/XTextDocument.hpp> - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XParagraph > SwVbaParagraph_BASE; class SwVbaParagraph : public SwVbaParagraph_BASE @@ -50,7 +49,6 @@ public: virtual css::uno::Sequence<OUString> getServiceNames(); }; - /* class SwVbaParagraphs */ typedef CollTestImplHelper< ooo::vba::word::XParagraphs > SwVbaParagraphs_BASE; diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx index 062b15354140..aa5d0c9b12ba 100644 --- a/sw/source/ui/vba/vbaparagraphformat.cxx +++ b/sw/source/ui/vba/vbaparagraphformat.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/style/BreakType.hpp> #include "vbatabstops.hxx" - using namespace ::ooo::vba; using namespace ::com::sun::star; diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx index e1326a5fa6f1..b522c44ce788 100644 --- a/sw/source/ui/vba/vbarangehelper.cxx +++ b/sw/source/ui/vba/vbarangehelper.cxx @@ -60,7 +60,6 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u return xRange; } - void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const OUString& rStr, sal_Bool _bAbsorb ) throw ( uno::RuntimeException ) { sal_Int32 nlastIndex = 0; diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx index 95c6357356ea..78e9b3003b20 100644 --- a/sw/source/ui/vba/vbarevisions.hxx +++ b/sw/source/ui/vba/vbarevisions.hxx @@ -24,7 +24,6 @@ #include <vbahelper/vbahelperinterface.hxx> #include <com/sun/star/text/XTextRange.hpp> - typedef CollTestImplHelper< ooo::vba::word::XRevisions > SwVbaRevisions_BASE; class SwVbaRevisions : public SwVbaRevisions_BASE diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index 62a18f4cc253..55bf3f442a10 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -30,7 +30,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; - SwVbaStyle::SwVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel>& xModel, const uno::Reference< beans::XPropertySet >& _xPropertySet ) throw ( script::BasicErrorException, uno::RuntimeException ) : SwVbaStyle_BASE( xParent, xContext ) , mxModel( xModel ), mxStyleProps( _xPropertySet ) { mxStyle.set( _xPropertySet, uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx index d71ee2673a03..3a9c87e57d4c 100644 --- a/sw/source/ui/vba/vbastyle.hxx +++ b/sw/source/ui/vba/vbastyle.hxx @@ -27,7 +27,6 @@ #include <ooo/vba/word/XFont.hpp> #include <ooo/vba/word/XListTemplate.hpp> - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XStyle > SwVbaStyle_BASE; class SwVbaStyle : public SwVbaStyle_BASE diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx index a224258d0dfc..3c0291b51b29 100644 --- a/sw/source/ui/vba/vbatableofcontents.cxx +++ b/sw/source/ui/vba/vbatableofcontents.cxx @@ -30,7 +30,6 @@ SwVbaTableOfContents::SwVbaTableOfContents( const uno::Reference< ooo::vba::XHel mxTocProps.set( mxDocumentIndex, uno::UNO_QUERY_THROW ); } - SwVbaTableOfContents::~SwVbaTableOfContents() { } diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index 2f48f5ef2414..ae94ba1194be 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -159,7 +159,6 @@ SwVbaTables::SwVbaTables( const uno::Reference< XHelperInterface >& xParent, con { } - uno::Reference< word::XTable > SAL_CALL SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& /*DefaultTableBehavior*/, const uno::Any& /*AutoFitBehavior*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { diff --git a/sw/source/ui/vba/vbatables.hxx b/sw/source/ui/vba/vbatables.hxx index 368e33dc1ffe..4d78a5dc514c 100644 --- a/sw/source/ui/vba/vbatables.hxx +++ b/sw/source/ui/vba/vbatables.hxx @@ -23,7 +23,6 @@ #include <ooo/vba/word/XTables.hpp> #include <vbahelper/vbacollectionimpl.hxx> - typedef CollTestImplHelper< ov::word::XTables > SwVbaTables_BASE; class SwVbaTables : public SwVbaTables_BASE diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx index 8a75916668c9..02880f48c95f 100644 --- a/sw/source/ui/vba/vbatemplate.cxx +++ b/sw/source/ui/vba/vbatemplate.cxx @@ -45,13 +45,11 @@ static OUString lcl_CheckGroupName( const OUString& rGroupName ) return comphelper::string::strip(sRet, ' '); } - SwVbaTemplate::SwVbaTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rFullUrl ) : SwVbaTemplate_BASE( rParent, rContext ), mxModel( rModel ), msFullUrl( rFullUrl ) { } - SwVbaTemplate::~SwVbaTemplate() { } diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx index cc54c363a44f..cc9ffec06050 100644 --- a/sw/source/ui/vba/vbawrapformat.cxx +++ b/sw/source/ui/vba/vbawrapformat.cxx @@ -240,5 +240,4 @@ extern sdecl::ServiceDecl const serviceDecl( "ooo.vba.word.WrapFormat" ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx index be3443da93f6..7bf49e6e2836 100644 --- a/sw/source/ui/vba/wordvbahelper.cxx +++ b/sw/source/ui/vba/wordvbahelper.cxx @@ -176,7 +176,7 @@ bool gotoSelectedObjectAnchor( const uno::Reference< frame::XModel>& xModel ) th } } // word -} // -} // +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wdocsh.cxx b/sw/source/ui/web/wdocsh.cxx index b3ec036767b7..ac44c7d16c4a 100644 --- a/sw/source/ui/web/wdocsh.cxx +++ b/sw/source/ui/web/wdocsh.cxx @@ -39,7 +39,6 @@ #include <unomid.h> - SFX_IMPL_INTERFACE( SwWebDocShell, SfxObjectShell, SW_RES(0) ) { } @@ -58,8 +57,6 @@ SwWebDocShell::~SwWebDocShell() { } - - void SwWebDocShell::FillClass( SvGlobalName * pClassName, sal_uInt32 * pClipFormat, OUString * /*pAppName*/, @@ -86,6 +83,4 @@ void SwWebDocShell::FillClass( SvGlobalName * pClassName, *pUserName = SW_RESSTR(STR_HUMAN_SWWEBDOC_NAME); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wformsh.cxx b/sw/source/ui/web/wformsh.cxx index d2224d5b9d5b..9911d0be198a 100644 --- a/sw/source/ui/web/wformsh.cxx +++ b/sw/source/ui/web/wformsh.cxx @@ -53,5 +53,4 @@ SwWebDrawFormShell::~SwWebDrawFormShell() { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wfrmsh.cxx b/sw/source/ui/web/wfrmsh.cxx index c30d0f751a68..d2697400f983 100644 --- a/sw/source/ui/web/wfrmsh.cxx +++ b/sw/source/ui/web/wfrmsh.cxx @@ -30,7 +30,6 @@ #include "shells.hrc" #include "web.hrc" - // STATIC DATA #define SwWebFrameShell #include <sfx2/msg.hxx> @@ -42,8 +41,6 @@ SFX_IMPL_INTERFACE(SwWebFrameShell, SwFrameShell, SW_RES(STR_SHELLNAME_WEBFRAME) SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_WEBFRAME_TOOLBOX)); } - - TYPEINIT1(SwWebFrameShell, SwFrameShell) SwWebFrameShell::SwWebFrameShell(SwView &_rView) : @@ -56,10 +53,4 @@ SwWebFrameShell::~SwWebFrameShell() { } - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wgrfsh.cxx b/sw/source/ui/web/wgrfsh.cxx index f2bc20d39eac..042b4ddbbefd 100644 --- a/sw/source/ui/web/wgrfsh.cxx +++ b/sw/source/ui/web/wgrfsh.cxx @@ -58,6 +58,4 @@ SwWebGrfShell::~SwWebGrfShell() { } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wlistsh.cxx b/sw/source/ui/web/wlistsh.cxx index cd850143cac3..7bca24fcf64e 100644 --- a/sw/source/ui/web/wlistsh.cxx +++ b/sw/source/ui/web/wlistsh.cxx @@ -52,5 +52,4 @@ SwWebListShell::~SwWebListShell() { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wolesh.cxx b/sw/source/ui/web/wolesh.cxx index d45a2444d4b7..bf8359c8ef47 100644 --- a/sw/source/ui/web/wolesh.cxx +++ b/sw/source/ui/web/wolesh.cxx @@ -53,5 +53,4 @@ SwWebOleShell::~SwWebOleShell() { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wtabsh.cxx b/sw/source/ui/web/wtabsh.cxx index cd9eb53d886c..ca24430380fd 100644 --- a/sw/source/ui/web/wtabsh.cxx +++ b/sw/source/ui/web/wtabsh.cxx @@ -23,7 +23,6 @@ #include <sfx2/objface.hxx> #include <svl/srchitem.hxx> - #include "cmdid.h" #include "globals.hrc" #include "uitool.hxx" @@ -59,6 +58,4 @@ SwWebTableShell::~SwWebTableShell() { } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wtextsh.cxx b/sw/source/ui/web/wtextsh.cxx index 80958cb8740e..16299b4f2e68 100644 --- a/sw/source/ui/web/wtextsh.cxx +++ b/sw/source/ui/web/wtextsh.cxx @@ -61,6 +61,4 @@ SwWebTextShell::~SwWebTextShell() { } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx index ee71392215f7..5e733721c280 100644 --- a/sw/source/ui/web/wview.cxx +++ b/sw/source/ui/web/wview.cxx @@ -65,7 +65,6 @@ #define ListInTable #include <swslots.hxx> - SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default") { SFX_VIEW_REGISTRATION(SwWebDocShell); @@ -274,7 +273,6 @@ void SwWebView::SelectShell() GetFormShell()->SetView( PTR_CAST( FmFormView, GetWrtShell().GetDrawView())); - } GetViewImpl()->GetUNOObject_Impl()->NotifySelChanged(); @@ -287,7 +285,4 @@ void SwWebView::SelectShell() GetWrtShell().UpdateTable(); } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx index bba3c3d369d3..7d95390ce8e9 100644 --- a/sw/source/ui/wrtsh/delete.cxx +++ b/sw/source/ui/wrtsh/delete.cxx @@ -102,8 +102,6 @@ long SwWrtShell::DelLine() return nRet; } - - long SwWrtShell::DelToStartOfLine() { OpenMark(); @@ -113,8 +111,6 @@ long SwWrtShell::DelToStartOfLine() return nRet; } - - long SwWrtShell::DelToEndOfLine() { OpenMark(); @@ -544,7 +540,4 @@ long SwWrtShell::DelPrvWord() return nRet; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx index c31afc6afec2..fdd75dfbbe14 100644 --- a/sw/source/ui/wrtsh/move.cxx +++ b/sw/source/ui/wrtsh/move.cxx @@ -421,7 +421,6 @@ sal_Bool SwWrtShell::PushCrsr(SwTwips lOffset, sal_Bool bSelect) // and we have to remember the position on the stack to return to it later. sal_Bool bIsFrmSel = sal_False; - //Target position is now within the viewable region --> //Place the cursor at the target position; remember that no target //position is longer on the stack. @@ -473,8 +472,6 @@ sal_Bool SwWrtShell::PushCrsr(SwTwips lOffset, sal_Bool bSelect) return !bDestOnStack && bDiff; } - - sal_Bool SwWrtShell::PopCrsr(sal_Bool bUpdate, sal_Bool bSelect) { if( 0 == pCrsrStack) @@ -546,8 +543,6 @@ void SwWrtShell::_ResetCursorStack() transpose cursor */ - - sal_Bool SwWrtShell::PageCrsr(SwTwips lOffset, sal_Bool bSelect) { // Do nothing if an offset of 0 was indicated diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx index 56660aa03052..5b8eee1f367f 100644 --- a/sw/source/ui/wrtsh/select.cxx +++ b/sw/source/ui/wrtsh/select.cxx @@ -40,14 +40,12 @@ #include <doc.hxx> #include <wordcountdialog.hxx> - namespace com { namespace sun { namespace star { namespace util { struct SearchOptions; } } } } using namespace ::com::sun::star::util; - static long nStartDragX = 0, nStartDragY = 0; static bool bStartDrag = false; @@ -71,8 +69,6 @@ sal_Bool SwWrtShell::SelNearestWrd() return SelWrd(); } - - sal_Bool SwWrtShell::SelWrd(const Point *pPt, sal_Bool ) { sal_Bool bRet; @@ -123,7 +119,6 @@ void SwWrtShell::SelPara(const Point *pPt, sal_Bool ) bSelWrd = sal_False; // disable SelWord, otherwise no SelLine goes on } - long SwWrtShell::SelAll() { const sal_Bool bLockedView = IsViewLocked(); @@ -475,7 +470,6 @@ long SwWrtShell::ExtSelWrd(const Point *pPt, sal_Bool ) return bRet; } - long SwWrtShell::ExtSelLn(const Point *pPt, sal_Bool ) { SwMvContext aMvContext(this); diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx index d29aac7dfc5a..1634d1dae0b6 100644 --- a/sw/source/ui/wrtsh/wrtsh2.cxx +++ b/sw/source/ui/wrtsh/wrtsh2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <svl/macitem.hxx> #include <sfx2/frame.hxx> @@ -276,7 +275,6 @@ sal_Bool SwWrtShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet // handler for click on the field given as parameter. // the cursor is positioned on the field. - void SwWrtShell::ClickToField( const SwField& rFld ) { // cross reference field must not be selected because it moves the cursor @@ -422,7 +420,6 @@ bool SwWrtShell::ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter ) return bRet; } - void LoadURL( SwViewShell& rVSh, const OUString& rURL, sal_uInt16 nFilter, const OUString& rTargetFrameName ) { @@ -542,5 +539,4 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk, } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx index 1030dce5d459..bc35ef16b8e3 100644 --- a/sw/source/ui/wrtsh/wrtsh3.cxx +++ b/sw/source/ui/wrtsh/wrtsh3.cxx @@ -158,7 +158,6 @@ void SwWrtShell::ExecMacro( const SvxMacro& rMacro, OUString* pRet, SbxArray* pA } } - sal_uInt16 SwWrtShell::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent, bool bChkPtr, SbxArray* pArgs, const Link* pCallBack ) @@ -166,7 +165,6 @@ sal_uInt16 SwWrtShell::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCa return GetDoc()->CallEvent( nEvent, rCallEvent, bChkPtr, pArgs, pCallBack ); } - // If a util::URL-Button is selected, return its util::URL // otherwise an emtpy string. bool SwWrtShell::GetURLFromButton( OUString& rURL, OUString& rDescr ) const diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx index 511d11deeca1..6290b5e7f5ce 100644 --- a/sw/source/ui/wrtsh/wrtundo.cxx +++ b/sw/source/ui/wrtsh/wrtundo.cxx @@ -138,7 +138,6 @@ sal_uInt16 SwWrtShell::GetDoStrings( DoType eDoType, SfxStringListItem& rStrs ) return static_cast<sal_uInt16>(comments.size()); } - OUString SwWrtShell::GetRepeatString() const { OUString str; |