targeted string re-work

Change-Id: I2e05baeb2c7f42e6f37613fe648fc19a8d0ac730

3 files changed, 18 insertions, 28 deletions

diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx
index 02b392a52fe7..2ac30648bb1f 100644
--- a/basebmp/test/bmpdemo.cxx
+++ b/basebmp/test/bmpdemo.cxx
@@ -970,7 +970,7 @@ class TestWindow : public Dialog
     public:
         TestWindow() : Dialog( (Window *) NULL )
         {
-            SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VIGRA test" )) );
+            SetText( rtl::OUString( "VIGRA test" ) );
             SetSizePixel( Size( 1024, 1024 ) );
             EnablePaint( true );
             Show();
@@ -1074,9 +1074,9 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
         basegfx::B2DPolyPolygon aPoly;
 
         basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "m0 0 h7 v7 h-7 z" )) );
+                                        ::rtl::OUString( "m0 0 h7 v7 h-7 z" ) );
         basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "m2 2 h3 v3 h-3 z" )) );
+                                        ::rtl::OUString( "m2 2 h3 v3 h-3 z" ) );
 
         pDevice->fillPolyPolygon(
             aPoly,
@@ -1095,7 +1095,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
         pMask->drawLine( aPt111, aPt222, aCol333, basebmp::DrawMode_PAINT );
 
 
-        ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" ));
+        ::rtl::OUString aSvg( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" );
         basegfx::B2DPolyPolygon aPoly;
         basegfx::tools::importFromSvgD( aPoly, aSvg );
         pMask->clear(basebmp::Color(0xFFFFFFFF));
@@ -1233,8 +1233,8 @@ void TestApp::Main()
 
     // Create UCB.
     uno::Sequence< uno::Any > aArgs( 2 );
-    aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
-    aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
+    aArgs[ 0 ] <<= rtl::OUString(UCB_CONFIGURATION_KEY1_LOCAL );
+    aArgs[ 1 ] <<= rtl::OUString(UCB_CONFIGURATION_KEY2_OFFICE );
     ::ucbhelper::ContentBroker::initialize( xFactory, aArgs );
 
     TestWindow pWindow;
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index e44aaeda0c8f..e1e8872acb6c 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -121,7 +121,7 @@ public:
                                          true,
                                          Format::THIRTYTWO_BIT_TC_MASK );
 
-        ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" ));
+        ::rtl::OUString aSvg( "m 0 0h5v10h5v-5h-10z" );
 
         basegfx::B2DPolyPolygon aPoly;
         basegfx::tools::importFromSvgD( aPoly, aSvg );
@@ -136,8 +136,7 @@ public:
             aColWhite,
             DrawMode_PAINT );
 
-        aSvg = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "m 0 0 h6 v10 h-6z" ));
+        aSvg = ::rtl::OUString( "m 0 0 h6 v10 h-6z" );
 
         aPoly.clear();
         basegfx::tools::importFromSvgD( aPoly, aSvg );
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index 63485000b7f9..0c6b6d4c5cb2 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -68,8 +68,7 @@ private:
 
         basegfx::tools::importFromSvgD(
             aPoly,
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "M2 2 l7 7 z" )) );
+            rtl::OUString( "M2 2 l7 7 z" ) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -83,8 +82,7 @@ private:
         aPoly.clear();
         basegfx::tools::importFromSvgD(
             aPoly,
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "M7 2 l-6 6 z" )) );
+            rtl::OUString( "M7 2 l-6 6 z" ) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -102,8 +100,7 @@ private:
 
         basegfx::tools::importFromSvgD(
             aPoly,
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "M2 2 h1 l7 7 h-1 z" )) );
+            rtl::OUString( "M2 2 h1 l7 7 h-1 z" ) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -117,8 +114,7 @@ private:
         aPoly.clear();
         basegfx::tools::importFromSvgD(
             aPoly,
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "M7 2 h-1 l-6 6 h1 z" )) );
+            rtl::OUString( "M7 2 h-1 l-6 6 h1 z" ) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -132,8 +128,7 @@ private:
         aPoly.clear();
         basegfx::tools::importFromSvgD(
             aPoly,
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "M0 0 l7 7 h-1 l-5-7 z" )) );
+            rtl::OUString( "M0 0 l7 7 h-1 l-5-7 z" ) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -150,8 +145,7 @@ private:
         basegfx::B2DPolyPolygon aPoly;
 
         basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                            "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" )) );
+                                        ::rtl::OUString( "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) );
 
         rDevice->fillPolyPolygon(
             aPoly,
@@ -169,8 +163,7 @@ private:
         basegfx::B2DPolyPolygon aPoly;
 
         basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                            "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" )) );
+                                        ::rtl::OUString( "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) );
         basegfx::B2DHomMatrix aMat;
         aMat.translate(-3,-3);
         aMat.rotate( 1.7 );
@@ -270,8 +263,7 @@ private:
         // *all* of the four two-pixel lines in that polygon do *not*
         // generate a single pixel, due to the rasterization effect.
         basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                            "M2 3 l1 -1 M4 2 l1 1 M2 8 l1 1 M5 8 l-1 1 M2 5 h4 M3 0 v10" )) );
+                                        ::rtl::OUString( "M2 3 l1 -1 M4 2 l1 1 M2 8 l1 1 M5 8 l-1 1 M2 5 h4 M3 0 v10" ) );
         BitmapDeviceSharedPtr pClippedDevice=(
             subsetBitmapDevice( rDevice,
                                 basegfx::B2IBox(3,3,5,9) ));
@@ -294,12 +286,11 @@ private:
         basegfx::B2DPolyPolygon aPoly;
 
         basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                            "M0 0 v2 l10 2 v-2 z"
+                                        ::rtl::OUString( "M0 0 v2 l10 2 v-2 z"
                                             "M10 6 v-2 l-10 2 v2 z"
                                             "M1 0 h1 v10 h-1 z"
                                             "M4 0 h1 v10 h-1 z"
-                                            "M8 0 h1 v10 h-1 z" )) );
+                                            "M8 0 h1 v10 h-1 z" ) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,