[Libreoffice-commits] core.git: sw/inc sw/source

[Libreoffice Gerrit user]

 sw/inc/viewopt.hxx                  |    1 -
 sw/source/core/inc/txtfrm.hxx       |    2 +-
 sw/source/core/text/txtinit.cxx     |    1 -
 sw/source/uibase/config/viewopt.cxx |    3 ---
 4 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit a2a922c273e90af27810cee4ec8cb724125b6aa5
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Dec 5 10:59:41 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Dec 5 13:10:48 2018 +0100

    loplugin:singlevalfields in sw
    
    Change-Id: I39a786155e25888fa9e719e22d2b0c4a70a5ce58
    Reviewed-on: https://gerrit.libreoffice.org/64598
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 2f9332789451..d2bec092e54b 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -185,7 +185,6 @@ protected:
     bool  m_bTest6        :1;     // Test-flag  "No screen adj"
     bool  m_bTest7        :1;     // Test-flag  "win format"
     bool  m_bTest8        :1;     // Test-flag  ""
-    static bool  s_bTest9;    // Test-Flag  "DrawingLayerNotLoading"
     bool  m_bTest10       :1;     // Test-Flag  "Format by Input"
 #endif
 
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index ea7f3d2c82fc..49de0599e4a9 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -153,7 +153,7 @@ class SW_DLLPUBLIC SwTextFrame: public SwContentFrame
     /// will still be set; GetFormatted() is the function that forces
     /// recreation of the SwLineLayout by Format() if necessary.
     static SwCache *s_pTextCache;
-    static long nMinPrtLine;    // This Line must not be underrun when printing
+    static constexpr long nMinPrtLine = 0;    // This Line must not be underrun when printing
                                 // Hack for table cells stretching multiple pages
 
     sal_uLong  mnAllLines        :24; // Line count for the Paint (including nThisLines)
diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx
index 83e4cf8de3d0..bd52450f444a 100644
--- a/sw/source/core/text/txtinit.cxx
+++ b/sw/source/core/text/txtinit.cxx
@@ -39,7 +39,6 @@
 #include <dbg_lay.hxx>
 
 SwCache *SwTextFrame::s_pTextCache = nullptr;
-long SwTextFrame::nMinPrtLine = 0;
 SwContourCache *pContourCache = nullptr;
 SwDropCapCache *pDropCapCache = nullptr;
 
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
index ad2f1d870645..024ad5f370b0 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -43,9 +43,6 @@
 #include <comphelper/lok.hxx>
 #include <comphelper/configurationlistener.hxx>
 
-#ifdef DBG_UTIL
-bool SwViewOption::s_bTest9 = false;        //DrawingLayerNotLoading
-#endif
 Color SwViewOption::s_aDocBoundColor(COL_LIGHTGRAY);
 Color SwViewOption::s_aObjectBoundColor(COL_LIGHTGRAY);
 Color SwViewOption::s_aDocColor(COL_LIGHTGRAY);