summaryrefslogtreecommitdiff
path: root/framework/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-03-16 09:51:44 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-03-16 11:45:19 +0100
commite568d233a3f9cbc926bfa12dac3fbc6d29a4b6c7 (patch)
treec5a60723f8a3315b4139e7f8ceef2780559a6b22 /framework/source
parent1f3630e2fb35389835cb326a46bd539660942632 (diff)
move framework/toolkit use of BitmapEx::GetMask inside vcl
Change-Id: I2a942377d6e9b8b09673e5ad2804e0e7fb2bb943 Reviewed-on: https://gerrit.libreoffice.org/51387 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/source')
-rw-r--r--framework/source/fwe/classes/imagewrapper.cxx19
1 files changed, 3 insertions, 16 deletions
diff --git a/framework/source/fwe/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx
index f916d7a4e607..bb7b65a622fa 100644
--- a/framework/source/fwe/classes/imagewrapper.cxx
+++ b/framework/source/fwe/classes/imagewrapper.cxx
@@ -21,6 +21,7 @@
#include <vcl/svapp.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
+#include <vcl/BitmapTools.hxx>
#include <tools/stream.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <vcl/dibtools.hxx>
@@ -74,22 +75,8 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB()
Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB()
{
SolarMutexGuard aGuard;
- BitmapEx aBmpEx( m_aImage.GetBitmapEx() );
-
- if ( aBmpEx.IsAlpha() )
- {
- SvMemoryStream aMem;
- WriteDIB(aBmpEx.GetAlpha().GetBitmap(), aMem, false, true);
- return Sequence< sal_Int8 >( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() );
- }
- else if ( aBmpEx.IsTransparent() )
- {
- SvMemoryStream aMem;
- WriteDIB(aBmpEx.GetMask(), aMem, false, true);
- return Sequence< sal_Int8 >( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() );
- }
-
- return Sequence< sal_Int8 >();
+
+ return vcl::bitmap::GetMaskDIB(m_aImage.GetBitmapEx());
}
// XUnoTunnel