diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 08:13:32 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 08:13:32 +0000 |
| commit | ba6fbef16ada61293f6bb4f6715b3f87cabf88f0 (patch) | |
| tree | 5b8a38b15866f4826c2f4eb91cec91e5afaa922f /connectivity | |
| parent | 0a3558c804238ee00961141f3e275a659aabbc1d (diff) | |
INTEGRATION: CWS dba31a (1.19.32); FILE MERGED
2008/06/30 07:33:44 oj 1.19.32.2: #i57999# wrong file name used
2008/06/30 06:39:40 oj 1.19.32.1: #i57999# name of lib changed
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/mozab/MDriver.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx index 49cd60936d..95bca677ca 100644 --- a/connectivity/source/drivers/mozab/MDriver.cxx +++ b/connectivity/source/drivers/mozab/MDriver.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MDriver.cxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.20 $ * * This file is part of OpenOffice.org. * @@ -33,6 +33,7 @@ #include "MDriver.hxx" #include "MConnection.hxx" #include "connectivity/dbexception.hxx" +#include <tools/solar.h> using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::beans; @@ -154,7 +155,7 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u else { ::rtl::OUString sMsg = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Could not load the library ")); - sMsg += ::rtl::OUString::createFromAscii(SAL_MODULENAME( "mozabdrv2" )); + sMsg += ::rtl::OUString::createFromAscii(SVLIBRARY( "mozabdrv" )); ::dbtools::throwGenericSQLException(sMsg,*this); } @@ -292,7 +293,7 @@ bool MozabDriver::ensureInit() OSL_ENSURE(NULL == m_pCreationFunc, "MozabDriver::ensureInit: inconsistence: already have a factory function!"); - const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(SAL_MODULENAME( "mozabdrv2" )); + const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(SVLIBRARY( "mozabdrv" )); // load the dbtools library m_hModule = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0); |