From 9cb8bef68b67b5f2fba3bee38cd8449ea804b86e Mon Sep 17 00:00:00 2001 From: Ricardo Montania Date: Sat, 27 Oct 2012 15:34:06 -0200 Subject: ::rtl::OUString -> OUString in basebmp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id9cde5559165c61da825938153e92df999233a59 Reviewed-on: https://gerrit.libreoffice.org/928 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- basebmp/test/bmpdemo.cxx | 17 ++++++++--------- basebmp/test/bmpmasktest.cxx | 4 ++-- basebmp/test/bmptest.cxx | 2 +- basebmp/test/cliptest.cxx | 4 ++-- basebmp/test/filltest.cxx | 2 +- basebmp/test/masktest.cxx | 2 +- basebmp/test/polytest.cxx | 18 +++++++++--------- 7 files changed, 24 insertions(+), 25 deletions(-) (limited to 'basebmp/test') diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index 18f4cab399ac..a7f39fcce3a6 100644 --- a/basebmp/test/bmpdemo.cxx +++ b/basebmp/test/bmpdemo.cxx @@ -959,7 +959,7 @@ class TestWindow : public Dialog public: TestWindow() : Dialog( (Window *) NULL ) { - SetText( rtl::OUString( "VIGRA test" ) ); + SetText( OUString( "VIGRA test" ) ); SetSizePixel( Size( 1024, 1024 ) ); EnablePaint( true ); Show(); @@ -1059,16 +1059,15 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) basebmp::Format::THIRTYTWO_BIT_TC_MASK )); { - ::rtl::OUString aSvg; + OUString aSvg; + basegfx::B2DPolyPolygon aPoly; - basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString( "m0 0 h7 v7 h-7 z" ) ); - basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString( "m2 2 h3 v3 h-3 z" ) ); + basegfx::tools::importFromSvgD( aPoly, OUString( "m0 0 h7 v7 h-7 z" ) ); + + basegfx::tools::importFromSvgD( aPoly, OUString( "m2 2 h3 v3 h-3 z" ) ); - pDevice->fillPolyPolygon( - aPoly, + pDevice->fillPolyPolygon( aPoly, basebmp::Color(0xFFFFFFFF), basebmp::DrawMode_PAINT ); } @@ -1084,7 +1083,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) pMask->drawLine( aPt111, aPt222, aCol333, basebmp::DrawMode_PAINT ); - ::rtl::OUString aSvg( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" ); + 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)); diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index f81083f94320..500ba91667d4 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -109,7 +109,7 @@ public: true, Format::THIRTYTWO_BIT_TC_MASK ); - ::rtl::OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); + OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); @@ -124,7 +124,7 @@ public: aColWhite, DrawMode_PAINT ); - aSvg = ::rtl::OUString( "m 0 0 h6 v10 h-6z" ); + aSvg = "m 0 0 h6 v10 h-6z" ; aPoly.clear(); basegfx::tools::importFromSvgD( aPoly, aSvg ); diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index e4b0931ff2c4..571e32e776d0 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -146,7 +146,7 @@ public: true, Format::THIRTYTWO_BIT_TC_MASK ); - ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" )); + OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index ca13ef8da0c7..21f94aa5474c 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -158,7 +158,7 @@ private: true, Format::EIGHT_BIT_GREY )); - ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" )); + OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); @@ -198,7 +198,7 @@ public: true, Format::THIRTYTWO_BIT_TC_MASK ); - ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" )); + OUString aSvg( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" ); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); mpClipMask->clear(Color(0)); diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index 5e7b02f6a801..a6e87e4cf5bc 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -146,7 +146,7 @@ private: CPPUNIT_ASSERT_MESSAGE("bottom-middle pixel set", rDevice->getPixel(aPt4) == aCol); - ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0l7 7h-1z" )); + OUString aSvg( "m 0 0l7 7h-1z" ); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index 9dc5e61d72a3..052db904ea24 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -113,7 +113,7 @@ public: true, Format::EIGHT_BIT_GREY ); - ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" )); + OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index a5c9b30960b8..cfc02b4c2ab6 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -54,7 +54,7 @@ private: basegfx::tools::importFromSvgD( aPoly, - rtl::OUString( "M2 2 l7 7 z" ) ); + OUString( "M2 2 l7 7 z" ) ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -68,7 +68,7 @@ private: aPoly.clear(); basegfx::tools::importFromSvgD( aPoly, - rtl::OUString( "M7 2 l-6 6 z" ) ); + OUString( "M7 2 l-6 6 z" ) ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -86,7 +86,7 @@ private: basegfx::tools::importFromSvgD( aPoly, - rtl::OUString( "M2 2 h1 l7 7 h-1 z" ) ); + OUString( "M2 2 h1 l7 7 h-1 z" ) ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -100,7 +100,7 @@ private: aPoly.clear(); basegfx::tools::importFromSvgD( aPoly, - rtl::OUString( "M7 2 h-1 l-6 6 h1 z" ) ); + OUString( "M7 2 h-1 l-6 6 h1 z" ) ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -114,7 +114,7 @@ private: aPoly.clear(); basegfx::tools::importFromSvgD( aPoly, - rtl::OUString( "M0 0 l7 7 h-1 l-5-7 z" ) ); + OUString( "M0 0 l7 7 h-1 l-5-7 z" ) ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -131,7 +131,7 @@ private: basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString( "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) ); + OUString( "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) ); rDevice->fillPolyPolygon( aPoly, @@ -149,7 +149,7 @@ private: basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString( "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) ); + 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 ); @@ -249,7 +249,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( "M2 3 l1 -1 M4 2 l1 1 M2 8 l1 1 M5 8 l-1 1 M2 5 h4 M3 0 v10" ) ); + 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) )); @@ -272,7 +272,7 @@ private: basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString( "M0 0 v2 l10 2 v-2 z" + 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" -- cgit