ucb: Use appropriate OUString functions on string constants

Change-Id: Ie889b3e74160e9ba121ba8351d9e12f6d273c573

25 files changed, 53 insertions, 55 deletions

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index eedcc07c641b..fccb5230accd 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -994,8 +994,7 @@ XTYPEPROVIDER_IMPL_11( CachedContentResultSet
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSet,
                                OUString(
                             "com.sun.star.comp.ucb.CachedContentResultSet" ),
-                            OUString(
-                            CACHED_CONTENT_RESULTSET_SERVICE_NAME ) );
+                            CACHED_CONTENT_RESULTSET_SERVICE_NAME );
 
 
 // XPropertySet methods. ( inherited )
@@ -2256,7 +2255,7 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory,
 
 XSERVICEINFO_IMPL_1_CTX( CachedContentResultSetFactory,
                      OUString( "com.sun.star.comp.ucb.CachedContentResultSetFactory" ),
-                     OUString( CACHED_CONTENT_RESULTSET_FACTORY_NAME ) );
+                     CACHED_CONTENT_RESULTSET_FACTORY_NAME );
 
 
 // Service factory implementation.
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index 03f66fc897a3..0a3b4919a656 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -172,7 +172,7 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub
 
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSetStub,
                         OUString( "com.sun.star.comp.ucb.CachedContentResultSetStub" ),
-                        OUString( CACHED_CRS_STUB_SERVICE_NAME ) );
+                        CACHED_CRS_STUB_SERVICE_NAME );
 
 
 // XFetchProvider methods.
@@ -544,7 +544,7 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetStubFactory,
 
 XSERVICEINFO_IMPL_1( CachedContentResultSetStubFactory,
                      OUString( "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" ),
-                     OUString( CACHED_CRS_STUB_FACTORY_NAME ) );
+                     CACHED_CRS_STUB_FACTORY_NAME );
 
 
 // Service factory implementation.
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index 50a4414e8b27..fd6d93c9307f 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -121,7 +121,7 @@ XTYPEPROVIDER_IMPL_4( CachedDynamicResultSet
 
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSet,
                             OUString( "com.sun.star.comp.ucb.CachedDynamicResultSet" ),
-                            OUString( CACHED_DRS_SERVICE_NAME ) );
+                            CACHED_DRS_SERVICE_NAME );
 
 
 // own methds. ( inherited )
@@ -190,7 +190,7 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetFactory,
 
 XSERVICEINFO_IMPL_1_CTX( CachedDynamicResultSetFactory,
                          OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" ),
-                         OUString( CACHED_DRS_FACTORY_NAME ) );
+                         CACHED_DRS_FACTORY_NAME );
 
 
 // Service factory implementation.
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index 2ae7166b8b5d..991f8eaa8d67 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -123,7 +123,7 @@ XTYPEPROVIDER_IMPL_5( CachedDynamicResultSetStub
 
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSetStub,
                         OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStub" ),
-                        OUString( CACHED_DRS_STUB_SERVICE_NAME ) );
+                        CACHED_DRS_STUB_SERVICE_NAME );
 
 
 
@@ -180,7 +180,7 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetStubFactory,
 
 XSERVICEINFO_IMPL_1_CTX( CachedDynamicResultSetStubFactory,
                      OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" ),
-                     OUString( CACHED_DRS_STUB_FACTORY_NAME ) );
+                     CACHED_DRS_STUB_FACTORY_NAME );
 
 
 // Service factory implementation.
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index 63fd79fc586f..db5f4cd4ee2a 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -54,7 +54,7 @@ UcbContentProviderProxyFactory::~UcbContentProviderProxyFactory()
 
 XSERVICEINFO_IMPL_1( UcbContentProviderProxyFactory,
                      OUString( "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" ),
-                     OUString( PROVIDER_FACTORY_SERVICE_NAME ) );
+                     PROVIDER_FACTORY_SERVICE_NAME );
 
 
 
@@ -185,7 +185,7 @@ Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes()
 
 XSERVICEINFO_NOFACTORY_IMPL_1( UcbContentProviderProxy,
                             OUString( "com.sun.star.comp.ucb.UcbContentProviderProxy" ),
-                            OUString( PROVIDER_PROXY_SERVICE_NAME ) );
+                            PROVIDER_PROXY_SERVICE_NAME );
 
 
 
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 82d36feb8335..da620349accb 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -348,7 +348,7 @@ void SAL_CALL UniversalContentBroker::removeEventListener(
 
 XSERVICEINFO_IMPL_1_CTX( UniversalContentBroker,
                      OUString( "com.sun.star.comp.ucb.UniversalContentBroker" ),
-                     OUString( UCB_SERVICE_NAME ) );
+                     UCB_SERVICE_NAME );
 
 
 
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index f21154d4663b..87828a820e1d 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -313,7 +313,7 @@ UcbPropertiesManager::~UcbPropertiesManager()
 
 XSERVICEINFO_IMPL_1( UcbPropertiesManager,
                      OUString( "com.sun.star.comp.ucb.UcbPropertiesManager" ),
-                     OUString( PROPERTIES_MANAGER_SERVICE_NAME ) );
+                     PROPERTIES_MANAGER_SERVICE_NAME );
 
 
 
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index a5ec9e6daeca..dc40ce852c4e 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -183,7 +183,7 @@ UcbStore::~UcbStore()
 
 XSERVICEINFO_IMPL_1_CTX( UcbStore,
                      OUString( "com.sun.star.comp.ucb.UcbStore" ),
-                     OUString( STORE_SERVICE_NAME ) );
+                     STORE_SERVICE_NAME );
 
 
 
@@ -295,7 +295,7 @@ PropertySetRegistry::~PropertySetRegistry()
 
 XSERVICEINFO_NOFACTORY_IMPL_1( PropertySetRegistry,
                                 OUString( "com.sun.star.comp.ucb.PropertySetRegistry" ),
-                                OUString( PROPSET_REG_SERVICE_NAME ) );
+                                PROPSET_REG_SERVICE_NAME );
 
 
 
@@ -994,8 +994,7 @@ Reference< XInterface > PropertySetRegistry::getRootConfigReadAccess()
             {
                 Sequence< Any > aArguments( 1 );
                 PropertyValue aProperty;
-                aProperty.Name
-                    = OUString( CFGPROPERTY_NODEPATH  );
+                aProperty.Name = CFGPROPERTY_NODEPATH;
                 aProperty.Value
                     <<= OUString( STORE_CONTENTPROPERTIES_KEY  );
                 aArguments[ 0 ] <<= aProperty;
@@ -1054,11 +1053,11 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess(
                 Sequence< Any > aArguments( 2 );
                 PropertyValue   aProperty;
 
-                aProperty.Name = OUString( CFGPROPERTY_NODEPATH  );
+                aProperty.Name = CFGPROPERTY_NODEPATH;
                 aProperty.Value <<= OUString( STORE_CONTENTPROPERTIES_KEY  );
                 aArguments[ 0 ] <<= aProperty;
 
-                aProperty.Name = OUString( CFGPROPERTY_LAZYWRITE  );
+                aProperty.Name = CFGPROPERTY_LAZYWRITE;
                 aProperty.Value <<= sal_True;
                 aArguments[ 1 ] <<= aProperty;
 
@@ -1191,7 +1190,7 @@ PersistentPropertySet::~PersistentPropertySet()
 
 XSERVICEINFO_NOFACTORY_IMPL_1( PersistentPropertySet,
                                 OUString( "com.sun.star.comp.ucb.PersistentPropertySet" ),
-                                OUString( PERS_PROPSET_SERVICE_NAME ) );
+                                PERS_PROPSET_SERVICE_NAME );
 
 
 
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 66457efbab10..214a589118ea 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -124,7 +124,7 @@ css::uno::Sequence< OUString > SAL_CALL SortedDynamicResultSet::getSupportedServ
 css::uno::Sequence< OUString > SortedDynamicResultSet::getSupportedServiceNames_Static()
 {
     css::uno::Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[ 0 ] = OUString( DYNAMIC_RESULTSET_SERVICE_NAME );
+    aSNS.getArray()[ 0 ] = DYNAMIC_RESULTSET_SERVICE_NAME;
     return aSNS;
 }
 
@@ -502,7 +502,7 @@ SortedDynamicResultSetFactory_CreateInstance( const css::uno::Reference<
 css::uno::Sequence< OUString > SortedDynamicResultSetFactory::getSupportedServiceNames_Static()
 {
     com::sun::star::uno::Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[ 0 ] =  OUString( DYNAMIC_RESULTSET_FACTORY_NAME );
+    aSNS.getArray()[ 0 ] = DYNAMIC_RESULTSET_FACTORY_NAME;
     return aSNS;
 }
 
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index daadc8b3d33b..7e1dde0ab407 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -193,7 +193,7 @@ css::uno::Sequence< OUString > SAL_CALL SortedResultSet::getSupportedServiceName
 css::uno::Sequence< OUString >SortedResultSet::getSupportedServiceNames_Static()
 {
     css::uno::Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[ 0 ] = OUString( RESULTSET_SERVICE_NAME );
+    aSNS.getArray()[ 0 ] = RESULTSET_SERVICE_NAME;
     return aSNS;
 }
 
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index 932828d919c5..dfe83a00a1c1 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -118,7 +118,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
 
 XSERVICEINFO_IMPL_1_CTX( ContentProvider,
                      OUString("com.sun.star.comp.CmisContentProvider"),
-                     OUString("com.sun.star.ucb.CmisContentProvider") );
+                     "com.sun.star.ucb.CmisContentProvider" );
 
 ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
 
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 54760b826e5a..ac930844121a 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -1121,7 +1121,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
         // as child
         dstUncPath = m_aUncPath;
 
-    dstUncPath += ( OUString("/") + NewTitle );
+    dstUncPath += "/" + NewTitle;
 
     sal_Int32 NameClash = aTransferInfo.NameClash;
 
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 04f3bf725876..d57ffa8aef21 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -202,7 +202,7 @@ css::uno::Sequence< OUString > SAL_CALL FTPContent::getSupportedServiceNames()
 css::uno::Sequence< OUString > FTPContent::getSupportedServiceNames_Static()
 {
     css::uno::Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[ 0 ] = OUString( "com.sun.star.ucb.FTPContent");
+    aSNS.getArray()[ 0 ] = "com.sun.star.ucb.FTPContent";
     return aSNS;
 }
 
@@ -636,9 +636,9 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand,
     }
 }
 
-#define FTP_FILE OUString( "application/vnd.sun.staroffice.ftp-file")
+#define FTP_FILE "application/vnd.sun.staroffice.ftp-file"
 
-#define FTP_FOLDER OUString( "application/vnd.sun.staroffice.ftp-folder")
+#define FTP_FOLDER "application/vnd.sun.staroffice.ftp-folder"
 
 Sequence<ContentInfo > SAL_CALL
 FTPContent::queryCreatableContentsInfo(  )
@@ -846,8 +846,8 @@ Reference< XRow > FTPContent::getPropertyValues(
             if(Name == "ContentType")
                 xRow->appendString(seqProp[i],
                                    aDirEntry.m_nMode&INETCOREFTP_FILEMODE_ISDIR
-                                   ? FTP_FOLDER
-                                   : FTP_FILE );
+                                   ? OUString(FTP_FOLDER)
+                                   : OUString(FTP_FILE) );
             else if(Name == "IsReadOnly")
                 xRow->appendBoolean(seqProp[i],
                                     aDirEntry.m_nMode
@@ -906,8 +906,7 @@ Sequence<Any> FTPContent::setPropertyValues(
                 try {
                     OUString OldTitle = m_aFTPURL.ren(Title);
                     evt.realloc(1);
-                    evt[0].PropertyName =
-                        OUString("Title");
+                    evt[0].PropertyName = "Title";
                     evt[0].Further = false;
                     evt[0].PropertyHandle = -1;
                     evt[0].OldValue <<= OldTitle;
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 07051ab758e9..a31a4b29b82a 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -148,7 +148,7 @@ FTPContentProvider_CreateInstance( const css::uno::Reference<
 css::uno::Sequence< OUString > FTPContentProvider::getSupportedServiceNames_Static()
 {
     css::uno::Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[ 0 ] = OUString(FTP_CONTENT_PROVIDER_SERVICE_NAME);
+    aSNS.getArray()[ 0 ] = FTP_CONTENT_PROVIDER_SERVICE_NAME;
     return aSNS;
 }
 
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 61ecd56855df..8f3b1237204b 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -1323,7 +1323,8 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
             m_aProps.setTitle( aOldTitle );
             m_aProps.setName ( aOldName );
 
-            aOldTitle = aOldName = "";
+            aOldTitle.clear();
+            aOldName.clear();
 
             // Set error .
             aRet[ nTitlePos ] <<= uno::Exception(
@@ -1804,7 +1805,7 @@ void HierarchyContent::transfer(
 
             ucb::TransferInfo aInfo;
             aInfo.MoveData  = sal_False;
-            aInfo.NewTitle  = "";
+            aInfo.NewTitle.clear();
             aInfo.SourceURL = aChildId;
             aInfo.NameClash = rInfo.NameClash;
 
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index 774a45be8131..0cd59ac93c29 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -292,7 +292,7 @@ bool HierarchyEntry::setData(
             uno::Sequence< uno::Any > aArguments( 1 );
             beans::PropertyValue      aProperty;
 
-            aProperty.Name    = OUString( CFGPROPERTY_NODEPATH  );
+            aProperty.Name    = CFGPROPERTY_NODEPATH;
             aProperty.Value <<= aParentPath;
             aArguments[ 0 ] <<= aProperty;
 
@@ -556,7 +556,7 @@ bool HierarchyEntry::move(
         uno::Sequence< uno::Any > aArguments( 1 );
         beans::PropertyValue      aProperty;
 
-        aProperty.Name  = OUString( CFGPROPERTY_NODEPATH  );
+        aProperty.Name  = CFGPROPERTY_NODEPATH;
         aProperty.Value <<= aOldParentPath;
         aArguments[ 0 ] <<= aProperty;
 
@@ -580,7 +580,7 @@ bool HierarchyEntry::move(
         {
             bDifferentParents = true;
 
-            aProperty.Name    = OUString( CFGPROPERTY_NODEPATH  );
+            aProperty.Name    = CFGPROPERTY_NODEPATH;
             aProperty.Value <<= aNewParentPath;
             aArguments[ 0 ] <<= aProperty;
 
@@ -817,7 +817,7 @@ bool HierarchyEntry::remove()
             uno::Sequence< uno::Any > aArguments( 1 );
             beans::PropertyValue      aProperty;
 
-            aProperty.Name    = OUString( CFGPROPERTY_NODEPATH  );
+            aProperty.Name    = CFGPROPERTY_NODEPATH;
             aProperty.Value <<= aParentPath;
             aArguments[ 0 ] <<= aProperty;
 
@@ -1056,8 +1056,7 @@ HierarchyEntry::getRootReadAccess()
 
                     uno::Sequence< uno::Any > aArguments( 1 );
                     beans::PropertyValue      aProperty;
-                    aProperty.Name = OUString(
-                         CFGPROPERTY_NODEPATH  );
+                    aProperty.Name = CFGPROPERTY_NODEPATH;
                     aProperty.Value <<= OUString(); // root path
                     aArguments[ 0 ] <<= aProperty;
 
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index 6355d86d99de..7a107c1e7b29 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -106,7 +106,7 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider,
 
 XSERVICEINFO_IMPL_1_CTX( HierarchyContentProvider,
                      OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ),
-                     OUString( HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME ) );
+                     HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME );
 
 
 
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
index b5964c722053..0c4b25957114 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
@@ -50,7 +50,9 @@ void HierarchyUri::init() const
     if ( !m_aUri.isEmpty() && m_aPath.isEmpty() )
     {
         // Note: Maybe it's a re-init, setUri only resets m_aPath!
-        m_aService = m_aParentUri = m_aName = "";
+        m_aService.clear();
+        m_aParentUri.clear();
+        m_aName.clear();
 
         // URI must match at least: <sheme>:
         if ( ( m_aUri.getLength() < HIERARCHY_URL_SCHEME_LENGTH + 1 ) )
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index c91b3d3c0d53..d51af504df8e 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -229,7 +229,7 @@ Content* Content::create(
 OUString Content::getContentType(
     const OUString& aScheme, bool bFolder )
 {
-    return ( OUString("application/")
+    return ( "application/"
              + aScheme
              + ( bFolder
                  ? OUString("-folder")
@@ -1390,7 +1390,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
         else
         {
             // Do not set new title!
-            aNewTitle = "";
+            aNewTitle.clear();
 
             // Set error .
             aRet[ nTitlePos ] <<= uno::Exception(
@@ -2040,7 +2040,7 @@ void Content::transfer(
 
                     ucb::TransferInfo aInfo;
                     aInfo.MoveData  = sal_False;
-                    aInfo.NewTitle  = "";
+                    aInfo.NewTitle.clear();
                     aInfo.SourceURL = aChildId;
                     aInfo.NameClash = rInfo.NameClash;
 
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index c07465810b71..b21f727b5663 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -168,7 +168,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
 
 XSERVICEINFO_IMPL_1_CTX( ContentProvider,
                      OUString( "com.sun.star.comp.ucb.PackageContentProvider" ),
-                     OUString( PACKAGE_CONTENT_PROVIDER_SERVICE_NAME ) );
+                     PACKAGE_CONTENT_PROVIDER_SERVICE_NAME );
 
 
 
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 910fe4f694aa..7ddd1545e0b9 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -1345,7 +1345,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
         {
             // Roll-back.
             m_aProps.setTitle( aOldTitle );
-            aOldTitle = "";
+            aOldTitle.clear();
 
             // Set error .
             aRet[ nTitlePos ] <<= uno::Exception(
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
index bdda0fa5c96b..2318d3af2ddb 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
@@ -96,8 +96,7 @@ DocumentContentFactory::getSupportedServiceNames_Static()
 {
     uno::Sequence< OUString > aSNS( 1 );
     aSNS.getArray()[ 0 ]
-        = OUString(
-            "com.sun.star.frame.TransientDocumentsDocumentContentFactory" );
+        = "com.sun.star.frame.TransientDocumentsDocumentContentFactory";
     return aSNS;
 }
 
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index a21939ec81b9..cce79c3e7ad0 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -112,7 +112,7 @@ XTYPEPROVIDER_IMPL_4( ContentProvider,
 XSERVICEINFO_IMPL_1_CTX(
     ContentProvider,
     OUString( "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ),
-    OUString( TDOC_CONTENT_PROVIDER_SERVICE_NAME ) );
+    TDOC_CONTENT_PROVIDER_SERVICE_NAME );
 
 
 
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 84e479226d7a..ec74be984cd7 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -1879,7 +1879,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             else
             {
                 // Do not set new title!
-                aNewTitle = "";
+                aNewTitle.clear();
 
                 // Set error .
                 aRet[ nTitlePos ] <<= uno::Exception(
@@ -1890,7 +1890,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
         catch ( DAVException const & e )
         {
             // Do not set new title!
-            aNewTitle = "";
+            aNewTitle.clear();
 
             // Set error .
             aRet[ nTitlePos ] <<= MapDAVException( e, true );
@@ -2572,7 +2572,7 @@ void Content::transfer(
         if ( aTitle == "/" )
         {
             // kso: ???
-            aTitle = "";
+            aTitle.clear();
         }
 
         targetURI.AppendPath( aTitle );
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
index bdaa4d071466..1a8b91be4f17 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
@@ -109,7 +109,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
 
 XSERVICEINFO_IMPL_1_CTX( ContentProvider,
                      OUString( "com.sun.star.comp.WebDAVContentProvider" ),
-                     OUString( WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ) );
+                     WEBDAV_CONTENT_PROVIDER_SERVICE_NAME );