loplugin:unusedfields

Change-Id: I5036b484055e516fd808428238a044e12d34e089
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152005
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 2 insertions, 38 deletions

diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 67e376576081..70656680f5f2 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -164,8 +164,6 @@ private:
     */
     model::SlideSorterModel* CreateModel();
 
-    bool mbIsValid;
-
     std::unique_ptr<controller::SlideSorterController> mpSlideSorterController;
     std::unique_ptr<model::SlideSorterModel> mpSlideSorterModel;
     std::unique_ptr<view::SlideSorterView> mpSlideSorterView;
diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx
index e0092816a327..908f3031d2be 100644
--- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx
@@ -25,9 +25,7 @@ namespace sd::slidesorter::controller {
 
 Properties::Properties()
     : maBackgroundColor(Application::GetSettings().GetStyleSettings().GetWindowColor()),
-      maTextColor(Application::GetSettings().GetStyleSettings().GetActiveTextColor()),
       maSelectionColor(Application::GetSettings().GetStyleSettings().GetHighlightColor()),
-      maHighlightColor(Application::GetSettings().GetStyleSettings().GetMenuHighlightColor()),
       mbIsUIReadOnly(false)
 {
 }
@@ -35,9 +33,7 @@ Properties::Properties()
 void Properties::HandleDataChangeEvent()
 {
     maBackgroundColor = Application::GetSettings().GetStyleSettings().GetWindowColor();
-    maTextColor = Application::GetSettings().GetStyleSettings().GetActiveTextColor();
     maSelectionColor = Application::GetSettings().GetStyleSettings().GetHighlightColor();
-    maHighlightColor = Application::GetSettings().GetStyleSettings().GetMenuHighlightColor();
 }
 
 void Properties::SetBackgroundColor (const Color& rColor)
@@ -45,21 +41,11 @@ void Properties::SetBackgroundColor (const Color& rColor)
     maBackgroundColor = rColor;
 }
 
-void Properties::SetTextColor (const Color& rColor)
-{
-    maTextColor = rColor;
-}
-
 void Properties::SetSelectionColor (const Color& rColor)
 {
     maSelectionColor = rColor;
 }
 
-void Properties::SetHighlightColor (const Color& rColor)
-{
-    maHighlightColor = rColor;
-}
-
 } // end of namespace ::sd::slidesorter::controller
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
index 1a57670d62f7..cd1914fe07a7 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
@@ -40,19 +40,11 @@ public:
     const Color& GetBackgroundColor() const { return maBackgroundColor; }
     void SetBackgroundColor(const Color& rColor);
 
-    /** Return the text color.
-    */
-    void SetTextColor(const Color& rColor);
-
     /** Return the color in which selections are to be painted.
     */
     const Color& GetSelectionColor() const { return maSelectionColor; }
     void SetSelectionColor(const Color& rColor);
 
-    /** Return the color used for highlighting e.g. the current slide.
-    */
-    void SetHighlightColor(const Color& rColor);
-
     /** The UI can be set to be read only independently from the model status.
         Used for instance in the presenter view.
     */
@@ -60,9 +52,7 @@ public:
 
 private:
     Color maBackgroundColor;
-    Color maTextColor;
     Color maSelectionColor;
-    Color maHighlightColor;
     bool mbIsUIReadOnly;
 };
 
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index b29f5e054432..92427ab51568 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -88,8 +88,7 @@ SlideSorter::SlideSorter (
     sd::Window* pContentWindow,
     ScrollAdaptor* pHorizontalScrollBar,
     ScrollAdaptor* pVerticalScrollBar)
-    : mbIsValid(false),
-      mpViewShell(&rViewShell),
+    : mpViewShell(&rViewShell),
       mpViewShellBase(&rViewShell.GetViewShellBase()),
       mpContentWindow(pContentWindow),
       mpHorizontalScrollBar(pHorizontalScrollBar),
@@ -102,8 +101,7 @@ SlideSorter::SlideSorter (
 SlideSorter::SlideSorter (
     ViewShellBase& rBase,
     vcl::Window& rParentWindow)
-    : mbIsValid(false),
-      mpViewShell(nullptr),
+    : mpViewShell(nullptr),
       mpViewShellBase(&rBase),
       mpContentWindow(VclPtr<ContentWindow>::Create(rParentWindow,*this )),
       mpHorizontalScrollBar(VclPtr<ScrollAdaptor>::Create(&rParentWindow, true)),
@@ -123,12 +121,8 @@ void SlideSorter::Init()
     {
         mpProperties->SetBackgroundColor(
             mpContentWindow->GetSettings().GetStyleSettings().GetWindowColor());
-        mpProperties->SetTextColor(
-            mpContentWindow->GetSettings().GetStyleSettings().GetWindowTextColor());
         mpProperties->SetSelectionColor(
             mpContentWindow->GetSettings().GetStyleSettings().GetMenuHighlightColor());
-        mpProperties->SetHighlightColor(
-            mpContentWindow->GetSettings().GetStyleSettings().GetMenuHighlightColor());
     }
 
     CreateModelViewController ();
@@ -153,14 +147,10 @@ void SlideSorter::Init()
 
     // Set view pointer of base class.
     SetupControls();
-
-    mbIsValid = true;
 }
 
 SlideSorter::~SlideSorter()
 {
-    mbIsValid = false;
-
     ReleaseListeners();
 
     // Dispose model, view and controller to avoid calls between them when