[PATCH] Use application background consistently in Draw, fdo#59042

Robert Roth (via Code Review) gerrit at gerrit.libreoffice.org
Fri Feb 1 14:34:31 PST 2013


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1957

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/1957/1

Use application background consistently in Draw, fdo#59042

Change-Id: I990a88b2726a7fafe8b15179962f004008090c7a
---
M sd/source/ui/view/drviews4.cxx
M sd/source/ui/view/drviews5.cxx
2 files changed, 2 insertions(+), 16 deletions(-)



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 @@
             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 @@
     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

-- 
To view, visit https://gerrit.libreoffice.org/1957
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I990a88b2726a7fafe8b15179962f004008090c7a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Robert Roth <robert.roth.off at gmail.com>


More information about the LibreOffice mailing list