compilerplugins/clang/unusedfields.writeonly.results | 36 ------------------- sw/inc/doc.hxx | 2 - sw/inc/printdata.hxx | 9 +--- sw/inc/prtopt.hxx | 2 - sw/inc/view.hxx | 3 - sw/qa/extras/uiwriter/uiwriter.cxx | 8 +--- sw/source/core/doc/docnew.cxx | 2 - sw/source/core/doc/tblrwcl.cxx | 12 +----- sw/source/core/inc/drawfont.hxx | 4 -- sw/source/core/inc/swfont.hxx | 16 -------- sw/source/core/text/porlay.cxx | 2 - sw/source/core/text/porlay.hxx | 4 -- sw/source/core/text/redlnitr.cxx | 4 -- sw/source/core/txtnode/swfont.cxx | 10 ----- sw/source/core/view/printdata.cxx | 1 sw/source/filter/html/htmlform.cxx | 2 - sw/source/filter/html/swhtml.cxx | 1 sw/source/filter/html/swhtml.hxx | 1 sw/source/ui/frmdlg/wrap.cxx | 12 ------ sw/source/uibase/inc/wrap.hxx | 13 ++---- sw/source/uibase/inc/wrtsh.hxx | 1 sw/source/uibase/uiview/view.cxx | 2 - sw/source/uibase/wrtsh/wrtsh1.cxx | 1 23 files changed, 19 insertions(+), 129 deletions(-)
New commits: commit 09a4d2faa429cc52d603abc55d99723f39dc9023 Author: Noel Grandin <[email protected]> Date: Fri Jun 30 13:08:51 2017 +0200 loplugin:unusedfields in sw Change-Id: I807f93757bfddf17f71568f1e3c174229f169f18 Reviewed-on: https://gerrit.libreoffice.org/39409 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results index ed2adcb55220..b3b4b5e7cce1 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -2932,42 +2932,18 @@ svx/source/sidebar/line/LinePropertyPanel.hxx:106 svx::sidebar::LinePropertyPanel maCapStyle sfx2::sidebar::ControllerItem svx/source/table/tablertfimporter.cxx:53 sdr::table::RTFCellDefault maItemSet class SfxItemSet -sw/inc/doc.hxx:328 - SwDoc mxForbiddenCharsTable rtl::Reference<SvxForbiddenCharactersTable> -sw/inc/printdata.hxx:59 - SwPrintData m_pPrintUIOptions const class SwPrintUIOptions * -sw/inc/printdata.hxx:76 - SwPrintData m_bModified _Bool sw/inc/shellio.hxx:147 SwReader aFileName class rtl::OUString sw/inc/swmodule.hxx:93 SwModule m_pErrorHandler class SfxErrorHandler * -sw/inc/view.hxx:232 - SwView m_bAlwaysShowSel _Bool -sw/qa/extras/uiwriter/uiwriter.cxx:3796 - PortionItem msText class rtl::OUString sw/source/core/crsr/crbm.cxx:64 (anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState -sw/source/core/doc/tblrwcl.cxx:198 - CR_SetLineHeight nLines sal_uInt16 sw/source/core/frmedt/fetab.cxx:90 TableWait m_pWait const std::unique_ptr<SwWait> -sw/source/core/inc/drawfont.hxx:96 - SwDrawTextInfo m_bLeft _Bool -sw/source/core/inc/drawfont.hxx:97 - SwDrawTextInfo m_bRight _Bool -sw/source/core/inc/swfont.hxx:166 - SwFont m_bNoHyph _Bool -sw/source/core/inc/swfont.hxx:173 - SwFont m_bNoColorReplace _Bool sw/source/core/inc/swfont.hxx:994 SvStatistics nGetStretchTextSize sal_uInt16 sw/source/core/layout/dbg_lay.cxx:164 SwImplEnterLeave nAction enum DbgAction -sw/source/core/text/porlay.hxx:86 - SwLineLayout m_bFntChg _Bool -sw/source/core/text/porlay.hxx:89 - SwLineLayout m_bTab _Bool sw/source/core/text/xmldump.cxx:33 XmlPortionDumper ofs sal_Int32 sw/source/filter/html/htmlcss1.cxx:77 @@ -2976,8 +2952,6 @@ sw/source/filter/html/htmlcss1.cxx:78 SwCSS1ItemIds nFormatPageDesc sal_uInt16 sw/source/filter/html/htmlcss1.cxx:79 SwCSS1ItemIds nFormatKeep sal_uInt16 -sw/source/filter/html/swhtml.hxx:467 - SwHTMLParser m_bFixSelectHeight _Bool sw/source/filter/inc/rtf.hxx:28 RTFSurround::(anonymous union)::(anonymous) nGoldCut sal_uInt8 sw/source/filter/inc/rtf.hxx:29 @@ -2990,16 +2964,6 @@ sw/source/uibase/inc/uivwimp.hxx:95 SwView_Impl xTmpSelDocSh class SfxObjectShellLock sw/source/uibase/inc/unodispatch.hxx:46 SwXDispatchProviderInterceptor::DispatchMutexLock_Impl aGuard class SolarMutexGuard -sw/source/uibase/inc/wrap.hxx:63 - SwWrapTabPage m_nOldLeftMargin sal_uInt16 -sw/source/uibase/inc/wrap.hxx:64 - SwWrapTabPage m_nOldRightMargin sal_uInt16 -sw/source/uibase/inc/wrap.hxx:65 - SwWrapTabPage m_nOldUpperMargin sal_uInt16 -sw/source/uibase/inc/wrap.hxx:66 - SwWrapTabPage m_nOldLowerMargin sal_uInt16 -sw/source/uibase/inc/wrtsh.hxx:556 - SwWrtShell m_bCopy _Bool toolkit/source/awt/stylesettings.cxx:90 toolkit::StyleMethodGuard m_aGuard class SolarMutexGuard ucb/source/ucp/gio/gio_mount.hxx:46 diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index e63fb0c7dd03..c9fb60cb678b 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -324,8 +324,6 @@ class SW_DLLPUBLIC SwDoc : IGrammarContact *mpGrammarContact; //< for grammar checking in paragraphs during editing - // table of forbidden characters of this document - rtl::Reference<SvxForbiddenCharactersTable> mxForbiddenCharsTable; css::uno::Reference< css::script::vba::XVBAEventProcessor > mxVbaEvents; css::uno::Reference<css::container::XNameContainer> m_xTemplateToProjectCache; diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index b340e6b8640c..eacb046fa089 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -56,7 +56,6 @@ enum class SwPostItMode class SwPrintData { - const SwPrintUIOptions * m_pPrintUIOptions; // not owner const SwRenderData * m_pRenderData; // not owner public: @@ -72,15 +71,13 @@ public: m_bPrintEmptyPages, /// #i56195# no field update while printing mail merge documents - m_bUpdateFieldsInPrinting, - m_bModified; + m_bUpdateFieldsInPrinting; SwPostItMode m_nPrintPostIts; OUString m_sFaxName; SwPrintData() { - m_pPrintUIOptions = nullptr; m_pRenderData = nullptr; m_bPrintGraphic = @@ -98,7 +95,6 @@ public: m_bPrintProspect = m_bPrintProspectRTL = m_bPrintSingleJobs = - m_bModified = m_bPrintBlackFont = m_bPrintHiddenText = m_bPrintTextPlaceholder = false; @@ -135,7 +131,6 @@ public: /** Note: in the context where this class is used the pointers should always be valid during the lifetime of this object */ const SwRenderData & GetRenderData() const { return *m_pRenderData; } - void SetPrintUIOptions( const SwPrintUIOptions *pOpt ) { m_pPrintUIOptions = pOpt; } void SetRenderData( const SwRenderData *pData ) { m_pRenderData = pData; } bool IsPrintGraphic() const { return m_bPrintGraphic; } @@ -176,7 +171,7 @@ public: void SetPrintHiddenText( bool b ) { doSetModified(); m_bPrintHiddenText = b; } void SetPrintTextPlaceholder( bool b ) { doSetModified(); m_bPrintTextPlaceholder = b; } - virtual void doSetModified () { m_bModified = true;} + virtual void doSetModified () {} }; class SwPrintUIOptions : public vcl::PrinterOptionsHelper diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx index 2bab12840019..d43884e6844a 100644 --- a/sw/inc/prtopt.hxx +++ b/sw/inc/prtopt.hxx @@ -36,7 +36,7 @@ public: virtual ~SwPrintOptions() override; virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; - virtual void doSetModified( ) override { m_bModified = true; SetModified();} + virtual void doSetModified() override { SetModified(); } SwPrintOptions& operator=(const SwPrintData& rData) { diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 60e0a783c7d4..67e024ed3e16 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -229,7 +229,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell bool m_bCenterCursor : 1, m_bTopCursor : 1, - m_bAlwaysShowSel : 1, m_bTabColFromDoc : 1, m_bTabRowFromDoc : 1, m_bSetTabColFromDoc : 1 , @@ -310,7 +309,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SAL_DLLPRIVATE void HyphStart( SvxSpellArea eSpell ); SAL_DLLPRIVATE void SpellKontext(bool bOn = true) - { m_bCenterCursor = bOn; m_bAlwaysShowSel = bOn; } + { m_bCenterCursor = bOn; } // for readonly switching SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index f743fd5a80b9..becae3b83617 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -3783,17 +3783,15 @@ void SwUiWriterTest::testTdf87922() struct PortionItem { PortionItem(OUString const & sItemType, sal_Int32 nLength = 0, - sal_uInt16 nTextType = 0, OUString const & sText = OUString()) + sal_uInt16 nTextType = 0) : msItemType(sItemType) , mnLength(nLength) , mnTextType(nTextType) - , msText(sText) {} OUString msItemType; sal_Int32 mnLength; sal_uInt16 mnTextType; - OUString msText; }; class PortionHandler : public SwPortionHandler @@ -3816,11 +3814,11 @@ class PortionHandler : public SwPortionHandler mPortionItems.push_back(PortionItem("text", nLength, nType)); } - virtual void Special(sal_Int32 nLength, const OUString & rText, + virtual void Special(sal_Int32 nLength, const OUString & /*rText*/, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/, const SwFont* /*pFont*/) override { - mPortionItems.push_back(PortionItem("special", nLength, nType, rText)); + mPortionItems.push_back(PortionItem("special", nLength, nType)); } virtual void LineBreak(sal_Int32 /*nWidth*/) override diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index ecb98a2c5284..3f236d2de388 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -712,8 +712,6 @@ void SwDoc::ClearDoc() else mpFrameFormatTable->DeleteAndDestroyAll( true ); - mxForbiddenCharsTable.clear(); - GetDocumentFieldsManager().ClearFieldTypes(); delete mpNumberFormatter; diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index e6f402cace45..d8089483435a 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -195,12 +195,11 @@ struct CR_SetLineHeight SwUndoTableNdsChg* pUndo; SwTwips nMaxSpace, nMaxHeight; TableChgMode nMode; - sal_uInt16 nLines; bool bBigger, bTop; CR_SetLineHeight( TableChgWidthHeightType eType, SwTableNode* pTNd ) : pTableNd( pTNd ), pUndo( nullptr ), - nMaxSpace( 0 ), nMaxHeight( 0 ), nLines( 0 ) + nMaxSpace( 0 ), nMaxHeight( 0 ) { bTop = TableChgWidthHeightType::RowTop == extractPosition( eType ) || TableChgWidthHeightType::CellTop == extractPosition( eType ); @@ -212,7 +211,7 @@ struct CR_SetLineHeight CR_SetLineHeight( const CR_SetLineHeight& rCpy ) : pTableNd( rCpy.pTableNd ), pUndo( rCpy.pUndo ), nMaxSpace( rCpy.nMaxSpace ), nMaxHeight( rCpy.nMaxHeight ), - nMode( rCpy.nMode ), nLines( rCpy.nLines ), + nMode( rCpy.nMode ), bBigger( rCpy.bBigger ), bTop( rCpy.bTop ) {} @@ -4278,13 +4277,6 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, TableChgWidthHeightType eType, *ppUndo = new SwUndoAttrTable( *aParam.pTableNd, true ); CR_SetLineHeight aParam1( aParam ); - if( TableChgMode::FixedWidthChangeProp == m_eTableChgMode && !bBigger && - !aParam.nMaxSpace ) - { - // We need to distribute the space evenly among all the Lines. - // That's why we need their count. - aParam1.nLines = nEnd - nStt; - } if( bTop ) { diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index 63d63568313b..f09f30681ccf 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -93,8 +93,6 @@ public: bool m_bSize : 1; bool m_bFnt : 1; bool m_bHyph : 1; - bool m_bLeft : 1; - bool m_bRight : 1; bool m_bKana : 1; bool m_bOfst : 1; bool m_bAscent: 1; @@ -152,7 +150,7 @@ public: // Get-function: m_bPos = m_bWrong = m_bGrammarCheck = m_bSize = m_bFnt = m_bAscent = m_bSpace = m_bNumberOfBlanks = m_bUppr = - m_bDrawSp = m_bLeft = m_bRight = m_bKana = m_bOfst = m_bHyph = + m_bDrawSp = m_bKana = m_bOfst = m_bHyph = m_bSperr = false; #endif } diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 17510eafef09..e59826889d85 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -163,14 +163,12 @@ class SW_DLLPUBLIC SwFont SwFontScript m_nActual; // actual font (Latin, CJK or CTL) // switch for the font-extensions - bool m_bNoHyph :1; // SwTextNoHyphenHere: no separator bool m_bBlink :1; // blinking font bool m_bPaintBlank :1; // blanks not with DrawRect - bool m_bFontChg :1; + bool m_bFontChg :1; bool m_bOrgChg :1; // nOrgHeight/Ascent are invalid bool m_bURL :1; bool m_bGreyWave :1; // for the extended TextInput: gray waveline - bool m_bNoColorReplace :1; // Replacement without colormanipulation public: SwFont( const SwAttrSet* pSet, const IDocumentSettingAccess* pIDocumentSettingAccess ); @@ -247,7 +245,6 @@ public: inline void SetRelief( const FontRelief eNew ); // Get/Set-methods for the current setting - inline void SetNoHyph( const bool bNew ); inline void SetBlink( const bool bBlink ); bool IsBlink() const { return m_bBlink; } sal_uInt8 &GetTox() { return m_nToxCount; } @@ -261,7 +258,6 @@ public: bool IsURL() const { return m_bURL; } inline void SetGreyWave( const bool bNew ); bool IsGreyWave() const { return m_bGreyWave; } - inline void SetNoCol( const bool bNew ); bool IsPaintBlank() const { return m_bPaintBlank; } // setting of the base class font for SwTextCharFormat @@ -811,11 +807,6 @@ inline void SwFont::SetLanguage( const LanguageType eNewLang, const SwFontScript } } -inline void SwFont::SetNoHyph( const bool bNew ) -{ - m_bNoHyph = bNew; -} - inline void SwFont::SetBlink( const bool bNew ) { m_bBlink = bNew; @@ -826,11 +817,6 @@ inline void SwFont::SetGreyWave( const bool bNew ) m_bGreyWave = bNew; } -inline void SwFont::SetNoCol( const bool bNew ) -{ - m_bNoColorReplace = bNew; -} - inline void SwSubFont::SetVertical( const sal_uInt16 nDir, const bool bVertFormat ) { m_pMagic = nullptr; diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 4492bf729e69..99069d1e1f77 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -622,7 +622,7 @@ void SwLineLayout::MaxAscentDescent( SwTwips& _orAscent, void SwLineLayout::ResetFlags() { - m_bFormatAdj = m_bDummy = m_bFntChg = m_bTab = m_bEndHyph = m_bMidHyph = m_bFly + m_bFormatAdj = m_bDummy = m_bEndHyph = m_bMidHyph = m_bFly = m_bRest = m_bBlinking = m_bClipping = m_bContent = m_bRedline = m_bForcedLeftMargin = m_bHanging = false; } diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx index a95145bd8184..edc3d2b43b53 100644 --- a/sw/source/core/text/porlay.hxx +++ b/sw/source/core/text/porlay.hxx @@ -80,13 +80,11 @@ private: SwLineLayout *m_pNext; // The next Line std::vector<long>* m_pLLSpaceAdd; // Used for justified alignment std::deque<sal_uInt16>* m_pKanaComp; // Used for Kana compression - sal_uInt16 m_nRealHeight; // The height resulting from line spacing and register + sal_uInt16 m_nRealHeight; // The height resulting from line spacing and register bool m_bFormatAdj : 1; bool m_bDummy : 1; - bool m_bFntChg : 1; bool m_bEndHyph : 1; bool m_bMidHyph : 1; - bool m_bTab : 1; bool m_bFly : 1; bool m_bRest : 1; bool m_bBlinking : 1; diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index 3a68743aaff5..c830216b5858 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -257,8 +257,6 @@ short SwRedlineItr::Seek_(SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld) pAttr->SetPriorityAttr( true ); m_Hints.push_back(pAttr); rAttrHandler.PushAndChg( *pAttr, rFnt ); - if( RES_CHRATR_COLOR == nWhich ) - rFnt.SetNoCol( true ); } nWhich = aIter.NextWhich(); } @@ -328,8 +326,6 @@ void SwRedlineItr::Clear_( SwFont* pFnt ) rAttrHandler.Pop( *pPos ); SwTextAttr::Destroy(pPos, const_cast<SwDoc&>(rDoc).GetAttrPool() ); } - if( pFnt ) - pFnt->SetNoCol( false ); } sal_Int32 SwRedlineItr::GetNextRedln_( sal_Int32 nNext ) diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index f7ee6d7cb61c..8c1cd91f3b10 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -648,9 +648,6 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, if( SfxItemState::SET == pAttrSet->GetItemState( RES_CHRATR_KERNING, true, &pItem )) SetFixKerning( static_cast<const SvxKerningItem*>(pItem)->GetValue() ); - if( SfxItemState::SET == pAttrSet->GetItemState( RES_CHRATR_NOHYPHEN, - true, &pItem )) - SetNoHyph( static_cast<const SvxNoHyphenItem*>(pItem)->GetValue() ); if( SfxItemState::SET == pAttrSet->GetItemState( RES_CHRATR_BLINK, true, &pItem )) SetBlink( static_cast<const SvxBlinkItem*>(pItem)->GetValue() ); @@ -693,7 +690,6 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, else { Invalidate(); - m_bNoHyph = false; m_bBlink = false; } m_bPaintBlank = false; @@ -728,8 +724,6 @@ SwFont::SwFont( const SwFont &rFont ) m_bPaintBlank = rFont.m_bPaintBlank; m_bURL = rFont.m_bURL; m_bGreyWave = rFont.m_bGreyWave; - m_bNoColorReplace = rFont.m_bNoColorReplace; - m_bNoHyph = rFont.m_bNoHyph; m_bBlink = rFont.m_bBlink; } @@ -745,8 +739,6 @@ SwFont::SwFont( const SwAttrSet* pAttrSet, m_bPaintBlank = false; m_bURL = false; m_bGreyWave = false; - m_bNoColorReplace = false; - m_bNoHyph = pAttrSet->GetNoHyphenHere().GetValue(); m_bBlink = pAttrSet->GetBlink().GetValue(); m_bOrgChg = true; { @@ -941,8 +933,6 @@ SwFont& SwFont::operator=( const SwFont &rFont ) m_bPaintBlank = rFont.m_bPaintBlank; m_bURL = rFont.m_bURL; m_bGreyWave = rFont.m_bGreyWave; - m_bNoColorReplace = rFont.m_bNoColorReplace; - m_bNoHyph = rFont.m_bNoHyph; m_bBlink = rFont.m_bBlink; return *this; } diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index ff77f21dbd01..9155d7dccf3c 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -146,7 +146,6 @@ void SwRenderData::MakeSwPrtOptions( //! needs to be set after MakeOptions since the assignment operation in that //! function will destroy the pointers - rOptions.SetPrintUIOptions( pOpt ); rOptions.SetRenderData( this ); } diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 07f4fa4174e2..de9bb703509c 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -2300,7 +2300,7 @@ void SwHTMLParser::NewSelect() } Size aSz( MINFLY, MINFLY ); - m_bFixSelectWidth = m_bFixSelectHeight = true; + m_bFixSelectWidth = true; if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.m_eWidthType ) { aSz.Width() = convertTwipToMm100( aCSS1PropInfo.m_nWidth ); diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 083d2a2ab07d..1ae6990ab51c 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -290,7 +290,6 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn, m_bInTitle( false ), m_bUpdateDocStat( false ), m_bFixSelectWidth( false ), - m_bFixSelectHeight( false ), m_bTextArea( false ), m_bSelect( false ), m_bInFootEndNoteAnchor( false ), diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 43921eb84927..80233b825bcf 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -464,7 +464,6 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient bool m_bChkJumpMark : 1; // maybe jump to predetermined mark bool m_bUpdateDocStat : 1; bool m_bFixSelectWidth : 1; // Set new width of select? - bool m_bFixSelectHeight : 1; // Set new height of select? bool m_bTextArea : 1; // 24 bool m_bSelect : 1; diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 810f75e461c5..645166772349 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -65,10 +65,6 @@ SwWrapDlg::SwWrapDlg(vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bo SwWrapTabPage::SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "WrapPage" , "modules/swriter/ui/wrappage.ui", &rSet) - , m_nOldLeftMargin(0) - , m_nOldRightMargin(0) - , m_nOldUpperMargin(0) - , m_nOldLowerMargin(0) , m_nAnchorId(RndStdIds::FLY_AT_PARA) , m_nHtmlMode(0) , m_pWrtSh(nullptr) @@ -410,14 +406,6 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) const SwFormatFrameSize& rFrameSize = static_cast<const SwFormatFrameSize&>(rSet.Get(RES_FRM_SIZE)); Size aSize = rFrameSize.GetSize(); - // margin - const SvxULSpaceItem& rUL = static_cast<const SvxULSpaceItem&>(rSet.Get(RES_UL_SPACE)); - const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>(rSet.Get(RES_LR_SPACE)); - m_nOldLeftMargin = static_cast< sal_uInt16 >(rLR.GetLeft()); - m_nOldRightMargin = static_cast< sal_uInt16 >(rLR.GetRight()); - m_nOldUpperMargin = rUL.GetUpper(); - m_nOldLowerMargin = rUL.GetLower(); - // position const SwFormatHoriOrient& rHori = static_cast<const SwFormatHoriOrient&>(rSet.Get(RES_HORI_ORIENT)); const SwFormatVertOrient& rVert = static_cast<const SwFormatVertOrient&>(rSet.Get(RES_VERT_ORIENT)); diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 00e26825b38a..a2807b1e7bed 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -60,16 +60,11 @@ class SwWrapTabPage: public SfxTabPage VclPtr<CheckBox> m_pWrapOutlineCB; VclPtr<CheckBox> m_pWrapOutsideCB; - sal_uInt16 m_nOldLeftMargin; - sal_uInt16 m_nOldRightMargin; - sal_uInt16 m_nOldUpperMargin; - sal_uInt16 m_nOldLowerMargin; + RndStdIds m_nAnchorId; + sal_uInt16 m_nHtmlMode; - RndStdIds m_nAnchorId; - sal_uInt16 m_nHtmlMode; - - Size m_aFrameSize; - SwWrtShell* m_pWrtSh; + Size m_aFrameSize; + SwWrtShell* m_pWrtSh; bool m_bFormat; bool m_bNew; diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index c491a10ec387..dd12bc01e27f 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -553,7 +553,6 @@ private: bool m_bAddMode :1; bool m_bBlockMode :1; bool m_bLayoutMode :1; - bool m_bCopy :1; bool m_bSelWrd :1; bool m_bSelLn :1; bool m_bIsInClickToEdit:1; diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index fa2693e8a1d0..a0eda8b5d33f 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -721,7 +721,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) // If the view is switch from one to another, the 'old' view is given by // parameter <pOldSh>. - m_bCenterCursor = m_bTopCursor = m_bAlwaysShowSel = m_bTabColFromDoc = m_bTabRowFromDoc = + m_bCenterCursor = m_bTopCursor = m_bTabColFromDoc = m_bTabRowFromDoc = m_bSetTabColFromDoc = m_bSetTabRowFromDoc = m_bAttrChgNotified = m_bAttrChgNotifiedWithRegistrations = m_bVerbsActive = m_bDrawRotate = m_bInOuterResizePixel = m_bInInnerResizePixel = m_bPasteState = m_bPasteSpecialState = m_bMakeSelectionVisible = false; diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index ee1dc7572425..42cf14b8385c 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -128,7 +128,6 @@ using namespace com::sun::star; m_bBlockMode = \ m_bExtMode = \ m_bInSelect = \ - m_bCopy = \ m_bLayoutMode = \ m_bSelWrd = \ m_bSelLn = \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
