targeted string re-work

Change-Id: I2ee4fbb1e166a926b36b100c47e6da4cf39d51b4

5 files changed, 96 insertions, 96 deletions

diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index fb24a6546b49..82924059788a 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -82,17 +82,17 @@ namespace css = ::com::sun::star;
 #define SEPERATOR_QUERYPARAM                            ((sal_Unicode)':')
 #define SEPERATOR_QUERYPARAMVALUE                       ((sal_Unicode)'=')
 
-#define QUERYPARAM_IFLAGS                               ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "iflags" ))
-#define QUERYPARAM_EFLAGS                               ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "eflags" ))
-#define QUERYPARAM_SORT_PROP                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sort_prop" ))
+#define QUERYPARAM_IFLAGS                               ::rtl::OUString( "iflags" )
+#define QUERYPARAM_EFLAGS                               ::rtl::OUString( "eflags" )
+#define QUERYPARAM_SORT_PROP                            ::rtl::OUString( "sort_prop" )
 
-#define QUERYPARAM_DESCENDING                           ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "descending" ))
-#define QUERYPARAM_USE_ORDER                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "use_order" ))
-#define QUERYPARAM_DEFAULT_FIRST                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "default_first" ))
-#define QUERYPARAM_CASE_SENSITIVE                       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "case_sensitive" ))
+#define QUERYPARAM_DESCENDING                           ::rtl::OUString( "descending" )
+#define QUERYPARAM_USE_ORDER                            ::rtl::OUString( "use_order" )
+#define QUERYPARAM_DEFAULT_FIRST                        ::rtl::OUString( "default_first" )
+#define QUERYPARAM_CASE_SENSITIVE                       ::rtl::OUString( "case_sensitive" )
 
-#define QUERYPARAMVALUE_SORT_PROP_NAME                  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "name" ))
-#define QUERYPARAMVALUE_SORT_PROP_UINAME                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uiname" ))
+#define QUERYPARAMVALUE_SORT_PROP_NAME                  ::rtl::OUString( "name" )
+#define QUERYPARAMVALUE_SORT_PROP_UINAME                ::rtl::OUString( "uiname" )
 
 
 
@@ -241,7 +241,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea
 
     // convert "_query_xxx:..." to "getByDocService=xxx:..."
     ::rtl::OUString sNewQuery(sQuery);
-    sal_Int32 pos = sNewQuery.indexOf(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_query_" )),0);
+    sal_Int32 pos = sNewQuery.indexOf(::rtl::OUString( "_query_" ),0);
     if (pos != -1)
     {
         OSL_FAIL("DEPRECATED!\nPlease use new query format: 'matchByDocumentService=...'");
@@ -306,43 +306,43 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize
     if ( sDocumentService == "writer" )
     {
         OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
-        sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ));
+        sDocumentService = ::rtl::OUString( "com.sun.star.text.TextDocument" );
     }
     else
     if ( sDocumentService == "web" )
     {
         OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
-        sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.WebDocument" ));
+        sDocumentService = ::rtl::OUString( "com.sun.star.text.WebDocument" );
     }
     else
     if ( sDocumentService == "global" )
     {
         OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
-        sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.GlobalDocument" ));
+        sDocumentService = ::rtl::OUString( "com.sun.star.text.GlobalDocument" );
     }
     else
     if ( sDocumentService == "calc" )
     {
         OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
-        sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ));
+        sDocumentService = ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" );
     }
     else
     if ( sDocumentService == "draw" )
     {
         OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
-        sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ));
+        sDocumentService = ::rtl::OUString( "com.sun.star.drawing.DrawingDocument" );
     }
     else
     if ( sDocumentService == "impress" )
     {
         OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
-        sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ));
+        sDocumentService = ::rtl::OUString( "com.sun.star.presentation.PresentationDocument" );
     }
     else
     if ( sDocumentService == "math" )
     {
         OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
-        sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.formula.FormulaProperties" ));
+        sDocumentService = ::rtl::OUString( "com.sun.star.formula.FormulaProperties" );
     }
 #endif
 
@@ -645,7 +645,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS
 
 ::rtl::OUString FilterFactory::impl_getImplementationName()
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.FilterFactory" ));
+    return ::rtl::OUString( "com.sun.star.comp.filter.config.FilterFactory" );
 }
 
 
@@ -653,7 +653,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS
 css::uno::Sequence< ::rtl::OUString > FilterFactory::impl_getSupportedServiceNames()
 {
     css::uno::Sequence< ::rtl::OUString > lServiceNames(1);
-    lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ));
+    lServiceNames[0] = ::rtl::OUString( "com.sun.star.document.FilterFactory" );
     return lServiceNames;
 }
 
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index a3249879e6ca..16459e5491e0 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2033,7 +2033,7 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape,
     if ( pCustoShape )
     {
         uno::Sequence< rtl::OUString > sEquationSource;
-        const rtl::OUString sEquations( RTL_CONSTASCII_USTRINGPARAM( "Equations" ) );
+        const rtl::OUString sEquations( "Equations"  );
         SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)(const SdrCustomShapeGeometryItem&)
             pCustoShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
         const uno::Any* pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sEquations );
@@ -2163,19 +2163,19 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
     if ( aXPropSet.is() )
     {
         SdrObjCustomShape* pCustoShape = (SdrObjCustomShape*)GetSdrObjectFromXShape( rXShape );
-        const rtl::OUString sCustomShapeGeometry( RTL_CONSTASCII_USTRINGPARAM( "CustomShapeGeometry" ) );
+        const rtl::OUString sCustomShapeGeometry( "CustomShapeGeometry"  );
         uno::Any aGeoPropSet = aXPropSet->getPropertyValue( sCustomShapeGeometry );
         uno::Sequence< beans::PropertyValue > aGeoPropSeq;
         if ( aGeoPropSet >>= aGeoPropSeq )
         {
-            const rtl::OUString sViewBox            ( RTL_CONSTASCII_USTRINGPARAM( "ViewBox" ) );
-            const rtl::OUString sTextRotateAngle    ( RTL_CONSTASCII_USTRINGPARAM( "TextRotateAngle" ) );
-            const rtl::OUString sExtrusion          ( RTL_CONSTASCII_USTRINGPARAM( "Extrusion" ) );
-            const rtl::OUString sEquations          ( RTL_CONSTASCII_USTRINGPARAM( "Equations" ) );
-            const rtl::OUString sPath               ( RTL_CONSTASCII_USTRINGPARAM( "Path" ) );
-            const rtl::OUString sTextPath           ( RTL_CONSTASCII_USTRINGPARAM( "TextPath" ) );
-            const rtl::OUString sHandles            ( RTL_CONSTASCII_USTRINGPARAM( "Handles" ) );
-            const rtl::OUString sAdjustmentValues   ( RTL_CONSTASCII_USTRINGPARAM( "AdjustmentValues" ) );
+            const rtl::OUString sViewBox            ( "ViewBox"  );
+            const rtl::OUString sTextRotateAngle    ( "TextRotateAngle"  );
+            const rtl::OUString sExtrusion          ( "Extrusion"  );
+            const rtl::OUString sEquations          ( "Equations"  );
+            const rtl::OUString sPath               ( "Path"  );
+            const rtl::OUString sTextPath           ( "TextPath"  );
+            const rtl::OUString sHandles            ( "Handles"  );
+            const rtl::OUString sAdjustmentValues   ( "AdjustmentValues"  );
 
             const beans::PropertyValue* pAdjustmentValuesProp = NULL;
             sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0;
@@ -2240,28 +2240,28 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                         for ( r = 0; r < nrCount; r++ )
                         {
                             const beans::PropertyValue& rrProp = aExtrusionPropSeq[ r ];
-                            const rtl::OUString sExtrusionBrightness            ( RTL_CONSTASCII_USTRINGPARAM( "Brightness" ) );
-                            const rtl::OUString sExtrusionDepth                 ( RTL_CONSTASCII_USTRINGPARAM( "Depth" ) );
-                            const rtl::OUString sExtrusionDiffusion             ( RTL_CONSTASCII_USTRINGPARAM( "Diffusion" ) );
-                            const rtl::OUString sExtrusionNumberOfLineSegments  ( RTL_CONSTASCII_USTRINGPARAM( "NumberOfLineSegments" ) );
-                            const rtl::OUString sExtrusionLightFace             ( RTL_CONSTASCII_USTRINGPARAM( "LightFace" ) );
-                            const rtl::OUString sExtrusionFirstLightHarsh       ( RTL_CONSTASCII_USTRINGPARAM( "FirstLightHarsh" ) );
-                            const rtl::OUString sExtrusionSecondLightHarsh      ( RTL_CONSTASCII_USTRINGPARAM( "SecondLightHarsh" ) );
-                            const rtl::OUString sExtrusionFirstLightLevel       ( RTL_CONSTASCII_USTRINGPARAM( "FirstLightLevel" ) );
-                            const rtl::OUString sExtrusionSecondLightLevel      ( RTL_CONSTASCII_USTRINGPARAM( "SecondLightLevel" ) );
-                            const rtl::OUString sExtrusionFirstLightDirection   ( RTL_CONSTASCII_USTRINGPARAM( "FirstLightDirection" ) );
-                            const rtl::OUString sExtrusionSecondLightDirection  ( RTL_CONSTASCII_USTRINGPARAM( "SecondLightDirection" ) );
-                            const rtl::OUString sExtrusionMetal                 ( RTL_CONSTASCII_USTRINGPARAM( "Metal" ) );
-                            const rtl::OUString sExtrusionShadeMode             ( RTL_CONSTASCII_USTRINGPARAM( "ShadeMode" ) );
-                            const rtl::OUString sExtrusionRotateAngle           ( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ) );
-                            const rtl::OUString sExtrusionRotationCenter        ( RTL_CONSTASCII_USTRINGPARAM( "RotationCenter" ) );
-                            const rtl::OUString sExtrusionShininess             ( RTL_CONSTASCII_USTRINGPARAM( "Shininess" ) );
-                            const rtl::OUString sExtrusionSkew                  ( RTL_CONSTASCII_USTRINGPARAM( "Skew" ) );
-                            const rtl::OUString sExtrusionSpecularity           ( RTL_CONSTASCII_USTRINGPARAM( "Specularity" ) );
-                            const rtl::OUString sExtrusionProjectionMode        ( RTL_CONSTASCII_USTRINGPARAM( "ProjectionMode" ) );
-                            const rtl::OUString sExtrusionViewPoint             ( RTL_CONSTASCII_USTRINGPARAM( "ViewPoint" ) );
-                            const rtl::OUString sExtrusionOrigin                ( RTL_CONSTASCII_USTRINGPARAM( "Origin" ) );
-                            const rtl::OUString sExtrusionColor                 ( RTL_CONSTASCII_USTRINGPARAM( "Color" ) );
+                            const rtl::OUString sExtrusionBrightness            ( "Brightness"  );
+                            const rtl::OUString sExtrusionDepth                 ( "Depth"  );
+                            const rtl::OUString sExtrusionDiffusion             ( "Diffusion"  );
+                            const rtl::OUString sExtrusionNumberOfLineSegments  ( "NumberOfLineSegments"  );
+                            const rtl::OUString sExtrusionLightFace             ( "LightFace"  );
+                            const rtl::OUString sExtrusionFirstLightHarsh       ( "FirstLightHarsh"  );
+                            const rtl::OUString sExtrusionSecondLightHarsh      ( "SecondLightHarsh"  );
+                            const rtl::OUString sExtrusionFirstLightLevel       ( "FirstLightLevel"  );
+                            const rtl::OUString sExtrusionSecondLightLevel      ( "SecondLightLevel"  );
+                            const rtl::OUString sExtrusionFirstLightDirection   ( "FirstLightDirection"  );
+                            const rtl::OUString sExtrusionSecondLightDirection  ( "SecondLightDirection"  );
+                            const rtl::OUString sExtrusionMetal                 ( "Metal"  );
+                            const rtl::OUString sExtrusionShadeMode             ( "ShadeMode"  );
+                            const rtl::OUString sExtrusionRotateAngle           ( "RotateAngle"  );
+                            const rtl::OUString sExtrusionRotationCenter        ( "RotationCenter"  );
+                            const rtl::OUString sExtrusionShininess             ( "Shininess"  );
+                            const rtl::OUString sExtrusionSkew                  ( "Skew"  );
+                            const rtl::OUString sExtrusionSpecularity           ( "Specularity"  );
+                            const rtl::OUString sExtrusionProjectionMode        ( "ProjectionMode"  );
+                            const rtl::OUString sExtrusionViewPoint             ( "ViewPoint"  );
+                            const rtl::OUString sExtrusionOrigin                ( "Origin"  );
+                            const rtl::OUString sExtrusionColor                 ( "Color"  );
 
                             if ( rrProp.Name.equals( sExtrusion ) )
                             {
@@ -2576,16 +2576,16 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                         for ( r = 0; r < nrCount; r++ )
                         {
                             const beans::PropertyValue& rrProp = aPathPropSeq[ r ];
-                            const rtl::OUString sPathExtrusionAllowed               ( RTL_CONSTASCII_USTRINGPARAM( "ExtrusionAllowed" ) );
-                            const rtl::OUString sPathConcentricGradientFillAllowed  ( RTL_CONSTASCII_USTRINGPARAM( "ConcentricGradientFillAllowed" ) );
-                            const rtl::OUString sPathTextPathAllowed                ( RTL_CONSTASCII_USTRINGPARAM( "TextPathAllowed" ) );
-                            const rtl::OUString sPathCoordinates                    ( RTL_CONSTASCII_USTRINGPARAM( "Coordinates" ) );
-                            const rtl::OUString sPathGluePoints                     ( RTL_CONSTASCII_USTRINGPARAM( "GluePoints" ) );
-                            const rtl::OUString sPathGluePointType                  ( RTL_CONSTASCII_USTRINGPARAM( "GluePointType" ) );
-                            const rtl::OUString sPathSegments                       ( RTL_CONSTASCII_USTRINGPARAM( "Segments" ) );
-                            const rtl::OUString sPathStretchX                       ( RTL_CONSTASCII_USTRINGPARAM( "StretchX" ) );
-                            const rtl::OUString sPathStretchY                       ( RTL_CONSTASCII_USTRINGPARAM( "StretchY" ) );
-                            const rtl::OUString sPathTextFrames                     ( RTL_CONSTASCII_USTRINGPARAM( "TextFrames" ) );
+                            const rtl::OUString sPathExtrusionAllowed               ( "ExtrusionAllowed"  );
+                            const rtl::OUString sPathConcentricGradientFillAllowed  ( "ConcentricGradientFillAllowed"  );
+                            const rtl::OUString sPathTextPathAllowed                ( "TextPathAllowed"  );
+                            const rtl::OUString sPathCoordinates                    ( "Coordinates"  );
+                            const rtl::OUString sPathGluePoints                     ( "GluePoints"  );
+                            const rtl::OUString sPathGluePointType                  ( "GluePointType"  );
+                            const rtl::OUString sPathSegments                       ( "Segments"  );
+                            const rtl::OUString sPathStretchX                       ( "StretchX"  );
+                            const rtl::OUString sPathStretchY                       ( "StretchY"  );
+                            const rtl::OUString sPathTextFrames                     ( "TextFrames"  );
 
                             if ( rrProp.Name.equals( sPathExtrusionAllowed ) )
                             {
@@ -2893,9 +2893,9 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                         for ( r = 0; r < nrCount; r++ )
                         {
                             const beans::PropertyValue& rrProp = aTextPathPropSeq[ r ];
-                            const rtl::OUString sTextPathMode       ( RTL_CONSTASCII_USTRINGPARAM( "TextPathMode" ) );
-                            const rtl::OUString sTextPathScaleX     ( RTL_CONSTASCII_USTRINGPARAM( "ScaleX" ) );
-                            const rtl::OUString sSameLetterHeights  ( RTL_CONSTASCII_USTRINGPARAM( "SameLetterHeights" ) );
+                            const rtl::OUString sTextPathMode       ( "TextPathMode"  );
+                            const rtl::OUString sTextPathScaleX     ( "ScaleX"  );
+                            const rtl::OUString sSameLetterHeights  ( "SameLetterHeights"  );
 
                             if ( rrProp.Name.equals( sTextPath ) )
                             {
@@ -2962,16 +2962,16 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                             if ( xText.is() )
                                 aText = xText->getString();
                             if ( aText.isEmpty() )
-                                aText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "your text" ));   // todo: moving into a resource
+                                aText = ::rtl::OUString( "your text" );   // todo: moving into a resource
                             AddOpt( DFF_Prop_gtextUNICODE, aText );
 
                             // FontWork Font
                             rtl::OUString aFontName;
-                            const rtl::OUString sCharFontName           ( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) );
+                            const rtl::OUString sCharFontName           ( "CharFontName"  );
                             uno::Any aAny = aXPropSet->getPropertyValue( sCharFontName );
                             aAny >>= aFontName;
                             if ( aFontName.isEmpty() )
-                                aFontName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Arial Black" ));
+                                aFontName = ::rtl::OUString( "Arial Black" );
                             AddOpt( DFF_Prop_gtextFont, aFontName );
 
                             if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CharScaleWidth" ) ), sal_True ) )
@@ -3061,17 +3061,17 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                     {
                                         const beans::PropertyValue& rPropVal = rPropSeq[ j ];
 
-                                        const rtl::OUString sPosition           ( RTL_CONSTASCII_USTRINGPARAM( "Position" ) );
-                                        const rtl::OUString sMirroredX          ( RTL_CONSTASCII_USTRINGPARAM( "MirroredX" ) );
-                                        const rtl::OUString sMirroredY          ( RTL_CONSTASCII_USTRINGPARAM( "MirroredY" ) );
-                                        const rtl::OUString sSwitched           ( RTL_CONSTASCII_USTRINGPARAM( "Switched" ) );
-                                        const rtl::OUString sPolar              ( RTL_CONSTASCII_USTRINGPARAM( "Polar" ) );
-                                        const rtl::OUString sRadiusRangeMinimum ( RTL_CONSTASCII_USTRINGPARAM( "RadiusRangeMinimum" ) );
-                                        const rtl::OUString sRadiusRangeMaximum ( RTL_CONSTASCII_USTRINGPARAM( "RadiusRangeMaximum" ) );
-                                        const rtl::OUString sRangeXMinimum      ( RTL_CONSTASCII_USTRINGPARAM( "RangeXMinimum" ) );
-                                        const rtl::OUString sRangeXMaximum      ( RTL_CONSTASCII_USTRINGPARAM( "RangeXMaximum" ) );
-                                        const rtl::OUString sRangeYMinimum      ( RTL_CONSTASCII_USTRINGPARAM( "RangeYMinimum" ) );
-                                        const rtl::OUString sRangeYMaximum      ( RTL_CONSTASCII_USTRINGPARAM( "RangeYMaximum" ) );
+                                        const rtl::OUString sPosition           ( "Position"  );
+                                        const rtl::OUString sMirroredX          ( "MirroredX"  );
+                                        const rtl::OUString sMirroredY          ( "MirroredY"  );
+                                        const rtl::OUString sSwitched           ( "Switched"  );
+                                        const rtl::OUString sPolar              ( "Polar"  );
+                                        const rtl::OUString sRadiusRangeMinimum ( "RadiusRangeMinimum"  );
+                                        const rtl::OUString sRadiusRangeMaximum ( "RadiusRangeMaximum"  );
+                                        const rtl::OUString sRangeXMinimum      ( "RangeXMinimum"  );
+                                        const rtl::OUString sRangeXMaximum      ( "RangeXMaximum"  );
+                                        const rtl::OUString sRangeYMinimum      ( "RangeYMinimum"  );
+                                        const rtl::OUString sRangeYMaximum      ( "RangeYMaximum"  );
 
                                         if ( rPropVal.Name.equals( sPosition ) )
                                         {
@@ -4052,9 +4052,9 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( sal_Bool bFirst )
                 SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)(const SdrCustomShapeGeometryItem&)
                     pCustoShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
 
-                const rtl::OUString sPath( RTL_CONSTASCII_USTRINGPARAM( "Path" ) );
-                const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) );
-                const rtl::OUString sGluePointType( RTL_CONSTASCII_USTRINGPARAM( "GluePointType" ) );
+                const rtl::OUString sPath( "Path"  );
+                const rtl::OUString sType( "Type"  );
+                const rtl::OUString sGluePointType( "GluePointType"  );
 
                 rtl::OUString sShapeType;
                 uno::Any* pType = rGeometryItem.GetPropertyValueByName( sType );
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index ebb7367c8c2d..bbd63d51d0f4 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -204,9 +204,9 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             }
             break;
         }
-        rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" )) ));
+        rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( "RotateAngle" ) ));
 
-        if( ( rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFontwork" )) ) &&
+        if( ( rObj.ImplGetPropertyValue( ::rtl::OUString( "IsFontwork" ) ) &&
             ::cppu::any2bool( rObj.GetUsrAny() ) ) ||
             rObj.GetType().EqualsAscii( "drawing.Measure" ) || rObj.GetType().EqualsAscii( "drawing.Caption" ) )
         {
@@ -287,7 +287,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
         {
             mpEscherEx->OpenContainer( ESCHER_SpContainer );
             sal_Int32 nRadius = (sal_Int32)rObj.ImplGetInt32PropertyValue(
-                                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CornerRadius" )));
+                                            ::rtl::OUString( "CornerRadius" ));
             if( nRadius )
             {
                 nRadius = ImplMapSize( Size( nRadius, 0 )).Width();
@@ -316,7 +316,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
         {
             CircleKind  eCircleKind = CircleKind_FULL;
             PolyStyle   ePolyKind = PolyStyle();
-            if ( rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleKind" )) ) )
+            if ( rObj.ImplGetPropertyValue( ::rtl::OUString( "CircleKind" ) ) )
             {
                 eCircleKind = *( (CircleKind*)rObj.GetUsrAny().getValue() );
                 switch ( eCircleKind )
@@ -351,10 +351,10 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             else
             {
                 sal_Int32 nStartAngle, nEndAngle;
-                if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleStartAngle" )) ) )
+                if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( "CircleStartAngle" ) ) )
                     break;
                 nStartAngle = *( (sal_Int32*)rObj.GetUsrAny().getValue() );
-                if( !rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleEndAngle" )) ) )
+                if( !rObj.ImplGetPropertyValue( ::rtl::OUString( "CircleEndAngle" ) ) )
                     break;
                 nEndAngle = *( (sal_Int32*)rObj.GetUsrAny().getValue() );
 
@@ -605,7 +605,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
                  'D' == rObj.GetType().GetChar( 9 ) )   // drawing.3D
         {
             // SceneObject, CubeObject, SphereObject, LatheObject, ExtrudeObject, PolygonObject
-            if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Bitmap" )) ) )
+            if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( "Bitmap" ) ) )
                 break;
 
             mpEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -629,7 +629,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
         aPropOpt.CreateShadowProperties( rObj.mXPropSet );
 
         if( USHRT_MAX != mpEscherEx->GetHellLayerId() &&
-            rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayerID" )) ) &&
+            rObj.ImplGetPropertyValue( ::rtl::OUString( "LayerID" ) ) &&
             (*((sal_uInt16*)rObj.GetUsrAny().getValue()) ) == mpEscherEx->GetHellLayerId() )
         {
             aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x200020 );
@@ -690,7 +690,7 @@ void ImplEESdrWriter::ImplWriteAdditionalText( ImplEESdrObject& rObj,
         if ( !mpPicStrm )
             mpPicStrm = mpEscherEx->QueryPictureStream();
         EscherPropertyContainer aPropOpt( mpEscherEx->GetGraphicProvider(), mpPicStrm, aRect100thmm );
-        rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ))));
+        rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( "RotateAngle" )));
         sal_Int32 nAngle = rObj.GetAngle();
         if( rObj.GetType().EqualsAscii( "drawing.Line" ))
         {
@@ -1042,8 +1042,8 @@ void ImplEESdrObject::Init( ImplEESdrWriter& rEx )
         xub_StrLen nPos = mType.SearchAscii( "Shape" );
         mType.Erase( nPos, 5 );
 
-        static const OUString sPresStr(RTL_CONSTASCII_USTRINGPARAM( "IsPresentationObject" ));
-        static const OUString sEmptyPresStr(RTL_CONSTASCII_USTRINGPARAM( "IsEmptyPresentationObject" ));
+        static const OUString sPresStr("IsPresentationObject" );
+        static const OUString sEmptyPresStr("IsEmptyPresentationObject" );
 
         if( ImplGetPropertyValue( sPresStr ) )
             mbPresObj = ::cppu::any2bool( mAny );
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index 4b1def1ef665..e2f1c0d5c1f9 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -39,7 +39,7 @@
 using namespace ::com::sun::star;
 using namespace ::rtl;
 
-#define C2U(cChar)  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(cChar))
+#define C2U(cChar)  rtl::OUString(cChar)
 
 static char sWW8_form[] = "WW-Standard";
 
diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx
index 6d0abe1e41f0..0e79ca4aaec0 100644
--- a/filter/source/xmlfilterdetect/filterdetect.cxx
+++ b/filter/source/xmlfilterdetect/filterdetect.cxx
@@ -124,7 +124,7 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm)
 ::rtl::OUString supportedByType( const ::rtl::OUString clipBoardFormat ,  const ::rtl::OString resultString, const ::rtl::OUString checkType)
 {
     ::rtl::OUString sTypeName;
-    if ( clipBoardFormat.match(OUString(RTL_CONSTASCII_USTRINGPARAM("doctype:"))) )
+    if ( clipBoardFormat.match(OUString("doctype:")) )
     {
         ::rtl::OString tryStr = ::rtl::OUStringToOString(clipBoardFormat.copy(8),RTL_TEXTENCODING_ASCII_US).getStr();
         if (resultString.indexOf(tryStr) >= 0)
@@ -189,7 +189,7 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm)
             return ::rtl::OUString();
 
         // test typedetect code
-        Reference <XNameAccess> xTypeCont(mxMSF->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ))),UNO_QUERY);
+        Reference <XNameAccess> xTypeCont(mxMSF->createInstance(OUString( "com.sun.star.document.TypeDetection" )),UNO_QUERY);
         Sequence < ::rtl::OUString > myTypes= xTypeCont->getElementNames();
         nLength = myTypes.getLength();
 
@@ -224,7 +224,7 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm)
         if (location == aArguments.getLength())
         {
             aArguments.realloc(nLength+1);
-            aArguments[location].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TypeName" ));
+            aArguments[location].Name = ::rtl::OUString( "TypeName" );
         }
         aArguments[location].Value <<=sTypeName;
     }