8 files changed, 11 insertions, 17 deletions
diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx
index 2b6da5830816..6bdd0eeb0bc9 100644
--- a/sd/source/filter/eppt/pptexanimations.hxx
+++ b/sd/source/filter/eppt/pptexanimations.hxx
@@ -70,6 +70,10 @@ const int AFTEREFFECT_SET = 2;
 class AnimationExporter
 {
     css::uno::Any aTarget;
+    const EscherSolverContainer& mrSolverContainer;
+    ppt::ExSoundCollection& mrExSoundCollection;
+    std::vector< AfterEffectNodePtr > maAfterEffectNodes;
+    sal_Int32 mnCurrentGroup;
 
     static void writeZString( SvStream& rStrm, const OUString& rVal );
     static bool getColorAny( const css::uno::Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC );
@@ -101,8 +105,6 @@ class AnimationExporter
     void exportAnimateColor( SvStream& rStrm, const css::uno::Reference< css::animations::XAnimationNode >& xNode, int nAfterEffectType );
     void exportIterate( SvStream& rStrm, const css::uno::Reference< css::animations::XAnimationNode >& xNode );
 
-    const EscherSolverContainer& mrSolverContainer;
-    ppt::ExSoundCollection& mrExSoundCollection;
     void processAfterEffectNodes( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
 
     bool isAfterEffectNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode ) const;
@@ -111,15 +113,11 @@ class AnimationExporter
 
     static css::uno::Reference< css::animations::XAnimationNode > createAfterEffectNodeClone( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
 
-    std::vector< AfterEffectNodePtr > maAfterEffectNodes;
-
 public:
     AnimationExporter( const EscherSolverContainer& rSolverContainer, ppt::ExSoundCollection& rExSoundCollection );
 
     void doexport( const css::uno::Reference< css::drawing::XDrawPage >& xPage, SvStream& rStrm );
 
-    sal_Int32 mnCurrentGroup;
-
         // helper methods also used in ooxml export
     static css::uno::Any convertAnimateValue( const css::uno::Any& rSource, const OUString& rAttributeName );
         static bool GetNodeType( const css::uno::Reference< css::animations::XAnimationNode >& xNode, sal_Int16& nType );
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx
index 9b674de7862b..d8b4096b7399 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -109,7 +109,7 @@ public:
 
     sal_Int32 getControlType() const { return mnType; }
 
-protected:
+private:
     sal_Int32 const  mnType;
 };
 
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 619e8cb4a319..269795b4c690 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -70,7 +70,6 @@ class SdVclAbstractDialog_Impl : public VclAbstractDialog
 
 class SdAbstractGenericDialog_Impl : public VclAbstractDialog
 {
-protected:
     std::unique_ptr<weld::GenericDialogController> m_xDlg;
 public:
     explicit SdAbstractGenericDialog_Impl(std::unique_ptr<weld::GenericDialogController> p)
@@ -128,7 +127,6 @@ public:
 
 class SdAbstractTabController_Impl : public SfxAbstractTabDialog
 {
-protected:
     std::shared_ptr<SfxTabDialogController> m_xDlg;
 public:
     explicit SdAbstractTabController_Impl(std::unique_ptr<SfxTabDialogController> p)
@@ -147,7 +145,6 @@ public:
 
 class AbstractBulletDialog_Impl : public SfxAbstractTabDialog
 {
-protected:
     std::shared_ptr<SfxTabDialogController> m_xDlg;
 public:
     explicit AbstractBulletDialog_Impl(std::unique_ptr<SfxTabDialogController> p)
@@ -167,7 +164,6 @@ public:
 class SdPresLayoutTemplateDlg;
 class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog
 {
-protected:
     std::shared_ptr<SdPresLayoutTemplateDlg> m_xDlg;
 public:
     explicit SdPresLayoutTemplateDlg_Impl(std::unique_ptr<SdPresLayoutTemplateDlg> p)
diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx
index 835460f643e0..d77df9057d6d 100644
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@@ -141,7 +141,6 @@ public:
     // change the parameter to int
     //void fireSwitchCurrentPage( String pageName) throw();
     void fireSwitchCurrentPage( sal_Int32 pageIndex) throw();
-    css::uno::Reference< css::drawing::XLayer>* mpCurrentLayer;
     bool IsDisposing() const { return mbDisposing; }
 
     /** Return a pointer to the ViewShellBase object that the DrawController
@@ -278,6 +277,8 @@ private:
     using cppu::OPropertySetHelper::disposing;
     using cppu::OPropertySetHelper::getFastPropertyValue;
 
+    css::uno::Reference< css::drawing::XLayer>* mpCurrentLayer;
+
     const css::uno::Type m_aSelectionTypeIdentifier;
 
     /** This pointer to the ViewShellBase can be NULL (after a call to
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index bfc5e7f73e63..f7d05f5721b9 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -130,8 +130,6 @@ public:
     virtual css::uno::Reference<css::accessibility::XAccessible>
         CreateAccessibleDocumentView (::sd::Window* pWindow) override;
 
-    OUString m_StrOldPageName;
-
     /** Update the preview to show the specified page.
     */
     virtual void UpdatePreview (SdPage* pPage, bool bInit = false) override;
@@ -150,6 +148,7 @@ public:
     void UpdateOutlineObject( SdPage* pPage, Paragraph* pPara );
 
 private:
+    OUString m_StrOldPageName;
     std::unique_ptr<OutlineView> pOlView;
     SdPage*         pLastPage; // For efficient processing of the preview
     rtl::Reference<TransferableClipboardListener> mxClipEvtLstnr;
diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx
index 6f40e6150ca0..3f9178ca2dd7 100644
--- a/sd/source/ui/inc/fuconstr.hxx
+++ b/sd/source/ui/inc/fuconstr.hxx
@@ -56,7 +56,7 @@ protected:
         ::sd::View* pView,
         SdDrawDocument* pDoc,
         SfxRequest& rReq);
-
+private:
     bool bSelectionChanged;
 };
 
diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx
index d65e04c35dfd..2130246128a8 100644
--- a/sd/source/ui/inc/smarttag.hxx
+++ b/sd/source/ui/inc/smarttag.hxx
@@ -169,7 +169,7 @@ public:
     const SmartTagReference& getTag() const { return mxSmartTag; }
 
     virtual bool isMarkable() const;
-protected:
+private:
     SmartTagReference const mxSmartTag;
 };
 
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index d40c7c4211eb..4686a879fecb 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -118,8 +118,8 @@ public:
     // css::presentation::XShapeEventListener:
     virtual void SAL_CALL click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent) override;
 
+private:
     ::comphelper::OInterfaceContainerHelper2 maListeners;
-
     rtl::Reference< SlideshowImpl > mxController;
     css::uno::Reference< css::presentation::XSlideShow > mxSlideShow;
 };