sc/source/filter/excel/xlstyle.cxx | 10 ++++------
sc/source/filter/inc/xlstyle.hxx | 2 --
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 2e97f7596c2d933e87391a5648341f885975c51b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Nov 8 09:53:26 2022 +0000
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Tue Nov 8 18:19:50 2022 +0100
tdf#122188 border colors should be the same regardless of the desktop theme
Change-Id: Ifc0297135981b315ce8646e0ca2fe8a899d49f32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142423
Tested-by: Jenkins
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/sc/source/filter/excel/xlstyle.cxx
b/sc/source/filter/excel/xlstyle.cxx
index 886a3a657617..ae4a6f1f6f37 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -94,8 +94,6 @@ XclDefaultPalette::XclDefaultPalette( const XclRoot& rRoot ) :
mnTableSize( 0 )
{
const StyleSettings& rSett = Application::GetSettings().GetStyleSettings();
- mnWindowText = rSett.GetWindowTextColor();
- mnWindowBack = rSett.GetWindowColor();
mnFaceColor = rSett.GetFaceColor();
// Don't use the system HelpBack and HelpText colours as it causes problems
// with modern gnome. This is because mnNoteText and mnNoteBack are used
@@ -147,12 +145,12 @@ Color XclDefaultPalette::GetDefColor( sal_uInt16
nXclIndex ) const
else switch( nXclIndex )
{
case EXC_COLOR_WINDOWTEXT3:
- case EXC_COLOR_WINDOWTEXT: nColor = mnWindowText; break;
- case EXC_COLOR_WINDOWBACK3:
- case EXC_COLOR_WINDOWBACK: nColor = mnWindowBack; break;
- case EXC_COLOR_BUTTONBACK: nColor = mnFaceColor; break;
+ case EXC_COLOR_WINDOWTEXT:
case EXC_COLOR_CHWINDOWTEXT: nColor = COL_BLACK; break;
+ case EXC_COLOR_WINDOWBACK3:
+ case EXC_COLOR_WINDOWBACK:
case EXC_COLOR_CHWINDOWBACK: nColor = COL_WHITE; break;
+ case EXC_COLOR_BUTTONBACK: nColor = mnFaceColor; break;
case EXC_COLOR_CHBORDERAUTO: nColor = COL_BLACK; break; //
TODO: really always black?
case EXC_COLOR_NOTEBACK: nColor = mnNoteBack; break;
case EXC_COLOR_NOTETEXT: nColor = mnNoteText; break;
diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx
index 69f4f9dabc15..098d2d3346b8 100644
--- a/sc/source/filter/inc/xlstyle.hxx
+++ b/sc/source/filter/inc/xlstyle.hxx
@@ -263,8 +263,6 @@ public:
private:
const Color* mpnColorTable; /// The table with RGB values.
- Color mnWindowText; /// System window text color.
- Color mnWindowBack; /// System window background color.
Color mnFaceColor; /// System button background color.
Color mnNoteText; /// Note text color.
Color mnNoteBack; /// Note background color.
