diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-15 21:21:06 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-15 23:30:24 +0200 |
| commit | a332a43ed282db578b48a4e4993756fcfdf13c80 (patch) | |
| tree | 5aaddfe427f5ef3422630cb2e1fd3574d036bcfa /dbaccess/source/ext | |
| parent | c931bed5f1ab16e758f8da8e4304c9c126a1ca49 (diff) | |
ErrorBox ERR_INVALID_BACKUP_LOCATION to String
Change-Id: Ied9fcfacc6d2751883d7c4d21582427690ba0f20
Diffstat (limited to 'dbaccess/source/ext')
| -rw-r--r-- | dbaccess/source/ext/macromigration/dbmm_global.hrc | 6 | ||||
| -rw-r--r-- | dbaccess/source/ext/macromigration/macromigration.src | 5 | ||||
| -rw-r--r-- | dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc index d32dafe3b442..3d0d42eac2c2 100644 --- a/dbaccess/source/ext/macromigration/dbmm_global.hrc +++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc @@ -24,13 +24,8 @@ //= bases -#define RID_DBMM_DIALOG_START RID_DBACCESS_START + 0 #define RID_DBMM_STRING_START RID_DBACCESS_START + 0 -//= error boxes - -#define ERR_INVALID_BACKUP_LOCATION RID_DBMM_DIALOG_START + 0 - //= strings #define STR_FORM ( RID_DBMM_STRING_START + 0 ) @@ -58,6 +53,7 @@ #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 ) +#define STR_INVALID_BACKUP_LOCATION ( RID_DBMM_STRING_START + 25 ) #endif // DBACCESS_DBMM_GLOBAL_HRC diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src index 4b797ed003fc..c0c138201d89 100644 --- a/dbaccess/source/ext/macromigration/macromigration.src +++ b/dbaccess/source/ext/macromigration/macromigration.src @@ -131,10 +131,9 @@ String STR_EXCEPTION Text [ en-US ] = "caught exception:"; }; -ErrorBox ERR_INVALID_BACKUP_LOCATION +String STR_INVALID_BACKUP_LOCATION { - Buttons = WB_OK; - Message [ en-US ] = "You need to choose a backup location other than the document location itself."; + Text [ en-US ] = "You need to choose a backup location other than the document location itself."; }; String STR_INVALID_NUMBER_ARGS diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index ba3611cd6c5f..136290f8d8d0 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -43,7 +43,7 @@ #include <svl/filenotation.hxx> #include <tools/diagnose_ex.h> #include <ucbhelper/content.hxx> -#include <vcl/msgbox.hxx> +#include <vcl/layout.hxx> #include <list> @@ -406,7 +406,7 @@ namespace dbmm // check that the backup location isn't the same as the document itself if ( lcl_equalURLs_nothrow( m_pData->aContext, sBackupLocation, m_pData->xDocumentModel->getURL() ) ) { - ErrorBox aErrorBox( const_cast< MacroMigrationDialog* >( this ), MacroMigrationResId( ERR_INVALID_BACKUP_LOCATION ) ); + MessageDialog aErrorBox( const_cast< MacroMigrationDialog* >( this ), MacroMigrationResId( STR_INVALID_BACKUP_LOCATION ) ); aErrorBox.Execute(); rBackupPage.grabLocationFocus(); return false; |