xmlhelp: Use appropriate OUString functions on string constants

Change-Id: I8642ec147cb0dca32dce7ec7f3efec93bcb99cb4

6 files changed, 23 insertions, 33 deletions

diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 56c122aa2a3a..a2282721c736 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -293,7 +293,7 @@ OString Databases::getImagesZipFileURL()
                 bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images.zip" ), aImageZip );
 
             if ( ! bFound )
-                aImageZip = "";
+                aImageZip.clear();
 
             m_aImagesZipFileURL = OUStringToOString(
                         rtl::Uri::encode(
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 1dcc86a163d4..0aa8584613d0 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -159,12 +159,8 @@ uno::Sequence< OUString >
 ContentProvider::getSupportedServiceNames_Static()
 {
     uno::Sequence< OUString > aSNS( 2 );
-    aSNS.getArray()[ 0 ] =
-        OUString(
-            MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 );
-    aSNS.getArray()[ 1 ] =
-        OUString(
-            MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 );
+    aSNS.getArray()[ 0 ] = MYUCP_CONTENT_PROVIDER_SERVICE_NAME1;
+    aSNS.getArray()[ 1 ] = MYUCP_CONTENT_PROVIDER_SERVICE_NAME2;
 
     return aSNS;
 }
@@ -327,10 +323,7 @@ void ContentProvider::init()
     {
     }
 
-    OUString productversion(
-        setupversion +
-        OUString( " " ) +
-        setupextension );
+    OUString productversion( setupversion + " " + setupextension );
 
     uno::Sequence< OUString > aImagesZipPaths( 2 );
     xHierAccess = getHierAccess( sProvider,  "org.openoffice.Office.Common" );
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 5656b5f92634..dbb3cea9ed81 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -331,10 +331,10 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
     for( m_nRow = 0; sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aPath.size(); ++m_nRow )
     {
         m_aPath[m_nRow] =
-            m_aPath[m_nRow]                         +
-            OUString( "?Language=" )           +
-            m_aURLParameter.get_language()          +
-            OUString( "&System=" )             +
+            m_aPath[m_nRow] +
+            "?Language=" +
+            m_aURLParameter.get_language() +
+            "&System=" +
             m_aURLParameter.get_system();
 
         uno::Reference< XContent > content = queryContent();
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
index a9cdba8ea434..c269d579da86 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
@@ -52,11 +52,11 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext
     for( sal_uInt32 i = 0; i < m_aPath.size(); ++i )
     {
         m_aPath[i] =
-            OUString( "vnd.sun.star.help://" ) +
-            m_aPath[i]                              +
-            OUString( "?Language=" )           +
-            m_aURLParameter.get_language()          +
-            OUString( "&System=" )             +
+            "vnd.sun.star.help://" +
+            m_aPath[i] +
+            "?Language=" +
+            m_aURLParameter.get_language() +
+            "&System=" +
             m_aURLParameter.get_system();
 
         m_nRow = sal_Int32( i );
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index b0a7b2372365..08cdee89b449 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -610,7 +610,7 @@ bool URLParameter::query()
         if( delimIdx == -1 )
         {
             value = query_.copy( equalIdx + 1 ).trim();
-            query_ = "";
+            query_.clear();
         }
         else
         {
@@ -635,7 +635,7 @@ bool URLParameter::query()
             if( m_aQuery.isEmpty() )
                 m_aQuery = value;
             else
-                m_aQuery += ( OUString( " " ) + value );
+                m_aQuery += " " + value;
         }
         else if( parameter == "Scope" )
             m_aScope = value;
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index fd9a809d0f16..c43ba25b8fbe 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -241,8 +241,7 @@ TVRead::TVRead( const ConfigData& configData,TVDom* tvDom )
     {
         TargetURL = ( tvDom->getTargetURL() + configData.appendix );
         if( !tvDom->anchor.isEmpty() )
-            TargetURL += ( OUString( "#" ) +
-                           tvDom->anchor );
+            TargetURL += "#" + tvDom->anchor;
     }
     else
         Children = new TVChildTarget( configData,tvDom );
@@ -665,9 +664,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext )
     {
     }
 
-    OUString productVersion( setupversion +
-                                  OUString( " " ) +
-                                  setupextension );
+    OUString productVersion( setupversion + " " + setupextension );
     OUString locale( getKey( xHierAccess,"L10N/ooLocale" ) );
 
     // Determine fileurl from url and locale
@@ -762,11 +759,11 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext )
        configData.system = system;
     configData.locale = locale;
     configData.appendix =
-        OUString( "?Language=" ) +
+        "?Language=" +
         configData.locale +
-        OUString( "&System=" ) +
+        "&System=" +
         configData.system +
-        OUString( "&UseDB=no" ) ;
+        "&UseDB=no";
 
     return configData;
 }
@@ -931,7 +928,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
             const Reference< deployment::XPackage > xSubPkg = pSeq[ iPkg ];
             const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xSubPkg->getPackageType();
             OUString aMediaType = xPackageTypeInfo->getMediaType();
-            if( aMediaType.equals( aHelpMediaType ) )
+            if( aMediaType == aHelpMediaType )
             {
                 xHelpPackage = xSubPkg;
                 o_xParentPackageBundle = xPackage;
@@ -943,7 +940,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
     {
         const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xPackage->getPackageType();
         OUString aMediaType = xPackageTypeInfo->getMediaType();
-        if( aMediaType.equals( aHelpMediaType ) )
+        if( aMediaType == aHelpMediaType )
             xHelpPackage = xPackage;
     }
 
@@ -1184,7 +1181,7 @@ OUString TreeFileIterator::implGetTreeFileFromPackage
     if( m_xSFA->exists( aRetFile ) )
         rnFileSize = m_xSFA->getSize( aRetFile );
     else
-        aRetFile = "";
+        aRetFile.clear();
 
     return aRetFile;
 }