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

[Katarina Behrens]

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

New commits:
commit 7f80b3eb26769143e18806392164aae8c5ad9763
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Wed Apr 1 23:25:34 2015 +0200

    Follow-up tdf#84288: call SetRectangleAttributes only once
    
    cherry-picking code from master (4.5) branch to 4.4 branch
    sadly didn't remove/replace the faulty
    m_pCtlXRectPreview->SetRectangleAttributes line b/c 4.4 code
    calls it a bit earlier. I noticed too late and dtardon was
    too quick with merging.
    
    Change-Id: Ib6e43c4475aacd5d87d9b82f321c24386187b736
    Reviewed-on: https://gerrit.libreoffice.org/15114
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 3216853..3e33839 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();