[Libreoffice-commits] core.git: include/vcl svtools/qa svtools/uiconfig svtools/UIConfig_svt.mk vcl/source

[Caolán McNamara (via logerrit)]

 include/vcl/wizdlg.hxx                        |    2 +-
 svtools/UIConfig_svt.mk                       |    1 -
 svtools/qa/unit/data/svtools-dialogs-test.txt |    1 -
 svtools/uiconfig/ui/wizarddialog.ui           |   12 ------------
 vcl/source/control/roadmapwizard.cxx          |    4 ++--
 vcl/source/control/wizardmachine.cxx          |    6 +++---
 6 files changed, 6 insertions(+), 20 deletions(-)

New commits:
commit aee628a37af1a5e54c23a70d2dee2ec1edbd56f2
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Sep 15 15:37:09 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Sep 15 18:21:23 2019 +0200

    ditch wizarddialog.ui now
    
    Change-Id: I4c0b169849ccd255766bbadf4b1eac900a0b192f
    Reviewed-on: https://gerrit.libreoffice.org/78940
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/wizdlg.hxx b/include/vcl/wizdlg.hxx
index d2c4520a0191..56bfbda4452b 100644
--- a/include/vcl/wizdlg.hxx
+++ b/include/vcl/wizdlg.hxx
@@ -54,7 +54,7 @@ namespace vcl
         <code>n2</code>, which share at least the first <code>k</code> states (where <code>k</code>
         is at least 1), and an arbitrary number of other states.
     */
-    class VCL_DLLPUBLIC RoadmapWizard : public ModalDialog
+    class VCL_DLLPUBLIC RoadmapWizard : public Dialog
     {
     private:
         Idle                    maWizardLayoutIdle;
diff --git a/svtools/UIConfig_svt.mk b/svtools/UIConfig_svt.mk
index 8ebefde11310..44963c37a1ca 100644
--- a/svtools/UIConfig_svt.mk
+++ b/svtools/UIConfig_svt.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_UIConfig_add_uifiles,svt,\
 	svtools/uiconfig/ui/printersetupdialog \
 	svtools/uiconfig/ui/querydeletedialog \
 	svtools/uiconfig/ui/restartdialog \
-	svtools/uiconfig/ui/wizarddialog \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/qa/unit/data/svtools-dialogs-test.txt b/svtools/qa/unit/data/svtools-dialogs-test.txt
index ea8d6725987f..2ed259ee5229 100644
--- a/svtools/qa/unit/data/svtools-dialogs-test.txt
+++ b/svtools/qa/unit/data/svtools-dialogs-test.txt
@@ -39,6 +39,5 @@ svt/ui/placeedit.ui
 svt/ui/printersetupdialog.ui
 svt/ui/restartdialog.ui
 svt/ui/graphicexport.ui
-svt/ui/wizarddialog.ui
 svt/ui/querydeletedialog.ui
 svt/ui/javadisableddialog.ui
diff --git a/svtools/uiconfig/ui/wizarddialog.ui b/svtools/uiconfig/ui/wizarddialog.ui
deleted file mode 100644
index ae109d1bb5cd..000000000000
--- a/svtools/uiconfig/ui/wizarddialog.ui
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
-<interface domain="svt">
-  <requires lib="gtk+" version="3.18"/>
-  <object class="GtkWindow" id="WizardDialog">
-    <property name="can_focus">False</property>
-    <property name="resizable">False</property>
-    <child>
-      <placeholder/>
-    </child>
-  </object>
-</interface>
diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx
index 94f12e0dcfdf..b24a50013e44 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -121,7 +121,7 @@ namespace vcl
 
     //= RoadmapWizard
     RoadmapWizard::RoadmapWizard(vcl::Window* pParent)
-        :ModalDialog(pParent, "WizardDialog", "svt/ui/wizarddialog.ui")
+        :Dialog(pParent)
         ,m_pFinish(nullptr)
         ,m_pCancel(nullptr)
         ,m_pNextPage(nullptr)
@@ -213,7 +213,7 @@ namespace vcl
         mpPrevBtn.clear();
         mpNextBtn.clear();
         mpViewWindow.clear();
-        ModalDialog::dispose();
+        Dialog::dispose();
     }
 
     void RoadmapWizard::SetRoadmapHelpId( const OString& _rId )
diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx
index 15237d963dd4..960f34d0361e 100644
--- a/vcl/source/control/wizardmachine.cxx
+++ b/vcl/source/control/wizardmachine.cxx
@@ -443,7 +443,7 @@ namespace vcl
             ImplPosTabPage();
         }
 
-        ModalDialog::Resize();
+        Dialog::Resize();
     }
 
     void RoadmapWizard::implUpdateTitle()
@@ -498,7 +498,7 @@ namespace vcl
             ImplShowTabPage( ImplGetPage( mnCurLevel ) );
         }
 
-        ModalDialog::StateChanged( nType );
+        Dialog::StateChanged( nType );
     }
 
     bool RoadmapWizard::EventNotify( NotifyEvent& rNEvt )
@@ -542,7 +542,7 @@ namespace vcl
             }
         }
 
-        return ModalDialog::EventNotify( rNEvt );
+        return Dialog::EventNotify( rNEvt );
     }
 
     void RoadmapWizard::setTitleBase(const OUString& _rTitleBase)