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

[Robert Roth]

 sd/source/ui/view/drviews4.cxx |    9 +--------
 sd/source/ui/view/drviews5.cxx |    9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

New commits:
commit 2d18b593f36c9146bd317b9e62163f8dc078f6b8
Author: Robert Roth <robert.roth.off at gmail.com>
Date:   Sat Feb 2 00:05:01 2013 +0200

    Use application background consistently in Draw, fdo#59042
    
    Change-Id: I990a88b2726a7fafe8b15179962f004008090c7a
    Reviewed-on: https://gerrit.libreoffice.org/1957
    Reviewed-by: Jan Holesovsky <kendy at suse.cz>
    Tested-by: Jan Holesovsky <kendy at suse.cz>

diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index fe92bc0..c3511c9 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -335,14 +335,7 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
             svtools::ColorConfig aColorConfig;
             Color aFillColor;
 
-            if(DOCUMENT_TYPE_IMPRESS == GetDoc()->GetDocumentType())
-            {
-                aFillColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND ).nColor );
-            }
-            else
-            {
-                aFillColor = Color( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor );
-            }
+            aFillColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND ).nColor );
 
             mpDrawView->SetApplicationBackgroundColor(aFillColor);
         }
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 6ae7a0a..2df7ffc 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -435,14 +435,7 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin)
     svtools::ColorConfig aColorConfig;
     Color aFillColor;
 
-    if(DOCUMENT_TYPE_IMPRESS == GetDoc()->GetDocumentType())
-    {
-        aFillColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND ).nColor );
-    }
-    else
-    {
-        aFillColor = Color( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor );
-    }
+    aFillColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND ).nColor );
 
     /* This is done before each text edit, so why not do it before every paint.
                 The default language is only used if the outliner only contains one