loplugin:stringconstant: elide explicit ctor usage (automatic rewrite)

Change-Id: Ifb9832022c92cc9996000d0515e81c53c36bfae8

15 files changed, 93 insertions, 94 deletions

diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 3dffc8d5bbbd..1b6c9bb406ff 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -309,7 +309,7 @@ void OFileAccess::kill( const OUString& FileURL )
     ucbhelper::Content aCnt( aDeleteObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
     try
     {
-        aCnt.executeCommand( OUString("delete" ), makeAny( true ) );
+        aCnt.executeCommand( "delete", makeAny( true ) );
     }
     catch ( ::com::sun::star::ucb::CommandFailedException const & )
     {
@@ -594,7 +594,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL )
 
     try
     {
-        aCnt.executeCommand( OUString("open" ), aCmdArg );
+        aCnt.executeCommand( "open", aCmdArg );
     }
     catch ( InteractiveIOException const & e )
     {
@@ -612,7 +612,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL )
             aInsertArg.ReplaceExisting = sal_False;
 
             aCmdArg <<= aInsertArg;
-            aCnt.executeCommand( OUString("insert" ), aCmdArg );
+            aCnt.executeCommand( "insert", aCmdArg );
 
             // Retry...
             return openFileReadWrite( FileURL );
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 935ba2faf4fc..67b3662acf9c 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -544,7 +544,7 @@ uno::Reference< ucb::XContent > createNew(
             ucb::IOErrorCode_CANT_CREATE,
             uno::Sequence< uno::Any >(&aProps, 1),
             rContext.xOrigEnv,
-            OUString("Target is no XCommandProcessor!"),
+            "Target is no XCommandProcessor!",
             rContext.xProcessor );
         // Unreachable
     }
@@ -595,7 +595,7 @@ uno::Reference< ucb::XContent > createNew(
                 ucb::IOErrorCode_CANT_CREATE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 rContext.xOrigEnv,
-                OUString("Target is no XContentCreator!"),
+                "Target is no XContentCreator!",
                 rContext.xProcessor );
             // Unreachable
         }
@@ -616,7 +616,7 @@ uno::Reference< ucb::XContent > createNew(
             ucb::IOErrorCode_CANT_CREATE,
             uno::Sequence< uno::Any >(&aProps, 1),
             rContext.xOrigEnv,
-            OUString("No types creatable!"),
+            "No types creatable!",
             rContext.xProcessor );
         // Unreachable
     }
@@ -730,7 +730,7 @@ uno::Reference< ucb::XContent > createNew(
                     ucb::IOErrorCode_CANT_CREATE,
                     uno::Sequence< uno::Any >(&aProps, 1),
                     rContext.xOrigEnv,
-                    OUString( "createNewContent failed!" ),
+                    "createNewContent failed!",
                     rContext.xProcessor );
                 // Unreachable
             }
@@ -769,7 +769,7 @@ void transferProperties(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             rContext.xOrigEnv,
-            OUString( "Unable to get propertyset info from source object!" ),
+            "Unable to get propertyset info from source object!",
             rContext.xProcessor );
         // Unreachable
     }
@@ -797,7 +797,7 @@ void transferProperties(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             rContext.xOrigEnv,
-            OUString( "Unable to get properties from source object!" ),
+            "Unable to get properties from source object!",
             rContext.xProcessor );
         // Unreachable
     }
@@ -1067,7 +1067,7 @@ void handleNameClashRename(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >( &aProps2, 1 ),
             rContext.xOrigEnv,
-            OUString( "Unable to get properties from new object!" ),
+            "Unable to get properties from new object!",
             rContext.xProcessor );
         // Unreachable
     }
@@ -1156,7 +1156,7 @@ void handleNameClashRename(
                             ucb::IOErrorCode_CANT_READ,
                             uno::Sequence< uno::Any >( &aProps2, 1 ),
                             rContext.xOrigEnv,
-                            OUString( "Got no data stream from source!" ),
+                            "Got no data stream from source!",
                             rContext.xProcessor );
                         // Unreachable
                     }
@@ -1261,7 +1261,7 @@ void globalTransfer_(
             ucb::IOErrorCode_CANT_CREATE,
             uno::Sequence< uno::Any >(&aProps, 1),
             rContext.xOrigEnv,
-            OUString( "No matching content type at target!" ),
+            "No matching content type at target!",
             rContext.xProcessor );
         // Unreachable
     }
@@ -1288,7 +1288,7 @@ void globalTransfer_(
             ucb::IOErrorCode_CANT_WRITE,
             uno::Sequence< uno::Any >(&aProps, 1),
             rContext.xOrigEnv,
-            OUString( "New content is not a XCommandProcessor!" ),
+            "New content is not a XCommandProcessor!",
             rContext.xProcessor );
         // Unreachable
     }
@@ -1309,7 +1309,7 @@ void globalTransfer_(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             rContext.xOrigEnv,
-            OUString( "Source content is not a XCommandProcessor!" ),
+            "Source content is not a XCommandProcessor!",
             rContext.xProcessor );
         // Unreachable
     }
@@ -1565,7 +1565,7 @@ void globalTransfer_(
                     ucb::IOErrorCode_CANT_READ,
                     uno::Sequence< uno::Any >(&aProps, 1),
                     rContext.xOrigEnv,
-                    OUString( "Unable to get properties from children of source!" ),
+                    "Unable to get properties from children of source!",
                     rContext.xProcessor );
                 // Unreachable
             }
@@ -1586,7 +1586,7 @@ void globalTransfer_(
                     ucb::IOErrorCode_CANT_READ,
                     uno::Sequence< uno::Any >(&aProps, 1),
                     rContext.xOrigEnv,
-                    OUString( "Unable to get children of source!" ),
+                    "Unable to get children of source!",
                     rContext.xProcessor );
                 // Unreachable
             }
@@ -1729,7 +1729,7 @@ void UniversalContentBroker::globalTransfer(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            OUString( "Can't instanciate target object!" ),
+            "Can't instanciate target object!",
             this );
         // Unreachable
     }
@@ -1752,7 +1752,7 @@ void UniversalContentBroker::globalTransfer(
                 ucb::IOErrorCode_CANT_READ,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                OUString( "Target content is not a XCommandProcessor!" ),
+                "Target content is not a XCommandProcessor!",
                 this );
             // Unreachable
         }
@@ -1915,7 +1915,7 @@ void UniversalContentBroker::globalTransfer(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            OUString( "Can't instanciate source object!" ),
+            "Can't instanciate source object!",
             this );
         // Unreachable
     }
@@ -1934,7 +1934,7 @@ void UniversalContentBroker::globalTransfer(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            OUString( "Source content is not a XCommandProcessor!" ),
+            "Source content is not a XCommandProcessor!",
             this );
         // Unreachable
     }
@@ -1972,7 +1972,7 @@ void UniversalContentBroker::globalTransfer(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps2, 1),
             xEnv,
-            OUString( "Unable to get properties from source object!" ),
+            "Unable to get properties from source object!",
             this );
         // Unreachable
     }
@@ -2060,7 +2060,7 @@ uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg,
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >( &aProps, 1 ),
             xEnv,
-            OUString( "Can't instanciate target object!" ),
+            "Can't instanciate target object!",
             this );
         // Unreachable
     }
@@ -2079,7 +2079,7 @@ uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg,
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >( &aProps, 1 ),
             xEnv,
-            OUString( "Target content is not a XCommandProcessor!" ),
+            "Target content is not a XCommandProcessor!",
             this );
         // Unreachable
     }
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index c50460543db7..6da4cd9881b1 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -407,7 +407,7 @@ namespace cmis
                         ucb::IOErrorCode_INVALID_DEVICE,
                         generateErrorArguments(m_aURL),
                         xEnv,
-                        OUString("error accessing a repository"));
+                        "error accessing a repository");
                 }
                 else
                 {
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 78b9dff1aa68..2cf091522e7c 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -216,7 +216,7 @@ namespace cmis
                                     ucb::IOErrorCode_ABORT,
                                     uno::Sequence< uno::Any >( 0 ),
                                     xEnv,
-                                    OUString( "Authentication cancelled" ) );
+                                    "Authentication cancelled" );
             }
         }
     }
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 0ba144f38e97..10e60ded83dd 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -273,7 +273,7 @@ namespace ucb { namespace ucp { namespace ext
             {
                 const OUString sPhysicalContentURL( getPhysicalURL() );
                 ::ucbhelper::Content aRequestedContent( sPhysicalContentURL, i_rEvironment, m_xContext );
-                aRet = aRequestedContent.executeCommand( OUString(  "open"  ), makeAny( aOpenCommand ) );
+                aRet = aRequestedContent.executeCommand( "open", makeAny( aOpenCommand ) );
             }
         }
 
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index b9c54218686b..72267c3b9d97 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -367,7 +367,7 @@ namespace fileaccess {
                 ioErrorCode,
                 generateErrorArguments(aUncPath),
                 xEnv,
-                OUString( "an error occurred during file opening"),
+                "an error occurred during file opening",
                 xComProc);
         }
         else if( errorCode == TASKHANDLING_OPEN_FOR_DIRECTORYLISTING  ||
@@ -420,7 +420,7 @@ namespace fileaccess {
                 ioErrorCode,
                 generateErrorArguments(aUncPath),
                 xEnv,
-                OUString( "an error occurred during opening a directory"),
+                "an error occurred during opening a directory",
                 xComProc);
         }
         else if( errorCode == TASKHANDLING_NOTCONNECTED_FOR_WRITE          ||
@@ -435,7 +435,7 @@ namespace fileaccess {
                 ioErrorCode,
                 generateErrorArguments(aUncPath),
                 xEnv,
-                OUString( "an error occurred writing or reading from a file"),
+                "an error occurred writing or reading from a file",
                 xComProc );
         }
         else if( errorCode == TASKHANDLING_FILEIOERROR_FOR_NO_SPACE )
@@ -445,7 +445,7 @@ namespace fileaccess {
                 ioErrorCode,
                 generateErrorArguments(aUncPath),
                 xEnv,
-                OUString( "device full"),
+                "device full",
                 xComProc);
         }
         else if( errorCode == TASKHANDLING_FILEIOERROR_FOR_WRITE ||
@@ -497,7 +497,7 @@ namespace fileaccess {
                 ioErrorCode,
                 generateErrorArguments(aUncPath),
                 xEnv,
-                OUString( "an error occurred during opening a file"),
+                "an error occurred during opening a file",
                 xComProc);
         }
         else if( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND ||
@@ -535,7 +535,7 @@ namespace fileaccess {
                 ioErrorCode,
                 generateErrorArguments(aUncPath),
                 xEnv,
-                OUString( "there were problems with the filesize"),
+                "there were problems with the filesize",
                 xComProc);
         }
         else if(errorCode == TASKHANDLING_INPUTSTREAM_FOR_WRITE)
@@ -635,7 +635,7 @@ namespace fileaccess {
                 generateErrorArguments(getParentName(aUncPath)),
                 //TODO! ok to supply physical URL to getParentName()?
                 xEnv,
-                OUString( "a folder could not be created"),
+                "a folder could not be created",
                 xComProc  );
         }
         else if( errorCode == TASKHANDLING_VALIDFILESTATUSWHILE_FOR_REMOVE  ||
@@ -686,7 +686,7 @@ namespace fileaccess {
                 ioErrorCode,
                 generateErrorArguments(aUncPath),
                 xEnv,
-                OUString( "a file status object could not be filled"),
+                "a file status object could not be filled",
                 xComProc  );
         }
         else if( errorCode == TASKHANDLING_DELETEFILE_FOR_REMOVE  ||
@@ -733,7 +733,7 @@ namespace fileaccess {
                 ioErrorCode,
                 generateErrorArguments(aUncPath),
                 xEnv,
-                OUString( "a file or directory could not be deleted"),
+                "a file or directory could not be deleted",
                 xComProc );
         }
         else if( errorCode == TASKHANDLING_TRANSFER_BY_COPY_SOURCE         ||
@@ -783,7 +783,7 @@ namespace fileaccess {
                 ioErrorCode,
                 generateErrorArguments(aUncPath),
                 xEnv,
-                OUString( "accessing the root during transfer"),
+                "accessing the root during transfer",
                 xComProc );
         }
         else if( errorCode == TASKHANDLING_TRANSFER_INVALIDSCHEME )
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 8fb30a4af342..98e7ea5d1d46 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -203,7 +203,7 @@ Reference<XContent> SAL_CALL FTPContentProvider::queryContent(
                     this);
 
         if(!m_pProxyDecider->shouldUseProxy(
-            OUString("ftp"),
+            "ftp",
             aURL.host(),
             aURL.port().toInt32()))
         {
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 0d84c4ee8a1e..7fcb46c566f5 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -494,7 +494,7 @@ uno::Any SAL_CALL HierarchyContent::execute(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 Environment,
-                OUString( "Cannot remove persistent data!" ),
+                "Cannot remove persistent data!",
                 this );
             // Unreachable
         }
@@ -1361,7 +1361,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
                     ucb::IOErrorCode_CANT_WRITE,
                     uno::Sequence< uno::Any >(&aProps, 1),
                     xEnv,
-                    OUString( "Cannot store persistent data!" ),
+                    "Cannot store persistent data!",
                     this );
                 // Unreachable
             }
@@ -1509,7 +1509,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
             ucb::IOErrorCode_CANT_WRITE,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            OUString("Cannot store persistent data!"),
+            "Cannot store persistent data!",
             this );
         // Unreachable
     }
@@ -1633,7 +1633,7 @@ void HierarchyContent::transfer(
                 ucb::IOErrorCode_RECURSIVE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                OUString( "Target is equal to or is a child of source!" ),
+                "Target is equal to or is a child of source!",
                 this );
             // Unreachable
         }
@@ -1672,7 +1672,7 @@ void HierarchyContent::transfer(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            OUString( "Cannot instanciate source object!" ),
+            "Cannot instanciate source object!",
             this );
         // Unreachable
     }
@@ -1705,7 +1705,7 @@ void HierarchyContent::transfer(
             ucb::IOErrorCode_CANT_CREATE,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            OUString( "XContentCreator::createNewContent failed!" ),
+            "XContentCreator::createNewContent failed!",
             this );
         // Unreachable
     }
@@ -1837,7 +1837,7 @@ void HierarchyContent::transfer(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                OUString( "Cannot remove persistent data of source object!" ),
+                "Cannot remove persistent data of source object!",
                 this );
             // Unreachable
         }
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
index 03c10dc22d24..196992db664e 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
@@ -100,7 +100,7 @@ void HierarchyUri::init() const
                 m_aUri = m_aUri.replaceAt(
                             HIERARCHY_URL_SCHEME_LENGTH + 2,
                             0,
-                            OUString( "/" DEFAULT_DATA_SOURCE_SERVICE "/"  ) );
+                            "/" DEFAULT_DATA_SOURCE_SERVICE "/" );
                 m_aService = DEFAULT_DATA_SOURCE_SERVICE;
 
                 nPos
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 42da2162a4fc..ecdbe2d34af0 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -591,7 +591,7 @@ uno::Any SAL_CALL Content::execute(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 Environment,
-                OUString( "Cannot remove persistent data!" ),
+                "Cannot remove persistent data!",
                 this );
             // Unreachable
         }
@@ -663,7 +663,7 @@ uno::Any SAL_CALL Content::execute(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 Environment,
-                OUString( "Cannot write file to disk!" ),
+                "Cannot write file to disk!",
                 this );
             // Unreachable
         }
@@ -1430,8 +1430,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                     ucb::IOErrorCode_CANT_WRITE,
                     uno::Sequence< uno::Any >(&aProps, 1),
                     xEnv,
-                    OUString(
-                        "Cannot store persistent data!" ),
+                    "Cannot store persistent data!",
                     this );
                 // Unreachable
             }
@@ -1506,7 +1505,7 @@ uno::Any Content::open(
                     m_eState == PERSISTENT
                         ? xEnv
                         : uno::Reference< ucb::XCommandEnvironment >(),
-                    OUString("Got no data stream!"),
+                    "Got no data stream!",
                     this );
                 // Unreachable
             }
@@ -1566,7 +1565,7 @@ uno::Any Content::open(
                             ? xEnv
                             : uno::Reference<
                                   ucb::XCommandEnvironment >(),
-                        OUString( "Got no data stream!" ),
+                        "Got no data stream!",
                         this );
                     // Unreachable
                 }
@@ -1732,7 +1731,7 @@ void Content::insert(
             ucb::IOErrorCode_CANT_WRITE,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            OUString("Cannot store persistent data!"),
+            "Cannot store persistent data!",
             this );
         // Unreachable
     }
@@ -1849,7 +1848,7 @@ void Content::transfer(
                 ucb::IOErrorCode_RECURSIVE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                OUString( "Target is equal to or is a child of source!" ),
+                "Target is equal to or is a child of source!",
                 this );
             // Unreachable
         }
@@ -1888,7 +1887,7 @@ void Content::transfer(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            OUString( "Cannot instanciate source object!" ),
+            "Cannot instanciate source object!",
             this );
         // Unreachable
     }
@@ -1920,7 +1919,7 @@ void Content::transfer(
             ucb::IOErrorCode_CANT_CREATE,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            OUString( "XContentCreator::createNewContent failed!" ),
+            "XContentCreator::createNewContent failed!",
             this );
         // Unreachable
     }
@@ -2079,7 +2078,7 @@ void Content::transfer(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                OUString( "Cannot remove persistent data of source object!" ),
+                "Cannot remove persistent data of source object!",
                 this );
             // Unreachable
         }
diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx
index 306c0f67bd97..a013056413b3 100644
--- a/ucb/source/ucp/package/pkguri.cxx
+++ b/ucb/source/ucp/package/pkguri.cxx
@@ -187,8 +187,8 @@ void PackageUri::init() const
                 if ( m_aPath.indexOf( "//" ) != -1
                   || m_aPath.indexOf( "%2F" ) != -1
                   || m_aPath.indexOf( "%2f" ) != -1
-                  || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, OUString( ".." ) )
-                  || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, OUString( "." ) ) )
+                  || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, ".." )
+                  || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, "." ) )
                 {
                     // error, but remember that we did a init().
                     m_aPath = "/";
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 7b48aa015e96..19d4247dc82c 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -558,7 +558,7 @@ uno::Any SAL_CALL Content::execute(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 Environment,
-                OUString( "Cannot remove persistent data!" ),
+                "Cannot remove persistent data!",
                 this );
             // Unreachable
         }
@@ -1382,7 +1382,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                     ucb::IOErrorCode_CANT_WRITE,
                     uno::Sequence< uno::Any >(&aProps, 1),
                     xEnv,
-                    OUString( "Cannot store persistent data!" ),
+                    "Cannot store persistent data!",
                     this );
                 // Unreachable
             }
@@ -1459,7 +1459,7 @@ uno::Any Content::open(
                     m_eState == PERSISTENT
                         ? xEnv
                         : uno::Reference< ucb::XCommandEnvironment >(),
-                    OUString( "Got no data stream!" ),
+                    "Got no data stream!",
                     this );
                 // Unreachable
             }
@@ -1493,7 +1493,7 @@ uno::Any Content::open(
                         m_eState == PERSISTENT
                             ? xEnv
                             : uno::Reference< ucb::XCommandEnvironment >(),
-                        OUString("Got no data stream!"),
+                        "Got no data stream!",
                         this );
                     // Unreachable
                 }
@@ -1554,7 +1554,7 @@ uno::Any Content::open(
                                 ? xEnv
                                 : uno::Reference<
                                       ucb::XCommandEnvironment >(),
-                            OUString( "Got no data stream!" ),
+                            "Got no data stream!",
                             this );
                         // Unreachable
                     }
@@ -1737,7 +1737,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData,
             ucb::IOErrorCode_CANT_WRITE,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            OUString("Cannot store persistent data!"),
+            "Cannot store persistent data!",
             this );
         // Unreachable
     }
@@ -1996,7 +1996,7 @@ void Content::transfer(
                 ucb::IOErrorCode_RECURSIVE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                OUString( "Target is equal to or is a child of source!" ),
+                "Target is equal to or is a child of source!",
                 this );
             // Unreachable
         }
@@ -2078,7 +2078,7 @@ void Content::transfer(
             ucb::IOErrorCode_CANT_WRITE,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            OUString( "Cannot copy data!"  ),
+            "Cannot copy data!",
             this );
         // Unreachable
     }
@@ -2110,7 +2110,7 @@ void Content::transfer(
             ucb::IOErrorCode_CANT_WRITE,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            OUString( "Cannot copy additional properties!"  ),
+            "Cannot copy additional properties!",
             this );
         // Unreachable
     }
@@ -2148,7 +2148,7 @@ void Content::transfer(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            OUString( "Cannot instanciate target object!" ),
+            "Cannot instanciate target object!",
             this );
         // Unreachable
     }
@@ -2190,7 +2190,7 @@ void Content::transfer(
                 ucb::IOErrorCode_CANT_READ,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                OUString( "Cannot instanciate target object!" ),
+                "Cannot instanciate target object!",
                 this );
             // Unreachable
         }
@@ -2212,7 +2212,7 @@ void Content::transfer(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                OUString( "Cannot remove persistent data of source object!" ),
+                "Cannot remove persistent data of source object!",
                 this );
             // Unreachable
         }
@@ -2231,7 +2231,7 @@ void Content::transfer(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                OUString( "Cannot remove additional properties of source object!" ),
+                "Cannot remove additional properties of source object!",
                 this );
             // Unreachable
         }
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index a2ce660093c3..2fa569d011d7 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -1037,7 +1037,7 @@ Content::queryCreatableContentsInfo()
 
     beans::Property aProp;
     m_pProvider->getProperty(
-        OUString(  "Title"  ), aProp );
+        "Title", aProp );
 
     uno::Sequence< beans::Property > aDocProps( 1 );
     aDocProps.getArray()[ 0 ] = aProp;
@@ -1454,7 +1454,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             //xProps.reset(
             //    new ContentProperties( aUnescapedTitle ) );
             xProps->addProperty(
-                OUString(  "Title"  ),
+                "Title",
                 uno::makeAny( aUnescapedTitle ),
                 true );
         }
@@ -1464,16 +1464,16 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                 xProps.reset( new ContentProperties( aUnescapedTitle, false ) );
             else
                 xProps->addProperty(
-                    OUString(  "Title"  ),
+                    "Title",
                     uno::makeAny( aUnescapedTitle ),
                     true );
 
             xProps->addProperty(
-                OUString(  "IsFolder"  ),
+                "IsFolder",
                 uno::makeAny( false ),
                 true );
             xProps->addProperty(
-                OUString(  "IsDocument"  ),
+                "IsDocument",
                 uno::makeAny( true ),
                 true );
         }
@@ -1495,7 +1495,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
         {
             // Add BaseURI property, if requested.
             xProps->addProperty(
-                 OUString(  "BaseURI"  ),
+                 "BaseURI",
                  uno::makeAny( getBaseURI( xResAccess ) ),
                  true );
         }
@@ -1504,10 +1504,10 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             // Add CreatableContentsInfo property, if requested.
             bool bFolder = false;
             xProps->getValue(
-                OUString(  "IsFolder"  ) )
+                "IsFolder" )
                     >>= bFolder;
             xProps->addProperty(
-                OUString( "CreatableContentsInfo"  ),
+                "CreatableContentsInfo",
                 uno::makeAny( bFolder
                                   ? queryCreatableContentsInfo()
                                   : uno::Sequence< ucb::ContentInfo >() ),
@@ -2524,22 +2524,22 @@ void Content::transfer(
         if ( aScheme == WEBDAV_URL_SCHEME )
         {
             sourceURI.SetScheme(
-                OUString( HTTP_URL_SCHEME ) );
+                HTTP_URL_SCHEME );
         }
         else if ( aScheme == WEBDAVS_URL_SCHEME )
         {
             sourceURI.SetScheme(
-                OUString( HTTPS_URL_SCHEME ) );
+                HTTPS_URL_SCHEME );
         }
         else if ( aScheme == DAV_URL_SCHEME )
         {
             sourceURI.SetScheme(
-                OUString( HTTP_URL_SCHEME ) );
+                HTTP_URL_SCHEME );
         }
         else if ( aScheme == DAVS_URL_SCHEME )
         {
             sourceURI.SetScheme(
-                OUString( HTTPS_URL_SCHEME ) );
+                HTTPS_URL_SCHEME );
         }
         else
         {
@@ -2558,16 +2558,16 @@ void Content::transfer(
         aScheme = targetURI.GetScheme().toAsciiLowerCase();
         if ( aScheme == WEBDAV_URL_SCHEME )
             targetURI.SetScheme(
-                OUString( HTTP_URL_SCHEME ) );
+                HTTP_URL_SCHEME );
         else if ( aScheme == WEBDAVS_URL_SCHEME )
             targetURI.SetScheme(
-                OUString( HTTPS_URL_SCHEME ) );
+                HTTPS_URL_SCHEME );
         else if ( aScheme == DAV_URL_SCHEME )
             targetURI.SetScheme(
-                OUString( HTTP_URL_SCHEME ) );
+                HTTP_URL_SCHEME );
         else if ( aScheme == DAVS_URL_SCHEME )
             targetURI.SetScheme(
-                OUString( HTTPS_URL_SCHEME ) );
+                HTTPS_URL_SCHEME );
 
         // @@@ This implementation of 'transfer' only works
         //     if the source and target are located at same host.
@@ -3403,7 +3403,7 @@ Content::getBaseURI( const std::unique_ptr< DAVResourceAccess > & rResAccess )
     if ( m_xCachedProps.get() )
     {
         OUString aLocation;
-        m_xCachedProps->getValue( OUString( "Content-Location"  ) ) >>= aLocation;
+        m_xCachedProps->getValue( "Content-Location" ) >>= aLocation;
         if ( !aLocation.isEmpty() )
         {
             try
diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
index 321374925628..44510d034369 100644
--- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
@@ -442,7 +442,7 @@ bool DataSupplier::getData()
 
                             const uno::Any & rValue
                                 = pContentProperties->getValue(
-                                    OUString( "IsFolder"  ) );
+                                    "IsFolder" );
                             rValue >>= bFolder;
 
                             if ( !bFolder )
@@ -457,7 +457,7 @@ bool DataSupplier::getData()
 
                             const uno::Any & rValue
                                 = pContentProperties->getValue(
-                                    OUString( "IsDocument"  ) );
+                                    "IsDocument" );
                             rValue >>= bDocument;
 
                             if ( !bDocument )
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
index 1f671145aabf..ce86fc0854de 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
@@ -159,28 +159,28 @@ ContentProvider::queryContent(
     {
         aURL = aURL.replaceAt( 0,
                                WEBDAV_URL_SCHEME_LENGTH,
-                               OUString( HTTP_URL_SCHEME ) );
+                               HTTP_URL_SCHEME );
         bNewId = true;
     }
     else if ( aScheme == WEBDAVS_URL_SCHEME )
     {
         aURL = aURL.replaceAt( 0,
                                WEBDAVS_URL_SCHEME_LENGTH,
-                               OUString( HTTPS_URL_SCHEME ) );
+                               HTTPS_URL_SCHEME );
         bNewId = true;
     }
     else if ( aScheme == DAV_URL_SCHEME )
     {
         aURL = aURL.replaceAt( 0,
                                DAV_URL_SCHEME_LENGTH,
-                               OUString( HTTP_URL_SCHEME ) );
+                               HTTP_URL_SCHEME );
         bNewId = true;
     }
     else if ( aScheme == DAVS_URL_SCHEME )
     {
         aURL = aURL.replaceAt( 0,
                                DAVS_URL_SCHEME_LENGTH,
-                               OUString( HTTPS_URL_SCHEME ) );
+                               HTTPS_URL_SCHEME );
         bNewId = true;
     }