From ecadd96bccf9e535362ee49ac9019cb2eb69f3ae Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 6 Oct 2010 12:16:50 +0100 Subject: #i113503# cppunit stl wrapper headers --- basebmp/test/basictest.cxx | 2 ++ basebmp/test/bmpmasktest.cxx | 2 ++ basebmp/test/bmptest.cxx | 2 ++ basebmp/test/cliptest.cxx | 2 ++ basebmp/test/filltest.cxx | 2 ++ basebmp/test/linetest.cxx | 2 ++ basebmp/test/makefile.mk | 7 +++++++ basebmp/test/masktest.cxx | 2 ++ basebmp/test/polytest.cxx | 2 ++ 9 files changed, 23 insertions(+) (limited to 'basebmp/test') diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx index 6f96cf56f492..a9c533a3a134 100644 --- a/basebmp/test/basictest.cxx +++ b/basebmp/test/basictest.cxx @@ -27,10 +27,12 @@ // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" +#include "postextstl.h" #include #include diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 9be504819fe8..29e261423a06 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -27,9 +27,11 @@ // 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 #include diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index 9e33f0a8d713..9d083980790b 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -27,9 +27,11 @@ // 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 #include diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index 875016d878cc..b0f0b72f07e0 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -27,9 +27,11 @@ // 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 #include diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index 150fa11b3a72..d03e887dbcc5 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -27,9 +27,11 @@ // 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 #include diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index fcd383fccdb0..dbdbe57de0a7 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.cxx @@ -27,9 +27,11 @@ // 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 #include diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index ca77721716f7..8dc95dcea0e5 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -60,6 +60,13 @@ CDEFS+=-xalias_level=compatible .ENDIF .ENDIF +#building with stlport, but cppunit was not built with stlport +.IF "$(USE_SYSTEM_STL)"!="YES" +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGSCXX+=-DADAPT_EXT_STL +.ENDIF +.ENDIF + CFLAGSCXX += $(CPPUNIT_CFLAGS) # --- Common ---------------------------------------------------------- diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index 77cd05588d5a..63f357a314d0 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -27,9 +27,11 @@ // 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 #include diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index f3b1f0018e17..2feef67774de 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -27,9 +27,11 @@ // 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 #include -- cgit From 4905a190326a423b418a6b5531c5d990a5cc0082 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Thu, 14 Oct 2010 08:27:31 +0200 Subject: Add vim/emacs modelines to all source files Fixes #fdo30794 Based on bin/add-modelines script (originally posted in mail 1286706307.1871.1399280959@webmail.messagingengine.com) Signed-off-by: Sebastian Spaeth --- basebmp/test/basictest.cxx | 3 +++ basebmp/test/bmpdemo.cxx | 3 +++ basebmp/test/bmpmasktest.cxx | 2 ++ basebmp/test/bmptest.cxx | 2 ++ basebmp/test/cliptest.cxx | 2 ++ basebmp/test/filltest.cxx | 2 ++ basebmp/test/linetest.cxx | 2 ++ basebmp/test/masktest.cxx | 2 ++ basebmp/test/polytest.cxx | 2 ++ basebmp/test/tools.cxx | 3 +++ basebmp/test/tools.hxx | 3 +++ 11 files changed, 26 insertions(+) (limited to 'basebmp/test') diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx index a9c533a3a134..5b88c4a3bf40 100644 --- a/basebmp/test/basictest.cxx +++ b/basebmp/test/basictest.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. @@ -300,3 +301,5 @@ CPPUNIT_TEST_SUITE_REGISTRATION(BasicTest); } CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index 99aa1bac2c5c..76d1ac6df17c 100644 --- a/basebmp/test/bmpdemo.cxx +++ b/basebmp/test/bmpdemo.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. @@ -1254,3 +1255,5 @@ void TestApp::Main() } TestApp aDemoApp; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 29e261423a06..0d4fa01b3301 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.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. @@ -191,3 +192,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(BmpMaskTest); // to let the user the possibility to also register some functions by hand. //NOADDITIONAL; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index 9d083980790b..f52a0567f271 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.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. @@ -218,3 +219,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(BmpTest); // to let the user the possibility to also register some functions by hand. //NOADDITIONAL; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index b0f0b72f07e0..31af87140682 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.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. @@ -285,3 +286,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ClipTest); // to let the user the possibility to also register some functions by hand. //NOADDITIONAL; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index d03e887dbcc5..469b984b6ca6 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.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. @@ -279,3 +280,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(FillTest); // to let the user the possibility to also register some functions by hand. //NOADDITIONAL; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index dbdbe57de0a7..68633e8935d0 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.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. @@ -227,3 +228,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(LineTest); // to let the user the possibility to also register some functions by hand. //NOADDITIONAL; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index 63f357a314d0..b7097518f64a 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.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. @@ -179,3 +180,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(MaskTest); // to let the user the possibility to also register some functions by hand. //NOADDITIONAL; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index 2feef67774de..0f0faab77552 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. @@ -299,3 +300,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(PolyTest); // to let the user the possibility to also register some functions by hand. //NOADDITIONAL; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/tools.cxx b/basebmp/test/tools.cxx index dbc11395d715..ab7219ec32af 100644 --- a/basebmp/test/tools.cxx +++ b/basebmp/test/tools.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. @@ -47,3 +48,5 @@ int countPixel( const BitmapDeviceSharedPtr& rDevice, return count; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/tools.hxx b/basebmp/test/tools.hxx index 254a988fc1bb..57668e55a741 100644 --- a/basebmp/test/tools.hxx +++ b/basebmp/test/tools.hxx @@ -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. @@ -29,3 +30,5 @@ int countPixel( const basebmp::BitmapDeviceSharedPtr& rDevice, basebmp::Color checkColor ); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From c300e27f5ca40ce87f91663d1c6fbf193727570a Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Tue, 19 Oct 2010 01:57:34 +0200 Subject: Cleanse non-compiled code Removed if-deffed code from LibO libs, enabled if-deffed code again in test/playground files --- basebmp/test/bmpdemo.cxx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'basebmp/test') diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index 76d1ac6df17c..043d165c14d6 100644 --- a/basebmp/test/bmpdemo.cxx +++ b/basebmp/test/bmpdemo.cxx @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -1090,7 +1091,6 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) basebmp::DrawMode_PAINT ); } -#if 0 { basebmp::BitmapDeviceSharedPtr pMask( basebmp::createBitmapDevice( aTestSize, false, @@ -1135,7 +1135,6 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) const basegfx::B2IPoint aPt3(0,1001); pDevice->drawLine( aPt1, aPt3, aCol, basebmp::DrawMode_PAINT ); } -#endif { pDevice->clear(basebmp::Color(0)); @@ -1172,12 +1171,12 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) aPoly.append( basegfx::B2DPoint(project( aP1 ) + aCenter) ); aPoly.append( basegfx::B2DPoint(project( aP2 ) + aCenter) ); pDevice->fillPolyPolygon( - basegfx::tools::createAreaGeometryForPolygon( + basegfx::tools::createAreaGeometry( aPoly, // std::max(1,n/30), // std::max(1,n/60), std::max(1,n/30), - basegfx::tools::B2DLINEJOIN_NONE), + basegfx::B2DLINEJOIN_NONE), aLineColor, basebmp::DrawMode_PAINT); @@ -1245,13 +1244,13 @@ void TestApp::Main() uno::Sequence< uno::Any > aArgs( 2 ); aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL ); aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE ); - ::ucb::ContentBroker::initialize( xFactory, aArgs ); + ::ucbhelper::ContentBroker::initialize( xFactory, aArgs ); TestWindow pWindow; pWindow.Execute(); // clean up UCB - ::ucb::ContentBroker::deinitialize(); + ::ucbhelper::ContentBroker::deinitialize(); } TestApp aDemoApp; -- cgit From 10bfc7d833b174c83aa97a32e6cd738490c82b20 Mon Sep 17 00:00:00 2001 From: Kevin Hunter Date: Tue, 9 Nov 2010 10:55:03 +0000 Subject: EasyHack: RTL conversion from createFromAscii --- basebmp/test/bmpdemo.cxx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'basebmp/test') diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index 043d165c14d6..160d69ecd532 100644 --- a/basebmp/test/bmpdemo.cxx +++ b/basebmp/test/bmpdemo.cxx @@ -975,7 +975,7 @@ class TestWindow : public Dialog public: TestWindow() : Dialog( (Window *) NULL ) { - SetText( rtl::OUString::createFromAscii( "VIGRA test" ) ); + SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VIGRA test" )) ); SetSizePixel( Size( 1024, 1024 ) ); EnablePaint( true ); Show(); @@ -1079,11 +1079,9 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString::createFromAscii( - "m0 0 h7 v7 h-7 z" ) ); + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "m0 0 h7 v7 h-7 z" )) ); basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString::createFromAscii( - "m2 2 h3 v3 h-3 z" ) ); + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "m2 2 h3 v3 h-3 z" )) ); pDevice->fillPolyPolygon( aPoly, @@ -1102,8 +1100,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) pMask->drawLine( aPt111, aPt222, aCol333, basebmp::DrawMode_PAINT ); - ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii( - "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" ); + ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "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)); -- cgit From aadfc4e784fb448066cd44322000062d685dcde1 Mon Sep 17 00:00:00 2001 From: Kevin Hunter Date: Tue, 9 Nov 2010 14:58:54 -0500 Subject: EasyHack: RTL conversion from createFromAscii --- basebmp/test/bmpmasktest.cxx | 3 +-- basebmp/test/bmptest.cxx | 3 +-- basebmp/test/cliptest.cxx | 6 ++---- basebmp/test/filltest.cxx | 3 +-- basebmp/test/masktest.cxx | 3 +-- 5 files changed, 6 insertions(+), 12 deletions(-) (limited to 'basebmp/test') diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 0d4fa01b3301..18db80442707 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -131,8 +131,7 @@ public: true, Format::THIRTYTWO_BIT_TC_MASK ); - ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii( - "m 0 0h5v10h5v-5h-10z" ); + ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" )); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index f52a0567f271..e6119a10c0eb 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -170,8 +170,7 @@ public: true, Format::THIRTYTWO_BIT_TC_MASK ); - ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii( - "m 0 0h5v10h5v-5h-10z" ); + ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "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 31af87140682..ff9d2d435ebf 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -180,8 +180,7 @@ private: true, Format::EIGHT_BIT_GREY )); - ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii( - "m 0 0h5v10h5v-5h-10z" ); + ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" )); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); @@ -221,8 +220,7 @@ public: true, Format::THIRTYTWO_BIT_TC_MASK ); - ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii( - "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" ); + ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "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 469b984b6ca6..bf7bbe808049 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -168,8 +168,7 @@ private: CPPUNIT_ASSERT_MESSAGE("bottom-middle pixel set", rDevice->getPixel(aPt4) == aCol); - ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii( - "m 0 0l7 7h-1z" ); + ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "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 b7097518f64a..74b393ebad36 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -137,8 +137,7 @@ public: true, Format::EIGHT_BIT_GREY ); - ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii( - "m 0 0h5v10h5v-5h-10z" ); + ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" )); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); -- cgit From 5cc959c4241982f47ca155f0070fdd15a65b6b53 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 10 Nov 2010 08:23:49 +0100 Subject: remove commented-out leftovers from testshl2 --- basebmp/test/bmpmasktest.cxx | 7 ------- basebmp/test/bmptest.cxx | 7 ------- basebmp/test/cliptest.cxx | 7 ------- basebmp/test/filltest.cxx | 7 ------- basebmp/test/linetest.cxx | 7 ------- basebmp/test/masktest.cxx | 7 ------- basebmp/test/polytest.cxx | 7 ------- 7 files changed, 49 deletions(-) (limited to 'basebmp/test') diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 18db80442707..6c6b0661db3a 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -184,11 +184,4 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(BmpMaskTest); } - -// ----------------------------------------------------------------------------- - -// 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: */ diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index e6119a10c0eb..65b9d82ec22a 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -211,11 +211,4 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(BmpTest); } - -// ----------------------------------------------------------------------------- - -// 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: */ diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index ff9d2d435ebf..aae5ff12ed8f 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -277,11 +277,4 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(ClipTest); } - -// ----------------------------------------------------------------------------- - -// 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: */ diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index bf7bbe808049..a5634c9bb695 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -272,11 +272,4 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(FillTest); } - -// ----------------------------------------------------------------------------- - -// 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: */ diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index 68633e8935d0..652892aa2755 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.cxx @@ -221,11 +221,4 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(LineTest); } - -// ----------------------------------------------------------------------------- - -// 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: */ diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index 74b393ebad36..7a1b697a8eca 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -172,11 +172,4 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(MaskTest); } - -// ----------------------------------------------------------------------------- - -// 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: */ diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index 0f0faab77552..fa4534988ba9 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -293,11 +293,4 @@ public: 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: */ -- cgit From 5455fee0cc7921f2f8706ac73bca533cc2895954 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 10 Nov 2010 08:55:47 +0100 Subject: remove unused includes --- basebmp/test/basictest.cxx | 10 ---------- basebmp/test/bmpdemo.cxx | 2 -- basebmp/test/bmpmasktest.cxx | 12 ------------ basebmp/test/bmptest.cxx | 12 ------------ basebmp/test/cliptest.cxx | 10 ---------- basebmp/test/filltest.cxx | 10 ---------- basebmp/test/linetest.cxx | 10 ---------- basebmp/test/masktest.cxx | 12 ------------ basebmp/test/polytest.cxx | 10 ---------- 9 files changed, 88 deletions(-) (limited to 'basebmp/test') diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx index 5b88c4a3bf40..70218b085059 100644 --- a/basebmp/test/basictest.cxx +++ b/basebmp/test/basictest.cxx @@ -41,21 +41,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( mpDevice32bpp, output ); -*/ - class BasicTest : public CppUnit::TestFixture { public: @@ -296,7 +287,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(BasicTest); } diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index 160d69ecd532..74cda664ee34 100644 --- a/basebmp/test/bmpdemo.cxx +++ b/basebmp/test/bmpdemo.cxx @@ -74,8 +74,6 @@ #include #include -#include -#include using namespace ::com::sun::star; diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 6c6b0661db3a..45bbceea767d 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -45,23 +45,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( rDevice, output ); - std::ofstream output2("32bpp_bmp.dump"); - debugDump( rBmp, output2 ); -*/ - class BmpMaskTest : public CppUnit::TestFixture { private: @@ -180,7 +169,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(BmpMaskTest); } diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index 65b9d82ec22a..5732e4527562 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -45,23 +45,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( rDevice, output ); - std::ofstream output2("32bpp_bmp.dump"); - debugDump( rBmp, output2 ); -*/ - class BmpTest : public CppUnit::TestFixture { private: @@ -207,7 +196,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(BmpTest); } diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index aae5ff12ed8f..3071cde74d57 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -46,21 +46,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( mpDevice32bpp, output ); -*/ - class ClipTest : public CppUnit::TestFixture { private: @@ -273,7 +264,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(ClipTest); } diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index a5634c9bb695..f36d95e6be72 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -45,21 +45,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( mpDevice32bpp, output ); -*/ - class FillTest : public CppUnit::TestFixture { private: @@ -268,7 +259,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(FillTest); } diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index 652892aa2755..f7894357c6cf 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.cxx @@ -40,21 +40,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( mpDevice32bpp, output ); -*/ - class LineTest : public CppUnit::TestFixture { private: @@ -217,7 +208,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(LineTest); } diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index 7a1b697a8eca..e39f118753ba 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -45,23 +45,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( rDevice, output ); - std::ofstream output2("32bpp_bmp.dump"); - debugDump( rBmp, output2 ); -*/ - class MaskTest : public CppUnit::TestFixture { private: @@ -168,7 +157,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(MaskTest); } diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index fa4534988ba9..0f22f4c498b5 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -46,21 +46,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( rDevice, output ); -*/ - class PolyTest : public CppUnit::TestFixture { private: @@ -289,7 +280,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(PolyTest); } -- cgit From 36ba6d664a6cc219d84d22dc74a562603d7fcdc5 Mon Sep 17 00:00:00 2001 From: Gert Faller Date: Tue, 23 Nov 2010 18:43:37 +0100 Subject: RTL_CONSTASCII_USTRINGPARAM in libs-gui 11 --- basebmp/test/bmpdemo.cxx | 4 ++-- basebmp/test/bmpmasktest.cxx | 4 ++-- basebmp/test/polytest.cxx | 32 ++++++++++++++++---------------- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'basebmp/test') diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index 74cda664ee34..ab260655d968 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 45bbceea767d..79e9b8fd3909 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 0f22f4c498b5..4fe18ee1101a 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, -- cgit From 931d9ef98d5bc94d975094bbe9bb4c4c923b4c64 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Wed, 2 Feb 2011 11:51:34 +0100 Subject: Clean up makefiles --- basebmp/test/makefile.mk | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'basebmp/test') diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index 8dc95dcea0e5..4fdc39bb6fd4 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -99,25 +99,6 @@ SHL1RPATH = NONE .ENDIF # END ------------------------------------------------------------------ -#APP2TARGET= bmpdemo - -#APP2OBJS= \ -# $(OBJ)$/bmpdemo.obj - -#APP2STDLIBS=$(TOOLSLIB) \ -# $(COMPHELPERLIB) \ -# $(BASEGFXLIB) \ -# $(BASEBMPLIB) \ -# $(CPPULIB) \ -# $(CPPUHELPERLIB) \ -# $(UCBHELPERLIB) \ -# $(SALLIB) \ -# $(VCLLIB) -# -#.IF "$(GUI)"!="UNX" -#APP2DEF= $(MISC)$/$(TARGET).def -#.ENDIF - #------------------------------- All object files ------------------------------- # do this here, so we get right dependencies SLOFILES=$(SHL1OBJS) -- cgit From e5e3ba75ecf716ad6760d8b74d095729306e1219 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 9 Feb 2011 10:51:01 +0100 Subject: Removing the ext_std masterpiece --- basebmp/test/basictest.cxx | 2 -- basebmp/test/bmpmasktest.cxx | 2 -- basebmp/test/bmptest.cxx | 2 -- basebmp/test/cliptest.cxx | 2 -- basebmp/test/filltest.cxx | 2 -- basebmp/test/linetest.cxx | 2 -- basebmp/test/masktest.cxx | 2 -- basebmp/test/polytest.cxx | 2 -- 8 files changed, 16 deletions(-) (limited to 'basebmp/test') diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx index 70218b085059..d953095585fa 100644 --- a/basebmp/test/basictest.cxx +++ b/basebmp/test/basictest.cxx @@ -28,12 +28,10 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" -#include "postextstl.h" #include #include diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 79e9b8fd3909..5ba477484903 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -28,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 #include diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index 5732e4527562..7b3a2cbcb18f 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -28,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 #include diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index 3071cde74d57..c41edf3e28a8 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -28,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 #include diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index f36d95e6be72..d15fa1010050 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -28,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 #include diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index f7894357c6cf..cee66f4d709b 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.cxx @@ -28,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 #include diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index e39f118753ba..239a069bf564 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -28,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 #include diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index 4fe18ee1101a..99aba1a06fc4 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -28,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 #include -- cgit From e30c7d6b9938e129c4e0d7577f3132fc01b9e581 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 9 Feb 2011 16:20:22 +0100 Subject: Trying to remove the stlport mention from the code --- basebmp/test/makefile.mk | 7 ------- 1 file changed, 7 deletions(-) (limited to 'basebmp/test') diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index 4fdc39bb6fd4..cdb4ccef5d52 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -60,13 +60,6 @@ CDEFS+=-xalias_level=compatible .ENDIF .ENDIF -#building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - CFLAGSCXX += $(CPPUNIT_CFLAGS) # --- Common ---------------------------------------------------------- -- cgit From 7de8f26207d44a34f71cf8297ae68831c92c118e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 5 Apr 2011 11:54:35 +0100 Subject: remove ADAPT_EXT_STL --- basebmp/test/makefile.mk | 7 ------- 1 file changed, 7 deletions(-) (limited to 'basebmp/test') diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index 4fdc39bb6fd4..cdb4ccef5d52 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -60,13 +60,6 @@ CDEFS+=-xalias_level=compatible .ENDIF .ENDIF -#building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - CFLAGSCXX += $(CPPUNIT_CFLAGS) # --- Common ---------------------------------------------------------- -- cgit From 87fbe86b7140a77cc6e38f063b08af9213078ca3 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 17 May 2011 10:03:46 +0200 Subject: generalize ScopedBitmapAccess and simplify usage It can be used for AlphaMask too now. --- basebmp/test/bmpdemo.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'basebmp/test') diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index ab260655d968..effce214bb2f 100644 --- a/basebmp/test/bmpdemo.cxx +++ b/basebmp/test/bmpdemo.cxx @@ -1189,8 +1189,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) // Fill bitmap with generated content { - ScopedBitmapWriteAccess pWriteAccess( aBitmap.AcquireWriteAccess(), - aBitmap ); + Bitmap::ScopedWriteAccess pWriteAccess( aBitmap ); for( int y=0; ySetPixel(y,x, -- cgit From 1a632cd63faa5b688499ae3be3cc3282dd7ce262 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 7 Jun 2011 00:45:42 +0300 Subject: No testing, sorry, when cross-compiling --- basebmp/test/makefile.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'basebmp/test') diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index cdb4ccef5d52..6941ed963b75 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -37,6 +37,11 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.IF "$(CROSS_COMPILING)"=="YES" +all: + @echo Nothing done when cross-compiling +.ENDIF + .IF "$(debug)"!="" || "$(DEBUG)"!="" .IF "$(COM)"=="MSC" -- cgit