[Libreoffice-commits] core.git: filter/source

Caolán McNamara caolanm at redhat.com
Fri Jan 20 11:27:52 UTC 2017


 filter/source/msfilter/mstoolbar.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2e4694f696c0c3aaee58ee29679621190f89261a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 20 11:27:00 2017 +0000

    don't need an intermediate Image
    
    Change-Id: I128a6546c4085b38103d61fda13d1ac6f84ef5b0

diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index dc700b9..8cb47f6 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -41,12 +41,12 @@ void CustomToolBarImportHelper::ScaleImage( uno::Reference< graphic::XGraphic >&
     Size aSize = aGraphic.GetSizePixel();
     if ( aSize.Height() && ( aSize.Height() == aSize.Width() ) )
     {
-        Image aImage( xGraphic );
+        Graphic aImage(xGraphic);
         if ( aSize.Height() != nNewSize )
         {
             BitmapEx aBitmap = aImage.GetBitmapEx();
             BitmapEx aBitmapex = BitmapEx::AutoScaleBitmap(aBitmap, nNewSize );
-            aImage = Image( aBitmapex);
+            aImage = Graphic(aBitmapex);
             xGraphic = aImage.GetXGraphic();
         }
     }


More information about the Libreoffice-commits mailing list