diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2022-06-17 16:51:22 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-06-27 15:46:16 +0200 |
| commit | 7613fa06e52e10130357898c5205b9ec7fc4e348 (patch) | |
| tree | d2e5f9ae2636cb2ece2d19b7f036a44da5b0f102 /include | |
| parent | a095f58d981569cbe79d724a301ed04f0f92748d (diff) | |
tdf#148820 sc: fix conditional formatted cell color
Store foreground color for color filtering, because in OOXML
the foreground color is used for color filtering and we overwrote
it with the background color which is used for conditional formatted cells too.
Regression from commit: 6f908b48373b71d45c8119b296b0504fb586f6f8
(tdf#143104 Fix xlsx import/export of color filter colors)
Change-Id: I737e6f1170851822a2689fa477db59e62f0d47fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136055
Tested-by: Jenkins
Tested-by: Gabor Kelemen <kelemeng@ubuntu.com>
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
(cherry picked from commit 415dc3bb1c03dbdbc3cbca274bc435ac7557ba2d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136457
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136479
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/brushitem.hxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 036463c85079..1a841c32d6a1 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -43,6 +43,7 @@ enum SvxGraphicPosition class EDITENG_DLLPUBLIC SvxBrushItem final : public SfxPoolItem { Color aColor; + Color aFilterColor; sal_Int32 nShadingValue; mutable std::unique_ptr<GraphicObject> xGraphicObject; sal_Int8 nGraphicTransparency; //contains a percentage value which is @@ -90,6 +91,10 @@ public: Color& GetColor() { return aColor; } void SetColor( const Color& rCol) { aColor = rCol; } + const Color& GetFiltColor() const { return aFilterColor; } + Color& GetFiltColor() { return aFilterColor; } + void SetFiltColor( const Color& rCol) { aFilterColor = rCol; } + SvxGraphicPosition GetGraphicPos() const { return eGraphicPos; } sal_Int32 GetShadingValue() const { return nShadingValue; } |