From d2e4aeb929b346acd0d1a2eaeee7237b89b99474 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 21 Jun 2017 11:41:27 +0200 Subject: loplugin:unusedfields in sw part3 Change-Id: I0ee93f4df757d477912de70937ec1dded82c48fb Reviewed-on: https://gerrit.libreoffice.org/39041 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sw/source/filter/html/css1atr.cxx | 3 --- sw/source/filter/html/htmlbas.cxx | 5 ----- sw/source/filter/html/htmltabw.cxx | 3 --- sw/source/filter/html/svxcss1.cxx | 3 --- sw/source/filter/html/svxcss1.hxx | 1 - sw/source/filter/html/swhtml.cxx | 1 - sw/source/filter/html/swhtml.hxx | 1 - sw/source/filter/html/wrthtml.cxx | 2 -- sw/source/filter/html/wrthtml.hxx | 1 - sw/source/filter/inc/wrtswtbl.hxx | 3 --- sw/source/filter/writer/wrtswtbl.cxx | 2 +- sw/source/ui/dbui/mmoutputtypepage.cxx | 17 ++++------------- sw/source/ui/dbui/mmresultdialogs.cxx | 3 +-- sw/source/ui/envelp/labfmt.cxx | 2 -- sw/source/ui/envelp/labfmt.hxx | 2 -- sw/source/ui/inc/mmresultdialogs.hxx | 3 +-- 16 files changed, 7 insertions(+), 45 deletions(-) (limited to 'sw') diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 1c020e270922..fc83c2a1326a 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -1604,9 +1604,6 @@ static Writer& OutCSS1_SwFormat( Writer& rWrt, const SwFormat& rFormat, bHasScriptDependencies = true; } - if( nPoolFormatId==RES_POOLCOLL_TEXT && !rHTMLWrt.m_bFirstCSS1Property ) - rHTMLWrt.m_bPoolCollTextModified = true; - // export Drop-Caps const SfxPoolItem *pItem; if( SfxItemState::SET==aItemSet.GetItemState( RES_PARATR_DROP, false, &pItem )) diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 2626291fb236..372ee9be7078 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -223,11 +223,6 @@ void SwHTMLParser::AddScriptSource() { m_aScriptSource += "\n"; } - else - { - // We're behind the CR/LF of the line before - m_nScriptStartLineNr = GetLineNr() - 1; - } m_aScriptSource += aToken; } } diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 60a71acc2e2a..d159d5d806f6 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -262,7 +262,6 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, if ( !nRowSpan ) return; - SwWriteTableCol *pCol = m_aCols[nCol]; bool bOutWidth = true; const SwStartNode* pSttNd = pBox->GetSttNd(); @@ -374,8 +373,6 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, sOut.append(static_cast(aPixelSz.Width())); } sOut.append("\""); - if( !m_bLayoutExport && nColSpan==1 ) - pCol->SetOutWidth( false ); } if( nHeight ) diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 6c2c1d1d1fbc..e87fb3ad6adf 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -722,7 +722,6 @@ SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL, sBaseURL( rBaseURL ), pSheetItemSet(nullptr), pItemSet(nullptr), - pSearchEntry( nullptr ), pPropInfo( nullptr ), nMinFixLineSpace( MM50/2 ), eDfltEnc( RTL_TEXTENCODING_DONTKNOW ), @@ -774,14 +773,12 @@ SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL, pSheetItemSet = new SfxItemSet( rPool, &aWhichMap[0] ); pSheetPropInfo = new SvxCSS1PropertyInfo; - pSearchEntry = new SvxCSS1MapEntry( rPool, &aWhichMap[0] ); } SvxCSS1Parser::~SvxCSS1Parser() { delete pSheetItemSet; delete pSheetPropInfo; - delete pSearchEntry; } void SvxCSS1Parser::InsertId( const OUString& rId, diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx index d212362f0d33..5acb446ad586 100644 --- a/sw/source/filter/html/svxcss1.hxx +++ b/sw/source/filter/html/svxcss1.hxx @@ -196,7 +196,6 @@ class SvxCSS1Parser : public CSS1Parser SfxItemSet *pSheetItemSet; // item set of Style-Sheet SfxItemSet *pItemSet; // current item set - SvxCSS1MapEntry *pSearchEntry; SvxCSS1PropertyInfo *pSheetPropInfo; SvxCSS1PropertyInfo *pPropInfo; diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 7b3a4a0c8d85..083d2a2ab07d 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -259,7 +259,6 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn, m_pImageMap( nullptr ), m_pImageMaps(nullptr), m_pFootEndNoteImpl( nullptr ), - m_nScriptStartLineNr( 0 ), m_nBaseFontStMin( 0 ), m_nFontStMin( 0 ), m_nDefListDeep( 0 ), diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index d38ff1ffeb15..43921eb84927 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -412,7 +412,6 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient Size m_aHTMLPageSize; // page size of HTML template sal_uInt32 m_aFontHeights[7]; // font heights 1-7 - sal_uInt32 m_nScriptStartLineNr; // line number of script block ImplSVEvent * m_nEventId; sal_uInt16 m_nBaseFontStMin; diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index adf1d388912d..cff264ca1bc1 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -138,7 +138,6 @@ SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL ) , m_bOutFlyFrame( false ) , m_bFirstCSS1Rule( false ) , m_bFirstCSS1Property( false ) - , m_bPoolCollTextModified( false ) , m_bCSS1IgnoreFirstPageDesc( false ) , m_bNoAlign( false ) , m_bClearLeft( false ) @@ -290,7 +289,6 @@ ErrCode SwHTMLWriter::WriteStream() m_nLeftMargin = m_nDfltLeftMargin = m_nDfltRightMargin = 0; m_nDfltTopMargin = m_nDfltBottomMargin = 0; m_nFirstLineIndent = m_nDfltFirstLineIndent = 0; - m_bPoolCollTextModified = false; m_bFirstCSS1Property = m_bFirstCSS1Rule = false; m_bCSS1IgnoreFirstPageDesc = false; m_nIndentLvl = 0; diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 45edb4e7e71a..c05634abaf86 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -366,7 +366,6 @@ public: bool m_bFirstCSS1Rule : 1; // was a property already written bool m_bFirstCSS1Property : 1; // was a property already written - bool m_bPoolCollTextModified : 1; // the text body style was modified // 16 bool m_bCSS1IgnoreFirstPageDesc : 1; diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx index dcebbc256efd..7ecb70ca3237 100644 --- a/sw/source/filter/inc/wrtswtbl.hxx +++ b/sw/source/filter/inc/wrtswtbl.hxx @@ -164,7 +164,6 @@ class SW_DLLPUBLIC SwWriteTableCol sal_uInt32 nWidthOpt; bool bRelWidthOpt : 1; - bool bOutWidth : 1; // output the column width? public: bool bLeftBorder : 1; // which borders are there? @@ -178,8 +177,6 @@ public: bool HasRightBorder() const { return bRightBorder; } - void SetOutWidth( bool bSet ) { bOutWidth = bSet; } - inline bool operator==( const SwWriteTableCol& rCol ) const; inline bool operator<( const SwWriteTableCol& rCol ) const; diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index df38952d847f..b059f04eaa5d 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -74,7 +74,7 @@ SwWriteTableCell *SwWriteTableRow::AddCell( const SwTableBox *pBox, } SwWriteTableCol::SwWriteTableCol(sal_uInt32 nPosition) - : nPos(nPosition), nWidthOpt(0), bRelWidthOpt(false), bOutWidth(true), + : nPos(nPosition), nWidthOpt(0), bRelWidthOpt(false), bLeftBorder(true), bRightBorder(true) { } diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index e5183576d1ac..6b5444843967 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -95,7 +95,6 @@ struct SwSendMailDialog_Impl std::vector< SwMailDescriptor > aDescriptors; sal_uInt32 nCurrentDescriptor; - sal_uInt32 nDocumentCount; ::rtl::Reference< MailDispatcher > xMailDispatcher; ::rtl::Reference< IMailDispatcherListener> xMailListener; uno::Reference< mail::XMailService > xConnectedMailService; @@ -103,11 +102,10 @@ struct SwSendMailDialog_Impl Idle aRemoveIdle; SwSendMailDialog_Impl() : - nCurrentDescriptor(0), - nDocumentCount(0) - { - aRemoveIdle.SetPriority(TaskPriority::LOWEST); - } + nCurrentDescriptor(0) + { + aRemoveIdle.SetPriority(TaskPriority::LOWEST); + } ~SwSendMailDialog_Impl() { @@ -348,13 +346,6 @@ void SwSendMailDialog::AddDocument( SwMailDescriptor& rDesc ) { IterateMails(); } - -} - -void SwSendMailDialog::SetDocumentCount( sal_Int32 nAllDocuments ) -{ - m_pImpl->nDocumentCount = nAllDocuments; - UpdateTransferStatus(); } IMPL_LINK( SwSendMailDialog, StopHdl_Impl, Button*, pButton, void ) diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index 2001a39ae300..186dc925e263 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -1085,7 +1085,6 @@ IMPL_LINK(SwMMResultEmailDialog, SendDocumentsHdl_Impl, Button*, pButton, void) //create the send dialog VclPtr pDlg = VclPtr::Create(pButton, *xConfigItem); - pDlg->SetDocumentCount( nEnd ); pDlg->ShowDialog(); //help to force painting the dialog //TODO/CLEANUP @@ -1242,7 +1241,7 @@ IMPL_LINK(SwMMResultEmailDialog, SendDocumentsHdl_Impl, Button*, pButton, void) break; } } - pDlg->EnableDesctruction(); + pDlg->EnableDestruction(); ::osl::File::remove( sTargetTempURL ); endDialog(pButton); diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 937cfb59bd31..056c8531f0aa 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -131,8 +131,6 @@ SwLabPreview::SwLabPreview(vcl::Window* pParent) m_lLeftWidth = GetTextWidth(m_aLeftStr ); m_lUpperWidth = GetTextWidth(m_aUpperStr ); m_lColsWidth = GetTextWidth(m_aColsStr ); - m_lPWidthWidth = GetTextWidth(m_aPWidthStr); - m_lPHeightWidth = GetTextWidth(m_aPHeightStr); m_lXHeight = GetTextHeight(); m_lXWidth = GetTextWidth(OUString('X')); } diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 4840eba3ba13..37902090f96e 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -46,8 +46,6 @@ class SwLabPreview : public vcl::Window long m_lLeftWidth; long m_lUpperWidth; long m_lColsWidth; - long m_lPWidthWidth; - long m_lPHeightWidth; long m_lXWidth; long m_lXHeight; diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx index c3ca717bc015..e8280c103cc2 100644 --- a/sw/source/ui/inc/mmresultdialogs.hxx +++ b/sw/source/ui/inc/mmresultdialogs.hxx @@ -213,8 +213,7 @@ public: virtual void dispose() override; void AddDocument( SwMailDescriptor& rDesc ); - void SetDocumentCount( sal_Int32 nAllDocuments ); - void EnableDesctruction() {m_bDesctructionEnabled = true;} + void EnableDestruction() {m_bDesctructionEnabled = true;} void ShowDialog(); void DocumentSent( css::uno::Reference< css::mail::XMailMessage> const & xMessage, -- cgit