[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source

[Jan-Marek Glogowski (via logerrit)]

 sw/source/ui/frmdlg/column.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a362277bd133832c71e66603a10e4e4e19492b4d
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Fri Oct 16 11:35:56 2020 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Fri Oct 16 19:53:29 2020 +0200

    tdf#136924 draw lines using field text color
    
    Interestingly, these are not icon images, as I expected, but it's
    a custom DrawingArea widget, which is completely drawn by some
    algorithm.
    
    Currently it uses the themes field color as background fill color
    and an independent font color for the lines. So just use the
    themed, matching field text color instead.
    
    Regressed-by: 39e027c669fc0a91e223d7635c10adb5778586c7
    Change-Id: I9f0073f41127207d2391ee23c9553512ffe4ba01
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104422
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    Tested-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit 160bd8cf3c9c6680b9a9291f2d2c4929ec0785c1)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104342
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    Tested-by: Jenkins

diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 50822c644e6b..343ce664a4e3 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -1325,7 +1325,7 @@ void ColumnValueSet::UserDraw(const UserDrawEvent& rUDEvt)
     Color aFillColor(pDev->GetFillColor());
     Color aLineColor(pDev->GetLineColor());
     pDev->SetFillColor(rStyleSettings.GetFieldColor());
-    pDev->SetLineColor(SwViewOption::GetFontColor());
+    pDev->SetLineColor(rStyleSettings.GetFieldTextColor());
 
     long nStep = std::abs(std::abs(nRectHeight * 95 /100) / 11);
     long nTop = (nRectHeight - 11 * nStep ) / 2;