diff options
Diffstat (limited to 'cppcanvas/qa/extras/emfplus/emfplus.cxx')
| -rw-r--r-- | cppcanvas/qa/extras/emfplus/emfplus.cxx | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx index 92bc161784ad..1ba179404f28 100644 --- a/cppcanvas/qa/extras/emfplus/emfplus.cxx +++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx @@ -7,15 +7,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <com/sun/star/frame/Desktop.hpp> +#include <test/unoapi_test.hxx> -#include <comphelper/processfactory.hxx> -#include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/sfxbasemodel.hxx> -#include <test/unoapi_test.hxx> #include <vcl/BitmapReadAccess.hxx> -#include <vcl/pngwrite.hxx> +#include <vcl/filter/PngImageWriter.hxx> #include <vcl/gdimtf.hxx> #include <tools/stream.hxx> @@ -29,29 +26,9 @@ public: { } - virtual void setUp() override - { - UnoApiTest::setUp(); - mxDesktop.set( - frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory()))); - SfxApplication::GetOrCreate(); - }; - - virtual void tearDown() override - { - if (mxComponent.is()) - { - closeDocument(mxComponent); - mxComponent->dispose(); - } - UnoApiTest::tearDown(); - }; - Bitmap load(const char* pName) { - OUString aFileURL; - createFileURL(OUString::createFromAscii(pName), aFileURL); - mxComponent = loadFromDesktop(aFileURL, "com.sun.star.drawing.DrawingDocument"); + loadFromFile(OUString::createFromAscii(pName)); SfxBaseModel* pModel = dynamic_cast<SfxBaseModel*>(mxComponent.get()); CPPUNIT_ASSERT(pModel); SfxObjectShell* pShell = pModel->GetObjectShell(); @@ -63,22 +40,20 @@ public: if (pEnv) { SvFileStream aStream(OUString::fromUtf8(pEnv), StreamMode::WRITE); - vcl::PNGWriter aWriter(aResultBitmap); - CPPUNIT_ASSERT(aWriter.Write(aStream)); + vcl::PngImageWriter aWriter(aStream); + CPPUNIT_ASSERT(aWriter.write(aResultBitmap)); } return aResultBitmap.GetBitmap(); } - - uno::Reference<lang::XComponent> mxComponent; }; CPPUNIT_TEST_FIXTURE(Test, testFdo77229) { Bitmap aBitmap = load("fdo77229.emf"); - Bitmap::ScopedReadAccess pAccess(aBitmap); + BitmapScopedReadAccess pAccess(aBitmap); // The green star was missing. - Color aColor(pAccess->GetPixel(142, 140)); + Color aColor(pAccess->GetPixel(284, 280)); CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), aColor.GetRed()); CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), aColor.GetBlue()); CPPUNIT_ASSERT(aColor.GetGreen() == 0xfe || aColor.GetGreen() == 0xff); |