diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-11-07 12:55:33 +0000 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2022-11-08 00:05:53 +0100 |
| commit | f8ad054de38a6592b60ab850e938e6e81ec4cc0d (patch) | |
| tree | 8c7361201c3e7a85ee2f0313830c6ed0bb8c0991 /sc/source | |
| parent | e6bc90aa8a959e08abf4b5c10d793ff9a549efe4 (diff) | |
tdf#151610 chart colors should be the same regardless of the desktop theme
Change-Id: I47ae80f744401bd13452ec8879cb8f420e35b9ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142383
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/filter/excel/xlstyle.cxx | 8 | ||||
| -rw-r--r-- | sc/source/filter/inc/xlstyle.hxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index b5de24df06a4..886a3a657617 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -147,12 +147,12 @@ Color XclDefaultPalette::GetDefColor( sal_uInt16 nXclIndex ) const else switch( nXclIndex ) { case EXC_COLOR_WINDOWTEXT3: - case EXC_COLOR_WINDOWTEXT: - case EXC_COLOR_CHWINDOWTEXT: nColor = mnWindowText; break; + case EXC_COLOR_WINDOWTEXT: nColor = mnWindowText; break; case EXC_COLOR_WINDOWBACK3: - case EXC_COLOR_WINDOWBACK: - case EXC_COLOR_CHWINDOWBACK: nColor = mnWindowBack; break; + case EXC_COLOR_WINDOWBACK: nColor = mnWindowBack; break; case EXC_COLOR_BUTTONBACK: nColor = mnFaceColor; break; + case EXC_COLOR_CHWINDOWTEXT: nColor = COL_BLACK; break; + case EXC_COLOR_CHWINDOWBACK: nColor = COL_WHITE; 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 3581f77f0162..69f4f9dabc15 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -207,8 +207,8 @@ const sal_uInt16 EXC_COLOR_WINDOWBACK3 = 25; /// System window backgr const sal_uInt16 EXC_COLOR_WINDOWTEXT = 64; /// System window text color (>=BIFF5). const sal_uInt16 EXC_COLOR_WINDOWBACK = 65; /// System window background color (>=BIFF5). const sal_uInt16 EXC_COLOR_BUTTONBACK = 67; /// System button background color (face color). -const sal_uInt16 EXC_COLOR_CHWINDOWTEXT = 77; /// System window text color (BIFF8 charts). -const sal_uInt16 EXC_COLOR_CHWINDOWBACK = 78; /// System window background color (BIFF8 charts). +const sal_uInt16 EXC_COLOR_CHWINDOWTEXT = 77; /// Chart window text color (BIFF8 charts). +const sal_uInt16 EXC_COLOR_CHWINDOWBACK = 78; /// Chart window background color (BIFF8 charts). const sal_uInt16 EXC_COLOR_CHBORDERAUTO = 79; /// Automatic frame border for series (BIFF8 charts). const sal_uInt16 EXC_COLOR_NOTEBACK = 80; /// Note background color. const sal_uInt16 EXC_COLOR_NOTETEXT = 81; /// Note text color. |