diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-11 11:25:20 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-11 17:11:12 +0200 |
commit | 84db94e97bf088cf442db5f97fefbe41fd45c1bb (patch) | |
tree | 061249ae846c064412204baf1d45b5a892ff0d2a /sw | |
parent | 6928f43c86d05b9229e24d6d199b3f139031d596 (diff) |
-Werror,-Wunused-private-field (various sw)
Change-Id: Ib2becb2af810da0fa3d24bd0aa21887d41e2f34c
Diffstat (limited to 'sw')
55 files changed, 45 insertions, 117 deletions
diff --git a/sw/inc/pvprtdat.hxx b/sw/inc/pvprtdat.hxx index 19a4785bcb60..513b1b3dabe3 100644 --- a/sw/inc/pvprtdat.hxx +++ b/sw/inc/pvprtdat.hxx @@ -29,12 +29,11 @@ class SwPagePreViewPrtData nHorzSpace, nVertSpace; sal_uInt8 nRow, nCol; sal_Bool bLandscape : 1; - sal_Bool bStretch : 1; public: SwPagePreViewPrtData() : nLeftSpace(0), nRightSpace(0), nTopSpace(0), nBottomSpace(0), nHorzSpace(0), nVertSpace(0), nRow(1), nCol(1), - bLandscape(0),bStretch(0) + bLandscape(0) {} sal_uLong GetLeftSpace() const { return nLeftSpace; } diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx index 974664236261..8d8be4635ba0 100644 --- a/sw/inc/splargs.hxx +++ b/sw/inc/splargs.hxx @@ -129,7 +129,6 @@ class SwInterHyphInfo ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > xHyphWord; const Point aCrsrPos; - sal_Bool bAuto : 1; sal_Bool bNoLang : 1; sal_Bool bCheck : 1; public: @@ -144,7 +143,7 @@ public: const sal_uInt16 nStartPos = 0, const sal_uInt16 nLength = USHRT_MAX ) : aCrsrPos( rCrsrPos ), - bAuto(sal_False), bNoLang(sal_False), bCheck(sal_False), + bNoLang(sal_False), bCheck(sal_False), nStart(nStartPos), nLen(nLength), nWordStart(0), nWordLen(0), nHyphPos(0), nMinTrail(0) diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 3642a8c089e8..948dd03e2526 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -49,8 +49,6 @@ #include <unoevtlstnr.hxx> #include <unotext.hxx> - -class SfxItemPropertSet; class SdrObject; class SwDoc; class SwFmt; @@ -171,8 +169,6 @@ class SwXTextFrame : public SwXTextFrameBaseClass, public SwXText, public SwXFrame { - const SfxItemPropertSet* _pPropSet; - protected: virtual const SwStartNode *GetStartNode() const; diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index d18eb2106dd9..76bbd5009776 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -288,8 +288,6 @@ public: class SwXPageStyle : public SwXStyle { - SwDocShell* pDocShell; - protected: void SAL_CALL SetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx index 63320c0e955f..d900267899a8 100644 --- a/sw/source/core/bastyp/swcache.cxx +++ b/sw/source/core/bastyp/swcache.cxx @@ -84,7 +84,6 @@ SwCache::SwCache( const sal_uInt16 nInitSize pRealFirst( 0 ), pFirst( 0 ), pLast( 0 ), - nMax( nInitSize ), nCurMax( nInitSize ) #ifdef DBG_UTIL , m_aName( rNm ) diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 8b439b3f9925..3dc4caf2d6c8 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -761,7 +761,7 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart ) { // BUG 26675: Send DataChanged before deleting, so that we notice which objects are in scope. // After that they can be before/after the position. - SwDataChanged aTmp( this, rPos, 0 ); + SwDataChanged aTmp( this, rPos ); } SwUndoSplitNode* pUndo = 0; @@ -944,7 +944,7 @@ bool SwDoc::InsertString( const SwPaM &rRg, const String &rStr, if(!pNode) return false; - SwDataChanged aTmp( rRg, 0 ); + SwDataChanged aTmp( rRg ); if (!bDoesUndo || !GetIDocumentUndoRedo().DoesGroupUndo()) { diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 0ed56d72a2bf..02db609042aa 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -227,7 +227,6 @@ private: const SwTxtNode *pTxtNd1, *pTxtNd2; int *pPos1, *pPos2; int nCnt1, nCnt2; // number of words - const unsigned nMul; void CalcPositions( int *pPos, const SwTxtNode *pTxtNd, int &nCnt ); @@ -2206,7 +2205,7 @@ bool CharArrayComparator::Compare( int nIdx1, int nIdx2 ) const WordArrayComparator::WordArrayComparator( const SwTxtNode *pNode1, const SwTxtNode *pNode2 ) - : pTxtNd1( pNode1 ), pTxtNd2( pNode2 ), nMul( 251 ) + : pTxtNd1( pNode1 ), pTxtNd2( pNode2 ) { pPos1 = new int[ pTxtNd1->GetTxt().Len() + 1 ]; pPos2 = new int[ pTxtNd2->GetTxt().Len() + 1 ]; diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 3f2e6992e36e..14ef5ae8ab92 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -725,7 +725,7 @@ void SwDoc::DeleteSection( SwNode *pNode ) void SwDoc::SetModified(SwPaM &rPaM) { - SwDataChanged aTmp( rPaM, 0 ); + SwDataChanged aTmp( rPaM ); SetModified(); } @@ -753,7 +753,7 @@ bool SwDoc::Overwrite( const SwPaM &rRg, const String &rStr ) sal_uInt16 nOldAttrCnt = pNode->GetpSwpHints() ? pNode->GetpSwpHints()->Count() : 0; - SwDataChanged aTmp( rRg, 0 ); + SwDataChanged aTmp( rRg ); SwIndex& rIdx = rPt.nContent; xub_StrLen nStart = 0; @@ -1662,7 +1662,7 @@ bool SwDoc::DeleteRangeImplImpl(SwPaM & rPam) // Send DataChanged before deletion, so that we still know // which objects are in the range. // Afterwards they could be before/after the Position. - SwDataChanged aTmp( rPam, 0 ); + SwDataChanged aTmp( rPam ); } @@ -2295,7 +2295,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr, nEnd = bOneNode ? pEnd->nContent.GetIndex() : pTxtNd->GetTxt().Len(); - SwDataChanged aTmp( aDelPam, 0 ); + SwDataChanged aTmp( aDelPam ); if( IsRedlineOn() ) { diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index b70ddccea06f..d68fd40b38bc 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -2565,7 +2565,7 @@ void SwDocUpdtFld::RemoveFldType( const SwFieldType& rType ) } SwDocUpdtFld::SwDocUpdtFld() - : pFldSortLst(0), nFldUpdtPos(LONG_MAX), nFldLstGetMode(0) + : pFldSortLst(0), nFldLstGetMode(0) { bInUpdateFlds = bFldsDirty = sal_False; memset( aFldTypeTable, 0, sizeof( aFldTypeTable ) ); diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 6b749df4bb17..ea14782d1ad7 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -313,7 +313,7 @@ sal_Bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs ) void SwDoc::RstTxtAttrs(const SwPaM &rRg, sal_Bool bInclRefToxMark ) { SwHistory* pHst = 0; - SwDataChanged aTmp( rRg, 0 ); + SwDataChanged aTmp( rRg ); if (GetIDocumentUndoRedo().DoesUndo()) { SwUndoResetAttr* pUndo = new SwUndoResetAttr( rRg, RES_CHRFMT ); @@ -385,11 +385,11 @@ void SwDoc::ResetAttrs( const SwPaM &rRg, } // #i96644# - // SwDataChanged aTmp( *pPam, 0 ); + // SwDataChanged aTmp( *pPam ); std::auto_ptr< SwDataChanged > pDataChanged; if ( bSendDataChangedEvents ) { - pDataChanged.reset( new SwDataChanged( *pPam, 0 ) ); + pDataChanged.reset( new SwDataChanged( *pPam ) ); } SwHistory* pHst = 0; if (GetIDocumentUndoRedo().DoesUndo()) @@ -1019,7 +1019,7 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet, bool SwDoc::InsertPoolItem( const SwPaM &rRg, const SfxPoolItem &rHt, const SetAttrMode nFlags ) { - SwDataChanged aTmp( rRg, 0 ); + SwDataChanged aTmp( rRg ); SwUndoAttr* pUndoAttr = 0; if (GetIDocumentUndoRedo().DoesUndo()) { @@ -1044,7 +1044,7 @@ bool SwDoc::InsertPoolItem( const SwPaM &rRg, const SfxPoolItem &rHt, bool SwDoc::InsertItemSet ( const SwPaM &rRg, const SfxItemSet &rSet, const SetAttrMode nFlags ) { - SwDataChanged aTmp( rRg, 0 ); + SwDataChanged aTmp( rRg ); SwUndoAttr* pUndoAttr = 0; if (GetIDocumentUndoRedo().DoesUndo()) { @@ -1689,7 +1689,7 @@ sal_Bool SwDoc::SetTxtFmtColl( const SwPaM &rRg, bool bReset, bool bResetListAttrs ) { - SwDataChanged aTmp( rRg, 0 ); + SwDataChanged aTmp( rRg ); const SwPosition *pStt = rRg.Start(), *pEnd = rRg.End(); SwHistory* pHst = 0; sal_Bool bRet = sal_True; diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index a0ff16871f07..6ac2c6ad6cb7 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -1874,7 +1874,7 @@ sal_Bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, sal_Bool bIsOutl // which objects are still in the Area. // After the move they could come before/after the // Position. - SwDataChanged aTmp( rPam, 0 ); + SwDataChanged aTmp( rPam ); } SwNodeIndex aIdx( nOffset > 0 ? pEnd->nNode : pStt->nNode, nOffs ); diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx index ceba15f63041..80c7ea68e7e2 100644 --- a/sw/source/core/doc/swserv.cxx +++ b/sw/source/core/doc/swserv.cxx @@ -303,16 +303,16 @@ void SwServerObject::SetDdeBookmark( ::sw::mark::IMark& rBookmark) -SwDataChanged::SwDataChanged( const SwPaM& rPam, sal_uInt16 nTyp ) - : pPam( &rPam ), pPos( 0 ), pDoc( rPam.GetDoc() ), nType( nTyp ) +SwDataChanged::SwDataChanged( const SwPaM& rPam ) + : pPam( &rPam ), pPos( 0 ), pDoc( rPam.GetDoc() ) { nNode = rPam.GetPoint()->nNode.GetIndex(); nCntnt = rPam.GetPoint()->nContent.GetIndex(); } -SwDataChanged::SwDataChanged( SwDoc* pDc, const SwPosition& rPos, sal_uInt16 nTyp ) - : pPam( 0 ), pPos( &rPos ), pDoc( pDc ), nType( nTyp ) +SwDataChanged::SwDataChanged( SwDoc* pDc, const SwPosition& rPos ) + : pPam( 0 ), pPos( &rPos ), pDoc( pDc ) { nNode = rPos.nNode.GetIndex(); nCntnt = rPos.nContent.GetIndex(); diff --git a/sw/source/core/inc/SwXMLBlockListContext.hxx b/sw/source/core/inc/SwXMLBlockListContext.hxx index 9e03115fa87a..3fd001aff5cf 100644 --- a/sw/source/core/inc/SwXMLBlockListContext.hxx +++ b/sw/source/core/inc/SwXMLBlockListContext.hxx @@ -46,9 +46,6 @@ public: class SwXMLBlockContext : public SvXMLImportContext { -private: - SwXMLBlockListImport & rLocalRef; - public: SwXMLBlockContext( SwXMLBlockListImport& rImport, sal_uInt16 nPrefix, diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx index 212b64850b34..ee8ede68e611 100644 --- a/sw/source/core/inc/docfld.hxx +++ b/sw/source/core/inc/docfld.hxx @@ -35,7 +35,6 @@ class SwTxtFld; class SwIndex; class SwNodeIndex; -class SwCntntNode; class SwCntntFrm; class SwSectionNode; class SwSection; @@ -154,10 +153,6 @@ class SwDocUpdtFld _SetGetExpFlds* pFldSortLst; // current field list for calculation SwCalcFldType* aFldTypeTable[ TBLSZ ]; - // another optimization - currently not used! - long nFldUpdtPos; // start update from this position - SwCntntNode* pCNode; // TxtNode at update position - sal_uLong nNodes; // if the node count is different sal_uInt8 nFldLstGetMode; diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index c36093863622..9c5656612e02 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -130,11 +130,10 @@ class SwDataChanged SwDoc* pDoc; sal_uLong nNode; xub_StrLen nCntnt; - sal_uInt16 nType; // Insert/Move/Delete/... (UndoIds) public: - SwDataChanged( const SwPaM& rPam, sal_uInt16 nType ); - SwDataChanged( SwDoc* pDoc, const SwPosition& rPos, sal_uInt16 nType ); + SwDataChanged( const SwPaM& rPam ); + SwDataChanged( SwDoc* pDoc, const SwPosition& rPos ); ~SwDataChanged(); sal_uLong GetNode() const { return nNode; } diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index d182c5cfcfc6..2a73bb77e8dd 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -44,7 +44,6 @@ class SwBlockName { friend class SwImpBlocks; sal_uInt16 nHashS, nHashL; // Hash-Codes zum Checken - long nPos; // Dateiposition (SW2-Format) public: String aShort; // Short name String aLong; // Long name @@ -53,7 +52,7 @@ public: sal_Bool bIsOnlyTxt : 1; // unformatted text sal_Bool bInPutMuchBlocks : 1; // put serveral block entries - SwBlockName( const String& rShort, const String& rLong, long n ); + SwBlockName( const String& rShort, const String& rLong ); SwBlockName( const String& rShort, const String& rLong, const String& rPackageName ); // fuer das Einsortieren in das Array diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index 2c54072773ca..c0acab9fc6cb 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -75,9 +75,6 @@ class SwCache SwCacheObj *pFirst; //der virtuelle erste. SwCacheObj *pLast; - const sal_uInt16 nMax; //Mehr sollen nicht aufgenommen werden, - //der Cache kann aber dynamisch um jeweils - //nMax vergroessert werden. sal_uInt16 nCurMax; //Mehr werden nicht aufgenommen. diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index b3efb8826a1d..3bef609d8be0 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -345,8 +345,7 @@ void SwCalcPixStatics( OutputDevice *pOut ) //To be able to save the statics so the paint is more or lees reentrant. class SwSavePaintStatics { - sal_Bool bSFlyMetafile, - bSPageOnly; + sal_Bool bSFlyMetafile; ViewShell *pSGlobalShell; OutputDevice *pSFlyMetafileOut; SwFlyFrm *pSRetoucheFly, diff --git a/sw/source/core/swg/SwXMLBlockListContext.cxx b/sw/source/core/swg/SwXMLBlockListContext.cxx index f86f30178d3c..36ad18e41dd3 100644 --- a/sw/source/core/swg/SwXMLBlockListContext.cxx +++ b/sw/source/core/swg/SwXMLBlockListContext.cxx @@ -90,8 +90,7 @@ SwXMLBlockContext::SwXMLBlockContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) : - SvXMLImportContext ( rImport, nPrefix, rLocalName ), - rLocalRef(rImport) + SvXMLImportContext ( rImport, nPrefix, rLocalName ) { static const CharClass & rCC = GetAppCharClass(); String aShort, aLong, aPackageName; diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx index cb938d21d2fa..46954c00b653 100644 --- a/sw/source/core/swg/swblocks.cxx +++ b/sw/source/core/swg/swblocks.cxx @@ -65,15 +65,15 @@ sal_uInt16 SwImpBlocks::Hash( const String& r ) } -SwBlockName::SwBlockName( const String& rShort, const String& rLong, long n ) - : nPos( n ), aShort( rShort ), aLong( rLong ), aPackageName (rShort), +SwBlockName::SwBlockName( const String& rShort, const String& rLong ) + : aShort( rShort ), aLong( rLong ), aPackageName (rShort), bIsOnlyTxtFlagInit( sal_False ), bIsOnlyTxt( sal_False ) { nHashS = SwImpBlocks::Hash( rShort ); nHashL = SwImpBlocks::Hash( rLong ); } SwBlockName::SwBlockName( const String& rShort, const String& rLong, const String& rPackageName) - : nPos( 0 ), aShort( rShort ), aLong( rLong ), aPackageName (rPackageName), + : aShort( rShort ), aLong( rLong ), aPackageName (rPackageName), bIsOnlyTxtFlagInit( sal_False ), bIsOnlyTxt( sal_False ) { nHashS = SwImpBlocks::Hash( rShort ); @@ -205,7 +205,7 @@ void SwImpBlocks::AddName( const String& rShort, const String& rLong, delete aNames[nIdx]; aNames.erase( aNames.begin() + nIdx ); } - SwBlockName* pNew = new SwBlockName( rShort, rLong, 0L ); + SwBlockName* pNew = new SwBlockName( rShort, rLong ); pNew->bIsOnlyTxtFlagInit = sal_True; pNew->bIsOnlyTxt = bOnlyTxt; aNames.insert( pNew ); diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 6cb4d561fe71..a975d04776a4 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -778,7 +778,6 @@ class SwDefFontSave SwTxtSizeInfo *pInf; SwFont *pFnt; SwFont *pNewFnt; - sal_Bool bAlter; public: SwDefFontSave( const SwTxtSizeInfo &rInf ); ~SwDefFontSave(); diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index 05f0cc9a1514..70af19170e13 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -184,7 +184,7 @@ SwRedlineItr::SwRedlineItr( const SwTxtNode& rTxtNd, SwFont& rFnt, SwAttrHandler& rAH, MSHORT nRed, sal_Bool bShw, const std::vector<sal_uInt16> *pArr, xub_StrLen nExtStart ) - : rDoc( *rTxtNd.GetDoc() ), rNd( rTxtNd ), rAttrHandler( rAH ), pSet( 0 ), + : rDoc( *rTxtNd.GetDoc() ), rAttrHandler( rAH ), pSet( 0 ), nNdIdx( rTxtNd.GetIndex() ), nFirst( nRed ), nAct( MSHRT_MAX ), bOn( sal_False ), bShow( bShw ) { diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx index 42f1c24053e6..8323f0539a9e 100644 --- a/sw/source/core/text/redlnitr.hxx +++ b/sw/source/core/text/redlnitr.hxx @@ -68,7 +68,6 @@ class SwRedlineItr { std::deque<SwTxtAttr *> m_Hints; const SwDoc& rDoc; - const SwTxtNode& rNd; SwAttrHandler& rAttrHandler; SfxItemSet *pSet; SwExtend *pExt; diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 57ac3b54ae3f..148d26114cc6 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -184,10 +184,9 @@ public: typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > StringHashMap; class SwVbaProjectNameProvider : public ::cppu::WeakImplHelper1< container::XNameContainer > { - SwDocShell* mpDocShell; StringHashMap mTemplateToProject; public: - SwVbaProjectNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell ) + SwVbaProjectNameProvider() { } virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) @@ -603,7 +602,7 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16 uno::Reference< container::XNameContainer > xProjProv = pDoc->GetVBATemplateToProjectCache(); if ( !xProjProv.is() && pDoc->GetDocShell() && ooo::vba::isAlienWordDoc( *pDoc->GetDocShell() ) ) { - xProjProv = new SwVbaProjectNameProvider( pDoc->GetDocShell() ); + xProjProv = new SwVbaProjectNameProvider; pDoc->SetVBATemplateToProjectCache( xProjProv ); } //xRet = (cppu::OWeakObject*)xProjProv; diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 447159ce5352..a851413e8641 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -2933,15 +2933,13 @@ void SwXStyle::Invalidate() SwXPageStyle::SwXPageStyle(SfxStyleSheetBasePool& rPool, SwDocShell* pDocSh, SfxStyleFamily eFam, const String& rStyleName): - SwXStyle(rPool, eFam, pDocSh->GetDoc(), rStyleName), - pDocShell(pDocSh) + SwXStyle(rPool, eFam, pDocSh->GetDoc(), rStyleName) { } SwXPageStyle::SwXPageStyle(SwDocShell* pDocSh) : - SwXStyle(pDocSh->GetDoc(), SFX_STYLE_FAMILY_PAGE), - pDocShell(pDocSh) + SwXStyle(pDocSh->GetDoc(), SFX_STYLE_FAMILY_PAGE) { } diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx index 65ca502aa608..ef18fc883df3 100644 --- a/sw/source/filter/html/htmlctxt.cxx +++ b/sw/source/filter/html/htmlctxt.cxx @@ -67,8 +67,6 @@ class _HTMLAttrContext_SaveDoc sal_Bool bStripTrailingPara : 1; // letzen Absatz entfernen? sal_Bool bKeepNumRules : 1; // Numerierung beibehalten? - sal_Bool bPopStack : 1; // Stack-Elemente oberhalb des - // zu schliessenden entfernen? sal_Bool bFixHeaderDist : 1; sal_Bool bFixFooterDist : 1; @@ -78,7 +76,6 @@ public: pPos( 0 ), pAttrTab( 0 ), nContextStMin( USHRT_MAX ), nContextStAttrMin( USHRT_MAX ), bStripTrailingPara( sal_False ), bKeepNumRules( sal_False ), - bPopStack( sal_False ), bFixHeaderDist( sal_False ), bFixFooterDist( sal_False ) {} diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 634fe20af61d..5bf9d26db013 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -133,7 +133,6 @@ class WW8_WrFkp sal_uInt8 nItemSize; sal_uInt8 nIMax; // Anzahl der Eintrags-Paare sal_uInt8 nOldVarLen; - sal_uInt8 nMark; bool bCombined; // true : Einfuegen verboten sal_uInt8 SearchSameSprm( sal_uInt16 nVarLen, const sal_uInt8* pSprms ); @@ -892,7 +891,7 @@ 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 )), - nIMax(0), nOldVarLen(0), nMark(0), bCombined(false) + nIMax(0), nOldVarLen(0), bCombined(false) { pFkp = (sal_uInt8*)new sal_Int32[128]; // 512 Byte pOfs = (sal_uInt8*)new sal_Int32[128]; // 512 Byte diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 8d24c241155e..b3e0d014e321 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -815,7 +815,6 @@ SwXMLTableColContext_Impl::~SwXMLTableColContext_Impl() class SwXMLTableColsContext_Impl : public SvXMLImportContext { SvXMLImportContextRef xMyTable; - sal_Bool bHeader; SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; } @@ -825,8 +824,7 @@ public: SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList, - SwXMLTableContext *pTable, - sal_Bool bHead ); + SwXMLTableContext *pTable ); virtual ~SwXMLTableColsContext_Impl(); @@ -840,10 +838,9 @@ public: SwXMLTableColsContext_Impl::SwXMLTableColsContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > &, - SwXMLTableContext *pTable, sal_Bool bHead ) : + SwXMLTableContext *pTable ) : SvXMLImportContext( rImport, nPrfx, rLName ), - xMyTable( pTable ), - bHeader( bHead ) + xMyTable( pTable ) { } @@ -1482,12 +1479,11 @@ SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, switch( rTokenMap.Get( nPrefix, rLocalName ) ) { case XML_TOK_TABLE_HEADER_COLS: - bHeader = sal_True; case XML_TOK_TABLE_COLS: if( IsValid() ) pContext = new SwXMLTableColsContext_Impl( GetSwImport(), nPrefix, rLocalName, xAttrList, - this, bHeader ); + this ); break; case XML_TOK_TABLE_COL: if( IsValid() && IsInsertColPossible() ) diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx index 12672aad42db..a15588e04bcd 100644 --- a/sw/source/ui/config/usrpref.cxx +++ b/sw/source/ui/config/usrpref.cxx @@ -394,8 +394,7 @@ Sequence<OUString> SwGridConfig::GetPropertyNames() SwGridConfig::SwGridConfig(sal_Bool bIsWeb, SwMasterUsrPref& rPar) : ConfigItem(bIsWeb ? C2U("Office.WriterWeb/Grid") : C2U("Office.Writer/Grid"), CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), - rParent(rPar), - bWeb(bIsWeb) + rParent(rPar) { } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 4642b444baea..87bf68e80fcd 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -374,7 +374,6 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ) aImageIL ( SW_RES(IL_BITMAPS)), rSh( rWrtSh ), - pAktEntry( 0 ), m_pDocInserter ( NULL ), m_pOldDefDlgParent ( NULL ), bDontCheckPasswd ( sal_True) diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx index b237996ff367..edcb45181f2e 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.cxx +++ b/sw/source/ui/docvw/SidebarTxtControl.cxx @@ -72,7 +72,6 @@ SidebarTxtControl::SidebarTxtControl( SwSidebarWin& rSidebarWin, , mrSidebarWin( rSidebarWin ) , mrDocView( rDocView ) , mrPostItMgr( rPostItMgr ) - , mbMouseOver( false ) { AddEventListener( LINK( &mrSidebarWin, SwSidebarWin, WindowEventListener ) ); } diff --git a/sw/source/ui/docvw/SidebarTxtControl.hxx b/sw/source/ui/docvw/SidebarTxtControl.hxx index e3d37421d2f7..2c703d9e685b 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.hxx +++ b/sw/source/ui/docvw/SidebarTxtControl.hxx @@ -47,8 +47,6 @@ class SidebarTxtControl : public Control SwView& mrDocView; SwPostItMgr& mrPostItMgr; - bool mbMouseOver; - protected: virtual void Paint( const Rectangle& rRect); virtual void KeyInput( const KeyEvent& rKeyEvt ); diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index d440523554d0..d31bf82bcbf3 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -61,7 +61,6 @@ class SwLabPreview : public Window long lLeftWidth; long lUpperWidth; long lColsWidth; - long PRowsWidth; long lPWidthWidth; long lPHeightWidth; diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 2d4cc6f1b5ad..c7e20d6b5ba0 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1255,7 +1255,6 @@ sal_uInt16 SwFldVarPage::GetGroup() SelectionListBox::SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId ) : ListBox (pDialog, rResId), - pDlg (pDialog), bCallAddSelection(sal_False) { } diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index f925dca4fb24..27611c1953a9 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -44,7 +44,6 @@ class SwFldVarPage; class SelectionListBox : public ListBox { - SwFldVarPage* pDlg; sal_Bool bCallAddSelection; virtual long PreNotify( NotifyEvent& rNEvt ); diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx index 0a994c0f0a9d..9bdd0b9e333b 100644 --- a/sw/source/ui/inc/content.hxx +++ b/sw/source/ui/inc/content.hxx @@ -186,8 +186,6 @@ class SwContentType : public SwTypeNumber sal_uInt16 nMemberCount; // content count sal_uInt16 nContentType; // content type's Id sal_uInt8 nOutlineLevel; - sal_Bool bMemberFilled : 1; // has content already been inserted? - sal_Bool bIsInternalDrag:1; // can content be relocated? sal_Bool bDataValid : 1; // sal_Bool bEdit: 1; // can this type be edited? sal_Bool bDelete: 1; // can this type be deleted? diff --git a/sw/source/ui/inc/frmdlg.hxx b/sw/source/ui/inc/frmdlg.hxx index 0cadce11e1b9..31ca68cd1365 100644 --- a/sw/source/ui/inc/frmdlg.hxx +++ b/sw/source/ui/inc/frmdlg.hxx @@ -41,7 +41,6 @@ class SwFrmDlg : public SfxTabDialog sal_Bool m_bFormat; sal_Bool m_bNew; sal_Bool m_bHTMLMode; - bool m_bEnableVertPos; const SfxItemSet& m_rSet; sal_uInt16 m_nDlgType; SwWrtShell* m_pWrtShell; diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index 4a73d99a4522..94453ce5d709 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -106,7 +106,6 @@ class SwFrmPage: public SfxTabPage sal_Bool bFormat; sal_Bool bNew; sal_Bool bNoModifyHdl; - sal_Bool bVerticalChanged; //check done whether frame is in vertical environment sal_Bool bIsVerticalFrame; //current frame is in vertical environment - strings are exchanged // --> OD 2009-08-31 #mongolianlayou# sal_Bool bIsVerticalL2R; diff --git a/sw/source/ui/inc/glshell.hxx b/sw/source/ui/inc/glshell.hxx index c37939c5fd7e..abe5fac02bad 100644 --- a/sw/source/ui/inc/glshell.hxx +++ b/sw/source/ui/inc/glshell.hxx @@ -25,7 +25,6 @@ class SwGlosDocShell : public SwDocShell String aLongName; String aShortName; String aGroupName; - sal_Bool bShow; using SotObject::GetInterface; diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx index 7814825d3b4d..8404b448da4e 100644 --- a/sw/source/ui/inc/inputwin.hxx +++ b/sw/source/ui/inc/inputwin.hxx @@ -111,7 +111,6 @@ public: class SwInputChild : public SfxChildWindow { - sal_Bool bObjVis; SfxDispatcher* pDispatch; public: SwInputChild( Window* , diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/ui/inc/insfnote.hxx index 367f2537f5c9..5380994d8e2f 100644 --- a/sw/source/ui/inc/insfnote.hxx +++ b/sw/source/ui/inc/insfnote.hxx @@ -44,7 +44,6 @@ class SwInsFootNoteDlg: public SvxStandardDialog // everything for the character(s) String aFontName; CharSet eCharSet; - char cExtChar; sal_Bool bExtCharAvailable; sal_Bool bEdit; FixedLine aNumberFL; diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx index d6133666918f..4bbdc118084c 100644 --- a/sw/source/ui/inc/num.hxx +++ b/sw/source/ui/inc/num.hxx @@ -149,7 +149,6 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog SwWrtShell& rWrtSh; String sRemoveText; - int nRetOptionsDialog; protected: virtual short Ok(); diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx index 6889c227d3fb..908aa53b97ef 100644 --- a/sw/source/ui/inc/optload.hxx +++ b/sw/source/ui/inc/optload.hxx @@ -159,7 +159,6 @@ private: String sNone; SwFldMgr *pMgr; - sal_uInt16 eType; sal_Bool bHTMLMode; DECL_LINK(SelectHdl, void *); diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index 63618c331e7f..0217dbfd7f31 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -109,7 +109,6 @@ class SwEditRegionDlg : public SfxModalDialog SwWrtShell& rSh; SectReprArr aSectReprArr; - SvLBoxEntry* pAktEntry; const SwSection* pCurrSect; sfx2::DocumentInserter* m_pDocInserter; Window* m_pOldDefDlgParent; diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/ui/inc/swuiccoll.hxx index 7d94b5d90f16..58d920daa130 100644 --- a/sw/source/ui/inc/swuiccoll.hxx +++ b/sw/source/ui/inc/swuiccoll.hxx @@ -20,7 +20,6 @@ #define _SWUI_CCOLL_HXX #include <tools/resary.hxx> -#include "ccoll.hxx" class SwWrtShell; class SwFmt; @@ -48,8 +47,6 @@ class SwCondCollPage : public SfxTabPage const CommandStruct*pCmds; SwFmt* pFmt; - CollName* pNms; - sal_Bool bNewTemplate; diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/ui/inc/usrpref.hxx index fbf1971fe959..351746807c27 100644 --- a/sw/source/ui/inc/usrpref.hxx +++ b/sw/source/ui/inc/usrpref.hxx @@ -74,7 +74,6 @@ class SwLayoutViewConfig : public utl::ConfigItem class SwGridConfig : public utl::ConfigItem { SwMasterUsrPref& rParent; - sal_Bool bWeb; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx index 2e8588c23c15..34fddb56a10f 100644 --- a/sw/source/ui/inc/workctrl.hxx +++ b/sw/source/ui/inc/workctrl.hxx @@ -139,9 +139,6 @@ class SwScrollNaviPopup : public SfxPopupWindow String sQuickHelp[2 * NID_COUNT]; - sal_uInt16 nFwdId; - sal_uInt16 nBackId; - void ApplyImageList(); using Window::GetQuickHelpText; diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx index 29644eecefaf..592606650a35 100644 --- a/sw/source/ui/misc/glshell.cxx +++ b/sw/source/ui/misc/glshell.cxx @@ -138,7 +138,6 @@ sal_Bool lcl_Save( SwWrtShell& rSh, const String& rGroupName, SwGlosDocShell::SwGlosDocShell(sal_Bool bNewShow) : SwDocShell( (bNewShow) ? SFX_CREATE_MODE_STANDARD : SFX_CREATE_MODE_INTERNAL ) - , bShow ( bNewShow ) { SetHelpId(SW_GLOSDOCSHELL); } diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 791407cbe5d3..c3c61dc78bd6 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -915,8 +915,7 @@ SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell & rSh) : SfxTabDialog(pParent, SW_RES(DLG_SVXTEST_NUM_BULLET), pSwItemSet, sal_False, &aEmptyStr), rWrtSh(rSh), - sRemoveText(SW_RES(ST_RESET)), - nRetOptionsDialog(USHRT_MAX) + sRemoveText(SW_RES(ST_RESET)) { FreeResource(); GetUserButton()->SetText(sRemoveText); diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index 168c435b8599..f95429f11867 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -404,9 +404,7 @@ SwScrollNaviPopup::SwScrollNaviPopup( sal_uInt16 nId, const Reference< XFrame >& aToolBox(this, 0), aSeparator(this, SW_RES(FL_SEP)), aInfoField(this, SW_RES(FI_INFO)), - aIList(SW_RES(IL_VALUES)), - nFwdId(FN_START_OF_NEXT_PAGE), - nBackId(FN_START_OF_PREV_PAGE) + aIList(SW_RES(IL_VALUES)) { sal_uInt16 i; diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 9330f46519ba..c3d0d44c2ee5 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -209,7 +209,6 @@ SwContentType::SwContentType(SwWrtShell* pShell, sal_uInt16 nType, sal_uInt8 nLe nMemberCount(0), nContentType(nType), nOutlineLevel(nLevel), - bMemberFilled(sal_False), bDataValid(sal_False), bEdit(sal_False), bDelete(sal_True) diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index f0ae51bea074..1d7f28258be8 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -112,7 +112,7 @@ public: } }; -SwVbaCells::SwVbaCells( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (uno::RuntimeException) : SwVbaCells_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new CellCollectionHelper( xParent, xContext, xTextTable, nLeft, nTop, nRight, nBottom ) ) ), mxTextTable( xTextTable ), mnLeft( nLeft ), mnTop( nTop ), mnRight( nRight ), mnBottom( nBottom ) +SwVbaCells::SwVbaCells( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (uno::RuntimeException) : SwVbaCells_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new CellCollectionHelper( xParent, xContext, xTextTable, nLeft, nTop, nRight, nBottom ) ) ), mxTextTable( xTextTable ), mnTop( nTop ), mnBottom( nBottom ) { } diff --git a/sw/source/ui/vba/vbacells.hxx b/sw/source/ui/vba/vbacells.hxx index c35d2254bb0b..6c15c09f20e1 100644 --- a/sw/source/ui/vba/vbacells.hxx +++ b/sw/source/ui/vba/vbacells.hxx @@ -39,9 +39,7 @@ class SwVbaCells : public SwVbaCells_BASE { private: css::uno::Reference< css::text::XTextTable > mxTextTable; - sal_Int32 mnLeft; sal_Int32 mnTop; - sal_Int32 mnRight; sal_Int32 mnBottom; public: diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx index 3a8921879d92..59b1aecb8198 100644 --- a/sw/source/ui/vba/vbatablehelper.cxx +++ b/sw/source/ui/vba/vbatablehelper.cxx @@ -35,7 +35,7 @@ using namespace ::ooo::vba; #define UNO_TABLE_COLUMN_SUM 10000 -SwVbaTableHelper::SwVbaTableHelper( const uno::Reference< text::XTextTable >& xTextTable ) throw (uno::RuntimeException) : mxTextTable( xTextTable ), pDoc( NULL ) +SwVbaTableHelper::SwVbaTableHelper( const uno::Reference< text::XTextTable >& xTextTable ) throw (uno::RuntimeException) : mxTextTable( xTextTable ) { pTable = GetSwTable( mxTextTable ); } diff --git a/sw/source/ui/vba/vbatablehelper.hxx b/sw/source/ui/vba/vbatablehelper.hxx index 72fc09bd1331..464c021a45e3 100644 --- a/sw/source/ui/vba/vbatablehelper.hxx +++ b/sw/source/ui/vba/vbatablehelper.hxx @@ -32,14 +32,12 @@ #include "wordvbahelper.hxx" #include <swtable.hxx> #include <tabcol.hxx> -#include <doc.hxx> class SwVbaTableHelper { private: css::uno::Reference< css::text::XTextTable > mxTextTable; SwTable* pTable; - SwDoc* pDoc; private: SwTableBox* GetTabBox( sal_Int32 nCol, sal_Int32 nRow ) throw (css::uno::RuntimeException); |