diff options
Diffstat (limited to 'basebmp/test/polytest.cxx')
| -rw-r--r-- | basebmp/test/polytest.cxx | 53 |
1 files changed, 18 insertions, 35 deletions
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index 2feef67774de..99aba1a06fc4 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,11 +28,9 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include <basegfx/vector/b2isize.hxx> #include <basegfx/range/b2irange.hxx> @@ -45,21 +44,12 @@ #include <basebmp/color.hxx> #include <basebmp/scanlineformats.hxx> #include <basebmp/bitmapdevice.hxx> -#include <basebmp/debug.hxx> #include "tools.hxx" -#include <iostream> -#include <fstream> - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( rDevice, output ); -*/ - class PolyTest : public CppUnit::TestFixture { private: @@ -76,8 +66,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, @@ -91,8 +81,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, @@ -111,8 +101,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, @@ -126,8 +116,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, @@ -141,8 +131,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, @@ -160,8 +150,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, @@ -180,8 +170,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 ); @@ -218,12 +208,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, @@ -288,14 +278,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(PolyTest); } - -// ----------------------------------------------------------------------------- - -// this macro creates an empty function, which will called by the RegisterAllFunctions() -// to let the user the possibility to also register some functions by hand. -//NOADDITIONAL; - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |