diff -Nru libreoffice-3.6.2~rc2/debian/changelog libreoffice-3.6.2~rc2/debian/changelog --- libreoffice-3.6.2~rc2/debian/changelog 2012-11-26 17:57:22.000000000 +0530 +++ libreoffice-3.6.2~rc2/debian/changelog 2013-01-23 15:59:03.000000000 +0530 @@ -1,3 +1,11 @@ +libreoffice (1:3.6.2~rc2-0ubuntu7) raring; urgency=low + + * debian/patches/lp734428-autocolor.patch: + - Wrong automatic text color "dark grey" with black background + (lp: #734428) + + -- Ritesh Khadgaray Wed, 23 Jan 2013 15:58:18 +0530 + libreoffice (1:3.6.2~rc2-0ubuntu6) raring; urgency=low * cherry pick from upstream 3.6 branch Change-Id diff -Nru libreoffice-3.6.2~rc2/debian/patches/lp734428-autocolor.patch libreoffice-3.6.2~rc2/debian/patches/lp734428-autocolor.patch --- libreoffice-3.6.2~rc2/debian/patches/lp734428-autocolor.patch 1970-01-01 05:30:00.000000000 +0530 +++ libreoffice-3.6.2~rc2/debian/patches/lp734428-autocolor.patch 2013-01-23 15:57:41.000000000 +0530 @@ -0,0 +1,61 @@ +From 456ec746d130d736caa526dfddc8d138fff6c797 Mon Sep 17 00:00:00 2001 +From: Benjamin Drung +Date: Fri, 8 Jun 2012 00:19:25 +0200 +Subject: [PATCH] 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 +--- + svtools/source/config/colorcfg.cxx | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +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; +-- +1.7.9.5 + + diff -Nru libreoffice-3.6.2~rc2/debian/patches/series libreoffice-3.6.2~rc2/debian/patches/series --- libreoffice-3.6.2~rc2/debian/patches/series 2012-11-26 17:57:20.000000000 +0530 +++ libreoffice-3.6.2~rc2/debian/patches/series 2013-01-23 15:58:02.000000000 +0530 @@ -31,3 +31,5 @@ packagekit.diff unitymenus.diff improve-faux-bold-font.patch +lp734428-autocolor.patch +