[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - svx/source

[Caolán McNamara (via logerrit)]

 svx/source/dialog/fntctrl.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit e21416088d73fb805a0bfdbdbeee7e4081d2c300
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Feb 13 20:30:02 2023 +0000
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Feb 14 09:57:32 2023 +0000

    tdf#153332 reset background to default if new preview has no bg
    
    but the old did
    
    Change-Id: I59ebd4d5974c5d67c4ac572b091febed879fc290
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146923
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 255d8ab8d9d9..031eb7dabc91 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -987,6 +987,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet 
&rSet, bool bPreviewBack
 
     if( !bPreviewBackgroundToCharacter )
     {
+        bool bBackColorFound = false;
         if( GetWhich( rSet, SID_ATTR_BRUSH, nWhich ) )
         {
             const SvxBrushItem& rBrush = static_cast<const  SvxBrushItem&>( 
rSet.Get( nWhich ) );
@@ -994,9 +995,14 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet 
&rSet, bool bPreviewBack
             {
                 const Color& rBrushColor = rBrush.GetColor();
                 if (rBrushColor != COL_TRANSPARENT)
+                {
                     pImpl->mxBackColor = rBrush.GetColor();
+                    bBackColorFound = true;
+                }
             }
         }
+        if (!bBackColorFound)
+            pImpl->mxBackColor = 
svtools::ColorConfig().GetColorValue(svtools::DOCCOLOR).nColor;
     }
 
     // Font