loplugin:constantparam in sd

Change-Id: I2bc989802c12b379a1ba4202f54ecfef1f339c8c
Reviewed-on: https://gerrit.libreoffice.org/28774
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

53 files changed, 150 insertions, 248 deletions

diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index c4a1308dca43..b261ed4e5997 100644
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
@@ -51,16 +51,6 @@ class IteratorPosition;
 */
 enum IteratorLocation {BEGIN,END,CURRENT};
 
-/** Use this enum to specify the type of iterator when creating a new
-    iterator:
-    <ul><li>SELECTION for iteration over all objects that belong to the
-    current mark list.</li>
-    <li>SINGLE_VIEW for iteration over all objects in the current view.</li>
-    <li>DOCUMENT for iteration over all object in all relevant
-    views.</li></ul>
-*/
-enum IteratorType {SELECTION,SINGLE_VIEW,DOCUMENT};
-
 /** This iterator can be used to iterate over all <type>SdrObject</type>
     objects of one of three set denoted by the <type>IteratorType</type>:
     <ul><li>All objects of the current mark list (selection)
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 04cff2034b33..ec5ba755fa19 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -169,7 +169,7 @@ public:
                                                                      const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) = 0;
     virtual VclAbstractDialog*          CreateRemoteDialog( vcl::Window* pWindow ) = 0;
     virtual SfxAbstractTabDialog*       CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SdResId& DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0;
-    virtual AbstractSdPresLayoutDlg*    CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, vcl::Window* pWindow, const SfxItemSet& rInAttrs) = 0;
+    virtual AbstractSdPresLayoutDlg*    CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs) = 0;
     virtual SfxAbstractTabDialog*       CreateSdTabTemplateDlg(vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView) = 0;
     virtual SfxAbstractDialog*          CreatSdActionDialog(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) = 0;
     virtual AbstractSdVectorizeDlg*     CreateSdVectorizeDlg( vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) = 0;
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx
index 5c3a0824973f..2b1ed48a4abc 100644
--- a/sd/inc/undo/undomanager.hxx
+++ b/sd/inc/undo/undomanager.hxx
@@ -32,7 +32,7 @@ namespace sd
 class SD_DLLPUBLIC UndoManager : public SdrUndoManager
 {
 public:
-    UndoManager( sal_uInt16 nMaxUndoActionCount = 20 );
+    UndoManager();
 
     virtual void            EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId, sal_Int32 nViewShellId) override;
 
diff --git a/sd/source/core/undo/undomanager.cxx b/sd/source/core/undo/undomanager.cxx
index b0b9b68e52e9..a18c858a680e 100644
--- a/sd/source/core/undo/undomanager.cxx
+++ b/sd/source/core/undo/undomanager.cxx
@@ -23,8 +23,8 @@
 
 using namespace sd;
 
-UndoManager::UndoManager( sal_uInt16 nMaxUndoActionCount /* = 20 */ )
-  : SdrUndoManager( nMaxUndoActionCount )
+UndoManager::UndoManager()
+  : SdrUndoManager( 20/*nMaxUndoActionCount*/ )
   , mpLinkedUndoManager(nullptr)
   , mpViewShell(nullptr)
 {
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 0fe824e86a8f..917c3e5c7896 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -349,7 +349,7 @@ HtmlExport::HtmlExport(
     :   maPath( aPath ),
         mpDoc(pExpDoc),
         mpDocSh( pDocShell ),
-        meEC(nullptr),
+        meEC(),
         meMode( PUBLISH_SINGLE_DOCUMENT ),
         mbContentsPage(false),
         mnButtonThema(-1),
@@ -3238,8 +3238,8 @@ sal_uLong EasyFile::close()
 }
 
 // This class helps reporting errors during file i/o
-HtmlErrorContext::HtmlErrorContext(vcl::Window *_pWin)
-: ErrorContext(_pWin)
+HtmlErrorContext::HtmlErrorContext()
+: ErrorContext(nullptr)
 {
     mnResId = 0;
 }
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 3344118ab624..f4b24c1d29a8 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -66,7 +66,7 @@ private:
     OUString  maURL2;
 
 public:
-                    explicit HtmlErrorContext(vcl::Window *pWin=nullptr);
+                    explicit HtmlErrorContext();
                     virtual ~HtmlErrorContext() {};
 
     virtual bool    GetString( sal_uLong nErrId, OUString& rCtxStr ) override;
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 28864c46b545..ceb7ff94f9f9 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -21,6 +21,7 @@
 
 #include <o3tl/any.hxx>
 #include <svx/svdmodel.hxx>
+#include <svx/svxids.hrc>
 #include <sfx2/app.hxx>
 #include <sfx2/sfx.hrc>
 #include <tools/helpers.hxx>
@@ -30,6 +31,7 @@
 #include "optsitem.hxx"
 #include "cfgids.hxx"
 #include "FrameView.hxx"
+#include <sdattr.hrc>
 
 using namespace ::utl;
 using namespace ::com::sun::star::uno;
@@ -266,14 +268,14 @@ bool SdOptionsLayout::WriteData( Any* pValues ) const
 |*
 \************************************************************************/
 
-SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich )
-:   SfxPoolItem     ( _nWhich )
+SdOptionsLayoutItem::SdOptionsLayoutItem()
+:   SfxPoolItem     ( ATTR_OPTIONS_LAYOUT )
 ,   maOptionsLayout ( 0, false )
 {
 }
 
-SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView )
-:   SfxPoolItem     ( _nWhich )
+SdOptionsLayoutItem::SdOptionsLayoutItem( SdOptions* pOpts, ::sd::FrameView* pView )
+:   SfxPoolItem     ( ATTR_OPTIONS_LAYOUT )
 ,   maOptionsLayout ( 0, false )
 {
     if( pOpts )
@@ -383,8 +385,8 @@ bool SdOptionsContents::WriteData( Any* pValues ) const
 |*
 \************************************************************************/
 
-SdOptionsContentsItem::SdOptionsContentsItem(sal_uInt16 _nWhich, SdOptions*, ::sd::FrameView*)
-:   SfxPoolItem         ( _nWhich )
+SdOptionsContentsItem::SdOptionsContentsItem( SdOptions*, ::sd::FrameView*)
+:   SfxPoolItem         ( ATTR_OPTIONS_CONTENTS )
 ,   maOptionsContents   ( 0, false )
 {
 }
@@ -635,14 +637,14 @@ bool SdOptionsMisc::WriteData( Any* pValues ) const
 |*
 \************************************************************************/
 
-SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich )
-:   SfxPoolItem     ( _nWhich )
+SdOptionsMiscItem::SdOptionsMiscItem()
+:   SfxPoolItem     ( ATTR_OPTIONS_MISC )
 ,   maOptionsMisc   ( 0, false )
 {
 }
 
-SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView )
-:   SfxPoolItem     ( _nWhich )
+SdOptionsMiscItem::SdOptionsMiscItem( SdOptions* pOpts, ::sd::FrameView* pView )
+:   SfxPoolItem     ( ATTR_OPTIONS_MISC )
 ,   maOptionsMisc   ( 0, false )
 {
     if( pOpts )
@@ -847,14 +849,14 @@ bool SdOptionsSnap::WriteData( Any* pValues ) const
 |*
 \************************************************************************/
 
-SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich )
-:   SfxPoolItem     ( _nWhich )
+SdOptionsSnapItem::SdOptionsSnapItem()
+:   SfxPoolItem     ( ATTR_OPTIONS_SNAP )
 ,   maOptionsSnap   ( 0, false )
 {
 }
 
-SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView )
-:   SfxPoolItem     ( _nWhich )
+SdOptionsSnapItem::SdOptionsSnapItem( SdOptions* pOpts, ::sd::FrameView* pView )
+:   SfxPoolItem     ( ATTR_OPTIONS_SNAP )
 ,   maOptionsSnap   ( 0, false )
 {
     if( pView )
@@ -1094,34 +1096,20 @@ bool SdOptionsGrid::WriteData( Any* pValues ) const
 |*
 \************************************************************************/
 
-SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) :
-    SvxGridItem( _nWhich )
+SdOptionsGridItem::SdOptionsGridItem( SdOptions* pOpts ) :
+    SvxGridItem( SID_ATTR_GRID_OPTIONS )
 {
     SetSynchronize( pOpts->IsSynchronize() );
     SetEqualGrid( pOpts->IsEqualGrid() );
 
-    if( pView )
-    {
-        SetFieldDrawX( pView->GetGridCoarse().Width() );
-        SetFieldDrawY( pView->GetGridCoarse().Height() );
-        SetFieldDivisionX( pView->GetGridFine().Width() ? ( GetFieldDrawX() / pView->GetGridFine().Width() - 1 ) : 0 );
-        SetFieldDivisionY( pView->GetGridFine().Height() ? ( GetFieldDrawY() / pView->GetGridFine().Height() - 1 ) : 0 );
-        SetFieldSnapX( long(pView->GetSnapGridWidthX()) );
-        SetFieldSnapY( long(pView->GetSnapGridWidthY()) );
-        SetUseGridSnap( pView->IsGridSnap() );
-        SetGridVisible( pView->IsGridVisible() );
-    }
-    else
-    {
-        SetFieldDrawX( pOpts->GetFieldDrawX() );
-        SetFieldDrawY( pOpts->GetFieldDrawY() );
-        SetFieldDivisionX( pOpts->GetFieldDivisionX() ? ( pOpts->GetFieldDrawX() / pOpts->GetFieldDivisionX() - 1 ) : 0 );
-        SetFieldDivisionY( pOpts->GetFieldDivisionY() ? ( pOpts->GetFieldDrawY() / pOpts->GetFieldDivisionY() - 1 ) : 0 );
-        SetFieldSnapX( pOpts->GetFieldSnapX() );
-        SetFieldSnapY( pOpts->GetFieldSnapY() );
-        SetUseGridSnap( pOpts->IsUseGridSnap() );
-        SetGridVisible( pOpts->IsGridVisible() );
-    }
+    SetFieldDrawX( pOpts->GetFieldDrawX() );
+    SetFieldDrawY( pOpts->GetFieldDrawY() );
+    SetFieldDivisionX( pOpts->GetFieldDivisionX() ? ( pOpts->GetFieldDrawX() / pOpts->GetFieldDivisionX() - 1 ) : 0 );
+    SetFieldDivisionY( pOpts->GetFieldDivisionY() ? ( pOpts->GetFieldDrawY() / pOpts->GetFieldDivisionY() - 1 ) : 0 );
+    SetFieldSnapX( pOpts->GetFieldSnapX() );
+    SetFieldSnapY( pOpts->GetFieldSnapY() );
+    SetUseGridSnap( pOpts->IsUseGridSnap() );
+    SetGridVisible( pOpts->IsGridVisible() );
 }
 
 void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const
@@ -1319,14 +1307,14 @@ bool SdOptionsPrint::WriteData( Any* pValues ) const
 |*
 \************************************************************************/
 
-SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich )
-:   SfxPoolItem     ( _nWhich )
+SdOptionsPrintItem::SdOptionsPrintItem()
+:   SfxPoolItem     ( ATTR_OPTIONS_PRINT )
 ,   maOptionsPrint  ( 0, false )
 {
 }
 
-SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* )
-:   SfxPoolItem     ( _nWhich )
+SdOptionsPrintItem::SdOptionsPrintItem( SdOptions* pOpts )
+:   SfxPoolItem     ( ATTR_OPTIONS_PRINT )
 ,   maOptionsPrint  ( 0, false )
 {
     if( pOpts )
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index b3349c396094..d658a1a81656 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -828,7 +828,7 @@ void OutlineToImpressFinalizer::operator() (bool)
         sd::OutlineView* pView = static_cast<sd::OutlineView*>(pOutlineShell->GetView());
         // mba: the stream can't contain any relative URLs, because we don't
         // have any information about a BaseURL!
-        if ( pOutlineShell->Read(*mpStream, OUString(), EE_FORMAT_RTF) == 0 )
+        if ( pOutlineShell->ReadRtf(*mpStream, OUString()) == 0 )
         {
         }
 
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 1818a021cdd3..1fcc5ef76b71 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -456,7 +456,7 @@ SfxItemSet*  SdModule::CreateItemSet( sal_uInt16 nSlot )
                         0 );
 
     // TP_OPTIONS_LAYOUT:
-    pRet->Put( SdOptionsLayoutItem( ATTR_OPTIONS_LAYOUT, pOptions, pFrameView ) );
+    pRet->Put( SdOptionsLayoutItem( pOptions, pFrameView ) );
 
     sal_uInt16 nDefTab = 0;
     if( pFrameView)
@@ -477,10 +477,10 @@ SfxItemSet*  SdModule::CreateItemSet( sal_uInt16 nSlot )
     pRet->Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)nMetric ) );
 
     // TP_OPTIONS_CONTENTS:
-    pRet->Put( SdOptionsContentsItem( ATTR_OPTIONS_CONTENTS, pOptions, pFrameView ) );
+    pRet->Put( SdOptionsContentsItem( pOptions, pFrameView ) );
 
     // TP_OPTIONS_MISC:
-    SdOptionsMiscItem aSdOptionsMiscItem( ATTR_OPTIONS_MISC, pOptions, pFrameView );
+    SdOptionsMiscItem aSdOptionsMiscItem( pOptions, pFrameView );
     if ( pFrameView )
     {
         aSdOptionsMiscItem.GetOptionsMisc().SetSummationOfParagraphs( pDoc->IsSummationOfParagraphs() );
@@ -490,7 +490,7 @@ SfxItemSet*  SdModule::CreateItemSet( sal_uInt16 nSlot )
     pRet->Put( aSdOptionsMiscItem );
 
     // TP_OPTIONS_SNAP:
-    pRet->Put( SdOptionsSnapItem( ATTR_OPTIONS_SNAP, pOptions, pFrameView ) );
+    pRet->Put( SdOptionsSnapItem( pOptions, pFrameView ) );
 
     // TP_SCALE:
     sal_uInt32 nW = 10L;
@@ -523,10 +523,10 @@ SfxItemSet*  SdModule::CreateItemSet( sal_uInt16 nSlot )
     pRet->Put( SfxUInt32Item( ATTR_OPTIONS_SCALE_HEIGHT, nH ) );
 
     // TP_OPTIONS_PRINT:
-    pRet->Put( SdOptionsPrintItem( ATTR_OPTIONS_PRINT, pOptions ) );
+    pRet->Put( SdOptionsPrintItem( pOptions ) );
 
     // RID_SVXPAGE_GRID:
-    pRet->Put( SdOptionsGridItem( SID_ATTR_GRID_OPTIONS, pOptions ) );
+    pRet->Put( SdOptionsGridItem( pOptions ) );
 
     return pRet;
 }
@@ -638,7 +638,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet )
         pPrintItem->SetOptions( pOptions );
 
         // set PrintOptionsSet
-        SdOptionsPrintItem aPrintItem( ATTR_OPTIONS_PRINT, pOptions );
+        SdOptionsPrintItem aPrintItem( pOptions );
         SfxFlagItem aFlagItem( SID_PRINTER_CHANGESTODOC );
         SfxPrinterChangeFlags nFlags =
                 (aPrintItem.GetOptionsPrint().IsWarningSize() ? SfxPrinterChangeFlags::CHG_SIZE : SfxPrinterChangeFlags::NONE) |
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index 21fe5a540404..a441b1a0a548 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -43,8 +43,7 @@ PaneChildWindow::PaneChildWindow (
     sal_uInt16 nId,
     SfxBindings* pBindings,
     SfxChildWinInfo* pInfo,
-    const sal_uInt16 nTitleBarResId,
-    SfxChildAlignment eAlignment)
+    const sal_uInt16 nTitleBarResId)
     : SfxChildWindow (pParentWindow, nId)
 {
     SetWindow( VclPtr<PaneDockingWindow>::Create(
@@ -52,7 +51,7 @@ PaneChildWindow::PaneChildWindow (
         this,
         pParentWindow,
         SD_RESSTR(nTitleBarResId)));
-    SetAlignment(eAlignment);
+    SetAlignment(SfxChildAlignment::LEFT);
     static_cast<SfxDockingWindow*>(GetWindow())->Initialize(pInfo);
     SetHideNotDelete(true);
 
@@ -85,8 +84,7 @@ LeftPaneImpressChildWindow::LeftPaneImpressChildWindow (
         nId,
         pBindings,
         pInfo,
-        STR_LEFT_PANE_IMPRESS_TITLE,
-        SfxChildAlignment::LEFT)
+        STR_LEFT_PANE_IMPRESS_TITLE)
 {
 }
 
@@ -101,8 +99,7 @@ LeftPaneDrawChildWindow::LeftPaneDrawChildWindow (
         nId,
         pBindings,
         pInfo,
-        STR_LEFT_PANE_DRAW_TITLE,
-        SfxChildAlignment::LEFT)
+        STR_LEFT_PANE_DRAW_TITLE)
 {
 }
 
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index ee84f3578357..a0cb60c16a25 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -39,9 +39,8 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlDiaPages,  SfxUInt16Item )
 
 // SdPagesField
 SdPagesField::SdPagesField( vcl::Window* pParent,
-                            const uno::Reference< frame::XFrame >& rFrame,
-                            WinBits nBits ) :
-    SvxMetricField  ( pParent, rFrame, nBits ),
+                            const uno::Reference< frame::XFrame >& rFrame ) :
+    SvxMetricField  ( pParent, rFrame, WB_BORDER | WB_SPIN | WB_REPEAT ),
     m_xFrame        ( rFrame )
 {
     OUString aStr( SD_RESSTR( STR_SLIDE_PLURAL ) );
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 94922cabe7da..0508797e9396 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -62,7 +62,7 @@ private:
     DECL_LINK_TYPED( IsMusicStoppedHdl, Idle *, void );
 
 public:
-    explicit SdFileDialog_Imp( const short nDialogType );
+    explicit SdFileDialog_Imp();
     virtual ~SdFileDialog_Imp();
 
     ErrCode Execute();
@@ -207,8 +207,8 @@ void SdFileDialog_Imp::CheckSelectionState()
     }
 }
 
-SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType ) :
-    FileDialogHelper( nDialogType ),
+SdFileDialog_Imp::SdFileDialog_Imp() :
+    FileDialogHelper( css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PLAY ),
     mnPlaySoundEvent( nullptr ),
     mbUsableSelection( false ),
     mbLabelPlaying(false)
@@ -222,32 +222,16 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType ) :
 
     if( mxControlAccess.is() )
     {
-        if( nDialogType == css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PLAY )
+        try
         {
-            try
-            {
-                mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
-                                           SD_RESSTR( STR_PLAY ) );
-            }
-            catch (const css::lang::IllegalArgumentException&)
-            {
-#ifdef DBG_UTIL
-                OSL_FAIL( "Cannot set play button label" );
-#endif
-            }
+            mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
+                                       SD_RESSTR( STR_PLAY ) );
         }
-        else if( !mbUsableSelection )
+        catch (const css::lang::IllegalArgumentException&)
         {
-            try
-            {
-                mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, false );
-            }
-            catch (const css::lang::IllegalArgumentException&)
-            {
 #ifdef DBG_UTIL
-                OSL_FAIL( "Cannot disable selection checkbox" );
+            OSL_FAIL( "Cannot set play button label" );
 #endif
-            }
         }
     }
 }
@@ -269,7 +253,7 @@ ErrCode SdFileDialog_Imp::Execute()
 
 // these are simple forwarders
 SdOpenSoundFileDialog::SdOpenSoundFileDialog() :
-    mpImpl( new SdFileDialog_Imp( css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PLAY ) )
+    mpImpl( new SdFileDialog_Imp() )
 {
     OUString aDescr;
     aDescr = SD_RESSTR(STR_ALL_FILES);
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index f8c2f8343ebb..4a8f1246be64 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -117,7 +117,7 @@ bool SdPrintOptions::FillItemSet( SfxItemSet* rAttrs )
         m_pRbtGrayscale->IsValueChangedFromSaved()||
         m_pRbtBlackWhite->IsValueChangedFromSaved())
     {
-        SdOptionsPrintItem aOptions( ATTR_OPTIONS_PRINT );
+        SdOptionsPrintItem aOptions;
 
         aOptions.GetOptionsPrint().SetDraw( m_pCbxDraw->IsChecked() );
         aOptions.GetOptionsPrint().SetNotes( m_pCbxNotes->IsChecked() );
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index 16efa6b75578..d733f6be3321 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -387,9 +387,9 @@ SfxAbstractTabDialog *  SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplate
     return new SdPresLayoutTemplateDlg_Impl( VclPtr<SdPresLayoutTemplateDlg>::Create( pDocSh, pParent, DlgId, rStyleBase, ePO, pSSPool ) );
 }
 
-AbstractSdPresLayoutDlg *  SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg(  ::sd::DrawDocShell* pDocShell, vcl::Window* pParent, const SfxItemSet& rInAttrs)
+AbstractSdPresLayoutDlg *  SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg(  ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs)
 {
-    return new AbstractSdPresLayoutDlg_Impl( VclPtr<SdPresLayoutDlg>::Create( pDocShell, pParent, rInAttrs ) );
+    return new AbstractSdPresLayoutDlg_Impl( VclPtr<SdPresLayoutDlg>::Create( pDocShell, nullptr, rInAttrs ) );
 }
 
 SfxAbstractTabDialog *  SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg(vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView )
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 5ccb90a2ee49..bcdce0407b31 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -230,7 +230,7 @@ public:
                                                                      const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) override;
     virtual VclAbstractDialog*          CreateRemoteDialog( vcl::Window* pWindow ) override; // ad for RemoteDialog
     virtual SfxAbstractTabDialog*       CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SdResId& DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) override;
-    virtual AbstractSdPresLayoutDlg*    CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, vcl::Window* pWindow, const SfxItemSet& rInAttrs) override;
+    virtual AbstractSdPresLayoutDlg*    CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs) override;
     virtual SfxAbstractTabDialog*       CreateSdTabTemplateDlg(vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) override;
     virtual SfxAbstractDialog*          CreatSdActionDialog(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) override;
     virtual AbstractSdVectorizeDlg*     CreateSdVectorizeDlg(vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell) override;
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 8253ee14c0a7..8986b719f800 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -157,7 +157,7 @@ void SdPresLayoutDlg::FillValueSet()
             aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR));
             maLayoutNames.push_back(aLayoutName);
 
-            Image aBitmap(Bitmap(mpDocSh->GetPagePreviewBitmap(pMaster, 90)));
+            Image aBitmap(Bitmap(mpDocSh->GetPagePreviewBitmap(pMaster)));
             m_pVS->InsertItem((sal_uInt16)maLayoutNames.size(), aBitmap, aLayoutName);
         }
     }
@@ -255,7 +255,7 @@ IMPL_LINK_NOARG_TYPED(SdPresLayoutDlg, ClickLoadHdl, Button*, void)
                             aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR));
                             maLayoutNames.push_back(aLayoutName);
 
-                            Image aBitmap(Bitmap(pTemplDocSh->GetPagePreviewBitmap(pMaster, 90)));
+                            Image aBitmap(Bitmap(pTemplDocSh->GetPagePreviewBitmap(pMaster)));
                             m_pVS->InsertItem((sal_uInt16)maLayoutNames.size(), aBitmap, aLayoutName);
                         }
                     }
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 4f38e6204a3d..2c57bca14966 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -58,7 +58,7 @@ SdTpOptionsSnap::~SdTpOptionsSnap()
 bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
 {
     SvxGridTabPage::FillItemSet(rAttrs);
-    SdOptionsSnapItem aOptsItem( ATTR_OPTIONS_SNAP );
+    SdOptionsSnapItem aOptsItem;
 
     aOptsItem.GetOptionsSnap().SetSnapHelplines( pCbxSnapHelplines->IsChecked() );
     aOptsItem.GetOptionsSnap().SetSnapBorder( pCbxSnapBorder->IsChecked() );
@@ -143,7 +143,7 @@ bool SdTpOptionsContents::FillItemSet( SfxItemSet* rAttrs )
         m_pCbxDragStripes->IsValueChangedFromSaved() ||
         m_pCbxHandlesBezier->IsValueChangedFromSaved() )
     {
-        SdOptionsLayoutItem aOptsItem( ATTR_OPTIONS_LAYOUT );
+        SdOptionsLayoutItem aOptsItem;
 
         aOptsItem.GetOptionsLayout().SetRulerVisible( m_pCbxRuler->IsChecked() );
         aOptsItem.GetOptionsLayout().SetMoveOutline( m_pCbxMoveOutline->IsChecked() );
@@ -399,7 +399,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs )
         m_pCbxCompatibility->IsValueChangedFromSaved()         ||
         m_pCbxUsePrinterMetrics->IsValueChangedFromSaved() )
     {
-        SdOptionsMiscItem aOptsItem( ATTR_OPTIONS_MISC );
+        SdOptionsMiscItem aOptsItem;
 
         aOptsItem.GetOptionsMisc().SetStartWithTemplate( m_pCbxStartWithTemplate->IsChecked() );
         aOptsItem.GetOptionsMisc().SetMarkedHitMovesAlways( m_pCbxMarkedHitMovesAlways->IsChecked() );
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index 3ec1a9eb3ae6..310f30ff4ac4 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -52,7 +52,7 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, sal_uInt16 nAspect)
       // THUMBNAIL: here we may can set the draft mode
     }
 
-    ClientView* pView = new ClientView(this, pOut, nullptr);
+    ClientView* pView = new ClientView(this, pOut);
 
     pView->SetHlplVisible(false);
     pView->SetGridVisible(false);
@@ -187,8 +187,9 @@ Size DrawDocShell::GetFirstPageSize()
 /**
  * Creates a bitmap of an arbitrary page
  */
-Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixel)
+Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage)
 {
+    const sal_uInt16 nMaxEdgePixel = 90;
     MapMode         aMapMode( MAP_100TH_MM );
     const Size      aSize( pPage->GetSize() );
     const Point     aNullPt;
@@ -211,7 +212,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixe
     aMapMode.SetScaleY( aFrac );
     pVDev->SetMapMode( aMapMode );
 
-    ClientView* pView = new ClientView( this, pVDev, nullptr );
+    ClientView* pView = new ClientView( this, pVDev );
     FrameView*      pFrameView = GetFrameView();
     pView->ShowSdrPage( pPage );
 
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 7f99c574fc09..71746fdaf002 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -99,8 +99,7 @@ SfxPrinter* DrawDocShell::GetPrinter(bool bCreate)
                             ATTR_OPTIONS_PRINT,         ATTR_OPTIONS_PRINT,
                             0 );
         // set PrintOptionsSet
-        SdOptionsPrintItem aPrintItem( ATTR_OPTIONS_PRINT,
-                            SD_MOD()->GetSdOptions(mpDoc->GetDocumentType()));
+        SdOptionsPrintItem aPrintItem( SD_MOD()->GetSdOptions(mpDoc->GetDocumentType()) );
         SfxFlagItem aFlagItem( SID_PRINTER_CHANGESTODOC );
         SfxPrinterChangeFlags nFlags =
                 (aPrintItem.GetOptionsPrint().IsWarningSize() ? SfxPrinterChangeFlags::CHG_SIZE : SfxPrinterChangeFlags::NONE) |
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index cbf79344334e..720b1681f170 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -280,7 +280,7 @@ void FuInsertClipboard::DoExecute( SfxRequest&  )
                     ( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) &&
                     aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) )
                 {
-                    pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "", nullptr );
+                    pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "" );
                 }
             }
         }
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 674aa643d4f2..de294488ba78 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -173,7 +173,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
     else
     {
         SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-        std::unique_ptr<AbstractSdPresLayoutDlg> pDlg(pFact ? pFact->CreateSdPresLayoutDlg(mpDocSh, nullptr, aSet ) : nullptr);
+        std::unique_ptr<AbstractSdPresLayoutDlg> pDlg(pFact ? pFact->CreateSdPresLayoutDlg(mpDocSh, aSet ) : nullptr);
 
         sal_uInt16 nResult = pDlg ? pDlg->Execute() : static_cast<short>(RET_CANCEL);
 
diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx
index 7a475ed5592f..cb681ad17854 100644
--- a/sd/source/ui/inc/ClientView.hxx
+++ b/sd/source/ui/inc/ClientView.hxx
@@ -35,8 +35,7 @@ class ClientView
 public:
     ClientView (
         DrawDocShell* pDocSh,
-        OutputDevice* pOutDev,
-        DrawViewShell* pShell);
+        OutputDevice* pOutDev);
     virtual ~ClientView();
 
     virtual void CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr) override;
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index cfadfc3113ce..0dd71b402d5d 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -134,7 +134,7 @@ public:
     bool                    IsMarked(  SdrObject* pObject  );
     // Optionally realize multi-selection of objects
     bool                    GetObjectIsmarked(const OUString& rBookmark, bool bRealizeMultiSelectionOfObjects);
-    Bitmap                  GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixel);
+    Bitmap                  GetPagePreviewBitmap(SdPage* pPage);
 
     /** checks, if the given name is a valid new name for a slide
 
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 825764009fc1..a4aa7db6a7a8 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -124,8 +124,7 @@ public:
     virtual void    SetZoom( long nZoom ) override;
     virtual void    SetZoomRect( const Rectangle& rZoomRect ) override;
 
-    void            InsertURLField(const OUString& rURL, const OUString& rText, const OUString& rTarget,
-                                   const Point* pPos);
+    void            InsertURLField(const OUString& rURL, const OUString& rText, const OUString& rTarget);
     void            InsertURLButton(const OUString& rURL, const OUString& rText, const OUString& rTarget,
                                     const Point* pPos);
 
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index 6533a83e62e6..214edd90eff7 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -111,7 +111,7 @@ public:
     virtual bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) override;
     virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) override;
 
-    sal_uLong   Read(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat);
+    sal_uLong   ReadRtf(SvStream& rInput, const OUString& rBaseURL);
 
     virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ) override;
     virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ) override;
diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
index 4df456224a92..e0ed58609618 100644
--- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx
+++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
@@ -91,20 +91,16 @@ public:
         @param rIterator
             The iterator to compare to.
         @return
-            When both iterators ar equal <TRUE/> is returned, <FALSE/> otherwise.
+            When both iterators are equal <TRUE/> is returned, <FALSE/> otherwise.
     */
     virtual bool operator== (const IteratorImplBase& rIterator) const;
-    /** This method is used by the equality operator.  Additionally to the
-        iterator it takes a type information which is taken into account on
-        comparison.  It is part of a "multimethod" pattern.
+    /** This method is used by the equality operator. It is part of a "multimethod" pattern.
         @param rIterator
             The iterator to compare to.
-        @param aType
-            The type of the iterator.
         @return
             Returns <TRUE/> when both iterators point to the same object.
     */
-    virtual bool IsEqual (const IteratorImplBase& rIterator, IteratorType aType) const;
+    virtual bool IsEqualSelection(const IteratorImplBase& rIterator) const;
     /** Reverse the direction of iteration.  The current object stays the same.
     */
     virtual void Reverse();
@@ -155,12 +151,10 @@ private:
         only the case that the given iterator is an instance of this class.
         @param rIterator
             The iterator to compare to.
-        @param aType
-            The type of the iterator.
         @return
             Returns <TRUE/> when both iterators point to the same object.
     */
-    virtual bool IsEqual (const IteratorImplBase& rIterator, IteratorType aType) const override;
+    virtual bool IsEqualSelection(const IteratorImplBase& rIterator) const override;
 
     IteratorImplBase& operator= (const IteratorImplBase& rIterator);
 };
diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx
index 6495d93aeb3d..f9a63bab4093 100644
--- a/sd/source/ui/inc/PaneChildWindows.hxx
+++ b/sd/source/ui/inc/PaneChildWindows.hxx
@@ -33,8 +33,7 @@ public:
         sal_uInt16 nId,
         SfxBindings* pBindings,
         SfxChildWinInfo* pInfo,
-        const sal_uInt16 nTitleBarResId,
-        SfxChildAlignment eAlignment);
+        const sal_uInt16 nTitleBarResId);
     virtual ~PaneChildWindow();
 };
 
diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx
index 1a62df6be844..004dc228d68e 100644
--- a/sd/source/ui/inc/PreviewRenderer.hxx
+++ b/sd/source/ui/inc/PreviewRenderer.hxx
@@ -41,15 +41,11 @@ class PreviewRenderer
 public:
     /** Create a new preview renderer that takes some of its initial values
         from the given output device.
-        @param pTemplate
-            May be NULL.
         @param bPaintFrame
             When <TRUE/> (the default) then a frame is painted around the
             preview.  This makes the actual preview smaller.
     */
-    PreviewRenderer (
-        OutputDevice* pTemplate = nullptr,
-        const bool bPaintFrame = true);
+    PreviewRenderer(const bool bPaintFrame = true);
 
     virtual ~PreviewRenderer();
 
diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx
index b7eb8aa2dc34..6e5a725616fd 100644
--- a/sd/source/ui/inc/diactrl.hxx
+++ b/sd/source/ui/inc/diactrl.hxx
@@ -41,8 +41,7 @@ protected:
 
 public:
                     SdPagesField( vcl::Window* pParent,
-                                  const css::uno::Reference< css::frame::XFrame >& rFrame,
-                                  WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT );
+                                  const css::uno::Reference< css::frame::XFrame >& rFrame );
                     virtual ~SdPagesField();
 
     void            UpdatePagesField( const SfxUInt16Item* pItem );
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 211f395a33bb..f413f3f4f83f 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -143,8 +143,8 @@ class SD_DLLPUBLIC SdOptionsLayoutItem : public SfxPoolItem
 {
 public:
 
-                            explicit SdOptionsLayoutItem( sal_uInt16 nWhich);
-                            SdOptionsLayoutItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = nullptr );
+                            explicit SdOptionsLayoutItem();
+                            SdOptionsLayoutItem( SdOptions* pOpts, ::sd::FrameView* pView = nullptr );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
@@ -177,7 +177,7 @@ class SD_DLLPUBLIC SdOptionsContentsItem : public SfxPoolItem
 {
 public:
 
-                            SdOptionsContentsItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = nullptr );
+                            SdOptionsContentsItem( SdOptions* pOpts, ::sd::FrameView* pView = nullptr );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
@@ -323,8 +323,8 @@ class SD_DLLPUBLIC SdOptionsMiscItem : public SfxPoolItem
 {
 public:
 
-                            explicit SdOptionsMiscItem( sal_uInt16 nWhich);
-                            SdOptionsMiscItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = nullptr );
+                            explicit SdOptionsMiscItem();
+                            SdOptionsMiscItem( SdOptions* pOpts, ::sd::FrameView* pView = nullptr );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
@@ -392,8 +392,8 @@ class SD_DLLPUBLIC SdOptionsSnapItem : public SfxPoolItem
 {
 public:
 
-                            explicit SdOptionsSnapItem( sal_uInt16 nWhich);
-                            SdOptionsSnapItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = nullptr );
+                            explicit SdOptionsSnapItem();
+                            SdOptionsSnapItem( SdOptions* pOpts, ::sd::FrameView* pView = nullptr );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
@@ -469,7 +469,7 @@ class SdOptionsGridItem : public SvxGridItem
 {
 
 public:
-                            SdOptionsGridItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = nullptr );
+                            SdOptionsGridItem( SdOptions* pOpts );
 
     void                    SetOptions( SdOptions* pOpts ) const;
 };
@@ -562,8 +562,8 @@ class SD_DLLPUBLIC SdOptionsPrintItem : public SfxPoolItem
 {
 public:
 
-                            explicit SdOptionsPrintItem( sal_uInt16 nWhich);
-                            SdOptionsPrintItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = nullptr );
+                            explicit SdOptionsPrintItem();
+                            SdOptionsPrintItem( SdOptions* pOpts );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index be5ab7b73098..6d51a4e0d4a5 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -53,10 +53,9 @@ namespace sd {
         OUString mPin;
 
         ClientInfoInternal( const OUString& rName,
-                            const bool bIsAlreadyAuthorised,
                             BufferedStreamSocket *pSocket,
                             const OUString& rPin ):
-                ClientInfo( rName, bIsAlreadyAuthorised ),
+                ClientInfo( rName, false ),
                 mpStreamSocket( pSocket ),
                 mPin( rPin ) {}
     };
@@ -130,8 +129,7 @@ void RemoteServer::execute()
             std::shared_ptr< ClientInfoInternal > pClient(
                 new ClientInfoInternal(
                     OStringToOUString( aName, RTL_TEXTENCODING_UTF8 ),
-                    false, pSocket, OStringToOUString( aPin,
-                                                                 RTL_TEXTENCODING_UTF8 ) ) );
+                    pSocket, OStringToOUString( aPin, RTL_TEXTENCODING_UTF8 ) ) );
             mAvailableClients.push_back( pClient );
 
             // Read off any additional non-empty lines
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
index 934536b5e070..782e55ae3dfc 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
@@ -39,7 +39,7 @@ class PageObjectViewObjectContact;
 namespace sd { namespace slidesorter { namespace cache {
 
 BitmapFactory::BitmapFactory()
-    : maRenderer(nullptr, false)
+    : maRenderer(false)
 {
 }
 
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index a3ad04e42967..12af47a320cb 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -99,7 +99,6 @@ void Animator::Dispose()
 
 Animator::AnimationId Animator::AddAnimation (
     const AnimationFunctor& rAnimation,
-    const sal_Int32 nDuration,
     const FinishFunctor& rFinishFunctor)
 {
     // When the animator is already disposed then ignore this call
@@ -112,7 +111,7 @@ Animator::AnimationId Animator::AddAnimation (
         new Animation(
             rAnimation,
             0,
-            nDuration / 1000.0,
+            300 / 1000.0,
             maElapsedTime.getElapsedTime(),
             ++mnNextAnimationId,
             rFinishFunctor));
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index b27701d9b779..4cca82bc1d00 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -109,9 +109,8 @@ void DragAndDropContext::UpdatePosition (
     }
 }
 
-void DragAndDropContext::SetTargetSlideSorter (
-    const Point& rMousePosition,
-    const InsertionIndicatorHandler::Mode eMode)
+void DragAndDropContext::SetTargetSlideSorter(
+    const Point& rMousePosition)
 {
     if (mpTargetSlideSorter != nullptr)
     {
@@ -128,7 +127,7 @@ void DragAndDropContext::SetTargetSlideSorter (
             false/*bIsOverSourceView*/);
         mpTargetSlideSorter->GetController().GetInsertionIndicatorHandler()->UpdatePosition(
             rMousePosition,
-            eMode);
+            InsertionIndicatorHandler::UnknownMode);
 
     }
 }
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
index 010691a107b4..dcced0be25e1 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
@@ -60,9 +60,7 @@ public:
         const InsertionIndicatorHandler::Mode eMode,
         const bool bAllowAutoScroll);
 
-    void SetTargetSlideSorter (
-        const Point& rMousePosition,
-        const InsertionIndicatorHandler::Mode eMode = InsertionIndicatorHandler::UnknownMode);
+    void SetTargetSlideSorter(const Point& rMousePosition);
 
 private:
     SlideSorter* mpTargetSlideSorter;
diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
index 9b301945faf7..5af575cd4fdb 100644
--- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
@@ -135,7 +135,7 @@ void VisibleAreaManager::MakeVisible()
     {
         mnScrollAnimationId = mrSlideSorter.GetController().GetAnimator()->AddAnimation(
             aAnimation,
-            300, Animator::FinishFunctor());
+            Animator::FinishFunctor());
     }
     else
     {
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index 4ce9ec5e05e5..70041b4ac43a 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -69,12 +69,9 @@ public:
         the specified duration.
         @param rAnimation
             The animation operation.
-        @param nDuration
-            The duration in milli seconds.
     */
     AnimationId AddAnimation (
         const AnimationFunctor& rAnimation,
-        const sal_Int32 nDuration,
         const FinishFunctor& rFinishFunctor);
 
     /** Abort and remove an animation.  In order to reduce the bookkeeping
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index 2145b389c3aa..8521d69fc852 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -393,7 +393,6 @@ void PageObjectRun::RestartAnimation()
     auto sharedThis(shared_from_this());
     mnAnimationId = mrAnimatorAccess.GetAnimator()->AddAnimation(
         [this] (double const val) { (*this)(val); },
-        300,
         [sharedThis] () { sharedThis->mrAnimatorAccess.RemoveRun(sharedThis); }
         );
 }
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index 7cc72e06fadc..feec76bf3bf3 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -64,23 +64,14 @@ namespace {
 //===== PreviewRenderer =======================================================
 
 PreviewRenderer::PreviewRenderer (
-    OutputDevice* pTemplate,
     const bool bHasFrame)
     : mpPreviewDevice (VclPtr<VirtualDevice>::Create()),
       mpDocShellOfView(nullptr),
       maFrameColor (svtools::ColorConfig().GetColorValue(svtools::DOCBOUNDARIES).nColor),
       mbHasFrame(bHasFrame)
 {
-    if (pTemplate != nullptr)
-    {
-        mpPreviewDevice->SetDigitLanguage (pTemplate->GetDigitLanguage());
-        mpPreviewDevice->SetBackground(pTemplate->GetBackground());
-    }
-    else
-    {
-        mpPreviewDevice->SetBackground(Wallpaper(
-            Application::GetSettings().GetStyleSettings().GetWindowColor()));
-    }
+    mpPreviewDevice->SetBackground(Wallpaper(
+        Application::GetSettings().GetStyleSettings().GetWindowColor()));
 }
 
 PreviewRenderer::~PreviewRenderer()
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index b34cdb12ba1e..18db3790bc4e 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -412,7 +412,7 @@ throw (UnknownPropertyException, PropertyVetoException,
     bool bValue = false;
     bool bOk, bChanged = false, bOptionsChanged = false;
 
-    SdOptionsPrintItem aOptionsPrintItem( ATTR_OPTIONS_PRINT );
+    SdOptionsPrintItem aOptionsPrintItem;
 
     SfxPrinter* pPrinter = pDocSh->GetPrinter( false );
     if( pPrinter )
@@ -992,7 +992,7 @@ throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::
                 static_cast<OWeakObject *>(this));
     }
 
-    SdOptionsPrintItem aOptionsPrintItem( ATTR_OPTIONS_PRINT );
+    SdOptionsPrintItem aOptionsPrintItem;
 
     SfxPrinter* pPrinter = pDocSh->GetPrinter( false );
     if( pPrinter )
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index 90f6b6d16a7f..c2d7bd5230ea 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star;
 
 uno::Reference< uno::XInterface > createUnoCustomShow( SdCustomShow* pShow )
 {
-    return static_cast<cppu::OWeakObject*>(new SdXCustomPresentation( pShow, nullptr ));
+    return static_cast<cppu::OWeakObject*>(new SdXCustomPresentation( pShow ));
 }
 
 SdXCustomPresentation::SdXCustomPresentation() throw()
@@ -48,8 +48,8 @@ SdXCustomPresentation::SdXCustomPresentation() throw()
 {
 }
 
-SdXCustomPresentation::SdXCustomPresentation( SdCustomShow* pShow, SdXImpressDocument* pMyModel) throw()
-:   mpSdCustomShow(pShow), mpModel(pMyModel),
+SdXCustomPresentation::SdXCustomPresentation( SdCustomShow* pShow) throw()
+:   mpSdCustomShow(pShow), mpModel(nullptr),
     aDisposeListeners( aDisposeContainerMutex ),
     bDisposing( false )
 {
diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx
index 94e60cbedb4d..896bbcdc9848 100644
--- a/sd/source/ui/unoidl/unocpres.hxx
+++ b/sd/source/ui/unoidl/unocpres.hxx
@@ -50,7 +50,7 @@ private:
 
 public:
     SdXCustomPresentation() throw();
-    SdXCustomPresentation( SdCustomShow* mpSdCustomShow, SdXImpressDocument* pMyModel) throw();
+    SdXCustomPresentation( SdCustomShow* mpSdCustomShow) throw();
     virtual ~SdXCustomPresentation() throw();
 
     // internal
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 27fd3ce6361f..eba557cf19d0 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1911,7 +1911,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
                 if ( !( (mpDoc->GetSdPage((sal_Int16) nPageNumber-1, PK_STANDARD))->IsExcluded() ) ||
                     (pPDFExtOutDevData && pPDFExtOutDevData->GetIsExportHiddenSlides()) )
                 {
-                    ::sd::ClientView* pView = new ::sd::ClientView( mpDocShell, pOut, nullptr );
+                    ::sd::ClientView* pView = new ::sd::ClientView( mpDocShell, pOut );
                     Rectangle               aVisArea = Rectangle( Point(), mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1, ePageKind )->GetSize() );
                     vcl::Region                  aRegion( aVisArea );
 
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 886f21f6305a..4f9042aa83da 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -781,7 +781,6 @@ namespace {
         TiledPrinterPage (
             const sal_uInt16 nPageIndex,
             const PageKind ePageKind,
-            const sal_Int32 nGap,
             const bool bPrintMarkedOnly,
             const OUString& rsPageString,
             const Point& rPageStringOffset,
@@ -791,7 +790,7 @@ namespace {
             : PrinterPage(ePageKind, MapMode(), bPrintMarkedOnly, rsPageString,
                 rPageStringOffset, nDrawMode, eOrientation, nPaperTray),
               mnPageIndex(nPageIndex),
-              mnGap(nGap)
+              mnGap(500)
         {
         }
 
@@ -2135,7 +2134,6 @@ private:
                 new TiledPrinterPage(
                     sal::static_int_cast<sal_uInt16>(nPageIndex),
                     ePageKind,
-                    500,
                     rInfo.mbPrintMarkedOnly,
                     rInfo.msPageString,
                     rInfo.mpPrinter->GetPageOffset(),
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index 36cdb32310f1..65e3fd11ef30 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -384,7 +384,7 @@ bool IteratorImplBase::operator== (const IteratorImplBase& rIterator) const
     return maPosition == rIterator.maPosition;
 }
 
-bool IteratorImplBase::IsEqual (const IteratorImplBase& rIterator, IteratorType ) const
+bool IteratorImplBase::IsEqualSelection(const IteratorImplBase& rIterator) const
 {
     // When this method is executed instead of the ones from derived classes
     // then the argument is of another type then the object itself.  In this
@@ -497,22 +497,15 @@ const IteratorPosition& SelectionIteratorImpl::GetPosition()
 
 bool SelectionIteratorImpl::operator== (const IteratorImplBase& rIterator) const
 {
-    return rIterator.IsEqual (*this, SELECTION);
+    return rIterator.IsEqualSelection(*this);
 }
 
-bool SelectionIteratorImpl::IsEqual (
-    const IteratorImplBase& rIterator,
-    IteratorType aType) const
+bool SelectionIteratorImpl::IsEqualSelection(const IteratorImplBase& rIterator) const
 {
-    if (aType == SELECTION)
-    {
-        const SelectionIteratorImpl* pSelectionIterator =
-            static_cast<const SelectionIteratorImpl*>(&rIterator);
-        return mpDocument == pSelectionIterator->mpDocument
-            && mnObjectIndex == pSelectionIterator->mnObjectIndex;
-    }
-    else
-        return false;
+    const SelectionIteratorImpl* pSelectionIterator =
+        static_cast<const SelectionIteratorImpl*>(&rIterator);
+    return mpDocument == pSelectionIterator->mpDocument
+        && mnObjectIndex == pSelectionIterator->mnObjectIndex;
 }
 
 //===== ViewIteratorImpl ================================================
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index c5c60589d695..2eb56764739f 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -55,7 +55,7 @@ public:
     bool mbIsListenerAddedToWindow;
 
     ShellDescriptor ();
-    ShellDescriptor (SfxShell* pShell, ShellId nId);
+    ShellDescriptor (ShellId nId);
     ShellDescriptor (const ShellDescriptor& rDescriptor);
     ShellDescriptor& operator= (const ShellDescriptor& rDescriptor);
     bool IsMainViewShell() const;
@@ -220,9 +220,7 @@ private:
 
     ShellDescriptor CreateSubShell (
         SfxShell* pShell,
-        ShellId nShellId,
-        vcl::Window* pParentWindow,
-        FrameView* pFrameView);
+        ShellId nShellId);
     void DestroyViewShell (ShellDescriptor& rDescriptor);
     static void DestroySubShell (
         const SfxShell& rViewShell,
@@ -571,7 +569,7 @@ void ViewShellManager::Implementation::ActivateSubShell (
     // Add just the id of the sub shell. The actual shell is created
     // later in CreateShells().
     UpdateLock aLock (*this);
-    rList.push_back(ShellDescriptor(nullptr, nId));
+    rList.push_back(ShellDescriptor(nId));
 }
 
 void ViewShellManager::Implementation::DeactivateSubShell (
@@ -936,7 +934,7 @@ void ViewShellManager::Implementation::CreateShells()
             {
                 if (iSubShell->mpShell == nullptr)
                 {
-                    *iSubShell = CreateSubShell(iShell->mpShell,iSubShell->mnId,nullptr,nullptr);
+                    *iSubShell = CreateSubShell(iShell->mpShell,iSubShell->mnId);
                 }
             }
         }
@@ -1029,9 +1027,7 @@ IMPL_LINK_TYPED(ViewShellManager::Implementation, WindowEventHandler, VclWindowE
 
 ShellDescriptor ViewShellManager::Implementation::CreateSubShell (
     SfxShell* pParentShell,
-    ShellId nShellId,
-    vcl::Window* pParentWindow,
-    FrameView* pFrameView)
+    ShellId nShellId)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ShellDescriptor aResult;
@@ -1045,7 +1041,7 @@ ShellDescriptor ViewShellManager::Implementation::CreateSubShell (
     {
         SharedShellFactory pFactory = iFactory->second;
         if (pFactory != nullptr)
-            aResult.mpShell = pFactory->CreateShell(nShellId, pParentWindow, pFrameView);
+            aResult.mpShell = pFactory->CreateShell(nShellId, nullptr, nullptr);
 
         // Exit the loop when the shell has been successfully created.
         if (aResult.mpShell != nullptr)
@@ -1216,9 +1212,8 @@ ShellDescriptor::ShellDescriptor()
 }
 
 ShellDescriptor::ShellDescriptor (
-    SfxShell* pShell,
     ShellId nId)
-    : mpShell(pShell),
+    : mpShell(nullptr),
       mnId(nId),
       mpFactory(),
       mbIsListenerAddedToWindow(false)
diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx
index b885d3bc25da..fc2ec9e614aa 100644
--- a/sd/source/ui/view/clview.cxx
+++ b/sd/source/ui/view/clview.cxx
@@ -34,9 +34,8 @@ class DrawViewShell;
 
 ClientView::ClientView(
     DrawDocShell* pDocSh,
-    OutputDevice* pOutDev,
-    DrawViewShell* pShell)
-    : DrawView (pDocSh, pOutDev, pShell)
+    OutputDevice* pOutDev)
+    : DrawView (pDocSh, pOutDev, nullptr)
 {
 }
 
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 1430657c844c..db8d511c6ca3 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1744,7 +1744,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                 if (pHLItem->GetInsertMode() == HLINK_FIELD)
                 {
                     InsertURLField(pHLItem->GetURL(), pHLItem->GetName(),
-                                   pHLItem->GetTargetFrame(), nullptr);
+                                   pHLItem->GetTargetFrame());
                 }
                 else if (pHLItem->GetInsertMode() == HLINK_BUTTON)
                 {
@@ -1758,7 +1758,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                     if (pOlView)
                     {
                         InsertURLField(pHLItem->GetURL(), pHLItem->GetName(),
-                                       pHLItem->GetTargetFrame(), nullptr);
+                                       pHLItem->GetTargetFrame());
                     }
                     else
                     {
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index c5f254f65189..c8d526f23ada 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -501,7 +501,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
                         ( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) &&
                           aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) )
                     {
-                        InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "", nullptr );
+                        InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "" );
                     }
                 }
             }
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index d156e48f4a9d..6204e6edc4c0 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -933,7 +933,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
                         ( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) &&
                           aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) )
                     {
-                        InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "", nullptr );
+                        InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "" );
                     }
                 }
             }
@@ -1418,7 +1418,7 @@ void DrawViewShell::FuSupportRotate(SfxRequest &rReq)
 }
 
 void DrawViewShell::InsertURLField(const OUString& rURL, const OUString& rText,
-                                   const OUString& rTarget, const Point* pPos)
+                                   const OUString& rTarget)
 {
     OutlinerView* pOLV = mpDrawView->GetTextEditOutlinerView();
 
@@ -1453,19 +1453,11 @@ void DrawViewShell::InsertURLField(const OUString& rURL, const OUString& rText,
         pOutl->SetUpdateMode( false );
 
         Point aPos;
-
-        if (pPos)
-        {
-            aPos = *pPos;
-        }
-        else
-        {
-            Rectangle aRect(aPos, GetActiveWindow()->GetOutputSizePixel() );
-            aPos = aRect.Center();
-            aPos = GetActiveWindow()->PixelToLogic(aPos);
-            aPos.X() -= aSize.Width() / 2;
-            aPos.Y() -= aSize.Height() / 2;
-        }
+        Rectangle aRect(aPos, GetActiveWindow()->GetOutputSizePixel() );
+        aPos = aRect.Center();
+        aPos = GetActiveWindow()->PixelToLogic(aPos);
+        aPos.X() -= aSize.Width() / 2;
+        aPos.Y() -= aSize.Height() / 2;
 
         Rectangle aLogicRect(aPos, aSize);
         pRectObj->SetLogicRect(aLogicRect);
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 647e538e5a41..093649972c3a 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1752,7 +1752,7 @@ void OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara )
 /**
  * Fill Outliner from Stream
  */
-sal_uLong OutlineViewShell::Read(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat)
+sal_uLong OutlineViewShell::ReadRtf(SvStream& rInput, const OUString& rBaseURL)
 {
     sal_uLong bRet = 0;
 
@@ -1761,7 +1761,7 @@ sal_uLong OutlineViewShell::Read(SvStream& rInput, const OUString& rBaseURL, sal
     OutlineViewPageChangesGuard aGuard( pOlView );
     OutlineViewModelChangeGuard aGuard2( *pOlView );
 
-    bRet = rOutl.Read( rInput, rBaseURL, eFormat, GetDocSh()->GetHeaderAttributes() );
+    bRet = rOutl.Read( rInput, rBaseURL, EE_FORMAT_RTF, GetDocSh()->GetHeaderAttributes() );
 
     SdPage* pPage = GetDoc()->GetSdPage( GetDoc()->GetSdPageCount(PK_STANDARD) - 1, PK_STANDARD );
     SfxStyleSheet* pTitleSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE );
diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx
index 3ccb4290196a..7769f9211d97 100644
--- a/sd/source/ui/view/sdruler.cxx
+++ b/sd/source/ui/view/sdruler.cxx
@@ -44,11 +44,11 @@ class RulerCtrlItem : public SfxControllerItem
                                 const SfxPoolItem* pItem ) override;
 
  public:
-    RulerCtrlItem(sal_uInt16 nId, Ruler& rRlr, SfxBindings& rBind);
+    RulerCtrlItem(Ruler& rRlr, SfxBindings& rBind);
 };
 
-RulerCtrlItem::RulerCtrlItem(sal_uInt16 _nId, Ruler& rRlr, SfxBindings& rBind)
-: SfxControllerItem(_nId, rBind)
+RulerCtrlItem::RulerCtrlItem(Ruler& rRlr, SfxBindings& rBind)
+: SfxControllerItem(SID_RULER_NULL_OFFSET, rBind)
 , rRuler(rRlr)
 {
 }
@@ -74,7 +74,7 @@ Ruler::Ruler( DrawViewShell& rViewSh, vcl::Window* pParent, ::sd::Window* pWin,
     , pDrViewShell(&rViewSh)
 {
     rBindings.EnterRegistrations();
-    pCtrlItem = new RulerCtrlItem(SID_RULER_NULL_OFFSET, *this, rBindings);
+    pCtrlItem = new RulerCtrlItem(*this, rBindings);
     rBindings.LeaveRegistrations();
 
     if ( nWinStyle & WB_HSCROLL )
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 4ee833c3b5dc..a3a615d728f3 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -336,7 +336,7 @@ void View::DoPaste (vcl::Window* pWindow)
                     ( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) &&
                       aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) )
                 {
-                    pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "", nullptr );
+                    pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "" );
                 }
             }
         }