diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /basegfx/test | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'basegfx/test')
-rw-r--r-- | basegfx/test/basegfx2d.cxx | 10 | ||||
-rw-r--r-- | basegfx/test/boxclipper.cxx | 18 | ||||
-rw-r--r-- | basegfx/test/clipstate.cxx | 8 | ||||
-rw-r--r-- | basegfx/test/genericclipper.cxx | 12 |
4 files changed, 24 insertions, 24 deletions
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index 4abcf6c00468..67ecb3e32d0b 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -55,10 +55,10 @@ namespace basegfx2d class b2dsvgdimpex : public CppUnit::TestFixture { private: - ::rtl::OUString aPath0; - ::rtl::OUString aPath1; - ::rtl::OUString aPath2; - ::rtl::OUString aPath3; + OUString aPath0; + OUString aPath1; + OUString aPath2; + OUString aPath3; public: // initialise your test code values here. @@ -139,7 +139,7 @@ public: void impex() { B2DPolyPolygon aPoly; - ::rtl::OUString aExport; + OUString aExport; CPPUNIT_ASSERT_MESSAGE("importing simple rectangle from SVG-D", tools::importFromSvgD( aPoly, diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx index fb084e85a03c..a296871d7fe9 100644 --- a/basegfx/test/boxclipper.cxx +++ b/basegfx/test/boxclipper.cxx @@ -165,7 +165,7 @@ public: B2DPolyPolygon randomPoly; tools::importFromSvgD( randomPoly, - rtl::OUString::createFromAscii(randomSvg)); + OUString::createFromAscii(randomSvg)); std::for_each(randomPoly.begin(), randomPoly.end(), boost::bind( @@ -241,9 +241,9 @@ public: CPPUNIT_ASSERT_MESSAGE(sName, tools::importFromSvgD( aTmp1, - rtl::OUString::createFromAscii(sSvg))); + OUString::createFromAscii(sSvg))); - const rtl::OUString aSvg= + const OUString aSvg= tools::exportToSvgD(toTest.solveCrossovers()); B2DPolyPolygon aTmp2; CPPUNIT_ASSERT_MESSAGE(sName, @@ -320,7 +320,7 @@ public: (void)pName; (void)rPoly; #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "%s - svg:d=\"%s\"\n", - pName, rtl::OUStringToOString( + pName, OUStringToOString( basegfx::tools::exportToSvgD(rPoly), RTL_TEXTENCODING_UTF8).getStr() ); #endif @@ -363,32 +363,32 @@ public: #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "%s input - svg:d=\"%s\"\n", - pName, rtl::OUStringToOString( + pName, OUStringToOString( basegfx::tools::exportToSvgD( genericClip), RTL_TEXTENCODING_UTF8).getStr() ); #endif const B2DPolyPolygon boxClipResult=rRange.solveCrossovers(); - const rtl::OUString boxClipSvg( + const OUString boxClipSvg( basegfx::tools::exportToSvgD( normalizePoly( boxClipResult))); #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "%s boxclipper - svg:d=\"%s\"\n", - pName, rtl::OUStringToOString( + pName, OUStringToOString( boxClipSvg, RTL_TEXTENCODING_UTF8).getStr() ); #endif genericClip = tools::solveCrossovers(genericClip); - const rtl::OUString genericClipSvg( + const OUString genericClipSvg( basegfx::tools::exportToSvgD( normalizePoly( genericClip))); #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "%s genclipper - svg:d=\"%s\"\n", - pName, rtl::OUStringToOString( + pName, OUStringToOString( genericClipSvg, RTL_TEXTENCODING_UTF8).getStr() ); #endif diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx index 54346835c1b5..f2b0ef0e94b7 100644 --- a/basegfx/test/clipstate.cxx +++ b/basegfx/test/clipstate.cxx @@ -94,7 +94,7 @@ public: { #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "%s - svg:d=\"%s\"\n", - sName, rtl::OUStringToOString( + sName, OUStringToOString( basegfx::tools::exportToSvgD(toTest.getClipPoly()), RTL_TEXTENCODING_UTF8).getStr() ); #endif @@ -103,9 +103,9 @@ public: CPPUNIT_ASSERT_MESSAGE(sName, tools::importFromSvgD( aTmp1, - rtl::OUString::createFromAscii(sSvg))); + OUString::createFromAscii(sSvg))); - const rtl::OUString aSvg= + const OUString aSvg= tools::exportToSvgD(toTest.getClipPoly()); B2DPolyPolygon aTmp2; CPPUNIT_ASSERT_MESSAGE(sName, @@ -143,7 +143,7 @@ public: B2DPolyPolygon aTmp1; tools::importFromSvgD( aTmp1, - rtl::OUString::createFromAscii(unionSvg)); + OUString::createFromAscii(unionSvg)); aMixedClip.intersectPolyPolygon(aTmp1); aMixedClip.subtractRange(B2DRange(-20,-150,20,0)); diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx index 6b62ff5d94de..c1af17d369c5 100644 --- a/basegfx/test/genericclipper.cxx +++ b/basegfx/test/genericclipper.cxx @@ -77,12 +77,12 @@ public: tools::prepareForPolygonOperation(aShiftedRectangle)); #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "%s input LHS - svg:d=\"%s\"\n", - pName, rtl::OUStringToOString( + pName, OUStringToOString( basegfx::tools::exportToSvgD( aSelfIntersect), RTL_TEXTENCODING_UTF8).getStr() ); fprintf(stderr, "%s input RHS - svg:d=\"%s\"\n", - pName, rtl::OUStringToOString( + pName, OUStringToOString( basegfx::tools::exportToSvgD( aRect), RTL_TEXTENCODING_UTF8).getStr() ); @@ -93,12 +93,12 @@ public: #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "%s - svg:d=\"%s\"\n", - pName, rtl::OUStringToOString( + pName, OUStringToOString( basegfx::tools::exportToSvgD(aRes), RTL_TEXTENCODING_UTF8).getStr() ); #endif - rtl::OUString aValid=rtl::OUString::createFromAscii(pValidSvgD); + OUString aValid=OUString::createFromAscii(pValidSvgD); CPPUNIT_ASSERT_MESSAGE(pName, basegfx::tools::exportToSvgD(aRes) == aValid); @@ -132,8 +132,8 @@ public: const char* pInputSvgD, const char* pValidSvgD) { - rtl::OUString aInput=rtl::OUString::createFromAscii(pInputSvgD); - rtl::OUString aValid=rtl::OUString::createFromAscii(pValidSvgD); + OUString aInput=OUString::createFromAscii(pInputSvgD); + OUString aValid=OUString::createFromAscii(pValidSvgD); B2DPolyPolygon aInputPoly, aValidPoly; tools::importFromSvgD(aInputPoly, aInput); |