weld AdvancedSettingsDialog

make run virtual and fold executes into it, so GenericUnoDialog
can call run on tabdialogs to do the right thing, and allows
Start_Impl to be private again

Change-Id: Ic457edfbdc7457f4c49d4e8ad679903f38ad9b42
Reviewed-on: https://gerrit.libreoffice.org/62227
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

5 files changed, 11 insertions, 11 deletions

diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 9dcefb6facf5..a34a445d0932 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -138,10 +138,10 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit, bool )
  * open a modal dialog and start a timer which calls the working function after
  * the opening of the dialog
  */
-short BreakDlg::execute()
+short BreakDlg::run()
 {
     m_aUpdateIdle.Start();
-    return run();
+    return SfxDialogController::run();
 }
 
 /**
diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx
index 446a82ab5f9f..95d4e44a4898 100644
--- a/sd/source/ui/dlg/masterlayoutdlg.cxx
+++ b/sd/source/ui/dlg/masterlayoutdlg.cxx
@@ -75,9 +75,9 @@ MasterLayoutDialog::~MasterLayoutDialog()
 {
 }
 
-short MasterLayoutDialog::execute()
+short MasterLayoutDialog::run()
 {
-    if (m_xDialog->run() == RET_OK)
+    if (GenericDialogController::run() == RET_OK)
         applyChanges();
     return RET_OK;
 }
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index e0b78e9c6a35..5b336e60822d 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -66,7 +66,7 @@ short AbstractSdCustomShowDlg_Impl::Execute()
 
 short SdPresLayoutTemplateDlg_Impl::Execute()
 {
-    return m_xDlg->execute();
+    return m_xDlg->run();
 }
 
 bool SdPresLayoutTemplateDlg_Impl::StartExecuteAsync(AsyncContext &rCtx)
@@ -118,7 +118,7 @@ IMPL_ABSTDLG_BASE(AbstractHeaderFooterDialog_Impl);
 
 short AbstractBulletDialog_Impl::Execute()
 {
-    return m_xDlg->execute();
+    return m_xDlg->run();
 }
 
 bool AbstractBulletDialog_Impl::StartExecuteAsync(AsyncContext &rCtx)
@@ -133,7 +133,7 @@ AbstractBreakDlg_Impl::AbstractBreakDlg_Impl(std::unique_ptr<::sd::BreakDlg> pDl
 
 short AbstractBreakDlg_Impl::Execute()
 {
-    return m_xDlg->execute();
+    return m_xDlg->run();
 }
 
 AbstractMasterLayoutDialog_Impl::AbstractMasterLayoutDialog_Impl(std::unique_ptr<::sd::MasterLayoutDialog> pDlg)
@@ -143,7 +143,7 @@ AbstractMasterLayoutDialog_Impl::AbstractMasterLayoutDialog_Impl(std::unique_ptr
 
 short AbstractMasterLayoutDialog_Impl::Execute()
 {
-    return m_xDlg->execute();
+    return m_xDlg->run();
 }
 
 void AbstractCopyDlg_Impl::GetAttr( SfxItemSet& rOutAttrs )
@@ -163,7 +163,7 @@ bool AbstractSdCustomShowDlg_Impl::IsCustomShow() const
 
 short SdAbstractTabController_Impl::Execute()
 {
-    return m_xDlg->execute();
+    return m_xDlg->run();
 }
 
 void SdAbstractTabController_Impl::SetCurPageId( const OString &rName )
diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx
index 21414b64f29e..faf0635ce03f 100644
--- a/sd/source/ui/inc/BreakDlg.hxx
+++ b/sd/source/ui/inc/BreakDlg.hxx
@@ -39,7 +39,7 @@ public:
     BreakDlg(weld::Window* pWindow, DrawView* pDrView, DrawDocShell* pShell,
              sal_uLong nSumActionCount, sal_uLong nObjCount);
 
-    short execute();
+    virtual short run() override;
 
 private:
     std::unique_ptr<weld::Label> m_xFiObjInfo;
diff --git a/sd/source/ui/inc/masterlayoutdlg.hxx b/sd/source/ui/inc/masterlayoutdlg.hxx
index 4b956c5c29c0..ce9d5a1429d7 100644
--- a/sd/source/ui/inc/masterlayoutdlg.hxx
+++ b/sd/source/ui/inc/masterlayoutdlg.hxx
@@ -54,7 +54,7 @@ public:
     MasterLayoutDialog(weld::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage);
     virtual ~MasterLayoutDialog() override;
 
-    short execute();
+    virtual short run() override;
 };
 
 }