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

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


 framework/source/uiconfiguration/imagemanagerimpl.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d1f18710788163a566c97b7fe9ec301f65535c51
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 20 11:09:45 2017 +0000

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

diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 89583b3..6d6e6ba 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -229,7 +229,7 @@ static bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGraphic
     }
 
     // Check size and scale it
-    Image  aImage( rInGraphic );
+    Graphic aImage(rInGraphic);
     Size   aSize = aImage.GetSizePixel();
     bool   bMustScale( false );
 
@@ -244,7 +244,7 @@ static bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGraphic
     {
         BitmapEx aBitmap = aImage.GetBitmapEx();
         aBitmap.Scale( aNormSize );
-        aImage = Image( aBitmap );
+        aImage = Graphic(aBitmap);
         rOutGraphic = aImage.GetXGraphic();
     }
     else


More information about the Libreoffice-commits mailing list