From 2302e9eb8a161abaf5899288b4e1c689f5a1ff07 Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Tue, 31 Mar 2015 22:44:28 +0200 Subject: 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 --- cui/source/tabpages/tpshadow.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index d57db3f22d9b..b163ceb16d05 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -222,8 +222,15 @@ 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 ); - m_pCtlXRectPreview->SetRectangleAttributes(rSet); } nPageType = PT_SHADOW; } -- cgit v1.2.3