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>

1 files changed, 6 insertions, 6 deletions

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 58ec3d6506d8..6bf964c8a98a 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -319,9 +319,9 @@ namespace
         {
         }
 
-        short execute()
+        virtual short run() override
         {
-            short nRet = m_xDialog->run();
+            short nRet = GenericDialogController::run();
             if (nRet == RET_OK)
                 showDocument("LICENSE");
             return nRet;
@@ -336,9 +336,9 @@ namespace
         {
         }
 
-        short execute()
+        virtual short run() override
         {
-            short nRet = m_xDialog->run();
+            short nRet = MessageDialogController::run();
             if (nRet == RET_OK)
             {
                 sfx2::SafeMode::putFlag();
@@ -574,7 +574,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
         case SID_SHOW_LICENSE:
         {
             LicenseDialog aDialog(rReq.GetFrameWeld());
-            aDialog.execute();
+            aDialog.run();
             break;
         }
 
@@ -1035,7 +1035,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
         case SID_SAFE_MODE:
         {
             SafeModeQueryDialog aDialog(rReq.GetFrameWeld());
-            aDialog.execute();
+            aDialog.run();
             break;
         }