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>

4 files changed, 5 insertions, 6 deletions

diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 8136fb735809..76854b0439d0 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -174,7 +174,6 @@ namespace pcr
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         AddTabPage("font", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), nullptr );
         AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), nullptr );
-        Start_Impl();
     }
 
     ControlCharacterDialog::~ControlCharacterDialog()
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 6aeaffd78d88..f8db077f5efc 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2529,7 +2529,7 @@ namespace pcr
         OUString sPropertyUIName( m_pInfoService->getPropertyTranslation( m_pInfoService->getPropertyId( _rProperty ) ) );
         ListSelectionDialog aDialog(impl_getDefaultDialogFrame_nothrow(), m_xComponent, _rProperty, sPropertyUIName);
         _rClearBeforeDialog.clear();
-        return ( RET_OK == aDialog.execute() );
+        return ( RET_OK == aDialog.run() );
     }
 
     bool FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow( bool _bFilter, OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
@@ -2787,7 +2787,7 @@ namespace pcr
             // destroyItemSet
             ControlCharacterDialog aDlg(impl_getDefaultDialogFrame_nothrow(), *pSet);
             _rClearBeforeDialog.clear();
-            if (RET_OK == aDlg.execute())
+            if (RET_OK == aDlg.run())
             {
                 const SfxItemSet* pOut = aDlg.GetOutputItemSet();
                 if ( pOut )
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx
index 0e8becb48f9d..5cbe35c7d3fc 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -51,9 +51,9 @@ namespace pcr
     {
     }
 
-    short ListSelectionDialog::execute()
+    short ListSelectionDialog::run()
     {
-        short nResult = m_xDialog->run();
+        short nResult = GenericDialogController::run();
 
         if ( RET_OK == nResult )
             commitSelection();
diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx
index e8b493132998..395b698ffdd4 100644
--- a/extensions/source/propctrlr/listselectiondlg.hxx
+++ b/extensions/source/propctrlr/listselectiondlg.hxx
@@ -43,7 +43,7 @@ namespace pcr
         );
         virtual ~ListSelectionDialog() override;
 
-        short   execute();
+        virtual short run() override;
 
     private:
         void    initialize( );