loplugin:singlevalfields in sw(part3)

Change-Id: Ie971a1483f4fedda61c81a097399d3d562862891
Reviewed-on: https://gerrit.libreoffice.org/26677
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

9 files changed, 1 insertions, 44 deletions

diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index 9e6a54d53b1a..157e8287f5fb 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -34,7 +34,6 @@ class SvxMacroTableDtor;
 class SwXMLTextBlocks : public SwImpBlocks
 {
 protected:
-    bool                    bAutocorrBlock;
     SfxObjectShellRef       xDocShellRef;
     sal_uInt16              nFlags;
     OUString                aPackageName;
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index d43e220c63f2..2470fd585c59 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -111,11 +111,6 @@ protected:
     bool m_bLayout :1;       ///< FLY_AT_PAGE, FLY_AT_FLY, at page or at frame
     bool m_bAutoPosition :1; ///< FLY_AT_CHAR, anchored at character
 
-    bool m_bNoShrink :1;     ///< temporary forbid shrinking to avoid loops
-    // If true, the content of the fly frame will not be deleted when it
-    // is moved to an invisible layer.
-    bool m_bLockDeleteContent :1;
-
     friend class SwNoTextFrame; // is allowed to call NotifyBackground
 
     Point m_aContentPos;        // content area's position relatively to Frame
@@ -203,8 +198,6 @@ public:
     bool IsNotifyBack() const { return m_bNotifyBack; }
     void SetNotifyBack()      { m_bNotifyBack = true; }
     void ResetNotifyBack()    { m_bNotifyBack = false; }
-    bool IsNoShrink()   const { return m_bNoShrink; }
-    bool IsLockDeleteContent()  const { return m_bLockDeleteContent; }
 
     bool IsClipped()        const   { return m_bHeightClipped || m_bWidthClipped; }
     bool IsHeightClipped()  const   { return m_bHeightClipped; }
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index ee9ef4950d78..fba851b632b4 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -172,9 +172,6 @@ class SwFlyInContentFrame : public SwFlyFrame
 {
     Point aRef;  // relative to this point AbsPos is being calculated
 
-    bool bInvalidLayout :1;
-    bool bInvalidContent  :1;
-
     virtual void DestroyImpl() override;
     virtual ~SwFlyInContentFrame();
 
@@ -196,10 +193,6 @@ public:
     const Point &GetRefPoint() const { return aRef; }
     const Point GetRelPos() const;
 
-    inline void InvalidateLayout() const;
-    inline void InvalidateContent() const;
-    bool IsInvalid() const { return (bInvalidLayout || bInvalidContent); }
-
     // (26.11.93, see tabfrm.hxx, but might also be valid for others)
     // For creation of a Fly after a FlyCnt was created _and_ inserted.
     // Must be called by creator because can be pasted only after creation.
@@ -218,16 +211,6 @@ public:
     virtual void ActionOnInvalidation( const InvalidationType _nInvalid ) override;
 };
 
-inline void SwFlyInContentFrame::InvalidateLayout() const
-{
-    const_cast<SwFlyInContentFrame*>(this)->bInvalidLayout = true;
-}
-inline void SwFlyInContentFrame::InvalidateContent() const
-{
-    const_cast<SwFlyInContentFrame*>(this)->bInvalidContent = true;
-}
-
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index aa278cf6494c..09265df6eab5 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -181,8 +181,6 @@ protected:
     bool     mbHadFollow;
     bool     mbInvaKeep;
     bool     mbValidSize;
-    // #i49383#
-    bool mbFrameDeleted;
 
 public:
     SwFrameNotify( SwFrame *pFrame );
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index d216486958e7..f549bc7b1e3c 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -186,7 +186,6 @@ class SwLayIdle
     SwContentNode *pContentNode;    // The current cursor position is saved here
     sal_Int32  nTextPos;
     bool        bPageValid;     // Were we able to evaluate everything on the whole page?
-    bool        bAllValid;      // Were we able to evaluate everything?
 
 #ifdef DBG_UTIL
     bool m_bIndicator;
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index c7a06b0156ee..14f3662876c6 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -58,8 +58,6 @@ namespace sw { namespace mark
             OUString m_aName;
             OUString m_aShortName;
             vcl::KeyCode m_aCode;
-            bool m_bSavePos;
-            bool m_bSaveOtherPos;
             IDocumentMarkAccess::MarkType m_eOrigBkmType;
             sal_uLong m_nNode1;
             sal_uLong m_nNode2;
diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx
index e6636215a447..1de7de04eb29 100644
--- a/sw/source/core/inc/objectformatter.hxx
+++ b/sw/source/core/inc/objectformatter.hxx
@@ -41,10 +41,6 @@ class SwObjectFormatter
         // page frame, at which the floating screen objects are registered.
         const SwPageFrame& mrPageFrame;
 
-        // boolean, indicating that only as-character anchored objects have to
-        // be formatted.
-        bool mbFormatOnlyAsCharAnchored;
-
         // value of document compatibility option 'Consider wrapping style on
         // object positioning'
         const bool mbConsiderWrapOnObjPos;
@@ -101,11 +97,6 @@ class SwObjectFormatter
             return mpLayAction;
         }
 
-        inline bool FormatOnlyAsCharAnchored() const
-        {
-            return mbFormatOnlyAsCharAnchored;
-        }
-
         /** performs the intrinsic format of a given floating screen object and its content.
         */
         void FormatObj_( SwAnchoredObject& _rAnchoredObj );
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 3c83bcdd40b7..eaea9f9bf95e 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -167,7 +167,6 @@ class SW_DLLPUBLIC SwFont
     bool m_bFontChg        :1;
     bool m_bOrgChg        :1;  // nOrgHeight/Ascent are invalid
     bool m_bURL           :1;
-    bool m_bPaintWrong    :1;  // flag for spelling mistakes
     bool m_bGreyWave      :1;  // for the extended TextInput: gray waveline
     bool m_bNoColorReplace  :1;  // Replacement without colormanipulation
 
@@ -990,12 +989,11 @@ public:
     sal_uInt16 nGetStretchTextSize;
     sal_uInt16 nDrawStretchText;
     sal_uInt16 nChangeFont;
-    sal_uInt16 nGetFontMetric;
 
     inline void Reset()
     {
         nGetTextSize = nDrawText = nGetStretchTextSize =
-        nDrawStretchText = nChangeFont = nGetFontMetric = 0;
+        nDrawStretchText = nChangeFont = 0;
     }
 
     inline SvStatistics() { Reset(); }
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index b7f6dddf467c..3c64fa1eb5eb 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -168,9 +168,7 @@ private:
     const bool mbAutomatic;
 
     sal_uLong mnCurrentNode;    // used for non-automatic mode
-    sal_uLong mnStartNode;      // used for non-automatic mode
     sal_uLong mnEndNode;        // used for non-automatic mode
-    bool mbWrapped;     // used for non-automatic mode
 };
 
 #endif