From 2d18b593f36c9146bd317b9e62163f8dc078f6b8 Mon Sep 17 00:00:00 2001 From: Robert Roth Date: Sat, 2 Feb 2013 00:05:01 +0200 Subject: Use application background consistently in Draw, fdo#59042 Change-Id: I990a88b2726a7fafe8b15179962f004008090c7a Reviewed-on: https://gerrit.libreoffice.org/1957 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky --- sd/source/ui/view/drviews4.cxx | 9 +-------- sd/source/ui/view/drviews5.cxx | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index fe92bc05cc68..c3511c9e86cb 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 6ae7a0a5a3c5..2df7ffc396bc 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 -- cgit v1.2.3