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

[Katarina Behrens]

 cui/source/tabpages/tpshadow.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 11402a73876e4213f1a4b0583d74ac51e4dacb33
Author: Katarina Behrens <bubli at bubli.org>
Date:   Tue Mar 31 22:44:28 2015 +0200

    tdf#84228: Fix annoying double shadow in preview
    
    SfxItemSet passed to ActivatePage method contains both rectangle AND
    shadow attributes, causing the old shadow to stick around even after
    new shadow attributes have been set. Thus, set shadow to none in a
    local copy of SfxItemSet and use that one to repaint the rectangle
    
    Change-Id: If798351fbecaaf951ef0479ae4a2c70d2db68ca4
    Reviewed-on: https://gerrit.libreoffice.org/15099
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 6aa0fe9..3216853 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -223,6 +223,14 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet )
                 else
                     m_pLbShadowColor->SelectEntryPos( nPos );
 
+                SfxItemSet rAttribs( rSet );
+                // rSet contains shadow attributes too, but we want
+                // to use it for updating rectangle attributes only,
+                // so set the shadow to none here
+                SdrOnOffItem aItem( makeSdrShadowItem( false ));
+                rAttribs.Put( aItem );
+
+                m_pCtlXRectPreview->SetRectangleAttributes( rAttribs );
                 ModifyShadowHdl_Impl( this );
             }
             nPageType = PT_SHADOW;