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

[Caolán McNamara (via logerrit)]

 sw/source/ui/config/optload.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 05776b4304485490760fb5213066a094c6e9600a
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Dec 1 09:14:48 2022 +0000
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Thu Dec 1 12:48:37 2022 +0100

    Resolves: tdf#152329 Caption preview font is black when using OS dark mode
    
    Change-Id: I2ed9ae77ecb9a5a83d88dce5a2834e6c882cfec1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143448
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 9f0531b77a67..1885c06ecf9d 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -375,10 +375,12 @@ SwCaptionPreview::SwCaptionPreview()
 
 void SwCaptionPreview::ApplySettings(vcl::RenderContext& rRenderContext)
 {
-    Wallpaper 
aBack(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor());
+    const StyleSettings& rSettings = 
rRenderContext.GetSettings().GetStyleSettings();
+    Wallpaper aBack(rSettings.GetWindowColor());
     rRenderContext.SetBackground(aBack);
     rRenderContext.SetFillColor(aBack.GetColor());
     rRenderContext.SetLineColor(aBack.GetColor());
+    rRenderContext.SetTextColor(rSettings.GetWindowTextColor());
 
     if (!mbFontInitialized)
     {