[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - svtools/source

[Benjamin Drung]

 svtools/source/config/colorcfg.cxx |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit f10bb02eb3083a089e3ca28c45983e616ef84d58
Author: Benjamin Drung <bdrung at debian.org>
Date:   Fri Jun 8 00:19:25 2012 +0200

    fdo#35365 Set the default font color to black and the document color to white.
    
    The font and document color of a Writer document or an Impress presentation
    should not be derived from a desktop theme. A Writer documents needs to look
    good on paper. An Impress presentation may have it's own theme. The appearance
    of a document should not change by changing the desktop theme.
    
    With this change a document looks the same on any computer if the user do not
    change the default colors.
    
    Change-Id: Ia42ca7882f0d2dd1f2a304db5e4b5aaba23244fc
    Reviewed-on: https://gerrit.libreoffice.org/2156
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index abdb852..4f899af 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -412,12 +412,12 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
 {
     static const sal_Int32 aAutoColors[] =
     {
-        0, // DOCCOLOR
+        COL_WHITE, // DOCCOLOR
         0xc0c0c0, // DOCBOUNDARIES
         0x808080, // APPBACKGROUND
         0xc0c0c0, // OBJECTBOUNDARIES
         0xc0c0c0, // TABLEBOUNDARIES
-        0, // FONTCOLOR
+        COL_BLACK, // FONTCOLOR
         0xcc, // LINKS
         0x80, // LINKSVISITED
         0xff0000, // SPELL
@@ -462,18 +462,10 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
     Color aRet;
     switch(eEntry)
     {
-        case DOCCOLOR :
-            aRet = Application::GetSettings().GetStyleSettings().GetWindowColor();
-            break;
-
         case APPBACKGROUND :
             aRet = Application::GetSettings().GetStyleSettings().GetWorkspaceColor();
             break;
 
-        case FONTCOLOR :
-            aRet = Application::GetSettings().GetStyleSettings().GetWindowTextColor();
-            break;
-
         case LINKS :
             aRet = Application::GetSettings().GetStyleSettings().GetLinkColor();
             break;