User: vg      
Date: 2008-08-19 09:13:34+0000
Modified:
   dba/connectivity/source/drivers/mozab/MDriver.cxx

Log:
 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

File Changes:

Directory: /dba/connectivity/source/drivers/mozab/
==================================================

File [changed]: MDriver.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MDriver.cxx?r1=1.19&r2=1.20
Delta lines:  +3 -2
-------------------
--- MDriver.cxx 2008-04-10 10:03:04+0000        1.19
+++ MDriver.cxx 2008-08-19 09:13:32+0000        1.20
@@ -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 @@
        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 @@
 
        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);




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to