[Libreoffice-commits] .: Branch 'integration/dev300_m98' - vcl/source

[Michael Meeks]

 vcl/source/window/introwin.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit d57bda4076be8ff2956ef08c0e1dd7765ab90fe6
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Mar 7 11:28:04 2011 +0000

    fix more merge issues for desktop/ to build

diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx
index 30f0af9..b662b05 100644
--- a/vcl/source/window/introwin.cxx
+++ b/vcl/source/window/introwin.cxx
@@ -77,4 +77,13 @@ void IntroWindow::SetBackgroundBitmap( const Bitmap& rBitmap )
     }
 }
 
+void IntroWindow::SetBackgroundBitmap( const BitmapEx& rBitmapEx )
+{
+    if( ! rBitmapEx.IsEmpty() )
+    {
+        SalBitmap* pBmp = rBitmapEx.ImplGetBitmapImpBitmap()->ImplGetSalBitmap();
+        ImplGetFrame()->SetBackgroundBitmap( pBmp );
+    }
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */