loplugin:unusedfields make some fields private

this is one of the secondary analyses this plugin performs

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

5 files changed, 58 insertions, 71 deletions

diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 15fa5ebd41ad..86917fcb7402 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -203,7 +203,9 @@ public:
 
     std::vector<Color> GetThemeColors() override;
 
-protected:
+private:
+    static void setEditMode(DrawViewShell* pDrawViewShell, bool isMasterPage);
+    void                    Construct(bool bClipboard);
 
     SdDrawDocument*         mpDoc;
     std::unique_ptr<SfxUndoManager> mpUndoManager;
@@ -218,11 +220,7 @@ protected:
     bool                    mbSdDataObj;
     bool                    mbInDestruction;
     bool                    mbOwnPrinter;
-
     bool                    mbOwnDocument;          // if true, we own mpDoc and will delete it in our d'tor
-    void                    Construct(bool bClipboard);
-private:
-    static void setEditMode(DrawViewShell* pDrawViewShell, bool isMasterPage);
 };
 
 #ifndef SV_DECL_DRAW_DOC_SHELL_DEFINED
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index e0ae9746f24a..a8e48c723d2e 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -376,24 +376,6 @@ public:
     //move this method to ViewShell.
     //void  NotifyAccUpdate();
 protected:
-    std::unique_ptr<DrawView> mpDrawView;
-    SdPage*             mpActualPage;
-    ::tools::Rectangle           maMarkRect;
-    Point               maMousePos;
-    VclPtr<TabControl>  maTabControl;
-    EditMode            meEditMode;
-    PageKind            mePageKind;
-    // tdf#137445 at context menu popup time set if the EditHyperlink entry
-    // should be disabled and use that state if queried about it if
-    // EditHyperlink is dispatched from the menu. So ignoring where the mouse
-    // currently happens to be when the menu was dismissed.
-    std::optional<bool> moAtContextMenu_DisableEditHyperlink;
-    bool                mbZoomOnPage;
-    bool                mbIsRulerDrag;
-    sal_uLong           mnLockCount;
-    bool                mbReadOnly;
-    static bool         mbPipette;
-
                     DECL_DLLPRIVATE_LINK( ClipboardChanged, TransferableDataHelper*, void );
                     DECL_DLLPRIVATE_LINK( TabSplitHdl, TabBar *, void );
                     DECL_DLLPRIVATE_LINK( NameObjectHdl, AbstractSvxObjectNameDialog&, bool );
@@ -414,37 +396,6 @@ protected:
     void            GetMenuStateSel(SfxItemSet& rSet);
 
 private:
-    /** Prevents grabbing focus while loading - see tdf#83773 that introduced
-        the grabbing, and tdf#150773 that needs grabbing disabled on loading
-    */
-    bool mbFirstTimeActivation = true;
-
-    /** This flag controls whether the layer mode is active, i.e. the layer
-        dialog is visible.
-    */
-    bool mbIsLayerModeActive;
-
-    /** This item contains the clipboard formats of the current clipboard
-        content that are supported both by that content and by the
-        DrawViewShell.
-    */
-    ::std::unique_ptr<SvxClipboardFormatItem> mpCurrentClipboardFormats;
-
-    /** On some occasions it is necessary to make SwitchPage calls
-        asynchronously.
-    */
-    tools::AsynchronousCall maAsynchronousSwitchPageCall;
-
-    /** This flag is used to prevent nested calls to SwitchPage().
-    */
-    bool mbIsInSwitchPage;
-
-    RotateTransliteration m_aRotateCase;
-
-    /** Listen for selection changes and broadcast context changes for the sidebar.
-    */
-    ::rtl::Reference<svx::sidebar::SelectionChangeHandler> mpSelectionChangeHandler;
-
     void Construct (DrawDocShell* pDocSh, PageKind ePageKind);
 
     /** Depending on the given request create a new page or duplicate an
@@ -459,13 +410,6 @@ private:
 
     void DuplicateSelectedSlides (SfxRequest& rRequest);
 
-    css::uno::Reference< css::scanner::XScannerManager2 > mxScannerManager;
-    css::uno::Reference< css::lang::XEventListener >      mxScannerListener;
-    rtl::Reference<TransferableClipboardListener>         mxClipEvtLstnr;
-    bool                                                  mbPastePossible;
-    bool                                                  mbMouseButtonDown;
-    bool                                                  mbMouseSelecting;
-
     virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint) override;
 
     /** Stop a running slide show.
@@ -491,11 +435,6 @@ private:
 
     using ViewShell::Notify;
 
-    ::std::unique_ptr< AnnotationManager > mpAnnotationManager;
-    ::std::unique_ptr< ViewOverlayManager > mpViewOverlayManager;
-
-    std::vector<std::unique_ptr<SdrExternalToolEdit>> m_ExternalEdits;
-
     virtual void ConfigurationChanged( utl::ConfigurationBroadcaster* pCb, ConfigurationHints ) override;
 
     void ConfigureAppBackgroundColor( svtools::ColorConfig* pColorConfig = nullptr );
@@ -506,6 +445,57 @@ private:
     /// later Invalidated to reset it back to its natural value
     void EnableEditHyperlink();
 
+private:
+    std::unique_ptr<DrawView> mpDrawView;
+    SdPage*             mpActualPage;
+    ::tools::Rectangle           maMarkRect;
+    Point               maMousePos;
+    VclPtr<TabControl>  maTabControl;
+    EditMode            meEditMode;
+    PageKind            mePageKind;
+    // tdf#137445 at context menu popup time set if the EditHyperlink entry
+    // should be disabled and use that state if queried about it if
+    // EditHyperlink is dispatched from the menu. So ignoring where the mouse
+    // currently happens to be when the menu was dismissed.
+    std::optional<bool> moAtContextMenu_DisableEditHyperlink;
+    bool                mbZoomOnPage;
+    bool                mbIsRulerDrag;
+    sal_uLong           mnLockCount;
+    bool                mbReadOnly;
+    static bool         mbPipette;
+    /** Prevents grabbing focus while loading - see tdf#83773 that introduced
+        the grabbing, and tdf#150773 that needs grabbing disabled on loading
+    */
+    bool mbFirstTimeActivation = true;
+    /** This flag controls whether the layer mode is active, i.e. the layer
+        dialog is visible.
+    */
+    bool mbIsLayerModeActive;
+    /** This item contains the clipboard formats of the current clipboard
+        content that are supported both by that content and by the
+        DrawViewShell.
+    */
+    ::std::unique_ptr<SvxClipboardFormatItem> mpCurrentClipboardFormats;
+    /** On some occasions it is necessary to make SwitchPage calls
+        asynchronously.
+    */
+    tools::AsynchronousCall maAsynchronousSwitchPageCall;
+    /** This flag is used to prevent nested calls to SwitchPage().
+    */
+    bool mbIsInSwitchPage;
+    RotateTransliteration m_aRotateCase;
+    /** Listen for selection changes and broadcast context changes for the sidebar.
+    */
+    ::rtl::Reference<svx::sidebar::SelectionChangeHandler> mpSelectionChangeHandler;
+    css::uno::Reference< css::scanner::XScannerManager2 > mxScannerManager;
+    css::uno::Reference< css::lang::XEventListener >      mxScannerListener;
+    rtl::Reference<TransferableClipboardListener>         mxClipEvtLstnr;
+    bool                                                  mbPastePossible;
+    bool                                                  mbMouseButtonDown;
+    bool                                                  mbMouseSelecting;
+    ::std::unique_ptr< AnnotationManager > mpAnnotationManager;
+    ::std::unique_ptr< ViewOverlayManager > mpViewOverlayManager;
+    std::vector<std::unique_ptr<SdrExternalToolEdit>> m_ExternalEdits;
     // The colour of the area behind the slide (used to be called "Wiese")
     Color mnAppBackgroundColor;
 };
diff --git a/sd/source/ui/inc/ViewClipboard.hxx b/sd/source/ui/inc/ViewClipboard.hxx
index f16c0ad33781..d39fdb8f0bbb 100644
--- a/sd/source/ui/inc/ViewClipboard.hxx
+++ b/sd/source/ui/inc/ViewClipboard.hxx
@@ -32,6 +32,8 @@ class View;
 */
 class ViewClipboard
 {
+    ::sd::View& mrView;
+
 public:
     ViewClipboard(::sd::View& rView);
     virtual ~ViewClipboard();
@@ -42,8 +44,6 @@ public:
     void HandlePageDrop(const SdTransferable& rTransferable);
 
 protected:
-    ::sd::View& mrView;
-
     /** Return the first master page of the given transferable.  When the
         bookmark list of the transferable contains at least one non-master
         page then NULL is returned.
diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx
index 775e68ba7e57..1eb3cb6d83b1 100644
--- a/sd/source/ui/inc/unopage.hxx
+++ b/sd/source/ui/inc/unopage.hxx
@@ -56,14 +56,13 @@ private:
     SdrModel* mpSdrModel;
     bool      mbIsImpressDocument;
     sal_Int16 mnTempPageNumber; // for printing handouts
+    const SvxItemPropertySet*   mpPropSet;
 
     void UpdateModel();
 
 protected:
     friend class SdXImpressDocument;
 
-    const SvxItemPropertySet*   mpPropSet;
-
     /// @throws css::lang::IllegalArgumentException
     virtual void setBackground( const css::uno::Any& rValue );
     /// @throws std::exception
diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx
index 6dcf681cbee6..965e80278e8d 100644
--- a/sd/source/ui/inc/unosrch.hxx
+++ b/sd/source/ui/inc/unosrch.hxx
@@ -39,9 +39,9 @@ class SdUnoSearchReplaceDescriptor;
 /** this class implements a search or replace operation on a given page or a given sdrobj */
 class SdUnoSearchReplaceShape : public css::util::XReplaceable
 {
-protected:
     css::drawing::XDrawPage* mpPage;
 
+protected:
     css::uno::Reference< css::text::XTextRange >  Search( const css::uno::Reference< css::text::XTextRange >&  xText, SdUnoSearchReplaceDescriptor* pDescr );
     bool Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) noexcept;
     static ESelection GetSelection( const css::uno::Reference< css::text::XTextRange >&  xTextRange ) noexcept;