From 8770cd3894ce27ea7ceea3047af9899be57aae83 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 23 Nov 2015 14:32:03 +0200 Subject: loplugin:unusedfields in sw/ Change-Id: I323a038e5581b00cd3a4ea2f362c66540377759e --- sw/source/filter/html/htmlatr.cxx | 1 - sw/source/filter/html/swhtml.cxx | 1 - sw/source/filter/html/swhtml.hxx | 2 -- sw/source/filter/html/wrthtml.cxx | 1 - sw/source/filter/html/wrthtml.hxx | 3 --- sw/source/filter/inc/wrtswtbl.hxx | 1 - sw/source/filter/writer/wrtswtbl.cxx | 3 +-- sw/source/filter/ww8/wrtww8.hxx | 1 - sw/source/filter/ww8/ww8par3.cxx | 2 -- sw/source/filter/xml/xmlexp.cxx | 3 +-- sw/source/filter/xml/xmlexp.hxx | 1 - sw/source/filter/xml/xmltexte.cxx | 1 - sw/source/filter/xml/xmltexte.hxx | 1 - 13 files changed, 2 insertions(+), 19 deletions(-) (limited to 'sw/source/filter') diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index c053eb298b77..7b644865b823 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -232,7 +232,6 @@ SwHTMLFormatInfo::SwHTMLFormatInfo( const SwFormat *pF, SwDoc *pDoc, SwDoc *pTem LanguageType eDfltLang, sal_uInt16 nCSS1Script, bool bHardDrop ) : pFormat(pF) - , pRefFormat(nullptr) , pItemSet(nullptr) , nLeftMargin(0) , nRightMargin(0) diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 7e2ea5721b2d..54cfe6767ba8 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -284,7 +284,6 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn, m_bLBEntrySelected ( false ), m_bTAIgnoreNewPara ( false ), m_bFixMarqueeWidth ( false ), - m_bFixMarqueeHeight ( false ), m_bNoParSpace( false ), m_bInNoEmbed( false ), m_bInTitle( false ), diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 4429254e7489..da2a33aa64e1 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -359,7 +359,6 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient OUString m_aPathToFile; OUString m_sBaseURL; - OUString m_sSaveBaseURL; OUString m_aBasicLib; OUString m_aBasicModule; OUString m_aScriptSource; // Inhalt des aktuellen Script-Blocks @@ -451,7 +450,6 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient bool m_bLBEntrySelected : 1; // Ist der aktuelle Listbox-Eintrag selekt. bool m_bTAIgnoreNewPara : 1; // naechstes LF in TextArea ignorieren? bool m_bFixMarqueeWidth : 1; // Groesse einer Laufschrift anpassen? - bool m_bFixMarqueeHeight : 1; bool m_bUpperSpace : 1; // obererer Absatz-Abstand wird benoetigt bool m_bNoParSpace : 1; diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 28f7c8f23786..f66e87631f12 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -1417,7 +1417,6 @@ HTMLSaveData::HTMLSaveData(SwHTMLWriter& rWriter, sal_uLong nStt, , bOldOutHeader(rWrt.m_bOutHeader) , bOldOutFooter(rWrt.m_bOutFooter) , bOldOutFlyFrame(rWrt.m_bOutFlyFrame) - , pOldFlyFormat(nullptr) { bOldWriteAll = rWrt.bWriteAll; diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 9a2704af74a4..8a65c8128ae6 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -211,7 +211,6 @@ public: struct SwHTMLFormatInfo { const SwFormat *pFormat; // das Format selbst - const SwFormat *pRefFormat; // das Vergleichs-Format OString aToken; // das auszugebende Token OUString aClass; // die auszugebende Klasse @@ -230,7 +229,6 @@ struct SwHTMLFormatInfo // Konstruktor fuer einen Dummy zum Suchen explicit SwHTMLFormatInfo( const SwFormat *pF ) : pFormat( pF ), - pRefFormat(nullptr), pItemSet( nullptr ), nLeftMargin( 0 ), nRightMargin( 0 ), @@ -624,7 +622,6 @@ struct HTMLSaveData bool bOldOutHeader : 1; bool bOldOutFooter : 1; bool bOldOutFlyFrame : 1; - const SwFlyFrameFormat* pOldFlyFormat; HTMLSaveData( SwHTMLWriter&, sal_uLong nStt, sal_uLong nEnd, bool bSaveNum=true, diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx index 47ea399bfb22..55819710c516 100644 --- a/sw/source/filter/inc/wrtswtbl.hxx +++ b/sw/source/filter/inc/wrtswtbl.hxx @@ -251,7 +251,6 @@ protected: bool m_bGetLineHeightCalled : 1; #endif - bool bColsOption : 1; bool bColTags : 1; bool bLayoutExport : 1; bool bCollectBorderWidth : 1; diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index a9475d2e68b6..5cd0bd4e27a1 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -732,7 +732,7 @@ SwWriteTable::SwWriteTable(const SwTable* pTable, const SwTableLines& rLines, lo #ifdef DBG_UTIL m_bGetLineHeightCalled(false), #endif - bColsOption(false), bColTags(true), bLayoutExport(false), + bColTags(true), bLayoutExport(false), bCollectBorderWidth(true) { sal_uInt32 nParentWidth = nBaseWidth + nLeftSub + nRightSub; @@ -765,7 +765,6 @@ SwWriteTable::SwWriteTable(const SwTable* pTable, const SwHTMLTableLayout *pLayo #ifdef DBG_UTIL m_bGetLineHeightCalled(false), #endif - bColsOption(pLayoutInfo->HasColsOption()), bColTags(pLayoutInfo->HasColTags()), bLayoutExport(true), bCollectBorderWidth(pLayoutInfo->HaveBordersChanged()) { diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index d9eb62718755..9bfb0bdb7139 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -437,7 +437,6 @@ struct MSWordSaveData bool bOldWriteAll : 1; ///< WW8Export only bool bOldOutTable : 1; - bool bOldIsInTable: 1; bool bOldFlyFrmAttrs : 1; bool bOldStartTOX : 1; bool bOldInWriteTOX : 1; diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index b08071a9fa13..ba0d4f03894a 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -430,7 +430,6 @@ struct WW8LFOInfo // unsortiert, d.h. Reihenfolge genau wie im WW8 Stream bool bOverride :1;// Flag, ob die NumRule nicht in maLSTInfos steht, // sondern fuer m_LFOInfos NEU angelegt wurde - bool bSimpleList:1;// Flag, ob diese NumRule nur einen Level verwendet bool bUsedInDoc :1;// Flag, ob diese NumRule im Doc verwendet wird, // oder beim Reader-Ende geloescht werden sollte bool bLSTbUIDSet :1;// Flag, ob bUsedInDoc in maLSTInfos gesetzt wurde, @@ -445,7 +444,6 @@ WW8LFOInfo::WW8LFOInfo(const WW8LFO& rLFO) , nIdLst(rLFO.nIdLst) , nLfoLvl(rLFO.nLfoLvl) , bOverride(rLFO.nLfoLvl != 0) - , bSimpleList(rLFO.bSimpleList) , bUsedInDoc(false) , bLSTbUIDSet(false) { diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index dfce3ca52921..7dd8d1bfba31 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -94,8 +94,7 @@ SwXMLExport::SwXMLExport( bSavedShowChanges( false ), doc( nullptr ), sNumberFormat("NumberFormat"), - sIsProtected("IsProtected"), - sCell("Cell") + sIsProtected("IsProtected") { _InitItemExport(); } diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index c7450aefce4f..1319bdca55cf 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -101,7 +101,6 @@ class SwXMLExport : public SvXMLExport // string constants for table cell export const OUString sNumberFormat; const OUString sIsProtected; - const OUString sCell; void setBlockMode(); private: diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 1091ddd46739..d310886bb0bd 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -174,7 +174,6 @@ SwXMLTextParagraphExport::SwXMLTextParagraphExport( SwXMLExport& rExp, SvXMLAutoStylePoolP& _rAutoStylePool ) : XMLTextParagraphExport( rExp, _rAutoStylePool ), - sTextTable( "TextTable" ), sEmbeddedObjectProtocol( "vnd.sun.star.EmbeddedObject:" ), sGraphicObjectProtocol( "vnd.sun.star.GraphicObject:" ), aAppletClassId( SO3_APPLET_CLASSID ), diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index a1a12b4da503..83140ac61188 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -32,7 +32,6 @@ namespace com { namespace sun { namespace star { namespace style { class SwXMLTextParagraphExport : public XMLTextParagraphExport { - const OUString sTextTable; const OUString sEmbeddedObjectProtocol; const OUString sGraphicObjectProtocol; -- cgit v1.2.3