targeted string re-work

Change-Id: I1af89db47fb3e387b5b83a86424bfac44eb28135

11 files changed, 95 insertions, 103 deletions

diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx
index b1d1c3f67f49..f2c1efe21a30 100644
--- a/unotools/source/config/accelcfg.cxx
+++ b/unotools/source/config/accelcfg.cxx
@@ -82,7 +82,7 @@ SvtAcceleratorConfig_Impl::SvtAcceleratorConfig_Impl( Reference< XInputStream >&
         : bModified( false )
 {
     Reference< XParser > xParser( ::comphelper::getProcessServiceFactory()->createInstance(
-                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))),
+                                    ::rtl::OUString("com.sun.star.xml.sax.Parser")),
                                   UNO_QUERY);
 
     // connect stream to input stream to the parser
@@ -102,7 +102,7 @@ bool SvtAcceleratorConfig_Impl::Commit( Reference< XOutputStream >& rOutputStrea
     Reference< XDocumentHandler > xWriter;
 
     xWriter = Reference< XDocumentHandler >( ::comphelper::getProcessServiceFactory()->createInstance(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer"))), UNO_QUERY) ;
+            ::rtl::OUString("com.sun.star.xml.sax.Writer")), UNO_QUERY) ;
 
     Reference< ::com::sun::star::io::XActiveDataSource> xDataSource( xWriter , UNO_QUERY );
     xDataSource->setOutputStream( rOutputStream );
@@ -202,7 +202,7 @@ SvtAcceleratorConfiguration::~SvtAcceleratorConfiguration()
 
 String SvtAcceleratorConfiguration::GetStreamName()
 {
-    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KeyBindings.xml"));
+    return rtl::OUString("KeyBindings.xml");
 }
 
 SvStream* SvtAcceleratorConfiguration::GetDefaultStream( StreamMode nMode )
diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx
index 0c83cb826bfb..b85a04aad06c 100644
--- a/unotools/source/config/itemholder1.cxx
+++ b/unotools/source/config/itemholder1.cxx
@@ -79,7 +79,7 @@ ItemHolder1::ItemHolder1()
     {
         css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
         css::uno::Reference< css::lang::XComponent > xCfg(
-            xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))),
+            xSMGR->createInstance(::rtl::OUString("com.sun.star.configuration.ConfigurationProvider")),
             css::uno::UNO_QUERY);
         if (xCfg.is())
             xCfg->addEventListener(static_cast< css::lang::XEventListener* >(this));
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 6bba8bd79db2..1e65dc86fd9e 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -71,17 +71,17 @@ namespace css = ::com::sun::star;
                     e.g.:
                             NAMELIST[ PROPERTYHANDLE_xxx ] => VALUELIST[ PROPERTYHANDLE_xxx ]
 *//*-*************************************************************************************************************/
-#define ROOTNODE_FACTORIES                  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Setup/Office/Factories"        ))
-#define PATHSEPERATOR                       ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"                             ))
+#define ROOTNODE_FACTORIES                  ::rtl::OUString("Setup/Office/Factories"        )
+#define PATHSEPERATOR                       ::rtl::OUString("/"                             )
 
 // Attention: The property "ooSetupFactoryEmptyDocumentURL" is read from configuration but not used! There is
 //            special code that uses hard coded strings to return them.
-#define PROPERTYNAME_SHORTNAME              ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryShortName"       ))
-#define PROPERTYNAME_TEMPLATEFILE           ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryTemplateFile"    ))
-#define PROPERTYNAME_WINDOWATTRIBUTES       ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryWindowAttributes"))
-#define PROPERTYNAME_EMPTYDOCUMENTURL       ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryEmptyDocumentURL"))
-#define PROPERTYNAME_DEFAULTFILTER          ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryDefaultFilter"   ))
-#define PROPERTYNAME_ICON                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryIcon"            ))
+#define PROPERTYNAME_SHORTNAME              ::rtl::OUString("ooSetupFactoryShortName"       )
+#define PROPERTYNAME_TEMPLATEFILE           ::rtl::OUString("ooSetupFactoryTemplateFile"    )
+#define PROPERTYNAME_WINDOWATTRIBUTES       ::rtl::OUString("ooSetupFactoryWindowAttributes")
+#define PROPERTYNAME_EMPTYDOCUMENTURL       ::rtl::OUString("ooSetupFactoryEmptyDocumentURL")
+#define PROPERTYNAME_DEFAULTFILTER          ::rtl::OUString("ooSetupFactoryDefaultFilter"   )
+#define PROPERTYNAME_ICON                   ::rtl::OUString("ooSetupFactoryIcon"            )
 
 #define PROPERTYHANDLE_SHORTNAME            0
 #define PROPERTYHANDLE_TEMPLATEFILE         1
@@ -92,16 +92,16 @@ namespace css = ::com::sun::star;
 
 #define PROPERTYCOUNT                       6
 
-#define FACTORYNAME_WRITER                  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"                ))
-#define FACTORYNAME_WRITERWEB               ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.WebDocument"                 ))
-#define FACTORYNAME_WRITERGLOBAL            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.GlobalDocument"              ))
-#define FACTORYNAME_CALC                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument"        ))
-#define FACTORYNAME_DRAW                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocument"          ))
-#define FACTORYNAME_IMPRESS                 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationDocument"))
-#define FACTORYNAME_MATH                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.formula.FormulaProperties"        ))
-#define FACTORYNAME_CHART                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.ChartDocument"             ))
-#define FACTORYNAME_DATABASE                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument"       ))
-#define FACTORYNAME_STARTMODULE             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.StartModule"                ))
+#define FACTORYNAME_WRITER                  ::rtl::OUString("com.sun.star.text.TextDocument"                )
+#define FACTORYNAME_WRITERWEB               ::rtl::OUString("com.sun.star.text.WebDocument"                 )
+#define FACTORYNAME_WRITERGLOBAL            ::rtl::OUString("com.sun.star.text.GlobalDocument"              )
+#define FACTORYNAME_CALC                    ::rtl::OUString("com.sun.star.sheet.SpreadsheetDocument"        )
+#define FACTORYNAME_DRAW                    ::rtl::OUString("com.sun.star.drawing.DrawingDocument"          )
+#define FACTORYNAME_IMPRESS                 ::rtl::OUString("com.sun.star.presentation.PresentationDocument")
+#define FACTORYNAME_MATH                    ::rtl::OUString("com.sun.star.formula.FormulaProperties"        )
+#define FACTORYNAME_CHART                   ::rtl::OUString("com.sun.star.chart2.ChartDocument"             )
+#define FACTORYNAME_DATABASE                ::rtl::OUString("com.sun.star.sdb.OfficeDatabaseDocument"       )
+#define FACTORYNAME_STARTMODULE             ::rtl::OUString("com.sun.star.frame.StartModule"                )
 
 #define FACTORYCOUNT                        10
 
@@ -285,16 +285,12 @@ struct FactoryInfo
                 xSubstVars
                     = css::uno::Reference< css::util::XStringSubstitution >(
                         xSMgr->createInstance(
-                            ::rtl::OUString(
-                                RTL_CONSTASCII_USTRINGPARAM(
-                                    "com.sun.star.util.PathSubstitution" ) ) ),
+                            ::rtl::OUString( "com.sun.star.util.PathSubstitution"  ) ),
                             css::uno::UNO_QUERY );
                 if ( !xSubstVars.is() )
                     throw css::uno::RuntimeException(
-                        ::rtl::OUString(
-                            RTL_CONSTASCII_USTRINGPARAM(
-                                "Cannot instanciate service "
-                                "com.sun.star.util.PathSubstitution" ) ),
+                        ::rtl::OUString( "Cannot instanciate service "
+                                "com.sun.star.util.PathSubstitution"  ),
                         css::uno::Reference< css::uno::XInterface >() );
             }
             return xSubstVars;
@@ -655,25 +651,25 @@ sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eMo
     ::rtl::OUString sShortName;
     switch( eFactory )
     {
-        case SvtModuleOptions::E_WRITER        :  sShortName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("swriter"));
+        case SvtModuleOptions::E_WRITER        :  sShortName = ::rtl::OUString("swriter");
                                                   break;
-        case SvtModuleOptions::E_WRITERWEB     :  sShortName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("swriter/web"));
+        case SvtModuleOptions::E_WRITERWEB     :  sShortName = ::rtl::OUString("swriter/web");
                                                   break;
-        case SvtModuleOptions::E_WRITERGLOBAL  :  sShortName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("swriter/GlobalDocument"));
+        case SvtModuleOptions::E_WRITERGLOBAL  :  sShortName = ::rtl::OUString("swriter/GlobalDocument");
                                                   break;
-        case SvtModuleOptions::E_CALC          :  sShortName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("scalc"));
+        case SvtModuleOptions::E_CALC          :  sShortName = ::rtl::OUString("scalc");
                                                   break;
-        case SvtModuleOptions::E_DRAW          :  sShortName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdraw"));
+        case SvtModuleOptions::E_DRAW          :  sShortName = ::rtl::OUString("sdraw");
                                                   break;
-        case SvtModuleOptions::E_IMPRESS       :  sShortName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("simpress"));
+        case SvtModuleOptions::E_IMPRESS       :  sShortName = ::rtl::OUString("simpress");
                                                   break;
-        case SvtModuleOptions::E_MATH          :  sShortName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("smath"));
+        case SvtModuleOptions::E_MATH          :  sShortName = ::rtl::OUString("smath");
                                                   break;
-        case SvtModuleOptions::E_CHART         :  sShortName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("schart"));
+        case SvtModuleOptions::E_CHART         :  sShortName = ::rtl::OUString("schart");
                                                   break;
-        case SvtModuleOptions::E_BASIC         :  sShortName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sbasic"));
+        case SvtModuleOptions::E_BASIC         :  sShortName = ::rtl::OUString("sbasic");
                                                   break;
-        case SvtModuleOptions::E_DATABASE     :  sShortName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdatabase"));
+        case SvtModuleOptions::E_DATABASE     :  sShortName = ::rtl::OUString("sdatabase");
                                                   break;
         default:
             OSL_FAIL( "unknown factory" );
@@ -707,25 +703,25 @@ sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eMo
     ::rtl::OUString sURL;
     switch( eFactory )
     {
-        case SvtModuleOptions::E_WRITER        :  sURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/swriter"));
+        case SvtModuleOptions::E_WRITER        :  sURL = ::rtl::OUString("private:factory/swriter");
                                                   break;
-        case SvtModuleOptions::E_WRITERWEB     :  sURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/swriter/web"));
+        case SvtModuleOptions::E_WRITERWEB     :  sURL = ::rtl::OUString("private:factory/swriter/web");
                                                   break;
-        case SvtModuleOptions::E_WRITERGLOBAL  :  sURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/swriter/GlobalDocument"));
+        case SvtModuleOptions::E_WRITERGLOBAL  :  sURL = ::rtl::OUString("private:factory/swriter/GlobalDocument");
                                                   break;
-        case SvtModuleOptions::E_CALC          :  sURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc"));
+        case SvtModuleOptions::E_CALC          :  sURL = ::rtl::OUString("private:factory/scalc");
                                                   break;
-        case SvtModuleOptions::E_DRAW          :  sURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/sdraw"));
+        case SvtModuleOptions::E_DRAW          :  sURL = ::rtl::OUString("private:factory/sdraw");
                                                   break;
-        case SvtModuleOptions::E_IMPRESS       :  sURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/simpress?slot=6686"));
+        case SvtModuleOptions::E_IMPRESS       :  sURL = ::rtl::OUString("private:factory/simpress?slot=6686");
                                                   break;
-        case SvtModuleOptions::E_MATH          :  sURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/smath"));
+        case SvtModuleOptions::E_MATH          :  sURL = ::rtl::OUString("private:factory/smath");
                                                   break;
-        case SvtModuleOptions::E_CHART         :  sURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/schart"));
+        case SvtModuleOptions::E_CHART         :  sURL = ::rtl::OUString("private:factory/schart");
                                                   break;
-        case SvtModuleOptions::E_BASIC         :  sURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/sbasic"));
+        case SvtModuleOptions::E_BASIC         :  sURL = ::rtl::OUString("private:factory/sbasic");
                                                   break;
-        case SvtModuleOptions::E_DATABASE     :  sURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/sdatabase?Interactive"));
+        case SvtModuleOptions::E_DATABASE     :  sURL = ::rtl::OUString("private:factory/sdatabase?Interactive");
                                                   break;
         default:
             OSL_FAIL( "unknown factory" );
@@ -1236,16 +1232,16 @@ namespace
 {
     switch( eModule )
     {
-        case SvtModuleOptions::E_SWRITER    :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Writer")); }
-        case SvtModuleOptions::E_SWEB       :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Web")); }
-        case SvtModuleOptions::E_SGLOBAL    :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Global")); }
-        case SvtModuleOptions::E_SCALC      :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Calc")); }
-        case SvtModuleOptions::E_SDRAW      :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Draw")); }
-        case SvtModuleOptions::E_SIMPRESS   :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Impress")); }
-        case SvtModuleOptions::E_SMATH      :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Math")); }
-        case SvtModuleOptions::E_SCHART     :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Chart")); }
-        case SvtModuleOptions::E_SBASIC     :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Basic")); }
-        case SvtModuleOptions::E_SDATABASE  :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Database")); }
+        case SvtModuleOptions::E_SWRITER    :   { return ::rtl::OUString("Writer"); }
+        case SvtModuleOptions::E_SWEB       :   { return ::rtl::OUString("Web"); }
+        case SvtModuleOptions::E_SGLOBAL    :   { return ::rtl::OUString("Global"); }
+        case SvtModuleOptions::E_SCALC      :   { return ::rtl::OUString("Calc"); }
+        case SvtModuleOptions::E_SDRAW      :   { return ::rtl::OUString("Draw"); }
+        case SvtModuleOptions::E_SIMPRESS   :   { return ::rtl::OUString("Impress"); }
+        case SvtModuleOptions::E_SMATH      :   { return ::rtl::OUString("Math"); }
+        case SvtModuleOptions::E_SCHART     :   { return ::rtl::OUString("Chart"); }
+        case SvtModuleOptions::E_SBASIC     :   { return ::rtl::OUString("Basic"); }
+        case SvtModuleOptions::E_SDATABASE  :   { return ::rtl::OUString("Database"); }
         default:
             OSL_FAIL( "unknown module" );
             break;
@@ -1325,9 +1321,9 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O
     try
     {
         xFilterCfg = css::uno::Reference< css::container::XNameAccess >(
-            xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.FilterFactory"))), css::uno::UNO_QUERY);
+            xSMGR->createInstance(::rtl::OUString("com.sun.star.document.FilterFactory")), css::uno::UNO_QUERY);
         xTypeCfg = css::uno::Reference< css::container::XNameAccess >(
-            xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection"))), css::uno::UNO_QUERY);
+            xSMGR->createInstance(::rtl::OUString("com.sun.star.document.TypeDetection")), css::uno::UNO_QUERY);
     }
     catch(const css::uno::RuntimeException&)
         { throw; }
@@ -1337,13 +1333,13 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O
     ::comphelper::SequenceAsHashMap stlDesc(lMediaDescriptor);
 
     // is there already a filter inside the descriptor?
-    ::rtl::OUString sFilterName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName")), ::rtl::OUString());
+    ::rtl::OUString sFilterName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString("FilterName"), ::rtl::OUString());
     if (!sFilterName.isEmpty())
     {
         try
         {
             ::comphelper::SequenceAsHashMap stlFilterProps   (xFilterCfg->getByName(sFilterName));
-            ::rtl::OUString                 sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentService")), ::rtl::OUString());
+            ::rtl::OUString                 sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString("DocumentService"), ::rtl::OUString());
             SvtModuleOptions::EFactory      eApp             = SvtModuleOptions::ClassifyFactoryByServiceName(sDocumentService);
 
             if (eApp != E_UNKNOWN_FACTORY)
@@ -1356,7 +1352,7 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O
     }
 
     // is there already a type inside the descriptor?
-    ::rtl::OUString sTypeName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName")), ::rtl::OUString());
+    ::rtl::OUString sTypeName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString("TypeName"), ::rtl::OUString());
     if (sTypeName.isEmpty())
     {
         // no :-(
@@ -1373,9 +1369,9 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O
     try
     {
         ::comphelper::SequenceAsHashMap stlTypeProps     (xTypeCfg->getByName(sTypeName));
-        ::rtl::OUString                 sPreferredFilter = stlTypeProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter")), ::rtl::OUString());
+        ::rtl::OUString                 sPreferredFilter = stlTypeProps.getUnpackedValueOrDefault(::rtl::OUString("PreferredFilter"), ::rtl::OUString());
         ::comphelper::SequenceAsHashMap stlFilterProps   (xFilterCfg->getByName(sPreferredFilter));
-        ::rtl::OUString                 sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentService")), ::rtl::OUString());
+        ::rtl::OUString                 sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString("DocumentService"), ::rtl::OUString());
         SvtModuleOptions::EFactory      eApp             = SvtModuleOptions::ClassifyFactoryByServiceName(sDocumentService);
 
         if (eApp != E_UNKNOWN_FACTORY)
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index c18d004c94f4..3b5cc26ada3e 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -66,8 +66,8 @@ using ::rtl::OString;
 using ::rtl::OStringToOUString;
 
 #define SEARCHPATH_DELIMITER  ';'
-#define SIGN_STARTVARIABLE    OUString( RTL_CONSTASCII_USTRINGPARAM( "$(" ) )
-#define SIGN_ENDVARIABLE      OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ) )
+#define SIGN_STARTVARIABLE    OUString( "$("  )
+#define SIGN_ENDVARIABLE      OUString( ")" )
 
 // Supported variables by the old SvtPathOptions implementation
 #define SUBSTITUTE_INSTPATH   "$(instpath)"
@@ -428,15 +428,14 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() :
 
     // Create necessary services
     m_xPathSettings = Reference< XFastPropertySet >( xSMgr->createInstance(
-                                                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                        "com.sun.star.util.PathSettings" ))),
+                                                    ::rtl::OUString( "com.sun.star.util.PathSettings" )),
                                                 UNO_QUERY );
     if ( !m_xPathSettings.is() )
     {
         // #112719#: check for existance
         OSL_FAIL( "SvtPathOptions_Impl::SvtPathOptions_Impl(): #112719# happened again!" );
         throw RuntimeException(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Service com.sun.star.util.PathSettings cannot be created" )),
+            ::rtl::OUString( "Service com.sun.star.util.PathSettings cannot be created" ),
             Reference< XInterface >() );
     }
 
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index ed030a70a426..f6c67a1f55ca 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -388,7 +388,7 @@ Sequence< OUString > GetPropertyNames()
 // -----------------------------------------------------------------------
 
 SvtSaveOptions_Impl::SvtSaveOptions_Impl()
-    : ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Save")) )
+    : ConfigItem( OUString("Office.Common/Save") )
     , nAutoSaveTime( 0 )
     , bUseUserData( sal_False )
     , bBackup( sal_False )
@@ -562,18 +562,18 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
     {
     css::uno::Reference< css::uno::XInterface > xCFG = ::comphelper::ConfigurationHelper::openConfig(
         ::comphelper::getProcessServiceFactory(),
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Recovery")),
+        ::rtl::OUString("org.openoffice.Office.Recovery"),
         ::comphelper::ConfigurationHelper::E_READONLY);
 
     ::comphelper::ConfigurationHelper::readRelativeKey(
         xCFG,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSave")),
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled"))) >>= bAutoSave;
+        ::rtl::OUString("AutoSave"),
+        ::rtl::OUString("Enabled")) >>= bAutoSave;
 
     ::comphelper::ConfigurationHelper::readRelativeKey(
         xCFG,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSave")),
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeIntervall"))) >>= nAutoSaveTime;
+        ::rtl::OUString("AutoSave"),
+        ::rtl::OUString("TimeIntervall")) >>= nAutoSaveTime;
     }
     catch(const css::uno::Exception&)
         { OSL_FAIL("Could not find needed informations for AutoSave feature."); }
@@ -749,19 +749,19 @@ void SvtSaveOptions_Impl::Commit()
 
     css::uno::Reference< css::uno::XInterface > xCFG = ::comphelper::ConfigurationHelper::openConfig(
         ::comphelper::getProcessServiceFactory(),
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Recovery")),
+        ::rtl::OUString("org.openoffice.Office.Recovery"),
         ::comphelper::ConfigurationHelper::E_STANDARD);
 
     ::comphelper::ConfigurationHelper::writeRelativeKey(
         xCFG,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSave")),
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeIntervall")),
+        ::rtl::OUString("AutoSave"),
+        ::rtl::OUString("TimeIntervall"),
         css::uno::makeAny(nAutoSaveTime));
 
     ::comphelper::ConfigurationHelper::writeRelativeKey(
         xCFG,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSave")),
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")),
+        ::rtl::OUString("AutoSave"),
+        ::rtl::OUString("Enabled"),
         css::uno::makeAny(bAutoSave));
 
     ::comphelper::ConfigurationHelper::flush(xCFG);
@@ -793,7 +793,7 @@ public:
 const sal_Char cUserDefinedSettings[] = "UserDefinedSettings";
 
 SvtLoadOptions_Impl::SvtLoadOptions_Impl()
-    : ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Load")) )
+    : ConfigItem( OUString("Office.Common/Load") )
     , bLoadUserDefinedSettings( sal_False )
 {
     Sequence< OUString > aNames(1);
diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index 3e30e7e27a3e..0c47646972d6 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -82,7 +82,7 @@ public:
 
 
 SvtSearchOptions_Impl::SvtSearchOptions_Impl() :
-    ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/SearchOptions")) )
+    ConfigItem( OUString("Office.Common/SearchOptions") )
 {
     RTL_LOGFILE_CONTEXT(aLog, "unotools SvtSearchOptions_Impl::SvtSearchOptions_Impl()");
     nFlags = 0x0003FFFF;    // set all options values to 'true'
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index fbe7ddf0f8c0..d25dbeb40051 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -794,7 +794,7 @@ void SvtUserOptions_Impl::SetApartment( const ::rtl::OUString& sApartment )
     sFullName = GetFirstName();
     sFullName.trim();
     if ( !sFullName.isEmpty() )
-        sFullName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
+        sFullName += ::rtl::OUString(" ");
     sFullName += GetLastName();
     sFullName.trim();
 
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index caa19f54675b..92f9a3b91971 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -180,7 +180,7 @@ typedef ::std::vector< ::rtl::OUString* > StringList_Impl;
         Reference< ::com::sun::star::sdbc::XResultSet > xResultSet;
         ::com::sun::star::uno::Sequence< ::rtl::OUString > aProps(1);
         ::rtl::OUString* pProps = aProps.getArray();
-        pProps[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Url"));
+        pProps[0] = ::rtl::OUString("Url");
 
         try
         {
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index 21578d95a8a6..ed1979319184 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -73,10 +73,10 @@ rtl::OUString getParentName( const rtl::OUString& aFileName )
     rtl::OUString aParent = aFileName.copy( 0,lastIndex );
 
     if( aParent[ aParent.getLength()-1] == sal_Unicode(':') && aParent.getLength() == 6 )
-        aParent += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+        aParent += rtl::OUString("/");
 
     if( 0 == aParent.compareToAscii( "file://" ) )
-        aParent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///"));
+        aParent = rtl::OUString("file:///");
 
     return aParent;
 }
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index 5b454c0cf4b6..cbb9ee917cb2 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -95,7 +95,7 @@ std::vector<rtl::OUString> getContents(rtl::OUString const & url) {
         std::vector<rtl::OUString> cs;
         ucbhelper::Content c(content(url));
         css::uno::Sequence<rtl::OUString> args(1);
-        args[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+        args[0] = rtl::OUString("Title");
         css::uno::Reference<css::sdbc::XResultSet> res(
             c.createCursor(args, ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS),
             css::uno::UNO_SET_THROW);
@@ -123,7 +123,7 @@ std::vector<rtl::OUString> getContents(rtl::OUString const & url) {
 rtl::OUString getCasePreservingUrl(INetURLObject url) {
     return
         content(url).executeCommand(
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getCasePreservingURL")),
+            rtl::OUString("getCasePreservingURL"),
             css::uno::Any()).
         get<rtl::OUString>();
 }
@@ -202,7 +202,7 @@ bool utl::UCBContentHelper::GetTitle(
     try {
         *title = content(url).
             getPropertyValue(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"))).
+                rtl::OUString("Title")).
             get<rtl::OUString>();
         return true;
     } catch (css::uno::RuntimeException const &) {
@@ -224,7 +224,7 @@ bool utl::UCBContentHelper::GetTitle(
 bool utl::UCBContentHelper::Kill(rtl::OUString const & url) {
     try {
         content(url).executeCommand(
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
+            rtl::OUString("delete"),
             css::uno::makeAny(true));
         return true;
     } catch (css::uno::RuntimeException const &) {
@@ -264,9 +264,7 @@ bool utl::UCBContentHelper::MakeFolder(
                         comphelper::getProcessServiceFactory(),
                         css::uno::UNO_SET_THROW)->
                      createInstance(
-                         rtl::OUString(
-                             RTL_CONSTASCII_USTRINGPARAM(
-                                 "com.sun.star.uui.InteractionHandler")))),
+                         rtl::OUString( "com.sun.star.uui.InteractionHandler"))),
                     css::uno::UNO_QUERY_THROW),
                 css::uno::Reference<css::ucb::XProgressHandler>()),
             parent)
@@ -293,7 +291,7 @@ bool utl::UCBContentHelper::MakeFolder(
                     continue;
                 }
                 css::uno::Sequence<rtl::OUString> keys(1);
-                keys[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+                keys[0] = rtl::OUString("Title");
                 css::uno::Sequence<css::uno::Any> values(1);
                 values[0] <<= title;
                 if (parent.insertNewContent(info[i].Type, keys, values, result))
@@ -341,7 +339,7 @@ sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const & url) {
     try {
         return
             content(url).getPropertyValue(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size"))).
+                rtl::OUString("Size")).
             get<sal_Int64>();
     } catch (css::uno::RuntimeException const &) {
         throw;
@@ -366,11 +364,11 @@ bool utl::UCBContentHelper::IsYounger(
         return
             convert(
                 content(younger).getPropertyValue(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified"))).
+                    rtl::OUString("DateModified")).
                 get<css::util::DateTime>())
             > convert(
                 content(older).getPropertyValue(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified"))).
+                    rtl::OUString("DateModified")).
                 get<css::util::DateTime>());
     } catch (css::uno::RuntimeException const &) {
         throw;
@@ -487,8 +485,7 @@ bool utl::UCBContentHelper::EqualURLs(
     ucbhelper::ContentBroker * broker = ucbhelper::ContentBroker::get();
     if (broker == 0) {
         throw css::uno::RuntimeException(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM("no ucbhelper::ContentBroker")),
+            rtl::OUString( "no ucbhelper::ContentBroker"),
             css::uno::Reference<css::uno::XInterface>());
     }
     return
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index d7ac3bcb62c7..9201a86e77f9 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
@@ -69,7 +69,7 @@ static SvStream* lcl_CreateStream( const String& rFileName, StreamMode eOpenMode
                 {
                     // truncate is implemented with deleting the original file
                     ::ucbhelper::Content aCnt( rFileName, Reference < XCommandEnvironment >() );
-                    aCnt.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) );
+                    aCnt.executeCommand( ::rtl::OUString("delete"), makeAny( sal_Bool( sal_True ) ) );
                 }
 
                 catch ( const CommandAbortedException& )
@@ -100,7 +100,7 @@ static SvStream* lcl_CreateStream( const String& rFileName, StreamMode eOpenMode
                     aInsertArg.ReplaceExisting = sal_False;
                     Any aCmdArg;
                     aCmdArg <<= aInsertArg;
-                    aContent.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")), aCmdArg );
+                    aContent.executeCommand( ::rtl::OUString("insert"), aCmdArg );
                 }
 
                 // it is NOT an error when the stream already exists and no truncation was desired