cui/source/tabpages/tpshadow.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
New commits: commit 466d0f2cb2b2bb7fba306ab089be7f648578474e Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Apr 17 14:09:46 2015 +0200 Clean up conversion from TriState to bool to witness, in Draw select multiple rectangles, with and without shadows, then "Format - Area... - Shadow" Change-Id: Ia1d042f0e3e99bb55228c558568c96b113edfe00 diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index b163ceb..fe94d0e 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -257,10 +257,14 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs ) { const SfxPoolItem* pOld = NULL; - TriState eState = m_pTsbShowShadow->GetState(); if( m_pTsbShowShadow->IsValueChangedFromSaved() ) { - SdrOnOffItem aItem( makeSdrShadowItem(sal::static_int_cast< sal_Bool >( eState )) ); + TriState eState = m_pTsbShowShadow->GetState(); + assert(eState != TRISTATE_INDET); + // given how m_pTsbShowShadow is set up and saved in Reset(), + // eState == TRISTATE_INDET would imply + // !IsValueChangedFromSaved() + SdrOnOffItem aItem( makeSdrShadowItem(eState == TRISTATE_TRUE) ); pOld = GetOldItem( *rAttrs, SDRATTR_SHADOW ); if ( !pOld || !( *static_cast<const SdrOnOffItem*>(pOld) == aItem ) ) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits