[Libreoffice-commits] .: basebmp/test

[Gert Faller]

 basebmp/test/bmpdemo.cxx     |    4 ++--
 basebmp/test/bmpmasktest.cxx |    4 ++--
 basebmp/test/polytest.cxx    |   32 ++++++++++++++++----------------
 3 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit d43643059a71f61616594f3b54b563c434303ae2
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date:   Tue Nov 23 18:43:37 2010 +0100

    RTL_CONSTASCII_USTRINGPARAM in libs-gui 11

diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx
index 6e0bd37..81d0227 100644
--- a/basebmp/test/bmpdemo.cxx
+++ b/basebmp/test/bmpdemo.cxx
@@ -1237,8 +1237,8 @@ void TestApp::Main()
 
     // Create UCB.
     uno::Sequence< uno::Any > aArgs( 2 );
-    aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
-    aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+    aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
+    aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
     ::ucbhelper::ContentBroker::initialize( xFactory, aArgs );
 
     TestWindow pWindow;
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index 455549b..1e0658a 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -135,8 +135,8 @@ public:
             aColWhite,
             DrawMode_PAINT );
 
-        aSvg = ::rtl::OUString::createFromAscii(
-            "m 0 0 h6 v10 h-6z" );
+        aSvg = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "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 26b641c..b3f9dbb 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -68,8 +68,8 @@ private:
 
         basegfx::tools::importFromSvgD(
             aPoly,
-            rtl::OUString::createFromAscii(
-                "M2 2 l7 7 z" ) );
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "M2 2 l7 7 z" )) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -83,8 +83,8 @@ private:
         aPoly.clear();
         basegfx::tools::importFromSvgD(
             aPoly,
-            rtl::OUString::createFromAscii(
-            "M7 2 l-6 6 z" ) );
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "M7 2 l-6 6 z" )) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -103,8 +103,8 @@ private:
 
         basegfx::tools::importFromSvgD(
             aPoly,
-            rtl::OUString::createFromAscii(
-                "M2 2 h1 l7 7 h-1 z" ) );
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "M2 2 h1 l7 7 h-1 z" )) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -118,8 +118,8 @@ private:
         aPoly.clear();
         basegfx::tools::importFromSvgD(
             aPoly,
-            rtl::OUString::createFromAscii(
-            "M7 2 h-1 l-6 6 h1 z" ) );
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "M7 2 h-1 l-6 6 h1 z" )) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -133,8 +133,8 @@ private:
         aPoly.clear();
         basegfx::tools::importFromSvgD(
             aPoly,
-            rtl::OUString::createFromAscii(
-            "M0 0 l7 7 h-1 l-5-7 z" ) );
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "M0 0 l7 7 h-1 l-5-7 z" )) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -152,8 +152,8 @@ private:
         ::rtl::OUString aSvg;
 
         basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString::createFromAscii(
-                                            "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) );
+                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                            "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" )) );
 
         rDevice->fillPolyPolygon(
             aPoly,
@@ -172,8 +172,8 @@ private:
         ::rtl::OUString aSvg;
 
         basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString::createFromAscii(
-                                            "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) );
+                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                            "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 );
@@ -210,12 +210,12 @@ private:
         ::rtl::OUString aSvg;
 
         basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString::createFromAscii(
+                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                             "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,