diff options
Diffstat (limited to 'dbaccess/source/ui/app/AppController.cxx')
| -rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index ef7070e2b720..402998f35920 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -19,7 +19,8 @@ #include <memory> #include "AppController.hxx" -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include "advancedsettingsdlg.hxx" #include "subcomponentmanager.hxx" #include "uiservices.hxx" @@ -109,7 +110,7 @@ #include "AppView.hxx" #include "browserids.hxx" #include "dbu_reghelper.hxx" -#include "dbu_app.hrc" +#include "strings.hrc" #include "defaultobjectnamecheck.hxx" #include "databaseobjectview.hxx" #include "listviewitems.hxx" @@ -864,7 +865,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const OUString sDSTypeName; if ( dbaccess::ODsnTypeCollection::isEmbeddedDatabase( sURL ) ) { - sDSTypeName = OUString( ModuleRes( RID_STR_EMBEDDED_DATABASE ) ); + sDSTypeName = DBA_RES(RID_STR_EMBEDDED_DATABASE); } else { @@ -2035,9 +2036,9 @@ void OApplicationController::renameEntry() { OUString sLabel; if ( eType == E_FORM ) - sLabel = OUString(ModuleRes( STR_FRM_LABEL )); + sLabel = DBA_RES(STR_FRM_LABEL); else - sLabel = OUString(ModuleRes( STR_RPT_LABEL )); + sLabel = DBA_RES(STR_RPT_LABEL); OUString sName = *aList.begin(); if ( xHNames->hasByHierarchicalName(sName) ) @@ -2134,7 +2135,7 @@ void OApplicationController::renameEntry() } catch(const ElementExistException& e) { - OUString sMsg( ModuleRes( STR_NAME_ALREADY_EXISTS ) ); + OUString sMsg(DBA_RES(STR_NAME_ALREADY_EXISTS)); showError(SQLExceptionInfo(SQLException(sMsg.replaceAll("#", e.Message), e.Context, "S1000", 0, Any()))); } catch(const Exception& ) @@ -2528,9 +2529,9 @@ void OApplicationController::OnFirstControllerConnected() return; SQLWarning aWarning; - aWarning.Message = OUString( ModuleRes( STR_SUB_DOCS_WITH_SCRIPTS ) ); + aWarning.Message = DBA_RES(STR_SUB_DOCS_WITH_SCRIPTS); SQLException aDetail; - aDetail.Message = OUString( ModuleRes( STR_SUB_DOCS_WITH_SCRIPTS_DETAIL ) ); + aDetail.Message = DBA_RES(STR_SUB_DOCS_WITH_SCRIPTS_DETAIL); aWarning.NextException <<= aDetail; Reference< XExecutableDialog > xDialog = ErrorMessageDialog::create( getORB(), "", nullptr, makeAny( aWarning ) ); @@ -2767,7 +2768,7 @@ sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection ) case DatabaseObjectContainer::REPORTS: if ( eSelectedCategory != E_NONE ) throw IllegalArgumentException( - ModuleRes(RID_STR_NO_DIFF_CAT), + DBA_RES(RID_STR_NO_DIFF_CAT), *this, sal_Int16( pObject - aSelectedObjects.getConstArray() ) ); eSelectedCategory = ( pObject->Type == DatabaseObjectContainer::TABLES ) ? E_TABLE @@ -2781,7 +2782,7 @@ sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection ) case DatabaseObjectContainer::DATA_SOURCE: { OUString sMessage( - OUString(ModuleRes(RID_STR_UNSUPPORTED_OBJECT_TYPE)). + DBA_RES(RID_STR_UNSUPPORTED_OBJECT_TYPE). replaceFirst("$type$", OUString::number(pObject->Type))); throw IllegalArgumentException(sMessage, *this, sal_Int16( pObject - aSelectedObjects.getConstArray() )); } |