[Libreoffice-commits] core.git: sw/inc sw/source

[Heiko Tietze (via logerrit)]

 sw/inc/viewopt.hxx             |    2 +-
 sw/source/core/text/porrst.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5836cd37b6d292b1b4e72d5a5a6dc9029c5cf730
Author:     Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Wed Sep 29 17:03:31 2021 +0200
Commit:     Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Fri Oct 1 10:27:23 2021 +0200

    Resolves tdf#144677 - Show bookmarks like fields
    
    Color and condition follow field shading now
    
    Change-Id: I810c90fee2663b1148c139b6e7978ba161fd37b6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122829
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>

diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index f073c185fc6d..e8a1c299b496 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -246,7 +246,7 @@ public:
     bool IsShowBookmarks(bool const bHard = false) const
     {
         return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::Bookmarks)
-                && (bHard || (m_nCoreOptions & ViewOptFlags1::ViewMetachars));
+                && (bHard || IsFieldShadings());
     }
 
     bool IsLineBreak(bool bHard = false) const
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 23f837d63051..83cc1cc57da1 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -597,7 +597,7 @@ bool SwBookmarkPortion::DoPaint(SwTextPaintInfo const& 
rTextPaintInfo,
     auto const nFactor = (Height() * 95) / aSize.Height();
     rFont.SetProportion(nFactor);
     rFont.SetWeight(WEIGHT_THIN, rFont.GetActual());
-    rFont.SetColor(NON_PRINTING_CHARACTER_COLOR);
+    rFont.SetColor(SwViewOption::GetFieldShadingsColor());
     // reset these to default...
     rFont.SetAlign(ALIGN_BASELINE);
     rFont.SetUnderline(LINESTYLE_NONE);