[Libreoffice-commits] core.git: cui/source

[Katarina Behrens]

 cui/source/tabpages/tpshadow.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8c7f6830e767897d3a0e88f75fc8d7ef7fca95dc
Author: Katarina Behrens <bubli at bubli.org>
Date:   Mon Jan 5 23:09:11 2015 +0100

    fdo#84228: Set rectangle props after setting shadow props
    
    It doesn't work the other way round, the preview then fails to be
    updated, the old shadow still sticks around. I don't know why. Those
    X different SfxItemSet pools just make my head spin :(
    
    Change-Id: I436a46f95299cf32f4bb43437cc5c23a655dbe9d

diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index dd06af6..15d00d1 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -210,7 +210,6 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet )
                     }
                 }
 
-                m_pCtlXRectPreview->SetRectangleAttributes(rSet);
                 // aLbShadowColor
                 nPos = m_pLbShadowColor->GetSelectEntryPos();
                 m_pLbShadowColor->Clear();
@@ -224,6 +223,7 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet )
                     m_pLbShadowColor->SelectEntryPos( nPos );
 
                 ModifyShadowHdl_Impl( this );
+                m_pCtlXRectPreview->SetRectangleAttributes(rSet);
             }
             nPageType = PT_SHADOW;
         }