[Libreoffice-commits] core.git: framework/source include/vcl vcl/source

[Caolán McNamara]

 framework/source/fwe/helper/actiontriggerhelper.cxx |    2 +-
 include/vcl/image.hxx                               |    1 -
 vcl/source/image/Image.cxx                          |    6 ------
 3 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 6391993d1ffb5ec6ce627671eb77925a4498946f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 14 15:50:10 2017 +0000

    move Image(Bitmap, MaskBitmap) code to last user of it
    
    the last use looks rather dubious to me, I wonder if anything can really end up
    here
    
    Change-Id: I13314610405463122891b3ed0f311da65fd1d542

diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 33a171b..d3873f5 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -189,7 +189,7 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, const Reference< X
                                         Bitmap aMaskBitmap;
                                         SvMemoryStream aMem( const_cast<sal_Int8 *>(aDIBSeq.getConstArray()), aDIBSeq.getLength(), StreamMode::READ );
                                         ReadDIB(aMaskBitmap, aMem, true);
-                                        aImage = Image( aBitmap, aMaskBitmap );
+                                        aImage = Image(BitmapEx(aBitmap, aMaskBitmap));
                                     }
                                     else
                                         aImage = Image( aBitmap );
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index 04e832b..519058a 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -59,7 +59,6 @@ public:
                     explicit Image( const ResId& rResId );
                     explicit Image( const BitmapEx& rBitmapEx );
                     explicit Image( const Bitmap& rBitmap );
-                    Image( const Bitmap& rBitmap, const Bitmap& rMaskBitmap );
                     Image( const Bitmap& rBitmap, const Color& rColor );
                     explicit Image( const css::uno::Reference< css::graphic::XGraphic >& rxGraphic );
                     explicit Image( const OUString &rPNGFileUrl );
diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx
index e4dde10..516883c 100644
--- a/vcl/source/image/Image.cxx
+++ b/vcl/source/image/Image.cxx
@@ -77,12 +77,6 @@ Image::Image(const Bitmap& rBitmap)
     ImplInit(rBitmap);
 }
 
-Image::Image(const Bitmap& rBitmap, const Bitmap& rMaskBitmap)
-{
-    const BitmapEx aBitmapEx(rBitmap, rMaskBitmap);
-    ImplInit(aBitmapEx);
-}
-
 Image::Image(const Bitmap& rBitmap, const Color& rColor)
 {
     const BitmapEx aBitmapEx(rBitmap, rColor);