Tag: cws_dev300_dba31a User: oj Date: 2008-06-30 07:33:47+0000 Modified: dba/connectivity/source/drivers/mozab/MDriver.cxx dba/connectivity/source/drivers/mozab/MServices.cxx
Log: #i57999# wrong file name used 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.32.1&r2=1.19.32.2 Delta lines: +4 -3 ------------------- --- MDriver.cxx 2008-06-30 06:39:40+0000 1.19.32.1 +++ MDriver.cxx 2008-06-30 07:33:44+0000 1.19.32.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MDriver.cxx,v $ - * $Revision: 1.19.32.1 $ + * $Revision: 1.19.32.2 $ * * 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 @@ else { ::rtl::OUString sMsg = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Could not load the library ")); - sMsg += ::rtl::OUString::createFromAscii(SAL_MODULENAME( "mozabdrv" )); + 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( "mozabdrv" )); + const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(SVLIBRARY( "mozabdrv" )); // load the dbtools library m_hModule = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0); File [changed]: MServices.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MServices.cxx?r1=1.8.32.1&r2=1.8.32.2 Delta lines: +3 -2 ------------------- --- MServices.cxx 2008-06-30 06:39:40+0000 1.8.32.1 +++ MServices.cxx 2008-06-30 07:33:45+0000 1.8.32.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MServices.cxx,v $ - * $Revision: 1.8.32.1 $ + * $Revision: 1.8.32.2 $ * * This file is part of OpenOffice.org. * @@ -36,6 +36,7 @@ #include <osl/diagnose.h> #include <com/sun/star/mozilla/XMozillaBootstrap.hpp> #include "bootstrap/MMozillaBootstrap.hxx" +#include <tools/solar.h> using namespace connectivity::mozab; using ::rtl::OUString; @@ -162,7 +163,7 @@ typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Reference< XMultiServiceFactory >& _rxFactory ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createMozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) { - const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(SAL_MODULENAME( "mozabdrv" )); + const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(SVLIBRARY( "mozabdrv" )); // load the dbtools library oslModule s_hModule = osl_loadModuleRelative( --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
