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, 6 insertions, 7 deletions

diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx
index 414185b39113..e9b3eef8a957 100644
--- a/include/sfx2/passwd.hxx
+++ b/include/sfx2/passwd.hxx
@@ -125,7 +125,7 @@ public:
 
     void ShowMinLengthText(bool bShow);
 
-    short execute();
+    virtual short run() override;
 };
 
 #endif // INCLUDED_SFX2_PASSWD_HXX
diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx
index e66d17b73f1d..1408ac776a95 100644
--- a/include/sfx2/prnmon.hxx
+++ b/include/sfx2/prnmon.hxx
@@ -46,7 +46,7 @@ public:
                                                   const SfxItemSet *rOptions);
     virtual                 ~SfxPrintOptionsDialog() override;
 
-    short execute();
+    virtual short run() override;
 
     const SfxItemSet&       GetOptions() const { return *pOptions; }
     void                    DisableHelp();
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index d46d243f4252..13d469ff88fc 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -234,6 +234,7 @@ private:
 
     DECL_DLLPRIVATE_LINK(ActivatePageHdl, const OString&, void);
     DECL_DLLPRIVATE_LINK(DeactivatePageHdl, const OString&, bool);
+    SAL_DLLPRIVATE void Start_Impl();
     SAL_DLLPRIVATE void CreatePages();
     SAL_DLLPRIVATE void setPreviewsToSamePlace();
 
@@ -255,8 +256,6 @@ protected:
     /** save the position of the TabDialog and which tab page is the currently active one
      */
     void SavePosAndId();
-
-    void Start_Impl();
 public:
     SfxTabDialogController(weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID,
                            const SfxItemSet * = nullptr, bool bEditFmt = false);
@@ -299,7 +298,7 @@ public:
     void                RemoveResetButton();
     void                RemoveStandardButton();
 
-    short               execute();
+    virtual short       run() override;
     static bool runAsync(const std::shared_ptr<SfxTabDialogController>& rController,
                          const std::function<void(sal_Int32)>&);
 
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index b10c70bc3571..4d75ce0a313c 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -56,7 +56,7 @@ public:
     void            SetPrinter( Printer* pNewPrinter ) { mpPrinter = pNewPrinter; }
     Printer*        GetPrinter() const { return mpPrinter; }
 
-    short   execute();
+    virtual short   run() override;
 
     weld::Window*   GetFrameWeld() const { return m_xDialog.get(); }
 
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 87139903d5d1..ebf796a55cdd 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1232,7 +1232,7 @@ public:
     {
         return const_cast<DialogController*>(this)->getDialog();
     }
-    short run() { return getDialog()->run(); }
+    virtual short run() { return getDialog()->run(); }
     static bool runAsync(const std::shared_ptr<DialogController>& rController,
                          const std::function<void(sal_Int32)>&);
     void set_title(const OUString& rTitle) { getDialog()->set_title(rTitle); }