diff options
Diffstat (limited to 'dbaccess/source/core/dataaccess/datasource.cxx')
| -rw-r--r-- | dbaccess/source/core/dataaccess/datasource.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 68c8d140ddcf..5f5aa0a4cede 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -20,9 +20,9 @@ #include "datasource.hxx" #include "userinformation.hxx" #include "commandcontainer.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "connection.hxx" #include "SharedConnection.hxx" #include "databasedocument.hxx" @@ -594,7 +594,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString sPwd = m_pImpl->m_aPassword; } - sal_uInt16 nExceptionMessageId = RID_STR_COULDNOTCONNECT_UNSPECIFIED; + const char* pExceptionMessageId = RID_STR_COULDNOTCONNECT_UNSPECIFIED; if (xManager.is()) { sal_Int32 nAdditionalArgs(0); @@ -630,7 +630,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString // Nowadays, it's allowed for a driver to be registered for a given URL, but actually not to accept it. // This is because registration nowadays happens at compile time (by adding respective configuration data), // but acceptance is decided at runtime. - nExceptionMessageId = RID_STR_COULDNOTCONNECT_NODRIVER; + pExceptionMessageId = RID_STR_COULDNOTCONNECT_NODRIVER; } else { @@ -672,11 +672,11 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString } } else - nExceptionMessageId = RID_STR_COULDNOTLOAD_MANAGER; + pExceptionMessageId = RID_STR_COULDNOTLOAD_MANAGER; if ( !xReturn.is() ) { - OUString sMessage = DBA_RES(nExceptionMessageId) + OUString sMessage = DBA_RES(pExceptionMessageId) .replaceAll("$name$", m_pImpl->m_sConnectURL); SQLContext aContext; |