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

[Caolán McNamara]

 toolkit/source/awt/vclxwindows.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e22f32b65465b5ae6e71acdf5ae4fceb379d7cb0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 20 10:53:26 2017 +0000

    don't need intermediate Images
    
    Change-Id: I7f36ca335ee7bf24ce634393b24a76c292c9a161

diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 8923916..9ceaf50 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2387,9 +2387,9 @@ throw(css::uno::RuntimeException, std::exception)
                 Reference< XGraphic > xGraphic;
                 if (( Value >>= xGraphic ) && xGraphic.is() )
                 {
-                    Image aImage( xGraphic );
+                    Graphic aImage(xGraphic);
 
-                    Wallpaper aWallpaper( aImage.GetBitmapEx());
+                    Wallpaper aWallpaper(aImage.GetBitmapEx());
                     aWallpaper.SetStyle( WallpaperStyle::Scale );
                     pDialog->SetBackground( aWallpaper );
                 }
@@ -2548,9 +2548,9 @@ throw(css::uno::RuntimeException, std::exception)
                 Reference< XGraphic > xGraphic;
                 if (( Value >>= xGraphic ) && xGraphic.is() )
                 {
-                    Image aImage( xGraphic );
+                    Graphic aImage(xGraphic);
 
-                    Wallpaper aWallpaper( aImage.GetBitmapEx());
+                    Wallpaper aWallpaper(aImage.GetBitmapEx());
                     aWallpaper.SetStyle( WallpaperStyle::Scale );
                     pTabControl->SetBackground( aWallpaper );
                 }
@@ -2778,9 +2778,9 @@ throw(css::uno::RuntimeException, std::exception)
                 Reference< XGraphic > xGraphic;
                 if (( Value >>= xGraphic ) && xGraphic.is() )
                 {
-                    Image aImage( xGraphic );
+                    Graphic aImage(xGraphic);
 
-                    Wallpaper aWallpaper( aImage.GetBitmapEx());
+                    Wallpaper aWallpaper(aImage.GetBitmapEx());
                     aWallpaper.SetStyle( WallpaperStyle::Scale );
                     pTabPage->SetBackground( aWallpaper );
                 }