diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-02-04 17:59:58 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-02-04 17:59:58 +0100 |
| commit | c7c976e4332422ebf7b0d92b6d50dec2d2dea435 (patch) | |
| tree | 7f80db16edfacf9e103004fdc14ea80bdbebd45e /dbaccess/source/ext/macromigration | |
| parent | bd267404f19f1ea561f5602bbae1f8586e24e4bb (diff) | |
| parent | 1e1b1d60af9fbbb8d745d5ebebf9fa46444ded67 (diff) | |
CWS svxsplit: merge with m71
Diffstat (limited to 'dbaccess/source/ext/macromigration')
| -rw-r--r-- | dbaccess/source/ext/macromigration/dbmm_global.hrc | 3 | ||||
| -rw-r--r-- | dbaccess/source/ext/macromigration/macromigration.src | 13 | ||||
| -rw-r--r-- | dbaccess/source/ext/macromigration/macromigrationwizard.cxx | 10 |
3 files changed, 20 insertions, 6 deletions
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc index 8afb08b919e2..853e00058d2a 100644 --- a/dbaccess/source/ext/macromigration/dbmm_global.hrc +++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc @@ -82,5 +82,8 @@ #define STR_WARNINGS ( RID_DBMM_STRING_START + 14 ) #define STR_EXCEPTION ( RID_DBMM_STRING_START + 15 ) #define STR_LIBRARY_TYPE_AND_NAME ( RID_DBMM_STRING_START + 16 ) +#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 ) #endif // DBACCESS_DBMM_GLOBAL_HRC diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src index bb49ac7ad287..fa973be93d00 100644 --- a/dbaccess/source/ext/macromigration/macromigration.src +++ b/dbaccess/source/ext/macromigration/macromigration.src @@ -441,3 +441,16 @@ ErrorBox ERR_INVALID_BACKUP_LOCATION Buttons = WB_OK; Message [ en-US ] = "You need to choose a backup location other than the document location itself."; }; + +String STR_INVALID_NUMBER_ARGS +{ + Text [ en-US ] = "Invalid number of initialization arguments. Expected 1."; +}; +String STR_NO_DATABASE +{ + Text [ en-US ] = "No database document found in the initializatin arguments."; +}; +String STR_NOT_READONLY +{ + Text [ en-US ] = "Not applicable to read-only documents."; +}; diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx index 732fa9906119..72eef7e1583b 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx @@ -32,6 +32,7 @@ #include "precompiled_dbaccess.hxx" #include "dbmm_module.hxx" +#include "dbmm_global.hrc" #include "macromigrationdialog.hxx" /** === begin UNO includes === **/ @@ -210,8 +211,7 @@ namespace dbmm if ( _rArguments.getLength() != 1 ) throw IllegalArgumentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Invalid number of initialization arguments. Expected 1." ) ), - // TODO: resource + String(MacroMigrationResId(STR_INVALID_NUMBER_ARGS)), *this, 1 ); @@ -219,8 +219,7 @@ namespace dbmm m_xDocument.set( _rArguments[0], UNO_QUERY ); if ( !m_xDocument.is() ) throw IllegalArgumentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No database document found in the initializatin arguments." ) ), - // TODO: resource + String(MacroMigrationResId(STR_NO_DATABASE)), *this, 1 ); @@ -228,8 +227,7 @@ namespace dbmm Reference< XStorable > xDocStor( m_xDocument, UNO_QUERY_THROW ); if ( xDocStor->isReadonly() ) throw IllegalArgumentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Not applicable to read-only documents." ) ), - // TODO: resource + String(MacroMigrationResId(STR_NOT_READONLY)), *this, 1 ); |