Remove more STRINGPARAM macros form dbaccess

Change-Id: I283ccd03dc811dda2f10963f400cd517f42ea7b3
Reviewed-on: https://gerrit.libreoffice.org/1878
Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>

5 files changed, 33 insertions, 44 deletions

diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index bc75824a7171..c7677ca8e471 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -115,27 +115,24 @@ namespace dbaccess
             return true;
         }
 
-        // .........................................................................
-        static const ::rtl::OUString& lcl_getRecoveryDataSubStorageName()
+        static const OUString& lcl_getRecoveryDataSubStorageName()
         {
-            static const ::rtl::OUString s_sRecDataStorName( RTL_CONSTASCII_USTRINGPARAM( "recovery" ) );
+            static const OUString s_sRecDataStorName( "recovery" );
             return s_sRecDataStorName;
         }
-        // .........................................................................
-        static const ::rtl::OUString& lcl_getObjectMapStreamName()
+
+        static const OUString& lcl_getObjectMapStreamName()
         {
-            static const ::rtl::OUString s_sObjectMapStreamName( RTL_CONSTASCII_USTRINGPARAM( "storage-component-map.ini" ) );
+            static const OUString s_sObjectMapStreamName( "storage-component-map.ini" );
             return s_sObjectMapStreamName;
         }
 
-        // .........................................................................
-        static const ::rtl::OUString& lcl_getMapStreamEncodingName()
+        static const OUString& lcl_getMapStreamEncodingName()
         {
-            static const ::rtl::OUString s_sMapStreamEncodingName( RTL_CONSTASCII_USTRINGPARAM( "UTF-8" ) );
+            static const OUString s_sMapStreamEncodingName( "UTF-8" );
             return s_sMapStreamEncodingName;
         }
 
-        // .........................................................................
         static void lcl_writeObjectMap_throw( const ::comphelper::ComponentContext& i_rContext, const Reference< XStorage >& i_rStorage,
             const MapStringToCompDesc& i_mapStorageToCompDesc )
         {
@@ -145,7 +142,7 @@ namespace dbaccess
 
             StorageTextOutputStream aTextOutput( i_rContext, i_rStorage, lcl_getObjectMapStreamName() );
 
-            aTextOutput.writeLine( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "[storages]" ) ) );
+            aTextOutput.writeLine( "[storages]" );
 
             for (   MapStringToCompDesc::const_iterator stor = i_mapStorageToCompDesc.begin();
                     stor != i_mapStorageToCompDesc.end();
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx
index 614c268d4b86..e54aa04d7629 100644
--- a/dbaccess/source/core/recovery/settingsimport.cxx
+++ b/dbaccess/source/core/recovery/settingsimport.cxx
@@ -57,13 +57,11 @@ namespace dbaccess
     {
     }
 
-    //--------------------------------------------------------------------
     oslInterlockedCount SAL_CALL SettingsImport::acquire()
     {
         return osl_atomic_increment( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
     oslInterlockedCount SAL_CALL SettingsImport::release()
     {
         oslInterlockedCount newCount = osl_atomic_decrement( &m_refCount );
@@ -72,29 +70,25 @@ namespace dbaccess
         return newCount;
     }
 
-    //--------------------------------------------------------------------
     void SettingsImport::startElement( const Reference< XAttributeList >& i_rAttributes )
     {
         // find the name of the setting
         if ( i_rAttributes.is() )
         {
-            m_sItemName = i_rAttributes->getValueByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "config:name" ) ) );
-            m_sItemType = i_rAttributes->getValueByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "config:type" ) ) );
+            m_sItemName = i_rAttributes->getValueByName( "config:name" );
+            m_sItemType = i_rAttributes->getValueByName( "config:type" );
         }
     }
 
-    //--------------------------------------------------------------------
     void SettingsImport::endElement()
     {
     }
 
-    //--------------------------------------------------------------------
     void SettingsImport::characters( const ::rtl::OUString& i_rCharacters )
     {
         m_aCharacters.append( i_rCharacters );
     }
 
-    //--------------------------------------------------------------------
     void SettingsImport::split( const ::rtl::OUString& i_rElementName, ::rtl::OUString& o_rNamespace, ::rtl::OUString& o_rLocalName )
     {
         o_rNamespace = ::rtl::OUString();
diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx
index 4ab012706a39..26d5cfab2216 100644
--- a/dbaccess/source/core/recovery/storagetextstream.cxx
+++ b/dbaccess/source/core/recovery/storagetextstream.cxx
@@ -62,9 +62,9 @@ namespace dbaccess
     namespace
     {
         //--------------------------------------------------------------------------------------------------------------
-        static const ::rtl::OUString& lcl_getTextStreamEncodingName()
+        static const OUString& lcl_getTextStreamEncodingName()
         {
-            static const ::rtl::OUString s_sMapStreamEncodingName( RTL_CONSTASCII_USTRINGPARAM( "UTF-8" ) );
+            static const OUString s_sMapStreamEncodingName( "UTF-8" );
             return s_sMapStreamEncodingName;
         }
 
diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx
index 7238b39930e8..8b6dd3bd244f 100644
--- a/dbaccess/source/core/recovery/subcomponentloader.cxx
+++ b/dbaccess/source/core/recovery/subcomponentloader.cxx
@@ -88,7 +88,7 @@ namespace dbaccess
                 if ( i_rData.xDocDefCommands.is() )
                 {
                     Command aCommandOpen;
-                    aCommandOpen.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "show" ) );
+                    aCommandOpen.Name = "show";
 
                     const sal_Int32 nCommandIdentifier = i_rData.xDocDefCommands->createCommandIdentifier();
                     i_rData.xDocDefCommands->execute( aCommandOpen, nCommandIdentifier, NULL );
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index d9129d18644b..3f738336682a 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -90,10 +90,10 @@ namespace dbaccess
         // .........................................................................
         static const ::rtl::OUString& lcl_getComponentStorageBaseName( const SubComponentType i_eType )
         {
-            static const ::rtl::OUString s_sFormBaseName( RTL_CONSTASCII_USTRINGPARAM( "form" ) );
-            static const ::rtl::OUString s_sReportBaseName( RTL_CONSTASCII_USTRINGPARAM( "report" ) );
-            static const ::rtl::OUString s_sTableBaseName( RTL_CONSTASCII_USTRINGPARAM( "table" ) );
-            static const ::rtl::OUString s_sQueryBaseName( RTL_CONSTASCII_USTRINGPARAM( "query" ) );
+            static const OUString s_sFormBaseName( "form" );
+            static const OUString s_sReportBaseName( "report" );
+            static const OUString s_sTableBaseName( "table" );
+            static const OUString s_sQueryBaseName( "query" );
 
             switch ( i_eType )
             {
@@ -176,17 +176,15 @@ namespace dbaccess
             return xCommandProcessor;
         }
 
-        // .........................................................................
-        static const ::rtl::OUString& lcl_getSettingsStreamName()
+        static const OUString& lcl_getSettingsStreamName()
         {
-            static const ::rtl::OUString s_sStatementStreamName( RTL_CONSTASCII_USTRINGPARAM( "settings.xml" ) );
+            static const OUString s_sStatementStreamName( "settings.xml" );
             return s_sStatementStreamName;
         }
 
-        // .........................................................................
-        static const ::rtl::OUString& lcl_getCurrentQueryDesignName()
+        static const OUString& lcl_getCurrentQueryDesignName()
         {
-            static const ::rtl::OUString s_sQuerySettingsName( RTL_CONSTASCII_USTRINGPARAM( "ooo:current-query-design" ) );
+            static const OUString s_sQuerySettingsName( "ooo:current-query-design" );
             return s_sQuerySettingsName;
         }
     }
@@ -249,7 +247,7 @@ namespace dbaccess
     void SettingsExportContext::StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const sal_Bool i_bIgnoreWhitespace )
     {
         if ( i_bIgnoreWhitespace )
-            m_rDelegator.ignorableWhitespace( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) ) );
+            m_rDelegator.ignorableWhitespace( " " );
 
         m_rDelegator.startElement( impl_prefix( i_eName ) );
     }
@@ -258,7 +256,7 @@ namespace dbaccess
     void SettingsExportContext::EndElement( const sal_Bool i_bIgnoreWhitespace )
     {
         if ( i_bIgnoreWhitespace )
-            m_rDelegator.ignorableWhitespace( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) ) );
+            m_rDelegator.ignorableWhitespace( " " );
         m_rDelegator.endElement();
     }
 
@@ -398,11 +396,11 @@ namespace dbaccess
     //--------------------------------------------------------------------
     const ::rtl::OUString SubComponentRecovery::getComponentsStorageName( const SubComponentType i_eType )
     {
-        static const ::rtl::OUString s_sFormsStorageName( RTL_CONSTASCII_USTRINGPARAM( "forms" ) );
-        static const ::rtl::OUString s_sReportsStorageName( RTL_CONSTASCII_USTRINGPARAM( "reports" ) );
-        static const ::rtl::OUString s_sTablesStorageName( RTL_CONSTASCII_USTRINGPARAM( "tables" ) );
-        static const ::rtl::OUString s_sQueriesStorageName( RTL_CONSTASCII_USTRINGPARAM( "queries" ) );
-        static const ::rtl::OUString s_sRelationsStorageName( RTL_CONSTASCII_USTRINGPARAM( "relations" ) );
+        static const OUString s_sFormsStorageName( "forms" );
+        static const OUString s_sReportsStorageName( "reports" );
+        static const OUString s_sTablesStorageName( "tables" );
+        static const OUString s_sQueriesStorageName( "queries" );
+        static const OUString s_sRelationsStorageName( "relations" );
 
         switch ( i_eType )
         {
@@ -487,11 +485,11 @@ namespace dbaccess
         switch ( m_eType )
         {
         case TABLE:
-            m_aCompDesc.bForEditing = sModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.TableDesign" ) );
+            m_aCompDesc.bForEditing = sModuleIdentifier == "com.sun.star.sdb.TableDesign";
             break;
 
         case QUERY:
-            m_aCompDesc.bForEditing = sModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.QueryDesign" ) );
+            m_aCompDesc.bForEditing = sModuleIdentifier == "com.sun.star.sdb.QueryDesign";
             break;
 
         case REPORT:
@@ -534,15 +532,15 @@ namespace dbaccess
         // the latter is updated only upon successful save of the design)
         Reference< XPropertySet > xDesignerProps( m_xComponent, UNO_QUERY_THROW );
         Sequence< PropertyValue > aCurrentQueryDesign;
-        OSL_VERIFY( xDesignerProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CurrentQueryDesign" ) ) ) >>= aCurrentQueryDesign );
+        OSL_VERIFY( xDesignerProps->getPropertyValue( "CurrentQueryDesign" ) >>= aCurrentQueryDesign );
 
         // write the query design
         StorageXMLOutputStream aDesignOutput( m_rContext, i_rObjectStorage, lcl_getSettingsStreamName() );
         SettingsExportContext aSettingsExportContext( m_rContext, aDesignOutput );
 
-        const ::rtl::OUString sWhitespace( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) ) );
+        const OUString sWhitespace( " " );
 
-        aDesignOutput.startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "office:settings" ) ) );
+        aDesignOutput.startElement( "office:settings" );
         aDesignOutput.ignorableWhitespace( sWhitespace );
 
         XMLSettingsExportHelper aSettingsExporter( aSettingsExportContext );