[Libreoffice-commits] .: Branch 'libreoffice-4-0' - vcl/source

[Libreoffice Gerrit user]

 vcl/source/window/dockingarea.cxx |    1 +
 vcl/source/window/menu.cxx        |    2 ++
 2 files changed, 3 insertions(+)

New commits:
commit b951f2f22940356db382704cc513b2b6d42b26d2
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Jan 17 16:40:24 2013 +0100

    Personas: Fix fdo#59208 - get rid of artifacts when we run out of bitmap.
    
    So far I am using the same color that is used for the workspace; should it be
    a problem, we can use a different color.
    
    Change-Id: I06fde7f31a9d37d2e387a7e3fd0b6d3d33f8d6e6
    Reviewed-on: https://gerrit.libreoffice.org/1742
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>

diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index e20265d..c79c226 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -55,6 +55,7 @@ static void ImplInitBackground( DockingAreaWindow* pThis )
     {
         Wallpaper aWallpaper( rPersonaBitmap );
         aWallpaper.SetStyle( WALLPAPER_TOPRIGHT );
+        aWallpaper.SetColor( Application::GetSettings().GetStyleSettings().GetWorkspaceColor() );
 
         // we need to shift the bitmap vertically so that it spans over the
         // menubar conveniently
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index ec35098..71a92b5 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3861,6 +3861,8 @@ static void ImplInitMenuWindow( Window* pWin, sal_Bool bFont, sal_Bool bMenuBar
         {
             Wallpaper aWallpaper( rPersonaBitmap );
             aWallpaper.SetStyle( WALLPAPER_TOPRIGHT );
+            aWallpaper.SetColor( Application::GetSettings().GetStyleSettings().GetWorkspaceColor() );
+
             pWin->SetBackground( aWallpaper );
             pWin->SetPaintTransparent( sal_False );
             pWin->SetParentClipMode( 0 );