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

[Caolán McNamara]

 sd/source/ui/dlg/PhotoAlbumDialog.cxx |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 2874632938bfaa06fc5901336c3ab53acf1b6edd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 20 12:40:25 2017 +0000

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

diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 83dfd54..7bcadbc 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -140,7 +140,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, void)
 
                 Reference< graphic::XGraphic > xGraphic = createXGraphicFromUrl(sUrl, xProvider);
 
-                Image aImg(xGraphic);
+                Graphic aImg(xGraphic);
                 // Save the original size, multiplied with 100
                 ::awt::Size aPicSize(aImg.GetSizePixel().Width()*100, aImg.GetSizePixel().Height()*100);
 
@@ -214,10 +214,9 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, void)
 
                 if( !sUrl1.isEmpty() )
                 {
-
                     Reference< graphic::XGraphic > xGraphic = createXGraphicFromUrl(sUrl1, xProvider);
 
-                    Image aImg(xGraphic);
+                    Graphic aImg(xGraphic);
                     // Save the original size, multiplied with 100
                     ::awt::Size aPicSize(aImg.GetSizePixel().Width()*100, aImg.GetSizePixel().Height()*100);
 
@@ -255,7 +254,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, void)
                 {
                     Reference< graphic::XGraphic > xGraphic = createXGraphicFromUrl(sUrl2, xProvider);
 
-                    Image aImg(xGraphic);
+                    Graphic aImg(xGraphic);
                     // Save the original size, multiplied with 100
                     ::awt::Size aPicSize(aImg.GetSizePixel().Width()*100, aImg.GetSizePixel().Height()*100);
 
@@ -338,7 +337,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, void)
                 {
                     Reference< graphic::XGraphic > xGraphic = createXGraphicFromUrl(sUrl1, xProvider);
 
-                    Image aImg(xGraphic);
+                    Graphic aImg(xGraphic);
                     // Save the original size, multiplied with 100
                     ::awt::Size aPicSize(aImg.GetSizePixel().Width()*100, aImg.GetSizePixel().Height()*100);
 
@@ -375,7 +374,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, void)
                 {
                     Reference< graphic::XGraphic > xGraphic = createXGraphicFromUrl(sUrl2, xProvider);
 
-                    Image aImg(xGraphic);
+                    Graphic aImg(xGraphic);
                     // Save the original size, multiplied with 100
                     ::awt::Size aPicSize(aImg.GetSizePixel().Width()*100, aImg.GetSizePixel().Height()*100);
 
@@ -410,10 +409,9 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, void)
                 }
                 if( !sUrl3.isEmpty() )
                 {
-
                     Reference< graphic::XGraphic > xGraphic = createXGraphicFromUrl(sUrl3, xProvider);
 
-                    Image aImg(xGraphic);
+                    Graphic aImg(xGraphic);
                     // Save the original size, multiplied with 100
                     ::awt::Size aPicSize(aImg.GetSizePixel().Width()*100, aImg.GetSizePixel().Height()*100);
 
@@ -450,7 +448,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, void)
                 {
                     Reference< graphic::XGraphic > xGraphic = createXGraphicFromUrl(sUrl4, xProvider);
 
-                    Image aImg(xGraphic);
+                    Graphic aImg(xGraphic);
                     // Save the original size, multiplied with 100
                     ::awt::Size aPicSize(aImg.GetSizePixel().Width()*100, aImg.GetSizePixel().Height()*100);