diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-29 21:39:24 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-29 21:39:24 -0500 |
| commit | 1a5637b8a958bc9aa22d3d5ebacc10e1a3a2bd4c (patch) | |
| tree | 6e4c4b8744f0868761a12b2f2cde3b86257fb9fb /connectivity | |
| parent | 20696849975f8e256a1be856e056bfaa8ade99d0 (diff) | |
targeted string re-work
Change-Id: If9a9889fa36bc76c9afed295568ed9a05de4587f
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/macab/MacabDriver.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index ff3d985cd8e2..8a8b2d1fc12b 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx @@ -102,7 +102,7 @@ bool MacabImplModule::impl_loadModule() OSL_ENSURE( !m_hConnectorModule && !m_pConnectionFactoryFunc, "MacabImplModule::impl_loadModule: inconsistence: inconsistency (never attempted load before, but some values already set)!"); - const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "macabdrv1" )) ); + const ::rtl::OUString sModuleName( SAL_MODULENAME( "macabdrv1" ) ); m_hConnectorModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, SAL_LOADMODULE_NOW ); // LAZY! #i61335# OSL_ENSURE( m_hConnectorModule, "MacabImplModule::impl_loadModule: could not load the implementation library!" ); if ( !m_hConnectorModule ) @@ -153,7 +153,7 @@ void MacabImplModule::impl_throwGenericSQLException( const ::rtl::OUString& _rMe { SQLException aError; aError.Message = _rMessage; - aError.SQLState = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "S1000" ) ); + aError.SQLState = ::rtl::OUString( "S1000" ); aError.ErrorCode = 0; throw aError; } @@ -195,7 +195,7 @@ MacabDriver::MacabDriver( try { Reference< XDesktop > xDesktop( - m_xMSFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ) ), + m_xMSFactory->createInstance( ::rtl::OUString( "com.sun.star.frame.Desktop" ) ), UNO_QUERY_THROW ); xDesktop->addTerminateListener( this ); } @@ -233,7 +233,7 @@ Sequence< ::rtl::OUString > MacabDriver::getSupportedServiceNames_Static( ) thr // which service is supported // for more information @see com.sun.star.sdbc.Driver Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver")); + aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); return aSNS; } @@ -291,7 +291,7 @@ sal_Bool SAL_CALL MacabDriver::acceptsURL( const ::rtl::OUString& url ) return sal_False; // here we have to look whether we support this URL format - return (!url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:macab:")), 18)); + return (!url.compareTo(::rtl::OUString("sdbc:address:macab:"), 18)); } // -------------------------------------------------------------------------------- Sequence< DriverPropertyInfo > SAL_CALL MacabDriver::getPropertyInfo( const ::rtl::OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException) |