diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx index bea04e6aca68..79e0bdf332a3 100644 --- a/avmedia/source/viewer/mediawindowbase_impl.cxx +++ b/avmedia/source/viewer/mediawindowbase_impl.cxx @@ -74,7 +74,7 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl: { uno::Reference< ::com::sun::star::media::XManager > xManager( - xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MANAGER_SERVICE_NAME )) ), + xFactory->createInstance( ::rtl::OUString( AVMEDIA_MANAGER_SERVICE_NAME ) ), uno::UNO_QUERY ); if( xManager.is() ) diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 07ba8c01f214..44d87cdc0356 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -291,8 +291,8 @@ sal_Bool hasUno( void ) } else { - Reference< XContentProviderManager > xManager( xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM - ( "com.sun.star.ucb.UniversalContentBroker" )) ), UNO_QUERY ); + Reference< XContentProviderManager > xManager( xSMgr->createInstance( + ::rtl::OUString( "com.sun.star.ucb.UniversalContentBroker" ) ), UNO_QUERY ); if ( !( xManager.is() && xManager->queryContentProvider( ::rtl::OUString("file:///" ) ).is() ) ) { diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx index 97e84c218986..9355cb60ff85 100644 --- a/connectivity/source/drivers/macab/macabutilities.hxx +++ b/connectivity/source/drivers/macab/macabutilities.hxx @@ -111,7 +111,7 @@ namespace connectivity /* Get the length, and make sure that there is actually a string * here. */ - if(_originalLabel.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_$!<"))) == 0) + if(_originalLabel.indexOf(::rtl::OUString("_$!<")) == 0) { return _originalLabel.copy(4,_originalLabel.getLength()-8); } diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx index 89f5bb98b24a..09bad4c9bbb5 100644 --- a/connectivity/source/drivers/mozab/MConnection.cxx +++ b/connectivity/source/drivers/mozab/MConnection.cxx @@ -99,7 +99,7 @@ const sal_Char* getSdbcScheme( SdbcScheme _eScheme ) // ----------------------------------------------------------------------------- ::rtl::OUString OConnection::getDriverImplementationName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MOZAB_DRIVER_IMPL_NAME)); + return rtl::OUString(MOZAB_DRIVER_IMPL_NAME); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/inc/ado/ACollection.hxx b/connectivity/source/inc/ado/ACollection.hxx index 3dafa36b9b3a..16865b0cad1a 100644 --- a/connectivity/source/inc/ado/ACollection.hxx +++ b/connectivity/source/inc/ado/ACollection.hxx @@ -81,7 +81,7 @@ namespace connectivity virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (staruno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ACollection")); + return ::rtl::OUString("com.sun.star.sdbcx.ACollection"); } virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& _rServiceName ) throw(staruno::RuntimeException) { @@ -96,7 +96,7 @@ namespace connectivity virtual staruno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(staruno::RuntimeException) { staruno::Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Container")); + aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.Container"); return aSupported; }