[Libreoffice-commits] core.git: svx/source

[Heiko Tietze (via logerrit)]

 svx/source/dialog/frmsel.cxx |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 6f7d1aaa8c375e6b7a9b80d1ae57efc176c6430f
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Wed Nov 11 11:25:40 2020 +0100
Commit:     Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Wed Dec 9 08:52:11 2020 +0100

    Resolves tdf#138127 - Use document color for border widget
    
    Change-Id: I57fdbd37c23f3bd2c20ac04ef598cd8a182aac6b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105577
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>

diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 78b4f77025fe..8854f7d8272c 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -24,6 +24,7 @@
 #include <vcl/event.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
+#include <svtools/colorcfg.hxx>
 
 #include <algorithm>
 #include <math.h>
@@ -297,11 +298,12 @@ void FrameSelectorImpl::Initialize( FrameSelFlags nFlags )
 void FrameSelectorImpl::InitColors()
 {
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    maBackCol = rSettings.GetFieldColor();
+    svtools::ColorConfig aColorConfig;
+    maBackCol = aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor;
     mbHCMode = rSettings.GetHighContrastMode();
-    maArrowCol = rSettings.GetFieldTextColor();
-    maMarkCol.operator=(maBackCol).Merge(maArrowCol, mbHCMode ? 0x80 : 0xC0);
-    maHCLineCol = rSettings.GetLabelTextColor();
+    maArrowCol = aColorConfig.GetColorValue(svtools::DOCBOUNDARIES).nColor;
+    maMarkCol = aColorConfig.GetColorValue(svtools::TABLEBOUNDARIES).nColor;
+    maHCLineCol = COL_BLACK;
 }
 
 const std::u16string_view aImageIds[] =