diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-15 10:24:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-15 12:37:35 +0100 |
| commit | 953a5cb1c8c750df24ed0316349a5916c384296d (patch) | |
| tree | 26a76707725fad73d9e71486f0723406bae52065 /vcl/qa/cppunit/svm | |
| parent | bca14a7126a8cea12eecd248ae84e3d07db9609b (diff) | |
move Bitmap::ScopedWriteAccess inside vcl
would have liked to make the AcquireWriteAccess methods DLLPRIVATE, but
they are needed by the workbench and testing code
Change-Id: I22497788eb68dfb84b7e542e5ef53322892a5274
Reviewed-on: https://gerrit.libreoffice.org/51310
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'vcl/qa/cppunit/svm')
| -rw-r--r-- | vcl/qa/cppunit/svm/svmtest.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx index 4633c64e6a11..0015706c8a0f 100644 --- a/vcl/qa/cppunit/svm/svmtest.cxx +++ b/vcl/qa/cppunit/svm/svmtest.cxx @@ -14,6 +14,7 @@ #include <vcl/metaact.hxx> #include <vcl/virdev.hxx> #include <vcl/bitmapaccess.hxx> +#include <bitmapwriteaccess.hxx> using namespace css; @@ -789,17 +790,17 @@ void SvmTest::testBitmaps() Bitmap aBitmap1(Size(4,4), 24); { - Bitmap::ScopedWriteAccess pAccess(aBitmap1); + BitmapScopedWriteAccess pAccess(aBitmap1); pAccess->Erase(COL_RED); } Bitmap aBitmap2(Size(4,4), 24); { - Bitmap::ScopedWriteAccess pAccess(aBitmap2); + BitmapScopedWriteAccess pAccess(aBitmap2); pAccess->Erase(COL_GREEN); } Bitmap aBitmap3(Size(4,4), 24); { - Bitmap::ScopedWriteAccess pAccess(aBitmap3); + BitmapScopedWriteAccess pAccess(aBitmap3); pAccess->Erase(COL_BLUE); } pVirtualDev->DrawBitmap(Point(1, 2), aBitmap1); @@ -850,21 +851,21 @@ void SvmTest::testBitmapExs() Bitmap aBitmap1(Size(4,4), 24); { - Bitmap::ScopedWriteAccess pAccess(aBitmap1); + BitmapScopedWriteAccess pAccess(aBitmap1); pAccess->Erase(COL_RED); } BitmapEx aBitmapEx1(aBitmap1, COL_YELLOW); Bitmap aBitmap2(Size(4,4), 24); { - Bitmap::ScopedWriteAccess pAccess(aBitmap2); + BitmapScopedWriteAccess pAccess(aBitmap2); pAccess->Erase(COL_GREEN); } BitmapEx aBitmapEx2(aBitmap2, COL_YELLOW); Bitmap aBitmap3(Size(4,4), 24); { - Bitmap::ScopedWriteAccess pAccess(aBitmap3); + BitmapScopedWriteAccess pAccess(aBitmap3); pAccess->Erase(COL_BLUE); } BitmapEx aBitmapEx3(aBitmap3, COL_YELLOW); @@ -906,17 +907,17 @@ void SvmTest::testMasks() Bitmap aBitmap1(Size(4,4), 24); { - Bitmap::ScopedWriteAccess pAccess(aBitmap1); + BitmapScopedWriteAccess pAccess(aBitmap1); pAccess->Erase(COL_RED); } Bitmap aBitmap2(Size(4,4), 24); { - Bitmap::ScopedWriteAccess pAccess(aBitmap2); + BitmapScopedWriteAccess pAccess(aBitmap2); pAccess->Erase(COL_GREEN); } Bitmap aBitmap3(Size(4,4), 24); { - Bitmap::ScopedWriteAccess pAccess(aBitmap3); + BitmapScopedWriteAccess pAccess(aBitmap3); pAccess->Erase(COL_BLUE); } |