The following commit has been merged in the ubuntu-precise-3.5 branch: commit 2bed50225955d3923fcc65e50a3df6baa6653976 Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Fri Feb 15 11:45:02 2013 +0100
lp#628105: backport patch for dark themes diff --git a/changelog b/changelog index 840a785..e07a3d7 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,9 @@ +libreoffice (1:3.5.7-0ubuntu5~ppa1) precise; urgency=low + + * backport theming fix for dark themes (LP: #628105) + + -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Fri, 15 Feb 2013 11:33:02 +0100 + libreoffice (1:3.5.7-0ubuntu4) precise; urgency=low [Nobuto MURATA] diff --git a/patches/lp-628105-fdo-35365-Set-the-default-font-color-to-black-and-th.diff b/patches/lp-628105-fdo-35365-Set-the-default-font-color-to-black-and-th.diff new file mode 100644 index 0000000..074cbfd --- /dev/null +++ b/patches/lp-628105-fdo-35365-Set-the-default-font-color-to-black-and-th.diff @@ -0,0 +1,60 @@ +From 79e869c1e2114e3fc3f1d2a33d84fa2b5e98b8a3 Mon Sep 17 00:00:00 2001 +From: Benjamin Drung <bdr...@debian.org> +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 45b5712..0c8bb7e 100644 +--- a/svtools/source/config/colorcfg.cxx ++++ b/svtools/source/config/colorcfg.cxx +@@ -414,12 +414,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 +@@ -464,18 +464,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.12.4 + diff --git a/patches/series b/patches/series index ad9f7a5..30ea929 100644 --- a/patches/series +++ b/patches/series @@ -58,3 +58,4 @@ lp-1097966-fdo-57532-restrict-page-sanity-check-to-non.diff lp-1097962-rhbz-827695-sw-prevent-crashes-after-incomplete-prin.diff lp-994388-fdo-43932-set-correct-paper-tray-in-UI.diff lp-1103495-rhbz-868479-fdo-56281-doubled-in-German-ok-.diff +lp-628105-fdo-35365-Set-the-default-font-color-to-black-and-th.diff -- LibreOffice packaging repository -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1u6j7l-0002fv...@vasks.debian.org