From eda2eb3014cadbc5f9818c84b9a698682a6061e6 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 30 Jul 2019 17:46:52 +0200 Subject: Improved loplugin:stringconstant (now that GCC 7 supports it): ucb Change-Id: Id9c3a97bdb3eaa69973d3742ce57257800fa21ae Reviewed-on: https://gerrit.libreoffice.org/76634 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- ucb/source/cacher/cachedcontentresultset.cxx | 4 ++-- ucb/source/cacher/cachedcontentresultsetstub.cxx | 4 ++-- ucb/source/cacher/cacheddynamicresultset.cxx | 4 ++-- ucb/source/cacher/cacheddynamicresultsetstub.cxx | 4 ++-- ucb/source/core/FileAccess.cxx | 2 +- ucb/source/core/cmdenv.cxx | 2 +- ucb/source/core/provprox.cxx | 4 ++-- ucb/source/core/ucb.cxx | 2 +- ucb/source/core/ucbprops.cxx | 2 +- ucb/source/core/ucbstore.cxx | 6 +++--- ucb/source/sorter/sortdynres.cxx | 4 ++-- ucb/source/sorter/sortresult.cxx | 2 +- ucb/source/ucp/cmis/cmis_content.cxx | 2 +- ucb/source/ucp/cmis/cmis_provider.cxx | 2 +- ucb/source/ucp/cmis/cmis_repo_content.cxx | 4 ++-- ucb/source/ucp/expand/ucpexpand.cxx | 2 +- ucb/source/ucp/ext/ucpext_content.cxx | 2 +- ucb/source/ucp/ext/ucpext_provider.cxx | 6 +++--- ucb/source/ucp/file/bc.cxx | 2 +- ucb/source/ucp/file/filtask.cxx | 2 +- ucb/source/ucp/ftp/ftpcontent.cxx | 4 ++-- ucb/source/ucp/ftp/ftpcontentidentifier.cxx | 2 +- ucb/source/ucp/ftp/ftpcontentprovider.cxx | 2 +- ucb/source/ucp/gio/gio_content.cxx | 2 +- ucb/source/ucp/gio/gio_provider.cxx | 2 +- ucb/source/ucp/hierarchy/hierarchycontent.cxx | 2 +- ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 4 ++-- ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 2 +- ucb/source/ucp/image/ucpimage.cxx | 2 +- ucb/source/ucp/package/pkgcontent.cxx | 2 +- ucb/source/ucp/package/pkgprovider.cxx | 2 +- ucb/source/ucp/tdoc/tdoc_content.cxx | 2 +- ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx | 4 ++-- ucb/source/ucp/tdoc/tdoc_provider.cxx | 2 +- ucb/source/ucp/webdav-neon/NeonUri.cxx | 2 +- ucb/source/ucp/webdav-neon/webdavcontent.cxx | 6 +++--- ucb/source/ucp/webdav-neon/webdavprovider.cxx | 2 +- 37 files changed, 53 insertions(+), 53 deletions(-) (limited to 'ucb') diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 4b229374b027..01cf15cd183c 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -939,7 +939,7 @@ XTYPEPROVIDER_IMPL_11( CachedContentResultSet OUString SAL_CALL CachedContentResultSet::getImplementationName() { - return OUString( "com.sun.star.comp.ucb.CachedContentResultSet" ); + return "com.sun.star.comp.ucb.CachedContentResultSet"; } sal_Bool SAL_CALL CachedContentResultSet::supportsService( const OUString& ServiceName ) @@ -2104,7 +2104,7 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory, // CachedContentResultSetFactory XServiceInfo methods. XSERVICEINFO_COMMOM_IMPL( CachedContentResultSetFactory, - OUString( "com.sun.star.comp.ucb.CachedContentResultSetFactory" ) ) + "com.sun.star.comp.ucb.CachedContentResultSetFactory" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > CachedContentResultSetFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index c410c19dfa68..178a1bb869bf 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -161,7 +161,7 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub OUString SAL_CALL CachedContentResultSetStub::getImplementationName() { - return OUString( "com.sun.star.comp.ucb.CachedContentResultSetStub" ); + return "com.sun.star.comp.ucb.CachedContentResultSetStub"; } sal_Bool SAL_CALL CachedContentResultSetStub::supportsService( const OUString& ServiceName ) @@ -541,7 +541,7 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetStubFactory, // CachedContentResultSetStubFactory XServiceInfo methods. XSERVICEINFO_COMMOM_IMPL( CachedContentResultSetStubFactory, - OUString( "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" ) ) + "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > CachedContentResultSetStubFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & ) diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx index ba1f72616071..8debcc1ac234 100644 --- a/ucb/source/cacher/cacheddynamicresultset.cxx +++ b/ucb/source/cacher/cacheddynamicresultset.cxx @@ -121,7 +121,7 @@ XTYPEPROVIDER_IMPL_4( CachedDynamicResultSet OUString SAL_CALL CachedDynamicResultSet::getImplementationName() { - return OUString( "com.sun.star.comp.ucb.CachedDynamicResultSet" ); + return "com.sun.star.comp.ucb.CachedDynamicResultSet"; } sal_Bool SAL_CALL CachedDynamicResultSet::supportsService( const OUString& ServiceName ) @@ -195,7 +195,7 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetFactory, // CachedDynamicResultSetFactory XServiceInfo methods. XSERVICEINFO_COMMOM_IMPL( CachedDynamicResultSetFactory, - OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" ) ) + "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > CachedDynamicResultSetFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx index 8197a0a6fe15..3e2affa2270f 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx @@ -123,7 +123,7 @@ XTYPEPROVIDER_IMPL_5( CachedDynamicResultSetStub OUString SAL_CALL CachedDynamicResultSetStub::getImplementationName() { - return OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStub" ); + return "com.sun.star.comp.ucb.CachedDynamicResultSetStub"; } sal_Bool SAL_CALL CachedDynamicResultSetStub::supportsService( const OUString& ServiceName ) @@ -187,7 +187,7 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetStubFactory, // CachedDynamicResultSetStubFactory XServiceInfo methods. XSERVICEINFO_COMMOM_IMPL( CachedDynamicResultSetStubFactory, - OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" ) ) + "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > CachedDynamicResultSetStubFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx index 34da0292938a..3f501ee576b8 100644 --- a/ucb/source/core/FileAccess.cxx +++ b/ucb/source/core/FileAccess.cxx @@ -120,7 +120,7 @@ public: virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) override; OUString SAL_CALL getImplementationName() override - { return OUString(IMPLEMENTATION_NAME); } + { return IMPLEMENTATION_NAME; } sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx index b49ebc3d4f51..638db5cc6044 100644 --- a/ucb/source/core/cmdenv.cxx +++ b/ucb/source/core/cmdenv.cxx @@ -90,7 +90,7 @@ UcbCommandEnvironment::getSupportedServiceNames() // static OUString UcbCommandEnvironment::getImplementationName_Static() { - return OUString( "com.sun.star.comp.ucb.CommandEnvironment" ); + return "com.sun.star.comp.ucb.CommandEnvironment"; } diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index fbf44c7eb091..034b33036250 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -50,7 +50,7 @@ UcbContentProviderProxyFactory::~UcbContentProviderProxyFactory() // XServiceInfo methods. XSERVICEINFO_COMMOM_IMPL( UcbContentProviderProxyFactory, - OUString( "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" ) ) + "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > UcbContentProviderProxyFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) @@ -174,7 +174,7 @@ Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes() OUString SAL_CALL UcbContentProviderProxy::getImplementationName() { - return OUString( "com.sun.star.comp.ucb.UcbContentProviderProxy" ); + return "com.sun.star.comp.ucb.UcbContentProviderProxy"; } sal_Bool SAL_CALL UcbContentProviderProxy::supportsService( const OUString& ServiceName ) diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index 1246d6483051..6e28cd18fc9a 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -333,7 +333,7 @@ void SAL_CALL UniversalContentBroker::removeEventListener( // XServiceInfo methods. XSERVICEINFO_COMMOM_IMPL( UniversalContentBroker, - OUString( "com.sun.star.comp.ucb.UniversalContentBroker" ) ) + "com.sun.star.comp.ucb.UniversalContentBroker" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > UniversalContentBroker_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx index c5a4fb6113f0..b2aadcec33b0 100644 --- a/ucb/source/core/ucbprops.cxx +++ b/ucb/source/core/ucbprops.cxx @@ -195,7 +195,7 @@ UcbPropertiesManager::~UcbPropertiesManager() // XServiceInfo methods. XSERVICEINFO_COMMOM_IMPL( UcbPropertiesManager, - OUString( "com.sun.star.comp.ucb.UcbPropertiesManager" ) ) + "com.sun.star.comp.ucb.UcbPropertiesManager" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > UcbPropertiesManager_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & /*rSMgr*/ ) diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 13118c33c6ce..010418323eae 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -158,7 +158,7 @@ UcbStore::~UcbStore() } XSERVICEINFO_COMMOM_IMPL( UcbStore, - OUString( "com.sun.star.comp.ucb.UcbStore" ) ) + "com.sun.star.comp.ucb.UcbStore" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > UcbStore_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) @@ -258,7 +258,7 @@ PropertySetRegistry::~PropertySetRegistry() OUString SAL_CALL PropertySetRegistry::getImplementationName() { - return OUString( "com.sun.star.comp.ucb.PropertySetRegistry" ); + return "com.sun.star.comp.ucb.PropertySetRegistry"; } sal_Bool SAL_CALL PropertySetRegistry::supportsService( const OUString& ServiceName ) @@ -1096,7 +1096,7 @@ PersistentPropertySet::~PersistentPropertySet() OUString SAL_CALL PersistentPropertySet::getImplementationName() { - return OUString( "com.sun.star.comp.ucb.PersistentPropertySet" ); + return "com.sun.star.comp.ucb.PersistentPropertySet"; } sal_Bool SAL_CALL PersistentPropertySet::supportsService( const OUString& ServiceName ) diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index 26e4e761e61f..7d8117c9a7c9 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -84,7 +84,7 @@ SortedDynamicResultSet::~SortedDynamicResultSet() OUString SAL_CALL SortedDynamicResultSet::getImplementationName() { - return OUString( "com.sun.star.comp.ucb.SortedDynamicResultSet" ); + return "com.sun.star.comp.ucb.SortedDynamicResultSet"; } sal_Bool SAL_CALL SortedDynamicResultSet::supportsService( const OUString& ServiceName ) @@ -424,7 +424,7 @@ OUString SAL_CALL SortedDynamicResultSetFactory::getImplementationName() OUString SortedDynamicResultSetFactory::getImplementationName_Static() { - return OUString( "com.sun.star.comp.ucb.SortedDynamicResultSetFactory" ); + return "com.sun.star.comp.ucb.SortedDynamicResultSetFactory"; } sal_Bool SAL_CALL SortedDynamicResultSetFactory::supportsService( const OUString& ServiceName ) diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index 118524114b82..3aa745d290fe 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -148,7 +148,7 @@ SortedResultSet::~SortedResultSet() OUString SAL_CALL SortedResultSet::getImplementationName() { - return OUString( "com.sun.star.comp.ucb.SortedResultSet" ); + return "com.sun.star.comp.ucb.SortedResultSet"; } sal_Bool SAL_CALL SortedResultSet::supportsService( const OUString& ServiceName ) diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index cf8cdacf05c2..c51459a4b417 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -1703,7 +1703,7 @@ namespace cmis OUString SAL_CALL Content::getImplementationName() { - return OUString("com.sun.star.comp.CmisContent"); + return "com.sun.star.comp.CmisContent"; } uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index eb36fac64232..3584d79d3f12 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -121,7 +121,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, css::ucb::XContentProvider ); XSERVICEINFO_COMMOM_IMPL( ContentProvider, - OUString("com.sun.star.comp.CmisContentProvider") ) + "com.sun.star.comp.CmisContentProvider" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index 744c6ba84270..d6e470cee749 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -310,7 +310,7 @@ namespace cmis OUString SAL_CALL RepoContent::getImplementationName() { - return OUString("com.sun.star.comp.CmisRepoContent"); + return "com.sun.star.comp.CmisRepoContent"; } uno::Sequence< OUString > SAL_CALL RepoContent::getSupportedServiceNames() @@ -321,7 +321,7 @@ namespace cmis OUString SAL_CALL RepoContent::getContentType() { - return OUString( CMIS_REPO_TYPE ); + return CMIS_REPO_TYPE; } uno::Any SAL_CALL RepoContent::execute( diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index 49a708fdc6a8..8c418f197bfc 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -115,7 +115,7 @@ uno::Reference< uno::XInterface > create( OUString implName() { - return OUString("com.sun.star.comp.ucb.ExpandContentProvider"); + return "com.sun.star.comp.ucb.ExpandContentProvider"; } diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index efb67d4fdfe2..3610291504cf 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -163,7 +163,7 @@ namespace ucb { namespace ucp { namespace ext OUString SAL_CALL Content::getImplementationName() { - return OUString( "org.openoffice.comp.ucp.ext.Content" ); + return "org.openoffice.comp.ucp.ext.Content"; } diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 88d00cade588..2689e2c9e2bb 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -56,7 +56,7 @@ namespace ucb { namespace ucp { namespace ext OUString ContentProvider::getImplementationName_static() { - return OUString( "org.openoffice.comp.ucp.ext.ContentProvider" ); + return "org.openoffice.comp.ucp.ext.ContentProvider"; } @@ -89,13 +89,13 @@ namespace ucb { namespace ucp { namespace ext OUString ContentProvider::getRootURL() { - return OUString( "vnd.sun.star.extension://" ); + return "vnd.sun.star.extension://"; } OUString ContentProvider::getArtificialNodeContentType() { - return OUString( "application/vnd.sun.star.extension-content" ); + return "application/vnd.sun.star.extension-content"; } diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 12ff24619303..9e17496bd7d9 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -223,7 +223,7 @@ BaseContent::dispose() OUString SAL_CALL BaseContent::getImplementationName() { - return OUString("com.sun.star.comp.ucb.FileContent"); + return "com.sun.star.comp.ucb.FileContent"; } sal_Bool SAL_CALL diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 761e248799a4..058ad0e5f76f 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -2945,7 +2945,7 @@ TaskManager::getScheme( OUString& Scheme ) OUString TaskManager::getImplementationName_static() { - return OUString("com.sun.star.comp.ucb.FileProvider"); + return "com.sun.star.comp.ucb.FileProvider"; } diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 937ebb7a3ce6..f8426a31e4e3 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -169,7 +169,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL FTPContent::getTypes() OUString SAL_CALL FTPContent::getImplementationName() { - return OUString( "com.sun.star.comp.FTPContent"); + return "com.sun.star.comp.FTPContent"; } sal_Bool SAL_CALL FTPContent::supportsService( const OUString& ServiceName ) @@ -188,7 +188,7 @@ css::uno::Sequence< OUString > SAL_CALL FTPContent::getSupportedServiceNames() // virtual OUString SAL_CALL FTPContent::getContentType() { - return OUString(FTP_CONTENT_TYPE); + return FTP_CONTENT_TYPE; } // XCommandProcessor methods. diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx index 67fc59604623..159e78a81969 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx @@ -101,7 +101,7 @@ OUString SAL_CALL FTPContentIdentifier::getContentProviderScheme( ) { - return OUString("ftp"); + return "ftp"; } diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx index c68fbe32dc0a..99cb557db1de 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx @@ -106,7 +106,7 @@ OUString SAL_CALL FTPContentProvider::getImplementationName() OUString FTPContentProvider::getImplementationName_Static() { - return OUString("com.sun.star.comp.FTPContentProvider"); + return "com.sun.star.comp.FTPContentProvider"; } sal_Bool SAL_CALL FTPContentProvider::supportsService( const OUString& ServiceName ) diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index f24fd29d132c..d165262159a0 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -1329,7 +1329,7 @@ css::uno::Any SAL_CALL Content::queryInterface( const css::uno::Type & rType ) OUString SAL_CALL Content::getImplementationName() { - return OUString("com.sun.star.comp.GIOContent"); + return "com.sun.star.comp.GIOContent"; } css::uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index d7508b273ca5..a27e0e9ec79f 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -97,7 +97,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, css::ucb::XContentProvider ); XSERVICEINFO_COMMOM_IMPL( ContentProvider, - OUString( "com.sun.star.comp.GIOContentProvider" ) ) + "com.sun.star.comp.GIOContentProvider" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 4b55810aa923..3c2b23538d88 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -246,7 +246,7 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes() // virtual OUString SAL_CALL HierarchyContent::getImplementationName() { - return OUString( "com.sun.star.comp.ucb.HierarchyContent" ); + return "com.sun.star.comp.ucb.HierarchyContent"; } diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 19438513dd4c..295a86612448 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -229,7 +229,7 @@ XTYPEPROVIDER_IMPL_4( HierarchyDataSource, // XServiceInfo methods. XSERVICEINFO_COMMOM_IMPL( HierarchyDataSource, - OUString( "com.sun.star.comp.ucb.HierarchyDataSource" ) ) + "com.sun.star.comp.ucb.HierarchyDataSource" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > HierarchyDataSource_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) @@ -611,7 +611,7 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes() OUString SAL_CALL HierarchyDataAccess::getImplementationName() { - return OUString("com.sun.star.comp.ucb.HierarchyDataAccess"); + return "com.sun.star.comp.ucb.HierarchyDataAccess"; } sal_Bool SAL_CALL HierarchyDataAccess::supportsService( const OUString& ServiceName ) diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index be2ae768a041..4c288a45ff83 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -99,7 +99,7 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider, // XServiceInfo methods. XSERVICEINFO_COMMOM_IMPL( HierarchyContentProvider, - OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ) ) + "com.sun.star.comp.ucb.HierarchyContentProvider" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > HierarchyContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) diff --git a/ucb/source/ucp/image/ucpimage.cxx b/ucb/source/ucp/image/ucpimage.cxx index 78bac968b722..75bc7404fc0d 100644 --- a/ucb/source/ucp/image/ucpimage.cxx +++ b/ucb/source/ucp/image/ucpimage.cxx @@ -48,7 +48,7 @@ public: private: OUString SAL_CALL getImplementationName() override - { return OUString("com.sun.star.comp.ucb.ImageContentProvider"); } + { return "com.sun.star.comp.ucb.ImageContentProvider"; } sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 8399b2298f12..587f0682e5ca 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -360,7 +360,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() // virtual OUString SAL_CALL Content::getImplementationName() { - return OUString( "com.sun.star.comp.ucb.PackageContent" ); + return "com.sun.star.comp.ucb.PackageContent"; } diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index f07c88f2410a..7b7848e9a72d 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -141,7 +141,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, // XServiceInfo methods. XSERVICEINFO_COMMOM_IMPL( ContentProvider, - OUString( "com.sun.star.comp.ucb.PackageContentProvider" ) ) + "com.sun.star.comp.ucb.PackageContentProvider" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 9f9377a711e6..93b4cff26e67 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -263,7 +263,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() // virtual OUString SAL_CALL Content::getImplementationName() { - return OUString( "com.sun.star.comp.ucb.TransientDocumentsContent" ); + return "com.sun.star.comp.ucb.TransientDocumentsContent"; } diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx index 4aea87a897aa..c79380c9b5b7 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx @@ -77,8 +77,8 @@ DocumentContentFactory::getSupportedServiceNames() // static OUString DocumentContentFactory::getImplementationName_Static() { - return OUString( - "com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory" ); + return + "com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory"; } diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index 9ef2524ae891..006f135b7701 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -108,7 +108,7 @@ XTYPEPROVIDER_IMPL_5( ContentProvider, // XServiceInfo methods. XSERVICEINFO_COMMOM_IMPL( ContentProvider, - OUString( "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ) ) + "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx index 6a825682a6dc..17db426dcf5b 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.cxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx @@ -222,7 +222,7 @@ OUString NeonUri::GetPathBaseName () const return aTemp; } else - return OUString("/"); + return "/"; } bool NeonUri::operator== ( const NeonUri & rOther ) const diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index cb1e2e02d2fc..e9f5e4a761a2 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -401,7 +401,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() // virtual OUString SAL_CALL Content::getImplementationName() { - return OUString( "com.sun.star.comp.ucb.WebDAVContent" ); + return "com.sun.star.comp.ucb.WebDAVContent"; } @@ -434,9 +434,9 @@ OUString SAL_CALL Content::getContentType() } if ( bFolder ) - return OUString( WEBDAV_COLLECTION_TYPE ); + return WEBDAV_COLLECTION_TYPE; - return OUString( WEBDAV_CONTENT_TYPE ); + return WEBDAV_CONTENT_TYPE; } diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx index d79818d79f44..3b821e61aa9d 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx @@ -97,7 +97,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, // XServiceInfo methods. XSERVICEINFO_COMMOM_IMPL( ContentProvider, - OUString( "com.sun.star.comp.WebDAVContentProvider" ) ) + "com.sun.star.comp.WebDAVContentProvider" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) -- cgit