diff options
Diffstat (limited to 'dbaccess/source/ui/dlg/DbAdminImpl.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/DbAdminImpl.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 848f07bbfaeb..7ef15fe23176 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -28,11 +28,14 @@ #include "DriverSettings.hxx" #include "IItemSetHelper.hxx" #include "UITools.hxx" -#include "dbu_dlg.hrc" -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "dbu_dlg.hxx" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "dsitems.hxx" #include "dsnItem.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "optionalboolitem.hxx" #include "propertysetitem.hxx" #include "stringlistitem.hxx" @@ -245,7 +248,7 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal } OUString sName = pName ? pName->GetValue() : OUString(); - OUString sLoginRequest(ModuleRes(STR_ENTER_CONNECTION_PASSWORD)); + OUString sLoginRequest(DBA_RES(STR_ENTER_CONNECTION_PASSWORD)); OUString sTemp = sName; sName = ::dbaui::getStrippedDatabaseName(nullptr,sTemp); if ( !sName.isEmpty() ) @@ -381,7 +384,7 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString // get the global DriverManager Reference< XConnectionPool > xDriverManager; - OUString sCurrentActionError = ModuleRes(STR_COULDNOTCREATE_DRIVERMANAGER); + OUString sCurrentActionError = DBA_RES(STR_COULDNOTCREATE_DRIVERMANAGER); sCurrentActionError = sCurrentActionError.replaceFirst("#servicename#", "com.sun.star.sdbc.ConnectionPool"); try @@ -398,7 +401,7 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString Reference< XDriver > xDriver = xDriverManager->getDriverByURL(_sURL); if (!xDriver.is()) { - sCurrentActionError = ModuleRes(STR_NOREGISTEREDDRIVER); + sCurrentActionError = DBA_RES(STR_NOREGISTEREDDRIVER); sCurrentActionError = sCurrentActionError.replaceFirst("#connurl#", _sURL); // will be caught and translated into an SQLContext exception throw SQLException(sCurrentActionError, getORB(), "S1000", 0, Any()); |