convert DLG_MACRO_MIGRATION to widget layout

Change-Id: Ie4cef54a943fc456b042425b53286492a0bed0be

dbaccess/source/ext/macromigration/dbmm_global.hrc

@@ -25,13 +25,8 @@
 //= bases
 
 #define RID_DBMM_DIALOG_START       RID_DBACCESS_START + 0
-#define RID_DBMM_TAPPAGE_START      RID_DBACCESS_START + 0
 #define RID_DBMM_STRING_START       RID_DBACCESS_START + 0
 
-//= dialogs
-
-#define DLG_MACRO_MIGRATION     RID_DBMM_DIALOG_START + 0
-
 //= error boxes
 
 #define ERR_INVALID_BACKUP_LOCATION     RID_DBMM_DIALOG_START + 0
@@ -58,6 +53,11 @@
 #define STR_INVALID_NUMBER_ARGS     ( RID_DBMM_STRING_START + 17 )
 #define STR_NO_DATABASE             ( RID_DBMM_STRING_START + 18 )
 #define STR_NOT_READONLY            ( RID_DBMM_STRING_START + 19 )
+#define STR_STATE_CLOSE_SUB_DOCS    ( RID_DBMM_STRING_START + 20 )
+#define STR_STATE_BACKUP_DBDOC      ( RID_DBMM_STRING_START + 21 )
+#define STR_STATE_MIGRATE           ( RID_DBMM_STRING_START + 22 )
+#define STR_STATE_SUMMARY           ( RID_DBMM_STRING_START + 23 )
+#define STR_TITLE_MACRO_MIGRATION   ( RID_DBMM_STRING_START + 24 )
 
 #endif // DBACCESS_DBMM_GLOBAL_HRC
 

dbaccess/source/ext/macromigration/macromigration.hrc

@@ -24,12 +24,6 @@
 #define TAB_PAGE_WIDTH  280
 #define TAB_PAGE_HEIGHT 185
 
-//... strings ............................................................
-#define STR_STATE_CLOSE_SUB_DOCS    1
-#define STR_STATE_BACKUP_DBDOC      2
-#define STR_STATE_MIGRATE           3
-#define STR_STATE_SUMMARY           4
-
 #endif // DBACCESS_MACROMIGRATION_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/ext/macromigration/macromigration.src

@@ -18,37 +18,30 @@
  */
 
 #include "dbmm_global.hrc"
-#include "macromigration.hrc"
 
-ModalDialog DLG_MACRO_MIGRATION
+String STR_TITLE_MACRO_MIGRATION
 {
-    HelpID = "dbaccess:ModalDialog:DLG_MACRO_MIGRATION";
-    OutputSize = TRUE ;
-    Moveable = TRUE;
-    Closeable = TRUE ;
-    Hide = TRUE;
-
-    Text[ en-US ]  = "Database Document Macro Migration" ;
+    Text [ en-US ]  = "Database Document Macro Migration" ;
+};
 
-    String STR_STATE_CLOSE_SUB_DOCS
-    {
-        Text [ en-US ] = "Prepare";
-    };
+String STR_STATE_CLOSE_SUB_DOCS
+{
+    Text [ en-US ] = "Prepare";
+};
 
-    String STR_STATE_BACKUP_DBDOC
-    {
-        Text [ en-US ] = "Backup Document";
-    };
+String STR_STATE_BACKUP_DBDOC
+{
+    Text [ en-US ] = "Backup Document";
+};
 
-    String STR_STATE_MIGRATE
-    {
-        Text [ en-US ] = "Migrate";
-    };
+String STR_STATE_MIGRATE
+{
+    Text [ en-US ] = "Migrate";
+};
 
-    String STR_STATE_SUMMARY
-    {
-        Text [ en-US ] = "Summary";
-    };
+String STR_STATE_SUMMARY
+{
+    Text [ en-US ] = "Summary";
 };
 
 String STR_FORM

dbaccess/source/ext/macromigration/macromigrationdialog.cxx

@@ -126,16 +126,15 @@ namespace dbmm
     };
 
     // MacroMigrationDialog
-    MacroMigrationDialog::MacroMigrationDialog( Window* _pParent, const Reference<XComponentContext>& _rContext,
-        const Reference< XOfficeDatabaseDocument >& _rxDocument )
-        :MacroMigrationDialog_Base( _pParent, MacroMigrationResId( DLG_MACRO_MIGRATION ) )
-        ,m_pData( new MacroMigrationDialog_Data( _rContext, _rxDocument ) )
+    MacroMigrationDialog::MacroMigrationDialog(Window* _pParent, const Reference<XComponentContext>& _rContext,
+        const Reference< XOfficeDatabaseDocument >& _rxDocument)
+        : MacroMigrationDialog_Base(_pParent)
+        , m_pData( new MacroMigrationDialog_Data( _rContext, _rxDocument ) )
     {
         OUString sTitlePrepare( MacroMigrationResId( STR_STATE_CLOSE_SUB_DOCS ) );
         OUString sTitleStoreAs( MacroMigrationResId( STR_STATE_BACKUP_DBDOC ) );
         OUString sTitleMigrate( MacroMigrationResId( STR_STATE_MIGRATE ) );
         OUString sTitleSummary( MacroMigrationResId( STR_STATE_SUMMARY ) );
-        FreeResource();
 
         describeState( STATE_CLOSE_SUB_DOCS,    sTitlePrepare, &PreparationPage::Create   );
         describeState( STATE_BACKUP_DBDOC,      sTitleStoreAs, &SaveDBDocPage::Create     );
@@ -155,10 +154,6 @@ namespace dbmm
         OSL_PRECOND( m_pData->xDocumentModel.is(), "MacroMigrationDialog::MacroMigrationDialog: illegal document!" );
     }
 
-    MacroMigrationDialog::~MacroMigrationDialog()
-    {
-    }
-
     const Reference<XComponentContext>& MacroMigrationDialog::getComponentContext() const
     {
         return m_pData->aContext;

dbaccess/source/ext/macromigration/macromigrationdialog.hxx

@@ -40,7 +40,6 @@ namespace dbmm
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext,
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XOfficeDatabaseDocument >& _rxDocument
         );
-        virtual ~MacroMigrationDialog();
 
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
                 getComponentContext() const;

include/svtools/roadmapwizard.hxx

@@ -77,6 +77,10 @@ namespace svt
             const WinBits i_nStyle,
             sal_uInt32 _nButtonFlags = WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP
         );
+        RoadmapWizard(
+            Window* _pParent,
+            sal_uInt32 _nButtonFlags = WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP
+        );
         virtual ~RoadmapWizard( );
 
         void            SetRoadmapHelpId( const OString& _rId );

svtools/source/dialogs/roadmapwizard.cxx

@@ -165,7 +165,6 @@ namespace svt
     }
 #endif
 
-
     RoadmapWizard::RoadmapWizard( Window* _pParent, const ResId& _rRes, sal_uInt32 _nButtonFlags )
         :OWizardMachine( _pParent, _rRes, _nButtonFlags )
         ,m_pImpl( new RoadmapWizardImpl )
@@ -181,6 +180,12 @@ namespace svt
         impl_construct();
     }
 
+    RoadmapWizard::RoadmapWizard( Window* _pParent, sal_uInt32 _nButtonFlags )
+        :OWizardMachine( _pParent, _nButtonFlags )
+        ,m_pImpl( new RoadmapWizardImpl )
+    {
+        impl_construct();
+    }
 
     void RoadmapWizard::impl_construct()
     {