[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - cui/source

[Julien Nabet (via logerrit)]

 cui/source/tabpages/tparea.cxx |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 7ccaecd33a30905e3929d43c8164b16bbb101b73
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Thu Sep 7 16:34:53 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Sep 9 11:53:06 2023 +0200

    tdf#157138: Can't switch from Use Background to None area fill
    
    Revert partly tdf#151260 fix
    
    Change-Id: I4c052e2cd1cb41dc8bda4b388b46e4416e351434
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156669
    (cherry picked from commit b69e14038288387b5f288a06821fb5df66dcf94e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156733
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index d1ece1c0e4d4..4751c21c93c5 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -240,11 +240,8 @@ DeactivateRC SvxAreaTabPage::DeactivatePage( SfxItemSet* 
_pSet )
             {
                 XFillStyleItem aStyleItem( drawing::FillStyle_NONE );
                 _pSet->Put( aStyleItem );
-                if (_pSet->HasItem(XATTR_FILLUSESLIDEBACKGROUND))
-                {
-                    XFillUseSlideBackgroundItem aFillBgItem( false );
-                    _pSet->Put( aFillBgItem );
-                }
+                XFillUseSlideBackgroundItem aFillBgItem( false );
+                _pSet->Put( aFillBgItem );
             }
             break;
         }