Convert 3 dialogs to .ui

I converted RID_DLG_LISTCOMBOWIZARD, RID_DLG_GROUPBOXWIZARD and
RID_DLG_GRIDWIZARD to .ui

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

7 files changed, 12 insertions, 39 deletions

diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 53179e65efd6..6efb35abe188 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -275,9 +275,9 @@ namespace dbp
     //= OControlWizard
 
 
-    OControlWizard::OControlWizard( Window* _pParent, const ResId& _rId,
+    OControlWizard::OControlWizard( Window* _pParent,
             const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext )
-        :OWizardMachine(_pParent, _rId, WZB_CANCEL | WZB_PREVIOUS | WZB_NEXT | WZB_FINISH)
+        :OWizardMachine(_pParent, WZB_CANCEL | WZB_PREVIOUS | WZB_NEXT | WZB_FINISH)
         ,m_xContext(_rxContext)
     {
         m_aContext.xObjectModel = _rxObjectModel;
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index 971f2ccd9e5a..52efe994916e 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -112,7 +112,6 @@ namespace dbp
     public:
         OControlWizard(
             Window* _pParent,
-            const ResId& _rId,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObjectModel,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext
         );
diff --git a/extensions/source/dbpilots/dbpilots.src b/extensions/source/dbpilots/dbpilots.src
index 9a7970b5756a..aeca267fc215 100644
--- a/extensions/source/dbpilots/dbpilots.src
+++ b/extensions/source/dbpilots/dbpilots.src
@@ -19,37 +19,13 @@
 
 #include "dbpresid.hrc"
 
-ModalDialog RID_DLG_GROUPBOXWIZARD
+String RID_STR_GROUPWIZARD_TITLE
 {
-    HelpID = "extensions:ModalDialog:RID_DLG_GROUPBOXWIZARD";
     Text [ en-US ] = "Group Element Wizard";
-
-    OutputSize      = TRUE ;
-    SVLook          = TRUE ;
-    Moveable        = TRUE ;
-    Closeable       = TRUE ;
-    Hide            = TRUE;
 };
 
-ModalDialog RID_DLG_LISTCOMBOWIZARD
+String RID_STR_GRIDWIZARD_TITLE
 {
-    HelpID = "extensions:ModalDialog:RID_DLG_LISTCOMBOWIZARD";
-    OutputSize      = TRUE ;
-    SVLook          = TRUE ;
-    Moveable        = TRUE ;
-    Closeable       = TRUE ;
-    Hide            = TRUE;
-};
-
-ModalDialog RID_DLG_GRIDWIZARD
-{
-    HelpID = "extensions:ModalDialog:RID_DLG_GRIDWIZARD";
-    OutputSize      = TRUE ;
-    SVLook          = TRUE ;
-    Moveable        = TRUE ;
-    Closeable       = TRUE ;
-    Hide            = TRUE;
-
     Text [ en-US ] = "Table Element Wizard";
 };
 
diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc
index 521f9a5b9dd2..6c7623723d7e 100644
--- a/extensions/source/dbpilots/dbpresid.hrc
+++ b/extensions/source/dbpilots/dbpresid.hrc
@@ -44,18 +44,14 @@
 #define RID_STR_TYPE_COMMAND            (RID_STRING_START + 10 )
 #define RID_STR_FIELDINFO_LISTBOX       (RID_STRING_START + 11 )
 #define RID_STR_FIELDINFO_COMBOBOX      (RID_STRING_START + 12 )
+#define RID_STR_GRIDWIZARD_TITLE        (RID_STRING_START + 13 )
+#define RID_STR_GROUPWIZARD_TITLE       (RID_STRING_START + 14 )
 
 // please adjust RID_STRING_END (below) when adding new strings
 #define RID_STRING_END                  RID_STR_TIMEPOSTFIX
 
-// dialogs
-
-#define RID_DLG_GROUPBOXWIZARD          ( RID_DIALOG_START +  1 )
-#define RID_DLG_LISTCOMBOWIZARD         ( RID_DIALOG_START +  2 )
-#define RID_DLG_GRIDWIZARD              ( RID_DIALOG_START +  3 )
-
 // please adjust RID_DIALOG_END (below) when adding new dialogs
-#define RID_DIALOG_END                  RID_DLG_GRIDWIZARD
+#define RID_DIALOG_END                  ( RID_DIALOG_START +  3 )
 
 // tab pages
 
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 9f599ccf2427..2b982ad9b47d 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -54,7 +54,7 @@ namespace dbp
 
     OGridWizard::OGridWizard( Window* _pParent,
             const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext )
-        :OControlWizard(_pParent, ModuleRes(RID_DLG_GRIDWIZARD), _rxObjectModel, _rxContext)
+        :OControlWizard(_pParent, _rxObjectModel, _rxContext)
         ,m_bHadDataSelection(true)
     {
         initControlSettings(&m_aSettings);
@@ -63,6 +63,7 @@ namespace dbp
         m_pNextPage->SetHelpId(HID_GRIDWIZARD_NEXT);
         m_pCancel->SetHelpId(HID_GRIDWIZARD_CANCEL);
         m_pFinish->SetHelpId(HID_GRIDWIZARD_FINISH);
+        setTitleBase(ModuleRes(RID_STR_GRIDWIZARD_TITLE).toString());
 
         // if we do not need the data source selection page ...
         if (!needDatasourceSelection())
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index ee59d003de09..3816e32111e5 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -49,7 +49,7 @@ namespace dbp
 
     OGroupBoxWizard::OGroupBoxWizard( Window* _pParent,
             const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext )
-        :OControlWizard(_pParent, ModuleRes(RID_DLG_GROUPBOXWIZARD), _rxObjectModel, _rxContext)
+        :OControlWizard(_pParent, _rxObjectModel, _rxContext)
         ,m_bVisitedDefault(false)
         ,m_bVisitedDB(false)
     {
@@ -59,6 +59,7 @@ namespace dbp
         m_pNextPage->SetHelpId(HID_GROUPWIZARD_NEXT);
         m_pCancel->SetHelpId(HID_GROUPWIZARD_CANCEL);
         m_pFinish->SetHelpId(HID_GROUPWIZARD_FINISH);
+        setTitleBase(ModuleRes(RID_STR_GROUPWIZARD_TITLE).toString());
     }
 
 
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index b191e98e2ab1..83bcfecd446d 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -51,7 +51,7 @@ namespace dbp
 
     OListComboWizard::OListComboWizard( Window* _pParent,
             const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext )
-        :OControlWizard(_pParent, ModuleRes(RID_DLG_LISTCOMBOWIZARD), _rxObjectModel, _rxContext)
+        :OControlWizard(_pParent, _rxObjectModel, _rxContext)
         ,m_bListBox(false)
         ,m_bHadDataSelection(true)
     {