diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-07-22 10:10:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-22 12:21:53 +0100 |
commit | 9c7a7d85aa6de5d4c384608dce157c420bc7c74f (patch) | |
tree | 1e8969d80a57484d86247f4f6e1eee936f183b7d /dbaccess/source/ext | |
parent | d8e64d76a8422320caf4980c2fba856c4e1f6785 (diff) |
convert DLG_MACRO_MIGRATION to widget layout
Change-Id: Ie4cef54a943fc456b042425b53286492a0bed0be
Diffstat (limited to 'dbaccess/source/ext')
5 files changed, 27 insertions, 46 deletions
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc index 946b7a5de7de..d32dafe3b442 100644 --- a/dbaccess/source/ext/macromigration/dbmm_global.hrc +++ b/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 diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc b/dbaccess/source/ext/macromigration/macromigration.hrc index 0cde314859ef..e4bc293c6803 100644 --- a/dbaccess/source/ext/macromigration/macromigration.hrc +++ b/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: */ diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src index ae07e0037997..4b797ed003fc 100644 --- a/dbaccess/source/ext/macromigration/macromigration.src +++ b/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 diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index 1f3303294b4c..1c007e363d93 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/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; diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx index 563bfbaaced1..9db62481463f 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx +++ b/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; |