core.git: Branch 'distro/collabora/co-23.05' - chart2/source

[Caolán McNamara (via logerrit)]

 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 1efd4e99741e69946068d0109743f37bc8c71bff
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Jan 31 19:51:33 2024 +0000
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Feb 1 13:53:38 2024 +0100

    use ViewShell DOCCOLOR when available for charts
    
    Change-Id: I200538bd94d60867d84b7dc37811094b65dd9aa5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162853
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx 
b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index cb63c2d690a8..6de5c69db94c 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/drawing/XShape.hpp>
 
 #include <sfx2/objsh.hxx>
+#include <sfx2/viewsh.hxx>
 #include <svx/helperhittest3d.hxx>
 
 using namespace ::com::sun::star;
@@ -211,8 +212,14 @@ void DrawViewWrapper::setMarkHandleProvider( 
MarkHandleProvider* pMarkHandleProv
 
 void DrawViewWrapper::CompleteRedraw(OutputDevice* pOut, const vcl::Region& 
rReg, sdr::contact::ViewObjectContactRedirector* /* pRedirector */)
 {
-    svtools::ColorConfig aColorConfig;
-    Color aFillColor( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor );
+    Color aFillColor;
+    if (const SfxViewShell* pViewShell = SfxViewShell::Current())
+        aFillColor = pViewShell->GetColorConfigColor(svtools::DOCCOLOR);
+    else
+    {
+        svtools::ColorConfig aColorConfig;
+        aFillColor = aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor;
+    }
     SetApplicationBackgroundColor(aFillColor);
     E3dView::CompleteRedraw( pOut, rReg );
 }