[Libreoffice-commits] core.git: cui/source include/vcl sd/source svx/source vcl/source

[Caolán McNamara]

 cui/source/customize/cfg.cxx    |    2 +-
 cui/source/dialogs/hlmarkwn.cxx |    2 +-
 include/vcl/image.hxx           |    1 -
 sd/source/ui/dlg/inspagob.cxx   |    2 +-
 svx/source/dialog/svxruler.cxx  |    2 +-
 vcl/source/image/Image.cxx      |    6 ------
 6 files changed, 4 insertions(+), 11 deletions(-)

New commits:
commit e9c17354d3cfb4f808fa2092ffcb3b9de7654dee
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 25 14:21:02 2017 +0000

    move Image ctor variant with mask color to callers
    
    Change-Id: I81a52aeb855edca823881360831b26e252780053

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index ca667f3..21c66b2 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -4868,7 +4868,7 @@ Image SvxToolbarEntriesListBox::GetSizedImage(
     rVDev.DrawLine( Point( aNewSize.Width()-3, 0 ), Point( aNewSize.Width()-3, aNewSize.Height()-1 ));
 
     // Create new image that uses the fillcolor as transparent
-    return Image( rVDev.GetBitmap( Point(), aNewSize ), aFillColor );
+    return Image(BitmapEx(rVDev.GetBitmap(Point(), aNewSize), aFillColor));
 }
 
 void SvxToolbarEntriesListBox::DataChanged( const DataChangedEvent& rDCEvt )
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index cd11a88..ca8a282 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -446,7 +446,7 @@ int SvxHlinkDlgMarkWnd::FillTree( const uno::Reference< container::XNameAccess >
                     uno::Reference< awt::XBitmap > aXBitmap( xTarget->getPropertyValue( aProp_LinkDisplayBitmap ), uno::UNO_QUERY );
                     if( aXBitmap.is() )
                     {
-                        Image aBmp( VCLUnoHelper::GetBitmap( aXBitmap ).GetBitmap(), aMaskColor );
+                        Image aBmp(BitmapEx(VCLUnoHelper::GetBitmap(aXBitmap).GetBitmap(), aMaskColor));
                         // insert Displayname into treelist with bitmaps
                         pEntry = mpLbTree->InsertEntry ( aStrDisplayname,
                                                         aBmp, aBmp,
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index 5edaf5a..6ee8f89 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -57,7 +57,6 @@ class SAL_WARN_UNUSED VCL_DLLPUBLIC Image
 public:
                     Image();
                     explicit Image( const BitmapEx& rBitmapEx );
-                    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/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index c3a7238..537865b 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -83,7 +83,7 @@ void SdInsertPagesObjsDlg::Reset()
     {
         Color aColor( COL_WHITE );
         Bitmap aBmpText( SdResId( BMP_DOC_TEXT ) );
-        Image aImgText( aBmpText, aColor );
+        Image aImgText(BitmapEx(aBmpText, aColor));
         m_pLbTree->InsertEntry( rName, aImgText, aImgText );
     }
 
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index e5b2560..6c25518 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -3399,7 +3399,7 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent )
                 DrawTab(*pDev, aFillColor, aPt, nStyle);
                 aMenu->InsertItem(i + 1,
                                  ResId(RID_SVXSTR_RULER_START + i, DIALOG_MGR()).toString(),
-                                 Image(pDev->GetBitmap(Point(), aSz), Color(COL_WHITE)));
+                                 Image(BitmapEx(pDev->GetBitmap(Point(), aSz), Color(COL_WHITE))));
                 aMenu->CheckItem(i + 1, i == mpTabs[mxRulerImpl->nIdx + TAB_GAP].nStyle);
                 pDev->SetOutputSize(aSz); // delete device
             }
diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx
index b1d3db9..649bf15 100644
--- a/vcl/source/image/Image.cxx
+++ b/vcl/source/image/Image.cxx
@@ -49,12 +49,6 @@ Image::Image(const BitmapEx& rBitmapEx)
     ImplInit(rBitmapEx);
 }
 
-Image::Image(const Bitmap& rBitmap, const Color& rColor)
-{
-    const BitmapEx aBitmapEx(rBitmap, rColor);
-    ImplInit(aBitmapEx);
-}
-
 Image::Image(const css::uno::Reference< css::graphic::XGraphic >& rxGraphic)
 {
     const Graphic aGraphic(rxGraphic);