summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Roth <robert.roth.off@gmail.com>2013-02-02 00:05:01 +0200
committerJan Holesovsky <kendy@suse.cz>2013-02-04 14:11:24 +0000
commit2d18b593f36c9146bd317b9e62163f8dc078f6b8 (patch)
tree743228d4da1587d7e9c70dbe7ab438e874d46290
parent026e06e1a6a1a1823dc65db9df8d9a3b15a7e517 (diff)
Use application background consistently in Draw, fdo#59042
Change-Id: I990a88b2726a7fafe8b15179962f004008090c7a Reviewed-on: https://gerrit.libreoffice.org/1957 Reviewed-by: Jan Holesovsky <kendy@suse.cz> Tested-by: Jan Holesovsky <kendy@suse.cz>
-rw-r--r--sd/source/ui/view/drviews4.cxx9
-rw-r--r--sd/source/ui/view/drviews5.cxx9
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