loplugin:unusedfields in sd/

Change-Id: Id6da990828ece02132032285116f3a20de423519

48 files changed, 98 insertions, 246 deletions

diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index ddb9af04152e..89ba020182f0 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -226,9 +226,6 @@ private:
     /// The number of pages in the current view.
     sal_uInt16 mnPageCount;
 
-    /// Number of objects on the current page / in the current selection.
-    sal_Int32 mnObjectCount;
-
     /** A <TRUE/> value indicates that the end of the find&replace or spell
         check has been reached.
     */
@@ -262,12 +259,6 @@ private:
     */
     ::std::vector<SdrObjectWeakRef> maMarkListCopy;
 
-    /**  This flag indicates that only the current view is to be used for
-         searching and spelling.  Automatically switching to other view does
-         not take place when this flag is set.
-    */
-    bool mbProcessCurrentViewOnly;
-
     /** Current object that may be a text object.  The object pointer to
         corresponds to <member>mnObjIndex</member>.  While iterating over the
         objects on a page <member>mpObj</member> will point to every object
@@ -326,12 +317,6 @@ private:
     */
     ::sd::outliner::IteratorPosition maLastValidPosition;
 
-    /** This flag remembers a selection change between a call to the
-        selection change listener callback and the next
-        <member>DetectChange()</member> method call.
-    */
-    bool mbSelectionHasChanged;
-
     /** This flag indicates whether a selection change event is expected due
         to a programatical change of the selection.
     */
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index b4c6f8a70e90..f140ccac9a69 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1178,15 +1178,13 @@ const int VERTICAL = 0x8000;
 
 struct LayoutDescriptor
 {
-    int mnLayout;
     PresObjKind meKind[MAX_PRESOBJS];
     bool mbVertical[MAX_PRESOBJS];
 
-    LayoutDescriptor( int nLayout, int k0 = 0, int k1 = 0, int k2 = 0, int k3 = 0, int k4 = 0, int k5 = 0, int k6 = 0 );
+    LayoutDescriptor( int k0 = 0, int k1 = 0, int k2 = 0, int k3 = 0, int k4 = 0, int k5 = 0, int k6 = 0 );
 };
 
-LayoutDescriptor::LayoutDescriptor( int nLayout, int k0, int k1, int k2, int k3, int k4, int k5, int k6 )
-: mnLayout( nLayout )
+LayoutDescriptor::LayoutDescriptor( int k0, int k1, int k2, int k3, int k4, int k5, int k6 )
 {
     meKind[0] = static_cast<PresObjKind>(k0 & (~VERTICAL)); mbVertical[0] = (k0 & VERTICAL) == VERTICAL;
     meKind[1] = static_cast<PresObjKind>(k1 & (~VERTICAL)); mbVertical[1] = (k1 & VERTICAL) == VERTICAL;
@@ -1201,43 +1199,43 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout )
 {
     static const LayoutDescriptor aLayouts[AUTOLAYOUT__END-AUTOLAYOUT__START] =
     {
-        LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_TEXT ),                                 // AUTOLAYOUT_TITLE
-        LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ),                              // AUTOLAYOUT_ENUM
-        LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ),                              // AUTOLAYOUT_CHART
-        LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_2TEXT
-        LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_TEXTCHART
-        LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ),                              // AUTOLAYOUT_ORG
-        LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_TEXTCLbIP
-        LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_CHARTTEXT
-        LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ),                              // AUTOLAYOUT_TAB
-        LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_CLIPTEXT
-        LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_TEXTOBJ
-        LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OBJECT ),                               // AUTOLAYOUT_OBJ
-        LayoutDescriptor( 2, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),    // AUTOLAYOUT_TEXT2OBJ
-        LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_TEXTOBJ
-        LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_OBJOVERTEXT
-        LayoutDescriptor( 3, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),    // AUTOLAYOUT_2OBJTEXT
-        LayoutDescriptor( 5, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),    // AUTOLAYOUT_2OBJOVERTEXT
-        LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_TEXTOVEROBJ
-        LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,                   // AUTOLAYOUT_4OBJ
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_TEXT ),                                 // AUTOLAYOUT_TITLE
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ),                              // AUTOLAYOUT_ENUM
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ),                              // AUTOLAYOUT_CHART
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_2TEXT
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_TEXTCHART
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ),                              // AUTOLAYOUT_ORG
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_TEXTCLbIP
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_CHARTTEXT
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ),                              // AUTOLAYOUT_TAB
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_CLIPTEXT
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_TEXTOBJ
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OBJECT ),                               // AUTOLAYOUT_OBJ
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),    // AUTOLAYOUT_TEXT2OBJ
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_TEXTOBJ
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_OBJOVERTEXT
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),    // AUTOLAYOUT_2OBJTEXT
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),    // AUTOLAYOUT_2OBJOVERTEXT
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),             // AUTOLAYOUT_TEXTOVEROBJ
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,                   // AUTOLAYOUT_4OBJ
             PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),
-        LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_NONE ),                                 // AUTOLAYOUT_ONLY_TITLE
-        LayoutDescriptor( 0, PRESOBJ_NONE ),                                                // AUTOLAYOUT_NONE
-        LayoutDescriptor( 0, PRESOBJ_PAGE, PRESOBJ_NOTES ),                                 // AUTOLAYOUT_NOTES
-        LayoutDescriptor( 0 ),                                                              // AUTOLAYOUT_HANDOUT1
-        LayoutDescriptor( 0 ),                                                              // AUTOLAYOUT_HANDOUT2
-        LayoutDescriptor( 0 ),                                                              // AUTOLAYOUT_HANDOUT3
-        LayoutDescriptor( 0 ),                                                              // AUTOLAYOUT_HANDOUT4
-        LayoutDescriptor( 0 ),                                                              // AUTOLAYOUT_HANDOUT6
-        LayoutDescriptor( 7, PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE ),// AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART
-        LayoutDescriptor( 8, PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ),            // AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE
-        LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL ),                     // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE
-        LayoutDescriptor( 9, PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ),   // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART
-        LayoutDescriptor( 0 ),                                                              // AUTOLAYOUT_HANDOUT9
-        LayoutDescriptor( 10, PRESOBJ_TEXT, PRESOBJ_NONE ),                                 // AUTOLAYOUT_ONLY_TEXT
-        LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,               // AUTOLAYOUT_4CLIPART
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_NONE ),                                 // AUTOLAYOUT_ONLY_TITLE
+        LayoutDescriptor( PRESOBJ_NONE ),                                                // AUTOLAYOUT_NONE
+        LayoutDescriptor( PRESOBJ_PAGE, PRESOBJ_NOTES ),                                 // AUTOLAYOUT_NOTES
+        LayoutDescriptor( ),                                                              // AUTOLAYOUT_HANDOUT1
+        LayoutDescriptor( ),                                                              // AUTOLAYOUT_HANDOUT2
+        LayoutDescriptor( ),                                                              // AUTOLAYOUT_HANDOUT3
+        LayoutDescriptor( ),                                                              // AUTOLAYOUT_HANDOUT4
+        LayoutDescriptor( ),                                                              // AUTOLAYOUT_HANDOUT6
+        LayoutDescriptor( PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE ),// AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART
+        LayoutDescriptor( PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ),            // AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL ),                     // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ),   // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART
+        LayoutDescriptor( ),                                                              // AUTOLAYOUT_HANDOUT9
+        LayoutDescriptor( PRESOBJ_TEXT, PRESOBJ_NONE ),                                 // AUTOLAYOUT_ONLY_TEXT
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,               // AUTOLAYOUT_4CLIPART
             PRESOBJ_GRAPHIC, PRESOBJ_GRAPHIC ),
-        LayoutDescriptor( 11, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,              // AUTOLAYOUT_6CLIPART
+        LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,              // AUTOLAYOUT_6CLIPART
             PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE )
     };
 
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index a272f8263e55..9e5c4a791021 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -91,7 +91,6 @@ PPTWriter::PPTWriter( tools::SvRef<SotStorage>& rSvStorage,
     mpExEmbed               ( new SvMemoryStream ),
     mnDrawings              ( 0 ),
     mnPagesWritten          ( 0 ),
-    mnUniqueSlideIdentifier ( 0 ),
     mnTxId                  ( 0x7a2f64 ),
     mnDiaMode               ( 0 ),
     mnShapeMasterTitle      ( 0 ),
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index c500464bff65..b24d797dcfab 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -136,11 +136,9 @@ struct PPTExOleObjEntry
 
 struct TextRuleEntry
 {
-    int                 nPageNumber;
     SvMemoryStream*     pOut;
 
-    explicit TextRuleEntry( int nPg ) :
-        nPageNumber( nPg ),
+    explicit TextRuleEntry() :
         pOut ( nullptr ){};
 
     ~TextRuleEntry() { delete pOut; };
@@ -191,7 +189,6 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
 
         sal_uInt32          mnDrawings;         // number of Slides +  masterpages + notes +  handout
         sal_uInt32          mnPagesWritten;
-        sal_uInt32          mnUniqueSlideIdentifier;
         sal_uInt32          mnTxId;             // Identifier determined by the HOST (PP) ????
         sal_uInt32          mnDiaMode;          // 0 -> manual
                                                 // 1 -> semi-automatic
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index 0297cf5a9346..e0e920880966 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -259,14 +259,13 @@ struct PPTExCharSheet
 
 struct PPTExParaLevel
 {
-    bool        mbIsBullet;
+    bool            mbIsBullet;
     sal_uInt16      mnBulletChar;
     sal_uInt16      mnBulletFont;
     sal_uInt16      mnBulletHeight;
     sal_uInt32      mnBulletColor;
 
     sal_uInt16      mnAdjust;
-    sal_Int16       mnOOAdjust;
     sal_uInt16      mnLineFeed;
     sal_uInt16      mnUpperDist;
     sal_uInt16      mnLowerDist;
@@ -274,7 +273,7 @@ struct PPTExParaLevel
     sal_uInt16      mnBulletOfs;
     sal_uInt16      mnDefaultTab;
 
-    bool        mbExtendedBulletsUsed;
+    bool            mbExtendedBulletsUsed;
     sal_uInt16      mnBulletId;
     sal_uInt16      mnBulletStart;
     sal_uInt32      mnMappedNumType;
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 74c8807f27fa..91a9cde63e94 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -3309,7 +3309,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                         else
                             nTextType = EPP_TEXTTYPE_Title;
 
-                        TextRuleEntry aTextRule( nPageNumber );
+                        TextRuleEntry aTextRule;
                         SvMemoryStream aExtBu( 0x200, 0x200 );
                         ImplGetText();
                         ImplWriteTextStyleAtom( *pClientTextBox, nTextType, nPObjects, &aTextRule, aExtBu, nullptr );
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index ed0d70d73cab..8848b8f1e9cd 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -83,50 +83,42 @@ char const sXML_styleStreamName[] = "styles.xml";
 char const sXML_contentStreamName[] = "content.xml";
 char const sXML_settingsStreamName[] = "settings.xml";
 
-char const sXML_export_impress_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisExporter";
 char const sXML_export_impress_meta_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisMetaExporter";
 char const sXML_export_impress_styles_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisStylesExporter";
 char const sXML_export_impress_content_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisContentExporter";
 char const sXML_export_impress_settings_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisSettingsExporter";
 
-char const sXML_export_draw_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisExporter";
 char const sXML_export_draw_meta_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisMetaExporter";
 char const sXML_export_draw_styles_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisStylesExporter";
 char const sXML_export_draw_content_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisContentExporter";
 char const sXML_export_draw_settings_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisSettingsExporter";
 
-char const sXML_import_impress_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisImporter";
 char const sXML_import_impress_meta_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisMetaImporter";
 char const sXML_import_impress_styles_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisStylesImporter";
 char const sXML_import_impress_content_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisContentImporter";
 char const sXML_import_impress_settings_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisSettingsImporter";
 
-char const sXML_import_draw_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisImporter";
 char const sXML_import_draw_meta_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisMetaImporter";
 char const sXML_import_draw_styles_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisStylesImporter";
 char const sXML_import_draw_content_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisContentImporter";
 char const sXML_import_draw_settings_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisSettingsImporter";
 
 // OOo
-char const sXML_export_impress_ooo_service[] = "com.sun.star.comp.Impress.XMLExporter";
 char const sXML_export_impress_meta_ooo_service[] = "com.sun.star.comp.Impress.XMLMetaExporter";
 char const sXML_export_impress_styles_ooo_service[] = "com.sun.star.comp.Impress.XMLStylesExporter";
 char const sXML_export_impress_content_ooo_service[] = "com.sun.star.comp.Impress.XMLContentExporter";
 char const sXML_export_impress_settings_ooo_service[] = "com.sun.star.comp.Impress.XMLSettingsExporter";
 
-char const sXML_export_draw_ooo_service[] = "com.sun.star.comp.Draw.XMLExporter";
 char const sXML_export_draw_meta_ooo_service[] = "com.sun.star.comp.Draw.XMLMetaExporter";
 char const sXML_export_draw_styles_ooo_service[] = "com.sun.star.comp.Draw.XMLStylesExporter";
 char const sXML_export_draw_content_ooo_service[] = "com.sun.star.comp.Draw.XMLContentExporter";
 char const sXML_export_draw_settings_ooo_service[] = "com.sun.star.comp.Draw.XMLSettingsExporter";
 
-char const sXML_import_impress_ooo_service[] = "com.sun.star.comp.Impress.XMLImporter";
 char const sXML_import_impress_meta_ooo_service[] = "com.sun.star.comp.Impress.XMLMetaImporter";
 char const sXML_import_impress_styles_ooo_service[] = "com.sun.star.comp.Impress.XMLStylesImporter";
 char const sXML_import_impress_content_ooo_service[] = "com.sun.star.comp.Impress.XMLContentImporter";
 char const sXML_import_impress_settings_ooo_service[] = "com.sun.star.comp.Impress.XMLSettingsImporter";
 
-char const sXML_import_draw_ooo_service[] = "com.sun.star.comp.Draw.XMLImporter";
 char const sXML_import_draw_meta_ooo_service[] = "com.sun.star.comp.Draw.XMLMetaImporter";
 char const sXML_import_draw_styles_ooo_service[] = "com.sun.star.comp.Draw.XMLStylesImporter";
 char const sXML_import_draw_content_ooo_service[] = "com.sun.star.comp.Draw.XMLContentImporter";
@@ -140,7 +132,6 @@ struct XML_SERVICEMAP
 
 struct XML_SERVICES
 {
-    const sal_Char* mpAll;
     const sal_Char* mpMeta;
     const sal_Char* mpStyles;
     const sal_Char* mpContent;
@@ -151,15 +142,15 @@ XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong nStoreVer )
 {
     static XML_SERVICES gServices[] =
     {
-        { sXML_export_impress_oasis_service, sXML_export_impress_meta_oasis_service, sXML_export_impress_styles_oasis_service, sXML_export_impress_content_oasis_service, sXML_export_impress_settings_oasis_service },
-        { sXML_export_draw_oasis_service, sXML_export_draw_meta_oasis_service, sXML_export_draw_styles_oasis_service, sXML_export_draw_content_oasis_service, sXML_export_draw_settings_oasis_service },
-        { sXML_import_impress_oasis_service, sXML_import_impress_meta_oasis_service, sXML_import_impress_styles_oasis_service, sXML_import_impress_content_oasis_service, sXML_import_impress_settings_oasis_service },
-        { sXML_import_draw_oasis_service, sXML_import_draw_meta_oasis_service, sXML_import_draw_styles_oasis_service, sXML_import_draw_content_oasis_service, sXML_import_draw_settings_oasis_service },
-
-        { sXML_export_impress_ooo_service, sXML_export_impress_meta_ooo_service, sXML_export_impress_styles_ooo_service, sXML_export_impress_content_ooo_service, sXML_export_impress_settings_ooo_service },
-        { sXML_export_draw_ooo_service, sXML_export_draw_meta_ooo_service, sXML_export_draw_styles_ooo_service, sXML_export_draw_content_ooo_service, sXML_export_draw_settings_ooo_service },
-        { sXML_import_impress_ooo_service, sXML_import_impress_meta_ooo_service, sXML_import_impress_styles_ooo_service, sXML_import_impress_content_ooo_service, sXML_import_impress_settings_ooo_service },
-        { sXML_import_draw_ooo_service, sXML_import_draw_meta_ooo_service, sXML_import_draw_styles_ooo_service, sXML_import_draw_content_ooo_service, sXML_import_draw_settings_ooo_service },
+        { sXML_export_impress_meta_oasis_service, sXML_export_impress_styles_oasis_service, sXML_export_impress_content_oasis_service, sXML_export_impress_settings_oasis_service },
+        { sXML_export_draw_meta_oasis_service, sXML_export_draw_styles_oasis_service, sXML_export_draw_content_oasis_service, sXML_export_draw_settings_oasis_service },
+        { sXML_import_impress_meta_oasis_service, sXML_import_impress_styles_oasis_service, sXML_import_impress_content_oasis_service, sXML_import_impress_settings_oasis_service },
+        { sXML_import_draw_meta_oasis_service, sXML_import_draw_styles_oasis_service, sXML_import_draw_content_oasis_service, sXML_import_draw_settings_oasis_service },
+
+        { sXML_export_impress_meta_ooo_service, sXML_export_impress_styles_ooo_service, sXML_export_impress_content_ooo_service, sXML_export_impress_settings_ooo_service },
+        { sXML_export_draw_meta_ooo_service, sXML_export_draw_styles_ooo_service, sXML_export_draw_content_ooo_service, sXML_export_draw_settings_ooo_service },
+        { sXML_import_impress_meta_ooo_service, sXML_import_impress_styles_ooo_service, sXML_import_impress_content_ooo_service, sXML_import_impress_settings_ooo_service },
+        { sXML_import_draw_meta_ooo_service, sXML_import_draw_styles_ooo_service, sXML_import_draw_content_ooo_service, sXML_import_draw_settings_ooo_service },
     };
 
     return &gServices[ (bImport ? 2 : 0) + ((nStoreVer == SOFFICE_FILEFORMAT_60) ? 4 : 0) + (bDraw ? 1 : 0 ) ];
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index fa7338bf0ff9..e7db43c6bfe8 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -33,8 +33,7 @@ namespace accessibility {
 
 AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, OutputDevice& rDevice)
     : mpView (pView),
-      mnWindowId (0),
-      mrDevice (rDevice)
+      mnWindowId (0)
 {
     // Search the output device to determine its id.
     for(sal_uInt32 a(0L); a < mpView->PaintWindowCount(); a++)
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index da1160d01acf..efe545b7ad38 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -85,52 +85,51 @@ struct snewfoil_value_info
 {
     sal_uInt16 mnBmpResId;
     sal_uInt16 mnStrResId;
-    WritingMode meWritingMode;
     AutoLayout maAutoLayout;
 };
 
 static const snewfoil_value_info notes[] =
 {
-    {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB, AUTOLAYOUT_NOTES},
-    {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+    {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, AUTOLAYOUT_NOTES},
+    {0, 0, AUTOLAYOUT_NONE},
 };
 
 static const snewfoil_value_info handout[] =
 {
-    {BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT1},
-    {BMP_FOILH_02, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT2},
-    {BMP_FOILH_03, STR_AUTOLAYOUT_HANDOUT3, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT3},
-    {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT4},
-    {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT6},
-    {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT9},
-    {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+    {BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, AUTOLAYOUT_HANDOUT1},
+    {BMP_FOILH_02, STR_AUTOLAYOUT_HANDOUT2, AUTOLAYOUT_HANDOUT2},
+    {BMP_FOILH_03, STR_AUTOLAYOUT_HANDOUT3, AUTOLAYOUT_HANDOUT3},
+    {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, AUTOLAYOUT_HANDOUT4},
+    {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, AUTOLAYOUT_HANDOUT6},
+    {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, AUTOLAYOUT_HANDOUT9},
+    {0, 0, AUTOLAYOUT_NONE},
 };
 
 static const snewfoil_value_info standard[] =
 {
-    {BMP_LAYOUT_EMPTY,    STR_AUTOLAYOUT_NONE,                 WritingMode_LR_TB, AUTOLAYOUT_NONE         },
-    {BMP_LAYOUT_HEAD03,   STR_AUTOLAYOUT_TITLE,                WritingMode_LR_TB, AUTOLAYOUT_TITLE        },
-    {BMP_LAYOUT_HEAD02,   STR_AUTOLAYOUT_CONTENT,              WritingMode_LR_TB, AUTOLAYOUT_ENUM         },
-    {BMP_LAYOUT_HEAD02A,  STR_AUTOLAYOUT_2CONTENT,             WritingMode_LR_TB, AUTOLAYOUT_2TEXT        },
-    {BMP_LAYOUT_HEAD01,   STR_AUTOLAYOUT_ONLY_TITLE,           WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE   },
-    {BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT,            WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT    },
-    {BMP_LAYOUT_HEAD03B,  STR_AUTOLAYOUT_2CONTENT_CONTENT,     WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT     },
-    {BMP_LAYOUT_HEAD03C,  STR_AUTOLAYOUT_CONTENT_2CONTENT,     WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ     },
-    {BMP_LAYOUT_HEAD03A,  STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT },
-    {BMP_LAYOUT_HEAD02B,  STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT  },
-    {BMP_LAYOUT_HEAD04,   STR_AUTOLAYOUT_4CONTENT,             WritingMode_LR_TB, AUTOLAYOUT_4OBJ         },
-    {BMP_LAYOUT_HEAD06,   STR_AUTOLAYOUT_6CONTENT,             WritingMode_LR_TB, AUTOLAYOUT_6CLIPART     },
-    {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
+    {BMP_LAYOUT_EMPTY,    STR_AUTOLAYOUT_NONE,                 AUTOLAYOUT_NONE         },
+    {BMP_LAYOUT_HEAD03,   STR_AUTOLAYOUT_TITLE,                AUTOLAYOUT_TITLE        },
+    {BMP_LAYOUT_HEAD02,   STR_AUTOLAYOUT_CONTENT,              AUTOLAYOUT_ENUM         },
+    {BMP_LAYOUT_HEAD02A,  STR_AUTOLAYOUT_2CONTENT,             AUTOLAYOUT_2TEXT        },
+    {BMP_LAYOUT_HEAD01,   STR_AUTOLAYOUT_ONLY_TITLE,           AUTOLAYOUT_ONLY_TITLE   },
+    {BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT,            AUTOLAYOUT_ONLY_TEXT    },
+    {BMP_LAYOUT_HEAD03B,  STR_AUTOLAYOUT_2CONTENT_CONTENT,     AUTOLAYOUT_2OBJTEXT     },
+    {BMP_LAYOUT_HEAD03C,  STR_AUTOLAYOUT_CONTENT_2CONTENT,     AUTOLAYOUT_TEXT2OBJ     },
+    {BMP_LAYOUT_HEAD03A,  STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,AUTOLAYOUT_2OBJOVERTEXT },
+    {BMP_LAYOUT_HEAD02B,  STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_OBJOVERTEXT  },
+    {BMP_LAYOUT_HEAD04,   STR_AUTOLAYOUT_4CONTENT,             AUTOLAYOUT_4OBJ         },
+    {BMP_LAYOUT_HEAD06,   STR_AUTOLAYOUT_6CONTENT,             AUTOLAYOUT_6CLIPART     },
+    {0, 0, AUTOLAYOUT_NONE}
 };
 
 static const snewfoil_value_info v_standard[] =
 {
     // vertical
-    {BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART,      WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART       },
-    {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE,    WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE },
-    {BMP_LAYOUT_HEAD02,     STR_AL_TITLE_VERT_OUTLINE,         WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE          },
-    {BMP_LAYOUT_HEAD02A,    STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART  },
-    {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
+    {BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART,      AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART       },
+    {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE,    AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE },
+    {BMP_LAYOUT_HEAD02,     STR_AL_TITLE_VERT_OUTLINE,         AUTOLAYOUT_TITLE_VERTICAL_OUTLINE          },
+    {BMP_LAYOUT_HEAD02A,    STR_AL_TITLE_VERT_OUTLINE_CLIPART, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART  },
+    {0, 0, AUTOLAYOUT_NONE}
 };
 
 static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pInfo )
diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx
index 12662aff5d3b..8a9094c05ded 100644
--- a/sd/source/ui/dlg/NavigatorChildWindow.cxx
+++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx
@@ -53,9 +53,7 @@ NavigatorChildWindow::NavigatorChildWindow (
     : SfxChildWindowContext( nId )
 {
     VclPtr<SdNavigatorWin> pNavWin = VclPtr<SdNavigatorWin>::Create(
-
         pParent,
-        this,
         SdResId( FLT_NAVIGATOR ),
         pBindings);
 
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index 7f96cb386b0c..33dcc56e877b 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -62,18 +62,15 @@ public:
     FolderDescriptor (
         int nPriority,
         const OUString& rsTitle,
-        const OUString& rsTargetDir,
         const OUString& rsContentIdentifier,
         const Reference<css::ucb::XCommandEnvironment>& rxFolderEnvironment)
         : mnPriority(nPriority),
           msTitle(rsTitle),
-          msTargetDir(rsTargetDir),
           msContentIdentifier(rsContentIdentifier),
           mxFolderEnvironment(rxFolderEnvironment)
     { }
     int mnPriority;
     OUString msTitle;
-    OUString msTargetDir;
     OUString msContentIdentifier;
     //    Reference<sdbc::XResultSet> mxFolderResultSet;
     Reference<css::ucb::XCommandEnvironment> mxFolderEnvironment;
@@ -340,7 +337,6 @@ TemplateScanner::State TemplateScanner::GatherFolderList()
                     FolderDescriptor(
                         Classify(sTitle,sTargetDir),
                         sTitle,
-                        sTargetDir,
                         aId,
                         mxFolderEnvironment));
             }
@@ -362,7 +358,6 @@ TemplateScanner::State TemplateScanner::ScanFolder()
         mpFolderDescriptors->erase(mpFolderDescriptors->begin());
 
         OUString sTitle (aDescriptor.msTitle);
-        OUString sTargetDir (aDescriptor.msTargetDir);
         OUString aId (aDescriptor.msContentIdentifier);
 
         maFolderContent = ::ucbhelper::Content (aId, aDescriptor.mxFolderEnvironment, comphelper::getProcessComponentContext());
@@ -370,7 +365,7 @@ TemplateScanner::State TemplateScanner::ScanFolder()
         {
             // Scan the folder and insert it into the list of template
             // folders.
-            mpTemplateDirectory = new TemplateDir (sTitle, sTargetDir);
+            mpTemplateDirectory = new TemplateDir (sTitle);
             mpTemplateDirectory->EnableSorting(mbEntrySortingEnabled);
             // Continue with scanning all entries in the folder.
             eNextState = INITIALIZE_ENTRY_SCAN;
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index 7df30fa2d850..7e25a5a6ced2 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -74,7 +74,7 @@ VCL_BUILDER_DECL_FACTORY(SdDocPreviewWin)
 }
 
 SdDocPreviewWin::SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle )
-: Control(pParent, nStyle), pMetaFile( nullptr ), bInEffect(false), mpObj(nullptr), mnShowPage(0)
+: Control(pParent, nStyle), pMetaFile( nullptr ), mpObj(nullptr), mnShowPage(0)
 {
     SetBorderStyle( WindowBorderStyle::MONO );
     svtools::ColorConfig aColorConfig;
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 0b763ab8dcc5..0617324a8348 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -65,14 +65,12 @@ static const sal_uInt16 nShowAllShapesFilter=2;
  */
 SdNavigatorWin::SdNavigatorWin(
     vcl::Window* pParent,
-    ::sd::NavigatorChildWindow* pChWinCtxt,
     const SdResId& rSdResId,
     SfxBindings* pInBindings)
     : vcl::Window( pParent, rSdResId )
     , maToolbox ( VclPtr<ToolBox>::Create( this, SdResId( 1 ) ) )
     , maTlbObjects( VclPtr<SdPageObjsTLB>::Create( this, SdResId( TLB_OBJECTS ) ) )
     , maLbDocs ( VclPtr<ListBox>::Create( this, SdResId( LB_DOCS ) ) )
-    , mpChildWinContext( pChWinCtxt )
     , mbDocImported ( false )
       // On changes of the DragType: adjust SelectionMode of TLB!
     , meDragType ( NAVIGATOR_DRAGTYPE_EMBEDDED )
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index f0f9ab2d2eea..41e9bfb01af4 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -29,8 +29,7 @@
  *  dialog to adjust print options
  */
 SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs ) :
-    SfxTabPage          ( pParent, "prntopts" , "modules/simpress/ui/prntopts.ui" , &rInAttrs ),
-    rOutAttrs           ( rInAttrs )
+    SfxTabPage          ( pParent, "prntopts" , "modules/simpress/ui/prntopts.ui" , &rInAttrs )
 {
     get( m_pFrmContent , "contentframe" );
     get( m_pCbxDraw , "drawingcb" );
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index ff3d2f1577fc..9bdb6bbfed6f 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -68,8 +68,6 @@ public:
     */
     css::uno::Reference<css::drawing::framework::XConfiguration> mxRequestedConfiguration;
 
-    ViewShellBase* mpBase;
-
     std::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer;
 
     std::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager;
@@ -550,7 +548,6 @@ ConfigurationController::Implementation::Implementation (
     : mxControllerManager(rxController, UNO_QUERY_THROW),
       mpBroadcaster(new ConfigurationControllerBroadcaster(&rController)),
       mxRequestedConfiguration(new Configuration(&rController, true)),
-      mpBase(nullptr),
       mpResourceFactoryContainer(new ResourceFactoryManager(mxControllerManager)),
       mpResourceManager(
           new ConfigurationControllerResourceManager(mpResourceFactoryContainer,mpBroadcaster)),
diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx
index 30855b6a00ed..43c3ab65f6f5 100644
--- a/sd/source/ui/inc/AccessibleViewForwarder.hxx
+++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx
@@ -84,7 +84,6 @@ public:
 protected:
     SdrPaintView* mpView;
     sal_uInt16 mnWindowId;
-    OutputDevice& mrDevice;
 
 private:
     AccessibleViewForwarder (AccessibleViewForwarder&) = delete;
diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx
index 112f27b0c49b..541f7e5aa721 100644
--- a/sd/source/ui/inc/EventMultiplexer.hxx
+++ b/sd/source/ui/inc/EventMultiplexer.hxx
@@ -128,12 +128,10 @@ public:
     */
     static const EventId EID_EDIT_MODE_MASTER       = 0x00080000;
 
-    const ViewShellBase& mrBase;
     EventId meEventId;
     const void* mpUserData;
 
     EventMultiplexerEvent (
-        const ViewShellBase& rBase,
         EventId eEventId,
         const void* pUserData);
 };
diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx
index cee27ab5bc57..2bce18b3bda1 100644
--- a/sd/source/ui/inc/GraphicObjectBar.hxx
+++ b/sd/source/ui/inc/GraphicObjectBar.hxx
@@ -52,7 +52,6 @@ public:
 protected:
     ::sd::View* mpView;
     ViewShell*  mpViewSh;
-    sal_uInt16          nMappedSlotFilter;
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx
index 55f603fa7b3e..561b52b7c841 100644
--- a/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/sd/source/ui/inc/MasterPageObserver.hxx
@@ -103,15 +103,12 @@ public:
     };
 
     EventType meType;
-    SdDrawDocument& mrDocument;
     const OUString& mrMasterPageName;
 
     MasterPageObserverEvent (
         EventType eType,
-        SdDrawDocument& rDocument,
         const OUString& rMasterPageName)
         : meType(eType),
-          mrDocument(rDocument),
           mrMasterPageName(rMasterPageName)
     {}
 
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 311360c51793..48fd1f6f16c1 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -130,7 +130,6 @@ public:
         sal_uInt16 nLayer = SDRPAGE_NOTFOUND) override;
     virtual sal_Int8 ExecuteDrop (
         const ExecuteDropEvent& rEvt,
-        DropTargetHelper& rTargetHelper,
         ::sd::Window* pTargetWindow = nullptr,
         sal_uInt16 nPage = SDRPAGE_NOTFOUND,
         sal_uInt16 nLayer = SDRPAGE_NOTFOUND) override;
diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx
index 102dc77ad92e..38d0d7780cfd 100644
--- a/sd/source/ui/inc/Ruler.hxx
+++ b/sd/source/ui/inc/Ruler.hxx
@@ -49,7 +49,6 @@ public:
 
     using ::Ruler::SetNullOffset;
 protected:
-    ::sd::View* pSdView;
     VclPtr< ::sd::Window> pSdWin;
     DrawViewShell* pDrViewShell;
     RulerCtrlItem* pCtrlItem;
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 880612c94b23..68901785b589 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -221,7 +221,6 @@ private:
     ViewShell* mpViewShell;
     ViewShellBase* mpViewShellBase;
     VclPtr<sd::Window> mpContentWindow;
-    bool mbOwnesContentWindow;
     VclPtr<ScrollBar> mpHorizontalScrollBar;
     VclPtr<ScrollBar> mpVerticalScrollBar;
     VclPtr<ScrollBarBox> mpScrollBarBox;
diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index 17f40d7ddb3e..6497848312bc 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -72,12 +72,11 @@ private:
 class TemplateDir
 {
 public:
-    TemplateDir (const OUString& rsRegion, const OUString& rsUrl )
-        :   msRegion(rsRegion), msUrl(rsUrl), maEntries(),
+    TemplateDir (const OUString& rsRegion )
+        :   msRegion(rsRegion), maEntries(),
             mbSortingEnabled(false), mpEntryCompare(nullptr) {}
 
     OUString msRegion;
-    OUString msUrl;
     ::std::vector<TemplateEntry*> maEntries;
 
     void EnableSorting(bool bSortingEnabled = true);
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 935ba079745c..5c9aef618ccd 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -105,7 +105,6 @@ public:
         sal_uInt16 nLayer = SDRPAGE_NOTFOUND);
     virtual sal_Int8 ExecuteDrop (
         const ExecuteDropEvent& rEvt,
-        DropTargetHelper& rTargetHelper,
         ::sd::Window* pTargetWindow = nullptr,
         sal_uInt16 nPage = SDRPAGE_NOTFOUND,
         sal_uInt16 nLayer = SDRPAGE_NOTFOUND);
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 2aa190be8d4a..74f8aa879a59 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -164,7 +164,6 @@ protected:
     bool mbCalcMinZoomByMinSide;
     bool mbCenterAllowed;
     long mnTicks;
-    bool mbDraggedFrom;
 
     ViewShell* mpViewShell;
     bool mbUseDropScroll;
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
index 5df4aab1828d..faf1e7bb0082 100644
--- a/sd/source/ui/inc/docprev.hxx
+++ b/sd/source/ui/inc/docprev.hxx
@@ -42,7 +42,6 @@ class SD_DLLPUBLIC SdDocPreviewWin : public Control, public SfxListener
 {
 protected:
     GDIMetaFile*    pMetaFile;
-    bool            bInEffect;
     Link<SdDocPreviewWin&,void> aClickHdl;
     SfxObjectShell* mpObj;
     sal_uInt16      mnShowPage;
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 2a15962c9c8f..8aae80ae3e64 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -92,7 +92,6 @@ public:
     */
     SdNavigatorWin(
         vcl::Window* pParent,
-        ::sd::NavigatorChildWindow* pChildWinContext,
         const SdResId& rSdResId,
         SfxBindings* pBindings);
     void SetUpdateRequestFunctor(const UpdateRequestFunctor& rUpdateRequest);
@@ -121,7 +120,6 @@ private:
     VclPtr<SdPageObjsTLB>       maTlbObjects;
     VclPtr<ListBox>             maLbDocs;
 
-    ::sd::NavigatorChildWindow*     mpChildWinContext;
     Size                        maSize;
     Size                        maMinSize;
     bool                        mbDocImported;
diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx
index 167f94a39e83..df668faefb29 100644
--- a/sd/source/ui/inc/prntopts.hxx
+++ b/sd/source/ui/inc/prntopts.hxx
@@ -52,8 +52,6 @@ private:
     VclPtr<CheckBox>            m_pCbxBack;
     VclPtr<CheckBox>            m_pCbxPaperbin;
 
-    const SfxItemSet&   rOutAttrs;
-
     DECL_LINK_TYPED( ClickCheckboxHdl, Button*, void );
     DECL_LINK_TYPED( ClickBookletHdl, Button*, void );
 
diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
index 46c0343f9aca..ac026cf381a5 100644
--- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
+++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
@@ -84,11 +84,6 @@ private:
     std::unique_ptr< ToolPanelViewShell_Impl >   mpImpl;
 
     std::shared_ptr<TaskPaneShellManager> mpSubShellManager;
-
-    /** The id of the menu in the menu bar/tool box of the parent docking
-        window.
-    */
-    sal_uInt16 mnMenuId;
 };
 
 } } // end of namespace ::sd::toolpanel
diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx
index 1e0a14ecd687..78b6dbc518de 100644
--- a/sd/source/ui/sidebar/MasterPageObserver.cxx
+++ b/sd/source/ui/sidebar/MasterPageObserver.cxx
@@ -199,7 +199,6 @@ void MasterPageObserver::Implementation::AddEventListener (
             {
               MasterPageObserverEvent aEvent (
                   MasterPageObserverEvent::ET_MASTER_PAGE_EXISTS,
-                  *aDocumentIterator->first,
                   *aNameIterator);
               SendEvent (aEvent);
             }
@@ -301,7 +300,6 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
 
             MasterPageObserverEvent aEvent (
                 MasterPageObserverEvent::ET_MASTER_PAGE_ADDED,
-                rDocument,
                 *I);
             SendEvent (aEvent);
         }
@@ -321,7 +319,6 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
 
             MasterPageObserverEvent aEvent (
                 MasterPageObserverEvent::ET_MASTER_PAGE_REMOVED,
-                rDocument,
                 *I);
             SendEvent (aEvent);
         }
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 2daa5ec3f09e..aec82e55b6ab 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -75,7 +75,6 @@ MasterPagesSelector::MasterPagesSelector (
       maMutex(),
       mpContainer(rpContainer),
       mrDocument(rDocument),
-      mbSmallPreviewSize(false),
       mrBase(rBase),
       mnDefaultClickAction(SID_TP_APPLY_TO_ALL_SLIDES),
       maPreviewUpdateQueue(),
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 431ddab9a8b9..8242b361e20a 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -111,7 +111,6 @@ protected:
     std::shared_ptr<MasterPageContainer> mpContainer;
 
     SdDrawDocument& mrDocument;
-    bool mbSmallPreviewSize;
     ViewShellBase& mrBase;
     /** Slot that is executed as default action when the left mouse button is
         clicked over a master page.
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx
index c2e64d8e6951..7c270c5bb431 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.cxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx
@@ -35,7 +35,6 @@ NavigatorWrapper::NavigatorWrapper (
       mrViewShellBase(rViewShellBase),
       maNavigator(VclPtr<SdNavigatorWin>::Create(
         this,
-        nullptr,
         SdResId(FLT_NAVIGATOR),
         pBindings))
 {
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 44044b639fed..d4817e3d8a59 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -491,7 +491,6 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation,
 , mpViewShell(pViewSh)
 , mpDocSh(pDoc->GetDocSh())
 , mpDoc(pDoc)
-, mpNewAttr(nullptr)
 , mpParentWindow(pParentWindow)
 , mpShowWindow(nullptr)
 , mpTimeButton(nullptr)
@@ -500,14 +499,9 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation,
 , meAnimationMode(ANIMATIONMODE_SHOW)
 , mpOldActiveWindow(nullptr)
 , mnChildMask( 0 )
-, mbGridVisible(false)
-, mbBordVisible(false)
-, mbSlideBorderVisible(false)
-, mbSetOnlineSpelling(false)
 , mbDisposed(false)
 , mbAutoSaveWasOn(false)
 , mbRehearseTimings(false)
-, mbDesignMode(false)
 , mbIsPaused(false)
 , mbWasPaused(false)
 , mbInputFreeze(false)
@@ -516,12 +510,6 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation,
 , mnUserPaintColor( 0x80ff0000L )
 , mbUsePen(false)
 , mdUserPaintStrokeWidth ( 150.0 )
-#ifdef ENABLE_ERASER_UI
-, mbSwitchEraserMode(false)
-, mnEraseInkSize(100)
-#endif
-, mnEntryCounter(0)
-, mnLastSlideNumber(-1)
 , msOnClick( "OnClick" )
 , msBookmark( "Bookmark" )
 , msVerb( "Verb" )
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index cf95f3276978..e70f18a27398 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -330,7 +330,6 @@ private:
     DrawDocShell* mpDocSh;
     SdDrawDocument* mpDoc;
 
-    SfxItemSet*     mpNewAttr;
     VclPtr<vcl::Window>    mpParentWindow;
     VclPtr<ShowWindow>     mpShowWindow;
     VclPtr<PushButton>     mpTimeButton;
@@ -346,22 +345,16 @@ private:
     OUString        maCharBuffer;
     Pointer         maOldPointer;
     Pointer         maPencil;
-    std::vector< VclPtr< ::sd::Window> > maDrawModeWindows;
     VclPtr< ::sd::Window>   mpOldActiveWindow;
     Link<StarBASIC*,bool>   maStarBASICGlobalErrorHdl;
     unsigned long   mnChildMask;
-    bool            mbGridVisible;
-    bool            mbBordVisible;
-    bool            mbSlideBorderVisible;
-    bool            mbSetOnlineSpelling;
     bool            mbDisposed;
     bool            mbAutoSaveWasOn;
     bool            mbRehearseTimings;
-    bool            mbDesignMode;
     bool            mbIsPaused;
     bool            mbWasPaused;        // used to cache pause state during context menu
     bool            mbInputFreeze;
-    bool        mbActive;
+    bool            mbActive;
 
     PresentationSettings maPresSettings;
     sal_Int32       mnUserPaintColor;
@@ -369,10 +362,6 @@ private:
     bool            mbUsePen;
     double          mdUserPaintStrokeWidth;
 
-    /// used in updateHdl to prevent recursive calls
-    sal_Int32       mnEntryCounter;
-
-    sal_Int32       mnLastSlideNumber;
     WrappedShapeEventImplMap    maShapeEventMap;
 
     OUString msOnClick;
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
index 66c47a969f69..d6d18f05dd1e 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
@@ -66,7 +66,6 @@ public:
 SelectionManager::SelectionManager (SlideSorter& rSlideSorter)
     : mrSlideSorter(rSlideSorter),
       mrController(rSlideSorter.GetController()),
-      maSelectionBeforeSwitch(),
       mbIsMakeSelectionVisiblePending(true),
       mnInsertionPosition(-1),
       mnAnimationId(Animator::NotAnAnimationId),
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
index 88e31375e2c3..2c052df17720 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
@@ -111,12 +111,6 @@ private:
 
     ::std::vector<Link<LinkParamNone*,void>> maSelectionChangeListeners;
 
-    /** This array stores the indices of the  selected page descriptors at
-        the time when the edit mode is switched to EM_MASTERPAGE.  With this
-        we can restore the selection when switching back to EM_PAGE mode.
-    */
-    ::std::vector<SdPage*> maSelectionBeforeSwitch;
-
     /** When this flag is set then on the next call to Paint() the selection
         is moved into the visible area.
     */
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index 39bf90fbeda0..f862a0ad1a02 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -115,7 +115,6 @@ SlideSorter::SlideSorter (
       mpViewShell(&rViewShell),
       mpViewShellBase(&rViewShell.GetViewShellBase()),
       mpContentWindow(pContentWindow),
-      mbOwnesContentWindow(false),
       mpHorizontalScrollBar(pHorizontalScrollBar),
       mpVerticalScrollBar(pVerticalScrollBar),
       mpScrollBarBox(pScrollBarBox),
@@ -137,7 +136,6 @@ SlideSorter::SlideSorter (
       mpViewShell(pViewShell),
       mpViewShellBase(&rBase),
       mpContentWindow(VclPtr<ContentWindow>::Create(rParentWindow,*this )),
-      mbOwnesContentWindow(true),
       mpHorizontalScrollBar(VclPtr<ScrollBar>::Create(&rParentWindow,WinBits(WB_HSCROLL | WB_DRAG))),
       mpVerticalScrollBar(VclPtr<ScrollBar>::Create(&rParentWindow,WinBits(WB_VSCROLL | WB_DRAG))),
       mpScrollBarBox(VclPtr<ScrollBarBox>::Create(&rParentWindow)),
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index 4c501de7ff7a..ff73e277274b 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -77,8 +77,6 @@ public:
 
     void CallListeners (EventMultiplexerEvent& rEvent);
 
-    ViewShellBase& GetViewShellBase() const { return mrBase; }
-
     //===== lang::XEventListener ==============================================
     virtual void SAL_CALL
         disposing (const css::lang::EventObject& rEventObject)
@@ -197,7 +195,7 @@ void EventMultiplexer::MultiplexEvent(
     EventMultiplexerEvent::EventId eEventId,
     void* pUserData )
 {
-    EventMultiplexerEvent aEvent (mpImpl->GetViewShellBase(), eEventId, pUserData);
+    EventMultiplexerEvent aEvent(eEventId, pUserData);
     mpImpl->CallListeners(aEvent);
 }
 
@@ -684,7 +682,7 @@ void EventMultiplexer::Implementation::CallListeners (
     EventMultiplexerEvent::EventId eId,
     void* pUserData)
 {
-    EventMultiplexerEvent aEvent (mrBase, eId, pUserData);
+    EventMultiplexerEvent aEvent(eId, pUserData);
     CallListeners(aEvent);
 }
 
@@ -708,13 +706,10 @@ IMPL_LINK_NOARG_TYPED(EventMultiplexer::Implementation, SlideSorterSelectionChan
 //===== EventMultiplexerEvent =================================================
 
 EventMultiplexerEvent::EventMultiplexerEvent (
-    const ViewShellBase& rBase,
     EventId eEventId,
     const void* pUserData)
-    : mrBase(rBase),
-      meEventId(eEventId),
+    : meEventId(eEventId),
       mpUserData(pUserData)
-
 {
 }
 
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 7ad4f504b999..43d96f3901e4 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -262,17 +262,6 @@ const SvEventDescription* ImplGetSupportedMacroItems()
     return aMacroDescriptionsImpl;
 }
 
-/**
- * compare function for QSort
- */
-struct SortStruct
-{
-    SdrObject*  pObj;
-    sal_uInt32      nOrder;
-};
-
-typedef SortStruct  SORT;
-
 SdXShape::SdXShape( SvxShape* pShape, SdXImpressDocument* pModel) throw()
 :   mpShape( pShape ),
     mpPropSet( pModel?
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index de78cf2d4cfd..21c691968a3a 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -65,9 +65,8 @@ GraphicObjectBar::GraphicObjectBar (
     ViewShell* pSdViewShell,
     ::sd::View* pSdView )
     : SfxShell (pSdViewShell->GetViewShell()),
-      mpView     ( pSdView ),
-      mpViewSh ( pSdViewShell ),
-      nMappedSlotFilter ( SID_GRFFILTER_INVERT )
+      mpView   ( pSdView ),
+      mpViewSh ( pSdViewShell )
 {
     DrawDocShell* pDocShell = mpViewSh->GetDocSh();
 
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 04b80c290f2b..a38bf683c1e4 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -147,14 +147,12 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode )
       mbStringFound(false),
       mbMatchMayExist(false),
       mnPageCount(0),
-      mnObjectCount(0),
       mbEndOfSearch(false),
       mbFoundObject(false),
       mbError(false),
       mbDirectionIsForward(true),
       mbRestrictSearchToSelection(false),
       maMarkListCopy(),
-      mbProcessCurrentViewOnly(false),
       mpObj(nullptr),
       mpFirstObj(nullptr),
       mpTextObj(nullptr),
@@ -170,7 +168,6 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode )
       maCurrentPosition(),
       maSearchStartPosition(),
       maLastValidPosition(),
-      mbSelectionHasChanged(false),
       mbExpectingSelectionChangeEvent(false),
       mbWholeDocumentProcessed(false),
       mbPrepareSpellingPending(true)
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index a933808352d0..3f99ac9f727e 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -1259,7 +1259,7 @@ sal_Int8 DrawViewShell::AcceptDrop (
 
 sal_Int8 DrawViewShell::ExecuteDrop (
     const ExecuteDropEvent& rEvt,
-    DropTargetHelper& rTargetHelper,
+    DropTargetHelper& /*rTargetHelper*/,
     ::sd::Window* pTargetWindow,
     sal_uInt16 nPage,
     sal_uInt16 nLayer)
@@ -1271,7 +1271,7 @@ sal_Int8 DrawViewShell::ExecuteDrop (
         return DND_ACTION_NONE;
 
     Broadcast(ViewShellHint(ViewShellHint::HINT_COMPLEX_MODEL_CHANGE_START));
-    sal_Int8 nResult (mpDrawView->ExecuteDrop( rEvt, rTargetHelper, pTargetWindow, nPage, nLayer ));
+    sal_Int8 nResult (mpDrawView->ExecuteDrop( rEvt, pTargetWindow, nPage, nLayer ));
     Broadcast(ViewShellHint(ViewShellHint::HINT_COMPLEX_MODEL_CHANGE_END));
 
     return nResult;
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index da72fcb8ad31..63c19ebfdcb6 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -77,15 +77,6 @@ namespace sd {
 // PROCESS_WITH_PROGRESS_THRESHOLD pages are concerned
 #define PROCESS_WITH_PROGRESS_THRESHOLD  5
 
-struct SdParaAndPos
-{
-    Paragraph* pPara;
-    sal_uInt16     nPos;
-};
-
-// - OutlineView -
-
-
 OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineViewShell& rOutlineViewShell)
 : ::sd::View(*rDocSh.GetDoc(), pWindow, &rOutlineViewShell)
 , mrOutlineViewShell(rOutlineViewShell)
@@ -1376,7 +1367,7 @@ sal_Int8 OutlineView::AcceptDrop( const AcceptDropEvent&, DropTargetHelper&, ::s
     return DND_ACTION_NONE;
 }
 
-sal_Int8 OutlineView::ExecuteDrop( const ExecuteDropEvent&, DropTargetHelper&, ::sd::Window*, sal_uInt16, sal_uInt16)
+sal_Int8 OutlineView::ExecuteDrop( const ExecuteDropEvent&, ::sd::Window*, sal_uInt16, sal_uInt16)
 {
     return DND_ACTION_NONE;
 }
diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx
index c6297eeef0ac..5f3bebf255c5 100644
--- a/sd/source/ui/view/sdruler.cxx
+++ b/sd/source/ui/view/sdruler.cxx
@@ -70,7 +70,6 @@ void RulerCtrlItem::StateChanged( sal_uInt16 nSId, SfxItemState, const SfxPoolIt
 
 Ruler::Ruler( DrawViewShell& rViewSh, vcl::Window* pParent, ::sd::Window* pWin, SvxRulerSupportFlags nRulerFlags,  SfxBindings& rBindings, WinBits nWinStyle)
     : SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle)
-    , pSdView(nullptr)
     , pSdWin(pWin)
     , pDrViewShell(&rViewSh)
 {
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index aef02b9b7ad6..9cd5e901ce64 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -75,22 +75,13 @@ using namespace ::com::sun::star;
 
 struct SdNavigatorDropEvent : public ExecuteDropEvent
 {
-    DropTargetHelper&       mrTargetHelper;
     VclPtr< ::sd::Window>    mpTargetWindow;
-    sal_uInt16                  mnPage;
-    sal_uInt16                  mnLayer;
 
     SdNavigatorDropEvent (
         const ExecuteDropEvent& rEvt,
-        DropTargetHelper& rTargetHelper,
-        ::sd::Window* pTargetWindow,
-        sal_uInt16 nPage,
-        sal_uInt16 nLayer )
+        ::sd::Window* pTargetWindow )
         : ExecuteDropEvent( rEvt ),
-          mrTargetHelper( rTargetHelper ),
-          mpTargetWindow( pTargetWindow ),
-          mnPage( nPage ),
-          mnLayer( nLayer )
+          mpTargetWindow( pTargetWindow )
     {}
 };
 
@@ -623,7 +614,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge
     return nRet;
 }
 
-sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper,
+sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt,
                               ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer )
 {
     SdrPageView*    pPV = GetSdrPageView();
@@ -721,8 +712,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar
                     {
                         // insert bookmark from own navigator (handled async. due to possible message box )
                         Application::PostUserEvent( LINK( this, View, ExecuteNavigatorDrop ),
-                                                    new SdNavigatorDropEvent( rEvt, rTargetHelper, pTargetWindow,
-                                                                              nPage, nLayer ) );
+                                                    new SdNavigatorDropEvent( rEvt, pTargetWindow ) );
                         nRet = nDropAction;
                     }
                     else
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 4d9566c3fa29..effde241b9b0 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -65,7 +65,6 @@ Window::Window(vcl::Window* pParent)
       mbCalcMinZoomByMinSide(true),
       mbCenterAllowed(true),
       mnTicks (0),
-      mbDraggedFrom(false),
       mpViewShell(nullptr),
       mbUseDropScroll (true)
 {
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 517e79fff166..3ba31822bb56 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -944,13 +944,13 @@ sal_Int8 ViewShell::AcceptDrop (
 
 sal_Int8 ViewShell::ExecuteDrop (
     const ExecuteDropEvent& rEvt,
-    DropTargetHelper& rTargetHelper,
+    DropTargetHelper& /*rTargetHelper*/,
     ::sd::Window* pTargetWindow,
     sal_uInt16 nPage,
     sal_uInt16 nLayer)
 {
     ::sd::View* pView = GetView();
-    return( pView ? pView->ExecuteDrop( rEvt, rTargetHelper, pTargetWindow, nPage, nLayer ) : DND_ACTION_NONE );
+    return pView ? pView->ExecuteDrop( rEvt, pTargetWindow, nPage, nLayer ) : DND_ACTION_NONE;
 }
 
 void ViewShell::WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse)