automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings

Done with a perl regex:

s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms

Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

39 files changed, 221 insertions, 221 deletions

diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index f32a11c40a90..0ba1a76d16c4 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -215,45 +215,45 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e
     switch( eObjType )
     {
         case ::svt::BBTYPE_BROWSEBOX:
-            aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "BrowseBox" ) );
+            aRetText = OUString( "BrowseBox" );
             break;
         case ::svt::BBTYPE_TABLE:
-            aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "Table" ) );
+            aRetText = OUString( "Table" );
             break;
         case ::svt::BBTYPE_ROWHEADERBAR:
-            aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "RowHeaderBar" ) );
+            aRetText = OUString( "RowHeaderBar" );
             break;
         case ::svt::BBTYPE_COLUMNHEADERBAR:
-            aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnHeaderBar" ) );
+            aRetText = OUString( "ColumnHeaderBar" );
             break;
         case ::svt::BBTYPE_TABLECELL:
-            aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "TableCell" ) );
+            aRetText = OUString( "TableCell" );
 #if OSL_DEBUG_LEVEL > 1
-            aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( " [" ) );
+            aRetText += OUString( " [" );
             aRetText += OUString::valueOf(sal_Int32(GetCurRow()));
-            aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "," ) );
+            aRetText += OUString( "," );
             aRetText += OUString::valueOf(sal_Int32(GetCurColumnId()));
-            aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "]" ) );
+            aRetText += OUString( "]" );
 #endif
             break;
         case ::svt::BBTYPE_ROWHEADERCELL:
-            aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "RowHeaderCell" ) );
+            aRetText = OUString( "RowHeaderCell" );
 #if OSL_DEBUG_LEVEL > 1
-            aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( " [" ) );
+            aRetText += OUString( " [" );
             aRetText += OUString::valueOf(sal_Int32(GetCurRow()));
-            aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "," ) );
+            aRetText += OUString( "," );
             aRetText += OUString::valueOf(sal_Int32(GetCurColumnId()));
-            aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "]" ) );
+            aRetText += OUString( "]" );
 #endif
             break;
         case ::svt::BBTYPE_COLUMNHEADERCELL:
-            aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnHeaderCell" ) );
+            aRetText = OUString( "ColumnHeaderCell" );
 #if OSL_DEBUG_LEVEL > 1
-            aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( " [" ) );
+            aRetText += OUString( " [" );
             aRetText += OUString::valueOf(sal_Int32(GetCurRow()));
-            aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "," ) );
+            aRetText += OUString( "," );
             aRetText += OUString::valueOf(sal_Int32(GetCurColumnId()));
-            aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "]" ) );
+            aRetText += OUString( "]" );
 #endif
             break;
         default:
@@ -269,25 +269,25 @@ OUString BrowseBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxOb
     switch( eObjType )
     {
         case ::svt::BBTYPE_BROWSEBOX:
-            aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "BrowseBox description" ) );
+            aRetText = OUString( "BrowseBox description" );
             break;
         case ::svt::BBTYPE_TABLE:
-            //  aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "TABLE description" ) );
+            //  aRetText = OUString( "TABLE description" );
             break;
         case ::svt::BBTYPE_ROWHEADERBAR:
-            //  aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERBAR description" ) );
+            //  aRetText = OUString( "ROWHEADERBAR description" );
             break;
         case ::svt::BBTYPE_COLUMNHEADERBAR:
-            //  aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERBAR description" ) );
+            //  aRetText = OUString( "COLUMNHEADERBAR description" );
             break;
         case ::svt::BBTYPE_TABLECELL:
-            //  aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "TABLECELL description" ) );
+            //  aRetText = OUString( "TABLECELL description" );
             break;
         case ::svt::BBTYPE_ROWHEADERCELL:
-            //  aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERCELL description" ) );
+            //  aRetText = OUString( "ROWHEADERCELL description" );
             break;
         case ::svt::BBTYPE_COLUMNHEADERCELL:
-            //  aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERCELL description" ) );
+            //  aRetText = OUString( "COLUMNHEADERCELL description" );
             break;
         case ::svt::BBTYPE_CHECKBOXCELL:
             break;
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 98d270a1dc6f..068430cd05f3 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
 sal_Bool SvtTabAppearanceCfg::bInitialized = sal_False;
 
 SvtTabAppearanceCfg::SvtTabAppearanceCfg()
-    :ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View")))
+    :ConfigItem(OUString("Office.Common/View"))
     ,nDragMode          ( DEFAULT_DRAGMODE )
     ,nScaleFactor       ( DEFAULT_SCALEFACTOR )
     ,nSnapMode          ( DEFAULT_SNAPMODE )
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 9235317f6c36..5c5e75e9a827 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -269,7 +269,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
             m_aComponentDisplayNames.insert(TDisplayNames::value_type(pIter->getToken(1,'/',nIndex),sComponentDisplayName));
         }
 
-        *pIter += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Entries"));
+        *pIter += ::rtl::OUString("/Entries");
         uno::Sequence < ::rtl::OUString > aDisplayNames = GetPropertyNames(*pIter);
         lcl_addString(aDisplayNames,sDisplayName);
 
@@ -296,7 +296,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
     {
         //detect current scheme name
         uno::Sequence < ::rtl::OUString > aCurrent(1);
-        aCurrent.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/CurrentColorScheme"));
+        aCurrent.getArray()[0] = ::rtl::OUString("ExtendedColorScheme/CurrentColorScheme");
         uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent );
         aCurrentVal.getConstArray()[0] >>= sScheme;
     } // if(!sScheme.getLength())
@@ -313,7 +313,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
     }
 
     if ( m_sLoadedScheme.isEmpty() )
-        m_sLoadedScheme = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default"));
+        m_sLoadedScheme = ::rtl::OUString("default");
 
     if ( sScheme != "default" )
     {
@@ -473,7 +473,7 @@ sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const ::rtl::OUString& _sSchemeN
     ::rtl::OUString sBase(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes"));
 
     uno::Sequence < ::rtl::OUString > aComponentNames = GetPropertyNames(sBase);
-    sBase += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + _sSchemeName;
+    sBase += ::rtl::OUString("/") + _sSchemeName;
     const ::rtl::OUString* pCompIter = aComponentNames.getConstArray();
     const ::rtl::OUString* pCompEnd  = pCompIter + aComponentNames.getLength();
     for(;pCompIter != pCompEnd && *pCompIter != sBase;++pCompIter)
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index b54cac24fab3..03debe3783d3 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -50,7 +50,7 @@ struct SvtFontSubstConfig_Impl
 };
 
 SvtFontSubstConfig::SvtFontSubstConfig() :
-    ConfigItem(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Font/Substitution"))),
+    ConfigItem(rtl::OUString("Office.Common/Font/Substitution")),
     bIsEnabled(sal_False),
     pImpl(new SvtFontSubstConfig_Impl)
 {
@@ -69,13 +69,13 @@ SvtFontSubstConfig::SvtFontSubstConfig() :
     Sequence<OUString> aPropNames(aNodeNames.getLength() * 4);
     OUString* pNames = aPropNames.getArray();
     sal_Int32 nName = 0;
-    sPropPrefix += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+    sPropPrefix += rtl::OUString("/");
     sal_Int32 nNode;
     for(nNode = 0; nNode < aNodeNames.getLength(); nNode++)
     {
         OUString sStart(sPropPrefix);
         sStart += pNodeNames[nNode];
-        sStart += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+        sStart += rtl::OUString("/");
         pNames[nName] = sStart;     pNames[nName++] += cReplaceFont;
         pNames[nName] = sStart;     pNames[nName++] += cSubstituteFont;
         pNames[nName] = sStart;     pNames[nName++] += cAlways;
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index f2e2cd2a1fcd..4c8ea3f38ed7 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -149,7 +149,7 @@ Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames()
 // -----------------------------------------------------------------------
 
 SvtHelpOptions_Impl::SvtHelpOptions_Impl()
-    : ConfigItem( OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Help" )) )
+    : ConfigItem( OUString( "Office.Common/Help" ) )
     , bExtendedHelp( sal_False )
     , bHelpTips( sal_True )
     , bHelpAgentEnabled( sal_False )
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index b0990afabf88..942417a3937f 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -40,15 +40,15 @@ using namespace ::rtl                   ;
 using namespace ::osl                   ;
 using namespace ::com::sun::star::uno   ;
 
-#define ROOTNODE_MENU                           OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Menu"  ))
+#define ROOTNODE_MENU                           OUString("Office.Common/View/Menu"  )
 #define DEFAULT_DONTHIDEDISABLEDENTRIES         sal_False
 #define DEFAULT_FOLLOWMOUSE                     sal_True
 #define DEFAULT_MENUICONS                       2
 
-#define PROPERTYNAME_DONTHIDEDISABLEDENTRIES    OUString(RTL_CONSTASCII_USTRINGPARAM("DontHideDisabledEntry"    ))
-#define PROPERTYNAME_FOLLOWMOUSE                OUString(RTL_CONSTASCII_USTRINGPARAM("FollowMouse"              ))
-#define PROPERTYNAME_SHOWICONSINMENUES          OUString(RTL_CONSTASCII_USTRINGPARAM("ShowIconsInMenues"        ))
-#define PROPERTYNAME_SYSTEMICONSINMENUES        OUString(RTL_CONSTASCII_USTRINGPARAM("IsSystemIconsInMenus"     ))
+#define PROPERTYNAME_DONTHIDEDISABLEDENTRIES    OUString("DontHideDisabledEntry"    )
+#define PROPERTYNAME_FOLLOWMOUSE                OUString("FollowMouse"              )
+#define PROPERTYNAME_SHOWICONSINMENUES          OUString("ShowIconsInMenues"        )
+#define PROPERTYNAME_SYSTEMICONSINMENUES        OUString("IsSystemIconsInMenus"     )
 
 #define PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES  0
 #define PROPERTYHANDLE_FOLLOWMOUSE              1
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index fc602aa00a27..415c501121fa 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -40,7 +40,7 @@ using namespace ::rtl                   ;
 using namespace ::osl                   ;
 using namespace ::com::sun::star::uno   ;
 
-#define ROOTNODE_START                  OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Drawinglayer"   ))
+#define ROOTNODE_START                  OUString("Office.Common/Drawinglayer"   )
 #define DEFAULT_OVERLAYBUFFER           sal_True
 #define DEFAULT_PAINTBUFFER             sal_True
 #define DEFAULT_STRIPE_COLOR_A          0
@@ -80,43 +80,43 @@ using namespace ::com::sun::star::uno   ;
 #define DEFAULT_TRANSPARENTSELECTIONPERCENT         75
 #define DEFAULT_SELECTIONMAXIMUMLUMINANCEPERCENT    70
 
-#define PROPERTYNAME_OVERLAYBUFFER      OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer"    ))
-#define PROPERTYNAME_PAINTBUFFER        OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer"      ))
-#define PROPERTYNAME_STRIPE_COLOR_A     OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorA"     ))
-#define PROPERTYNAME_STRIPE_COLOR_B     OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorB"     ))
-#define PROPERTYNAME_STRIPE_LENGTH      OUString(RTL_CONSTASCII_USTRINGPARAM("StripeLength"     ))
+#define PROPERTYNAME_OVERLAYBUFFER      OUString("OverlayBuffer"    )
+#define PROPERTYNAME_PAINTBUFFER        OUString("PaintBuffer"      )
+#define PROPERTYNAME_STRIPE_COLOR_A     OUString("StripeColorA"     )
+#define PROPERTYNAME_STRIPE_COLOR_B     OUString("StripeColorB"     )
+#define PROPERTYNAME_STRIPE_LENGTH      OUString("StripeLength"     )
 
 // #i73602#
-#define PROPERTYNAME_OVERLAYBUFFER_CALC         OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Calc"))
-#define PROPERTYNAME_OVERLAYBUFFER_WRITER       OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Writer"))
-#define PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS  OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_DrawImpress"))
+#define PROPERTYNAME_OVERLAYBUFFER_CALC         OUString("OverlayBuffer_Calc")
+#define PROPERTYNAME_OVERLAYBUFFER_WRITER       OUString("OverlayBuffer_Writer")
+#define PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS  OUString("OverlayBuffer_DrawImpress")
 
 // #i74769#, #i75172#
-#define PROPERTYNAME_PAINTBUFFER_CALC           OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Calc"))
-#define PROPERTYNAME_PAINTBUFFER_WRITER         OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Writer"))
-#define PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS    OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_DrawImpress"))
+#define PROPERTYNAME_PAINTBUFFER_CALC           OUString("PaintBuffer_Calc")
+#define PROPERTYNAME_PAINTBUFFER_WRITER         OUString("PaintBuffer_Writer")
+#define PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS    OUString("PaintBuffer_DrawImpress")
 
 // #i4219#
-#define PROPERTYNAME_MAXIMUMPAPERWIDTH OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperWidth"))
-#define PROPERTYNAME_MAXIMUMPAPERHEIGHT OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperHeight"))
-#define PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperLeftMargin"))
-#define PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperRightMargin"))
-#define PROPERTYNAME_MAXIMUMPAPERTOPMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperTopMargin"))
-#define PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperBottomMargin"))
+#define PROPERTYNAME_MAXIMUMPAPERWIDTH OUString("MaximumPaperWidth")
+#define PROPERTYNAME_MAXIMUMPAPERHEIGHT OUString("MaximumPaperHeight")
+#define PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN OUString("MaximumPaperLeftMargin")
+#define PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN OUString("MaximumPaperRightMargin")
+#define PROPERTYNAME_MAXIMUMPAPERTOPMARGIN OUString("MaximumPaperTopMargin")
+#define PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN OUString("MaximumPaperBottomMargin")
 
 // primitives
-#define PROPERTYNAME_ANTIALIASING OUString(RTL_CONSTASCII_USTRINGPARAM("AntiAliasing"))
-#define PROPERTYNAME_SNAPHORVERLINESTODISCRETE OUString(RTL_CONSTASCII_USTRINGPARAM("SnapHorVerLinesToDiscrete"))
-#define PROPERTYNAME_SOLIDDRAGCREATE OUString(RTL_CONSTASCII_USTRINGPARAM("SolidDragCreate"))
-#define PROPERTYNAME_RENDERDECORATEDTEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderDecoratedTextDirect"))
-#define PROPERTYNAME_RENDERSIMPLETEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderSimpleTextDirect"))
-#define PROPERTYNAME_QUADRATIC3DRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("Quadratic3DRenderLimit"))
-#define PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("QuadraticFormControlRenderLimit"))
+#define PROPERTYNAME_ANTIALIASING OUString("AntiAliasing")
+#define PROPERTYNAME_SNAPHORVERLINESTODISCRETE OUString("SnapHorVerLinesToDiscrete")
+#define PROPERTYNAME_SOLIDDRAGCREATE OUString("SolidDragCreate")
+#define PROPERTYNAME_RENDERDECORATEDTEXTDIRECT OUString("RenderDecoratedTextDirect")
+#define PROPERTYNAME_RENDERSIMPLETEXTDIRECT OUString("RenderSimpleTextDirect")
+#define PROPERTYNAME_QUADRATIC3DRENDERLIMIT OUString("Quadratic3DRenderLimit")
+#define PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT OUString("QuadraticFormControlRenderLimit")
 
 // #i97672# selection settings
-#define PROPERTYNAME_TRANSPARENTSELECTION OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelection"))
-#define PROPERTYNAME_TRANSPARENTSELECTIONPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelectionPercent"))
-#define PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("SelectionMaximumLuminancePercent"))
+#define PROPERTYNAME_TRANSPARENTSELECTION OUString("TransparentSelection")
+#define PROPERTYNAME_TRANSPARENTSELECTIONPERCENT OUString("TransparentSelectionPercent")
+#define PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT OUString("SelectionMaximumLuminancePercent")
 
 #define PROPERTYHANDLE_OVERLAYBUFFER                0
 #define PROPERTYHANDLE_PAINTBUFFER                  1
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 87e8e353b312..f36fc74cba50 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -41,20 +41,20 @@ static sal_uInt16 aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
 
 #define DPI_COUNT (SAL_N_ELEMENTS(aDPIArray))
 
-#define ROOTNODE_START                                  OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Print/Option"))
-#define ROOTNODE_PRINTOPTION                            OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Print/Option"))
-
-#define PROPERTYNAME_REDUCETRANSPARENCY                 OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceTransparency"))
-#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE            OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedTransparencyMode"))
-#define PROPERTYNAME_REDUCEGRADIENTS                    OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceGradients"))
-#define PROPERTYNAME_REDUCEDGRADIENTMODE                OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientMode"))
-#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT           OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientStepCount"))
-#define PROPERTYNAME_REDUCEBITMAPS                      OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceBitmaps"))
-#define PROPERTYNAME_REDUCEDBITMAPMODE                  OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapMode"))
-#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION            OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapResolution"))
-#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY  OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapIncludesTransparency"))
-#define PROPERTYNAME_CONVERTTOGREYSCALES                OUString(RTL_CONSTASCII_USTRINGPARAM("ConvertToGreyscales"))
-#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT        OUString(RTL_CONSTASCII_USTRINGPARAM("PDFAsStandardPrintJobFormat"))
+#define ROOTNODE_START                                  OUString("Office.Common/Print/Option")
+#define ROOTNODE_PRINTOPTION                            OUString("org.openoffice.Office.Common/Print/Option")
+
+#define PROPERTYNAME_REDUCETRANSPARENCY                 OUString("ReduceTransparency")
+#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE            OUString("ReducedTransparencyMode")
+#define PROPERTYNAME_REDUCEGRADIENTS                    OUString("ReduceGradients")
+#define PROPERTYNAME_REDUCEDGRADIENTMODE                OUString("ReducedGradientMode")
+#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT           OUString("ReducedGradientStepCount")
+#define PROPERTYNAME_REDUCEBITMAPS                      OUString("ReduceBitmaps")
+#define PROPERTYNAME_REDUCEDBITMAPMODE                  OUString("ReducedBitmapMode")
+#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION            OUString("ReducedBitmapResolution")
+#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY  OUString("ReducedBitmapIncludesTransparency")
+#define PROPERTYNAME_CONVERTTOGREYSCALES                OUString("ConvertToGreyscales")
+#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT        OUString("PDFAsStandardPrintJobFormat")
 
 using namespace ::utl;
 using namespace ::rtl;
@@ -724,7 +724,7 @@ SvtPrinterOptions::SvtPrinterOptions()
     if( m_pStaticDataContainer == NULL )
     {
         OUString aRootPath( ROOTNODE_START );
-        m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += OUString( RTL_CONSTASCII_USTRINGPARAM( "/Printer" ) ) );
+        m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += OUString( "/Printer" ) );
         pPrinterOptionsDataContainer = m_pStaticDataContainer;
         svtools::ItemHolder2::holdConfigItem(E_PRINTOPTIONS);
     }
@@ -758,7 +758,7 @@ SvtPrintFileOptions::SvtPrintFileOptions()
     if( m_pStaticDataContainer == NULL )
     {
         OUString aRootPath( ROOTNODE_START );
-        m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += OUString( RTL_CONSTASCII_USTRINGPARAM( "/File" ) ) );
+        m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += OUString( "/File" ) );
         pPrintFileOptionsDataContainer = m_pStaticDataContainer;
 
         svtools::ItemHolder2::holdConfigItem(E_PRINTFILEOPTIONS);
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index 766221a5badc..16fd91535a54 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -159,18 +159,18 @@ namespace svt
             Reference< XResultSet > xResultSet;
             Sequence< OUString > aProps(12);
 
-            aProps[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ));
-            aProps[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ));
-            aProps[2] = OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ));
-            aProps[3] = OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ));
-            aProps[4] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ));
-            aProps[5] = OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetURL" ));
-            aProps[6] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsHidden" ));
-            aProps[7] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVolume" ));
-            aProps[8] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsRemote" ));
-            aProps[9] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsRemoveable" ));
-            aProps[10] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFloppy" ));
-            aProps[11] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsCompactDisc" ));
+            aProps[0] = OUString( "Title" );
+            aProps[1] = OUString( "Size" );
+            aProps[2] = OUString( "DateModified" );
+            aProps[3] = OUString( "DateCreated" );
+            aProps[4] = OUString( "IsFolder" );
+            aProps[5] = OUString( "TargetURL" );
+            aProps[6] = OUString( "IsHidden" );
+            aProps[7] = OUString( "IsVolume" );
+            aProps[8] = OUString( "IsRemote" );
+            aProps[9] = OUString( "IsRemoveable" );
+            aProps[10] = OUString( "IsFloppy" );
+            aProps[11] = OUString( "IsCompactDisc" );
 
             Reference< XCommandEnvironment > xEnvironment;
             try
@@ -266,8 +266,8 @@ namespace svt
                                 ::ucbhelper::Content aCnt( aTargetURL, xEnvironment, comphelper::getProcessComponentContext() );
                                 try
                                 {
-                                aCnt.getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" )) ) >>= pData->maSize;
-                                aCnt.getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= aDT;
+                                aCnt.getPropertyValue( OUString( "Size" ) ) >>= pData->maSize;
+                                aCnt.getPropertyValue( OUString( "DateModified" ) ) >>= aDT;
                                 }
                                 catch (...) {}
                             }
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 5b021fb8341b..25b1269270fa 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -823,7 +823,7 @@ PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void )
                     if ( aCommands.is() )
                         bEnableDelete
                             = aCommands->hasCommandByName(
-                                OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" )) );
+                                OUString( "delete" ) );
                     else
                         bEnableDelete = false;
                 }
@@ -842,7 +842,7 @@ PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void )
                     {
                         Property aProp
                             = aProps->getPropertyByName(
-                                OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" )) );
+                                OUString( "Title" ) );
                         bEnableRename
                             = !( aProp.Attributes & PropertyAttribute::READONLY );
                     }
@@ -926,7 +926,7 @@ void ViewTabListBox_Impl::DeleteEntries()
             if ( aCommands.is() )
                 canDelete
                     = aCommands->hasCommandByName(
-                        OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" )) );
+                        OUString( "delete" ) );
             else
                 canDelete = false;
         }
@@ -1118,7 +1118,7 @@ sal_Bool ViewTabListBox_Impl::Kill( const OUString& rContent )
     try
     {
         ::ucbhelper::Content aCnt( rContent, mxCmdEnv, comphelper::getProcessComponentContext() );
-        aCnt.executeCommand( OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" )), makeAny( sal_Bool( sal_True ) ) );
+        aCnt.executeCommand( OUString( "delete" ), makeAny( sal_Bool( sal_True ) ) );
     }
     catch( ::com::sun::star::ucb::CommandAbortedException const & )
     {
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index d52382c87077..c433ef97a78a 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -1089,7 +1089,7 @@ sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Poin
 
         case ::svt::BBTYPE_ROWHEADERBAR:
         case ::svt::BBTYPE_ROWHEADERCELL:
-            aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "error" ) );
+            aRetText = ::rtl::OUString( "error" );
             break;
 
         default:
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index f8547c2c12b8..e499cfd93e1e 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -665,7 +665,7 @@ void SvtFrameWindow_Impl::ShowDocInfo( const String& rURL )
         uno::Reference < task::XInteractionHandler2 > xInteractionHandler(
             task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) );
         uno::Sequence < beans::PropertyValue> aProps(1);
-        aProps[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
+        aProps[0].Name = ::rtl::OUString( "InteractionHandler" );
         aProps[0].Value <<= xInteractionHandler;
         m_xDocProps->loadFromMedium( rURL, aProps );
         pEditWin->fill( m_xDocProps, rURL );
@@ -747,7 +747,7 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B
 
                         uno::Reference < task::XInteractionHandler2 > xInteractionHandler(
                             task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) );
-                        aArgs[3].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
+                        aArgs[3].Name = ::rtl::OUString( "InteractionHandler" );
                         aArgs[3].Value <<= xInteractionHandler;
 
                         b = sal_False;
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index ceed216572fd..983e4ca311f0 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -374,8 +374,8 @@ void SvtMatchContext_Impl::ReadFolder( const String& rURL,
         uno::Reference< XResultSet > xResultSet;
         Sequence< OUString > aProps(2);
         OUString* pProps = aProps.getArray();
-        pProps[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) );
-        pProps[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) );
+        pProps[0] = OUString( "Title" );
+        pProps[1] = OUString( "IsFolder" );
 
         try
         {
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index 7d7e2b440e0e..93e57f345946 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -762,7 +762,7 @@ namespace svt
 
         if ( mpID )
         {
-            ::rtl::OUString aIDText = ::rtl::OUString::valueOf( (sal_Int32)( _nIndex + 1 ) ) +  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ));
+            ::rtl::OUString aIDText = ::rtl::OUString::valueOf( (sal_Int32)( _nIndex + 1 ) ) +  ::rtl::OUString( "." );
              mpID->SetText( aIDText );
         }
 
@@ -838,7 +838,7 @@ namespace svt
     {
         // calculate widths
         long nIDWidth = mpID->GetTextWidth( mpID->GetText() );
-        long nMaxIDWidth = mpID->GetTextWidth( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "100." )) );
+        long nMaxIDWidth = mpID->GetTextWidth( ::rtl::OUString( "100." ) );
         nIDWidth = ::std::min( nIDWidth, nMaxIDWidth );
 
         // check how many space the description would need
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index 3d0642b680bc..56537b97cee4 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -226,7 +226,7 @@ sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole() throw (RuntimeException)
 OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription() throw (RuntimeException)
 {
     ThrowIfDisposed();
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "ToolbarMenu" ) );
+    return OUString( "ToolbarMenu" );
 }
 
 // -----------------------------------------------------------------------------
@@ -599,7 +599,7 @@ void ToolbarMenuAcc::ThrowIfDisposed (void) throw (DisposedException)
 {
     if(rBHelper.bDisposed || rBHelper.bInDispose || !mpParent)
     {
-        throw DisposedException ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("object has been already disposed")), static_cast<XWeak*>(this));
+        throw DisposedException ( ::rtl::OUString("object has been already disposed"), static_cast<XWeak*>(this));
     }
 }
 
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index bb9623dc733e..0df398ece368 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -747,7 +747,7 @@ void ValueSetAcc::ThrowIfDisposed (void)
     {
         OSL_TRACE ("Calling disposed object. Throwing exception:");
         throw lang::DisposedException (
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("object has been already disposed")),
+            ::rtl::OUString("object has been already disposed"),
             static_cast<uno::XWeak*>(this));
     }
     else
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index a9e3e4dd9060..51b93e538db8 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -391,7 +391,7 @@ IMPL_LINK( CmisDetailsContainer, RefreshReposHdl, void *, EMPTYARG  )
     // Get the Content
     ::ucbhelper::Content aCnt( sUrl, m_xCmdEnv, comphelper::getProcessComponentContext() );
     Sequence< rtl::OUString > aProps( 1 );
-    aProps[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) );
+    aProps[0] = rtl::OUString( "Title" );
 
     try
     {
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 3df3fbff76d0..639ddfe8dca9 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -321,9 +321,9 @@ void AssignmentPersistentData::Commit()
 
     // -------------------------------------------------------------------
     AssignmentPersistentData::AssignmentPersistentData()
-        :ConfigItem( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.DataAccess/AddressBook" )))
+        :ConfigItem( ::rtl::OUString( "Office.DataAccess/AddressBook" ))
     {
-        Sequence< ::rtl::OUString > aStoredNames = GetNodeNames(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fields")));
+        Sequence< ::rtl::OUString > aStoredNames = GetNodeNames(::rtl::OUString("Fields"));
         const ::rtl::OUString* pStoredNames = aStoredNames.getConstArray();
         for (sal_Int32 i=0; i<aStoredNames.getLength(); ++i, ++pStoredNames)
             m_aStoredFields.insert(*pStoredNames);
@@ -348,7 +348,7 @@ void AssignmentPersistentData::Commit()
         {
             ::rtl::OUString sFieldPath(RTL_CONSTASCII_USTRINGPARAM("Fields/"));
             sFieldPath += _rLogicalName;
-            sFieldPath += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/AssignedFieldName"));
+            sFieldPath += ::rtl::OUString("/AssignedFieldName");
             sAssignment = getStringProperty(sFieldPath);
         }
         return sAssignment;
@@ -421,17 +421,17 @@ void AssignmentPersistentData::Commit()
 
         // Fields/<field>
         ::rtl::OUString sFieldElementNodePath(sDescriptionNodePath);
-        sFieldElementNodePath += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+        sFieldElementNodePath += ::rtl::OUString("/");
         sFieldElementNodePath += _rLogicalName;
 
         Sequence< PropertyValue > aNewFieldDescription(2);
         // Fields/<field>/ProgrammaticFieldName
         aNewFieldDescription[0].Name = sFieldElementNodePath;
-        aNewFieldDescription[0].Name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/ProgrammaticFieldName"));
+        aNewFieldDescription[0].Name += ::rtl::OUString("/ProgrammaticFieldName");
         aNewFieldDescription[0].Value <<= _rLogicalName;
         // Fields/<field>/AssignedFieldName
         aNewFieldDescription[1].Name = sFieldElementNodePath;
-        aNewFieldDescription[1].Name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/AssignedFieldName"));
+        aNewFieldDescription[1].Name += ::rtl::OUString("/AssignedFieldName");
         aNewFieldDescription[1].Value <<= _rAssignment;
 
         // just set the new value
@@ -1236,7 +1236,7 @@ void AssignmentPersistentData::Commit()
                 if ( xProp.is() )
                 {
                     ::rtl::OUString sName;
-                    xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sName;
+                    xProp->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sName;
 
                     INetURLObject aURL( sName );
                     if( aURL.GetProtocol() != INET_PROT_NOT_VALID )
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index 0b7cfbcd78a0..92c64ff6f177 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -87,7 +87,7 @@ short SvColorDialog::Execute()
         Sequence< PropertyValue > props( 2 );
         props[0].Name = sColor;
         props[0].Value <<= (sal_Int32) maColor.GetColor();
-        props[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Mode" ) );
+        props[1].Name = OUString( "Mode" );
         props[1].Value <<= (sal_Int16) meMode;
 
         xPropertyAccess->setPropertyValues( props );
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index af30375a2bee..29078cc949dd 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -108,8 +108,8 @@ void SvObjectServerList::FillInsertObjects()
         ::rtl::OUString sReaderService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" ));
         uno::Sequence< uno::Any > aArguments( 1 );
         beans::PropertyValue aPathProp;
-        aPathProp.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
-        aPathProp.Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Embedding/ObjectNames" ));
+        aPathProp.Name = ::rtl::OUString( "nodepath" );
+        aPathProp.Value <<= ::rtl::OUString( "/org.openoffice.Office.Embedding/ObjectNames" );
         aArguments[0] <<= aPathProp;
 
         uno::Reference< container::XNameAccess > xNameAccess(
@@ -135,8 +135,8 @@ void SvObjectServerList::FillInsertObjects()
                 {
                     ::rtl::OUString aUIName;
                     ::rtl::OUString aClassID;
-                    xEntry->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ObjectUIName" )) ) >>= aUIName;
-                    xEntry->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ClassID" )) ) >>= aClassID;
+                    xEntry->getByName( ::rtl::OUString( "ObjectUIName" ) ) >>= aUIName;
+                    xEntry->getByName( ::rtl::OUString( "ClassID" ) ) >>= aClassID;
 
                     if ( !aUIName.isEmpty() )
                     {
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index 19597874dc79..e17dfb8bdf1d 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -53,7 +53,7 @@ uno::Reference< uno::XInterface >
 OUString SvFilterOptionsDialog_getImplementationName()
     throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.SvFilterOptionsDialog" ) );
+    return OUString( "com.sun.star.comp.svtools.SvFilterOptionsDialog" );
 }
 #define SERVICE_NAME "com.sun.star.ui.dialog.FilterOptionsDialog"
 sal_Bool SAL_CALL SvFilterOptionsDialog_supportsService( const OUString& ServiceName )
@@ -238,9 +238,9 @@ void SvFilterOptionsDialog::setSourceDocument( const uno::Reference< lang::XComp
             ( xDoc, uno::UNO_QUERY );
     if ( xServiceInfo.is() )
     {
-        if ( xServiceInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ) )
+        if ( xServiceInfo->supportsService( OUString( "com.sun.star.presentation.PresentationDocument" ) ) )
             aConfigPath = String( RTL_CONSTASCII_USTRINGPARAM( "Office.Impress/Layout/Other/MeasureUnit" ) );
-        else if ( xServiceInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) ) )
+        else if ( xServiceInfo->supportsService( OUString( "com.sun.star.drawing.DrawingDocument" ) ) )
             aConfigPath = String( RTL_CONSTASCII_USTRINGPARAM( "Office.Draw/Layout/Other/MeasureUnit" ) );
         if ( aConfigPath.Len() )
         {
diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx
index f0e5e7f603ab..ee322a14152a 100644
--- a/svtools/source/graphic/graphic.cxx
+++ b/svtools/source/graphic/graphic.cxx
@@ -119,7 +119,7 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId_Static()
 ::rtl::OUString Graphic::getImplementationName_Static()
     throw()
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.graphic.Graphic" ) );
+    return ::rtl::OUString( "com.sun.star.comp.graphic.Graphic" );
 }
 
 // ------------------------------------------------------------------------------
@@ -129,7 +129,7 @@ uno::Sequence< ::rtl::OUString > Graphic::getSupportedServiceNames_Static()
 {
     uno::Sequence< ::rtl::OUString > aSeq( 1 );
 
-    aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.Graphic" ) );
+    aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.Graphic" );
 
     return aSeq;
 }
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index 7148fa3568a4..07817c818b8d 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -70,7 +70,7 @@ GraphicProvider::~GraphicProvider()
 ::rtl::OUString GraphicProvider::getImplementationName_Static()
     throw()
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.graphic.GraphicProvider" ) );
+    return ::rtl::OUString( "com.sun.star.comp.graphic.GraphicProvider" );
 }
 
 // ------------------------------------------------------------------------------
@@ -80,7 +80,7 @@ uno::Sequence< ::rtl::OUString > GraphicProvider::getSupportedServiceNames_Stati
 {
     uno::Sequence< ::rtl::OUString > aSeq( 1 );
 
-    aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicProvider" ) );
+    aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.GraphicProvider" );
 
     return aSeq;
 }
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index 8091ee53820b..2f90fa39a885 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -67,7 +67,7 @@ GraphicRendererVCL::~GraphicRendererVCL()
 ::rtl::OUString GraphicRendererVCL::getImplementationName_Static()
     throw()
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.graphic.GraphicRendererVCL" ) );
+    return ::rtl::OUString( "com.sun.star.comp.graphic.GraphicRendererVCL" );
 }
 
 // ------------------------------------------------------------------------------
@@ -77,7 +77,7 @@ uno::Sequence< ::rtl::OUString > GraphicRendererVCL::getSupportedServiceNames_St
 {
     uno::Sequence< ::rtl::OUString > aSeq( 1 );
 
-    aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicRendererVCL" ) );
+    aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.GraphicRendererVCL" );
 
     return aSeq;
 }
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx
index 0cf4d7d120fd..da76739afc95 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.cxx
@@ -87,7 +87,7 @@ IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserReq
                 xWindow->setVisible( sal_False );
 
                 // reparent the window
-                xWinPeer->setProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PluginParent" ) ),
+                xWinPeer->setProperty( ::rtl::OUString( "PluginParent" ),
                                         uno::makeAny( (sal_Int64) 0 ) );
 
                 Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
@@ -206,13 +206,13 @@ void SAL_CALL ODocumentCloser::initialize( const uno::Sequence< uno::Any >& aArg
     sal_Int32 nLen = aArguments.getLength();
     if ( nLen != 1 )
         throw lang::IllegalArgumentException(
-                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Wrong count of parameters!" ) ),
+                        ::rtl::OUString("Wrong count of parameters!" ),
                         uno::Reference< uno::XInterface >(),
                         0 );
 
     if ( !( aArguments[0] >>= m_xFrame ) || !m_xFrame.is() )
         throw lang::IllegalArgumentException(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Nonempty reference is expected as the first argument!" ) ),
+                ::rtl::OUString("Nonempty reference is expected as the first argument!" ),
                 uno::Reference< uno::XInterface >(),
                 0 );
 
@@ -259,7 +259,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ODocumentCloser::impl_staticGetSupport
 // --------------------------------------------------------
 ::rtl::OUString SAL_CALL ODocumentCloser::impl_staticGetImplementationName()
 {
-    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.embed.DocumentCloser" ) );
+    return rtl::OUString( "com.sun.star.comp.embed.DocumentCloser" );
 }
 
 // --------------------------------------------------------
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx
index 02848c2284c1..033710bc439a 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.cxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx
@@ -31,15 +31,15 @@ using namespace ::com::sun::star;
 uno::Sequence< ::rtl::OUString > SAL_CALL OHatchWindowFactory::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.HatchWindowFactory" ));
-    aRet[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.embed.HatchWindowFactory" ));
+    aRet[0] = ::rtl::OUString( "com.sun.star.embed.HatchWindowFactory" );
+    aRet[1] = ::rtl::OUString( "com.sun.star.comp.embed.HatchWindowFactory" );
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OHatchWindowFactory::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.embed.HatchWindowFactory" ));
+    return ::rtl::OUString( "com.sun.star.comp.embed.HatchWindowFactory" );
 }
 
 //-------------------------------------------------------------------------
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 6bd32c9e3e89..b167234f937d 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -296,65 +296,65 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
         switch( aKey.KeyCode )
         {
         case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfLine" ) );
+            return rtl::OUString( ".uno:DelToStartOfLine" );
         case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfLine" ) );
+            return rtl::OUString( ".uno:DelToEndOfLine" );
         case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfPara" ) );
+            return rtl::OUString( ".uno:DelToStartOfPara" );
         case com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfPara" ) );
+            return rtl::OUString( ".uno:DelToEndOfPara" );
         case com::sun::star::awt::Key::DELETE_WORD_BACKWARD:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfWord" ) );
+            return rtl::OUString( ".uno:DelToStartOfWord" );
         case com::sun::star::awt::Key::DELETE_WORD_FORWARD:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfWord" ) );
+            return rtl::OUString( ".uno:DelToEndOfWord" );
         case com::sun::star::awt::Key::INSERT_LINEBREAK:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertLinebreak" ) );
+            return rtl::OUString( ".uno:InsertLinebreak" );
         case com::sun::star::awt::Key::INSERT_PARAGRAPH:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPara" ) );
+            return rtl::OUString( ".uno:InsertPara" );
         case com::sun::star::awt::Key::MOVE_WORD_BACKWARD:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToPrevWord" ) );
+            return rtl::OUString( ".uno:GoToPrevWord" );
         case com::sun::star::awt::Key::MOVE_WORD_FORWARD:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToNextWord" ) );
+            return rtl::OUString( ".uno:GoToNextWord" );
         case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfLine" ) );
+            return rtl::OUString( ".uno:GoToStartOfLine" );
         case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfLine" ) );
+            return rtl::OUString( ".uno:GoToEndOfLine" );
         case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfPara" ) );
+            return rtl::OUString( ".uno:GoToStartOfPara" );
         case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfPara" ) );
+            return rtl::OUString( ".uno:GoToEndOfPara" );
         case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfDoc" ) );
+            return rtl::OUString( ".uno:GoToStartOfDoc" );
         case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfDoc" ) );
+            return rtl::OUString( ".uno:GoToEndOfDoc" );
         case com::sun::star::awt::Key::SELECT_BACKWARD:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharLeftSel" ) );
+            return rtl::OUString( ".uno:CharLeftSel" );
         case com::sun::star::awt::Key::SELECT_FORWARD:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharRightSel" ) );
+            return rtl::OUString( ".uno:CharRightSel" );
         case com::sun::star::awt::Key::SELECT_WORD_BACKWARD:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:WordLeftSel" ) );
+            return rtl::OUString( ".uno:WordLeftSel" );
         case com::sun::star::awt::Key::SELECT_WORD_FORWARD:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:WordRightSel" ) );
+            return rtl::OUString( ".uno:WordRightSel" );
         case com::sun::star::awt::Key::SELECT_WORD:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectWord" ) );
+            return rtl::OUString( ".uno:SelectWord" );
         case com::sun::star::awt::Key::SELECT_LINE:
             return rtl::OUString();
         case com::sun::star::awt::Key::SELECT_PARAGRAPH:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectText" ) );
+            return rtl::OUString( ".uno:SelectText" );
         case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfLineSel" ) );
+            return rtl::OUString( ".uno:StartOfLineSel" );
         case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfLineSel" ) );
+            return rtl::OUString( ".uno:EndOfLineSel" );
         case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfParaSel" ) );
+            return rtl::OUString( ".uno:StartOfParaSel" );
         case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfParaSel" ) );
+            return rtl::OUString( ".uno:EndOfParaSel" );
         case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfDocumentSel" ) );
+            return rtl::OUString( ".uno:StartOfDocumentSel" );
         case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfDocumentSel" ) );
+            return rtl::OUString( ".uno:EndOfDocumentSel" );
         case com::sun::star::awt::Key::SELECT_ALL:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectAll" ) );
+            return rtl::OUString( ".uno:SelectAll" );
         default:
             break;
         }
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index 7a15af515753..b21d576ab632 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -148,7 +148,7 @@ namespace svt
 
             // let it create a graphic from the given URL
             Sequence< PropertyValue > aMediaProperties( 1 );
-            aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+            aMediaProperties[0].Name = ::rtl::OUString( "URL" );
             aMediaProperties[0].Value <<= _rImageResourceURL;
             Reference< XGraphic > xGraphic( xProvider->queryGraphic( aMediaProperties ) );
             OSL_ENSURE( xGraphic.is(), "GraphicAccess::getImageStream: the provider did not give us a graphic object!" );
@@ -163,10 +163,10 @@ namespace svt
             );
 
             aMediaProperties.realloc( 2 );
-            aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ) );
+            aMediaProperties[0].Name = ::rtl::OUString( "OutputStream" );
             aMediaProperties[0].Value <<= xBufferAccess;
-            aMediaProperties[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MimeType" ) );
-            aMediaProperties[1].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "image/png" ) );
+            aMediaProperties[1].Name = ::rtl::OUString( "MimeType" );
+            aMediaProperties[1].Value <<= ::rtl::OUString( "image/png" );
             xProvider->storeGraphic( xGraphic, aMediaProperties );
 
             pMemBuffer->Seek( 0 );
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index 42be4cad5173..c6d7a719338f 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -425,7 +425,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             break;
         }
         case USCRIPT_LATIN:
-            sSampleText = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Lorem ipsum"));
+            sSampleText = rtl::OUString("Lorem ipsum");
             break;
         default:
             break;
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 538c2246111a..2039c3d41c5b 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -602,10 +602,10 @@ namespace svt
             // create a content for the current folder root
             Reference< XResultSet > xResultSet;
             Sequence< ::rtl::OUString > aContentProperties( 4);
-            aContentProperties[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ));
-            aContentProperties[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ));
-            aContentProperties[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ));
-            aContentProperties[3] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ));
+            aContentProperties[0] = ::rtl::OUString( "Title" );
+            aContentProperties[1] = ::rtl::OUString( "DateModified" );
+            aContentProperties[2] = ::rtl::OUString( "DateCreated" );
+            aContentProperties[3] = ::rtl::OUString( "IsFolder" );
 
             // get the set of sub contents in the folder
             try
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index e702089e8d08..8b8990903f05 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -1393,33 +1393,33 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
                 aFlavorEx.mnSotId = SOT_FORMATSTR_ID_HTML_NO_COMMENT;
                 rDataFlavorExVector.push_back( aFlavorEx );
             }
-            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/plain" )) ) )
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/plain" ) ) )
             {
                 // add, if it is a UTF-8 byte buffer
                 if( xMimeType->hasParameter( aCharsetStr ) )
                 {
-                    if( xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unicode" )) ) ||
-                        xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "utf-16" )) ) )
+                    if( xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( "unicode" ) ) ||
+                        xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( "utf-16" ) ) )
                     {
                         rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_STRING;
 
                     }
                 }
             }
-            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/rtf" )) ) )
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/rtf" ) ) )
             {
                 rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_RTF;
             }
-            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/html" )) ) )
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/html" ) ) )
 
             {
                 rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMATSTR_ID_HTML;
             }
-            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/uri-list" )) ) )
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/uri-list" ) ) )
             {
                 rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMAT_FILE_LIST;
             }
-            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-objectdescriptor-xml" )) ) )
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "application/x-openoffice-objectdescriptor-xml" ) ) )
             {
                 rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMATSTR_ID_OBJECTDESCRIPTOR;
             }
@@ -2276,19 +2276,19 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer::
         {
             if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( xRequestType2->getFullMediaType() ) )
             {
-                if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/plain" )) ) )
+                if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/plain" ) ) )
                 {
                     // special handling for text/plain media types
                     const ::rtl::OUString aCharsetString(RTL_CONSTASCII_USTRINGPARAM( "charset" ));
 
                     if( !xRequestType2->hasParameter( aCharsetString ) ||
-                        xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "utf-16" )) ) ||
-                        xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unicode" )) ) )
+                        xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( "utf-16" ) ) ||
+                        xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( "unicode" ) ) )
                     {
                         bRet = sal_True;
                     }
                 }
-                else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice" )) ) )
+                else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "application/x-openoffice" ) ) )
                 {
                     // special handling for application/x-openoffice media types
                     const ::rtl::OUString aFormatString(RTL_CONSTASCII_USTRINGPARAM( "windows_formatname" ));
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 5b46420c8826..6a1fc18447fe 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -295,16 +295,16 @@ namespace svt { namespace table
         switch( eObjType )
         {
             case TCTYPE_GRIDCONTROL:
-                aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Grid control" ) );
+                aRetText = ::rtl::OUString( "Grid control" );
                 break;
             case TCTYPE_TABLE:
-                aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Grid conrol" ) );
+                aRetText = ::rtl::OUString( "Grid conrol" );
                 break;
             case TCTYPE_ROWHEADERBAR:
-                aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RowHeaderBar" ) );
+                aRetText = ::rtl::OUString( "RowHeaderBar" );
                 break;
             case TCTYPE_COLUMNHEADERBAR:
-                aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnHeaderBar" ) );
+                aRetText = ::rtl::OUString( "ColumnHeaderBar" );
                 break;
             case TCTYPE_TABLECELL:
                 //the name of the cell constists of column name and row name if defined
@@ -340,16 +340,16 @@ namespace svt { namespace table
         switch( eObjType )
         {
             case TCTYPE_GRIDCONTROL:
-                aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Grid control description" ) );
+                aRetText = ::rtl::OUString( "Grid control description" );
                 break;
             case TCTYPE_TABLE:
-                    aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TABLE description" ) );
+                    aRetText = ::rtl::OUString( "TABLE description" );
                 break;
             case TCTYPE_ROWHEADERBAR:
-                    aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERBAR description" ) );
+                    aRetText = ::rtl::OUString( "ROWHEADERBAR description" );
                 break;
             case TCTYPE_COLUMNHEADERBAR:
-                    aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERBAR description" ) );
+                    aRetText = ::rtl::OUString( "COLUMNHEADERBAR description" );
                 break;
             case TCTYPE_TABLECELL:
                 // the description of the cell consists of column name and row name if defined
@@ -365,10 +365,10 @@ namespace svt { namespace table
                 }
                 break;
             case TCTYPE_ROWHEADERCELL:
-                    aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERCELL description" ) );
+                    aRetText = ::rtl::OUString( "ROWHEADERCELL description" );
                 break;
             case TCTYPE_COLUMNHEADERCELL:
-                    aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERCELL description" ) );
+                    aRetText = ::rtl::OUString( "COLUMNHEADERCELL description" );
                 break;
         }
         return aRetText;
@@ -378,7 +378,7 @@ namespace svt { namespace table
     ::rtl::OUString TableControl::GetRowDescription( sal_Int32 _nRow) const
     {
         (void)_nRow;
-        return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "row description" ) );
+        return rtl::OUString( "row description" );
     }
 
     //------------------------------------------------------------------------------------------------------------------
@@ -393,7 +393,7 @@ namespace svt { namespace table
     ::rtl::OUString TableControl::GetColumnDescription( sal_uInt16 _nColumn) const
     {
         (void)_nColumn;
-        return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "col description" ) );
+        return rtl::OUString( "col description" );
     }
 
     //------------------------------------------------------------------------------------------------------------------
diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx
index f40f964732e1..5de9580fd3fa 100644
--- a/svtools/source/uno/miscservices.cxx
+++ b/svtools/source/uno/miscservices.cxx
@@ -96,7 +96,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL svt_component_getFactory (
         {
             Sequence< OUString > aServiceNames(1);
             aServiceNames.getArray()[0] =
-                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.AddressBookSourceDialog" ));
+                OUString( "com.sun.star.ui.AddressBookSourceDialog" );
 
             xFactory = ::cppu::createSingleFactory (
                 reinterpret_cast< XMultiServiceFactory* >( _pServiceManager ),
@@ -109,7 +109,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL svt_component_getFactory (
         {
             Sequence< OUString > aServiceNames(1);
             aServiceNames.getArray()[0] =
-                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilterOptionsDialog" ));
+                OUString( "com.sun.star.ui.dialogs.FilterOptionsDialog" );
 
             xFactory = ::cppu::createSingleFactory (
                 reinterpret_cast< XMultiServiceFactory* >( _pServiceManager ),
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 6707dfcb0d68..86bdf797e6cb 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -404,7 +404,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
         {
             Reference< XGridDataModel > const xDataModel( aValue, UNO_QUERY );
             if ( !xDataModel.is() )
-                throw GridInvalidDataException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Invalid data model." ) ), *this );
+                throw GridInvalidDataException( ::rtl::OUString( "Invalid data model." ), *this );
 
             m_pTableModel->setDataModel( xDataModel );
             impl_checkTableModelInit();
@@ -416,7 +416,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
             // obtain new col model
             Reference< XGridColumnModel > const xColumnModel( aValue, UNO_QUERY );
             if ( !xColumnModel.is() )
-                throw GridInvalidModelException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Invalid column model." ) ), *this );
+                throw GridInvalidModelException( ::rtl::OUString( "Invalid column model." ), *this );
 
             // remove all old columns
             m_pTableModel->removeAllColumns();
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 14e3bc4960cf..becdcd04bbbf 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -148,7 +148,7 @@ Reference< XLayoutManager > ToolboxController::getLayoutManager() const
     {
         try
         {
-            xLayoutManager.set(xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))),UNO_QUERY);
+            xLayoutManager.set(xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" )),UNO_QUERY);
         }
         catch ( Exception& )
         {
@@ -380,7 +380,7 @@ throw (::com::sun::star::uno::RuntimeException)
             Sequence<PropertyValue>   aArgs( 1 );
 
             // Provide key modifier information to dispatch function
-            aArgs[0].Name   = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
+            aArgs[0].Name   = rtl::OUString( "KeyModifier" );
             aArgs[0].Value  = makeAny( KeyModifier );
 
             aTargetURL.Complete = aCommandURL;
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 809cf61c83ba..692b23a9a9c2 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1467,7 +1467,7 @@ bool TreeControlPeer::loadImage( const ::rtl::OUString& rURL, Image& rImage )
     if( mxGraphicProvider.is() ) try
     {
         ::com::sun::star::beans::PropertyValues aProps( 1 );
-        aProps[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+        aProps[0].Name = OUString( "URL" );
         aProps[0].Value <<= rURL;
 
         Reference< XGraphic > xGraphic( mxGraphicProvider->queryGraphic( aProps ) );
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 49edf88dd409..43612825ac3f 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -1449,7 +1449,7 @@ void SVTXRoadmap::propertyChange( const ::com::sun::star::beans::PropertyChangeE
         xRoadmapItem = evt.Source;
         sal_Int32 nID = 0;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet( xRoadmapItem, ::com::sun::star::uno::UNO_QUERY );
-        ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" )));
+        ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( "ID" ));
         aValue >>= nID;
 
         ::com::sun::star::uno::Any rVal = evt.NewValue;
@@ -1498,11 +1498,11 @@ RMItemData SVTXRoadmap::GetRMItemData( const ::com::sun::star::container::Contai
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet( xRoadmapItem, ::com::sun::star::uno::UNO_QUERY );
     if ( xPropertySet.is() )
     {
-        ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" )));
+        ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( "Label" ));
         aValue >>= aCurRMItemData.Label;
-        aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" )));
+        aValue = xPropertySet->getPropertyValue(::rtl::OUString( "ID" ));
         aValue >>= aCurRMItemData.n_ID;
-        aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" )));
+        aValue = xPropertySet->getPropertyValue(::rtl::OUString( "Enabled" ));
         aValue >>= aCurRMItemData.b_Enabled;
     }
     return aCurRMItemData;
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 26ba6f636c03..8fa36eb35faf 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -401,18 +401,18 @@ Sequence< ::rtl::OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNam
     throw(RuntimeException)
 {
     Sequence< ::rtl::OUString > aSNS( 2 );
-    aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapObject" ));
+    aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.image.ImageMapObject" );
     switch( mnType )
     {
     case IMAP_OBJ_POLYGON:
     default:
-        aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapPolygonObject" ));
+        aSNS.getArray()[1] = ::rtl::OUString("com.sun.star.image.ImageMapPolygonObject" );
         break;
     case IMAP_OBJ_RECTANGLE:
-        aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapRectangleObject" ));
+        aSNS.getArray()[1] = ::rtl::OUString("com.sun.star.image.ImageMapRectangleObject" );
         break;
     case IMAP_OBJ_CIRCLE:
-        aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapCircleObject" ));
+        aSNS.getArray()[1] = ::rtl::OUString("com.sun.star.image.ImageMapCircleObject" );
         break;
     }
     return aSNS;
@@ -424,11 +424,11 @@ Sequence< ::rtl::OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNam
     {
     case IMAP_OBJ_POLYGON:
     default:
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapPolygonObject") );
+        return ::rtl::OUString("org.openoffice.comp.svt.ImageMapPolygonObject");
     case IMAP_OBJ_CIRCLE:
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapCircleObject") );
+        return ::rtl::OUString("org.openoffice.comp.svt.ImageMapCircleObject");
     case IMAP_OBJ_RECTANGLE:
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapRectangleObject") );
+        return ::rtl::OUString("org.openoffice.comp.svt.ImageMapRectangleObject");
     }
 }
 
@@ -721,7 +721,7 @@ sal_Bool SAL_CALL SvUnoImageMap::hasElements(  ) throw(RuntimeException)
 ::rtl::OUString SAL_CALL SvUnoImageMap::getImplementationName(  )
     throw(RuntimeException)
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.svt.SvUnoImageMap" ) );
+    return ::rtl::OUString( "org.openoffice.comp.svt.SvUnoImageMap" );
 }
 
 sal_Bool SAL_CALL SvUnoImageMap::supportsService( const ::rtl::OUString& ServiceName )
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 5d9ffac6ebc2..bb8a2bfcbd61 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -158,7 +158,7 @@ namespace svt { namespace uno
             {
                 if ( i_rPaths[i][0] != nFirstPageId )
                     throw IllegalArgumentException(
-                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "All paths must start with the same page id." ) ),
+                        ::rtl::OUString( "All paths must start with the same page id." ),
                         i_rContext, 2 );
             }
         }
@@ -240,14 +240,14 @@ namespace svt { namespace uno
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL Wizard::getImplementationName_static() throw(RuntimeException)
     {
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.uno.Wizard" ) );
+        return ::rtl::OUString( "com.sun.star.comp.svtools.uno.Wizard" );
     }
 
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL Wizard::getSupportedServiceNames_static() throw(RuntimeException)
     {
         Sequence< ::rtl::OUString > aServices(1);
-        aServices[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.Wizard" ) );
+        aServices[0] = ::rtl::OUString( "com.sun.star.ui.dialogs.Wizard" );
         return aServices;
     }