diff options
Diffstat (limited to 'sd/source/ui/func')
-rw-r--r-- | sd/source/ui/func/fuolbull.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/func/fupage.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/func/fuparagr.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/futempl.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/futext.cxx | 6 |
5 files changed, 9 insertions, 11 deletions
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index f8be75ef3643..4565e0b5e81f 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -335,7 +335,7 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u } if( pItem == nullptr ) - pItem = static_cast<const SvxNumBulletItem*>( aNewAttr.GetPool()->GetSecondaryPool()->GetPoolDefaultItem(EE_PARA_NUMBULLET) ); + pItem = aNewAttr.GetPool()->GetSecondaryPool()->GetPoolDefaultItem(EE_PARA_NUMBULLET); //DBG_ASSERT( pItem, "No EE_PARA_NUMBULLET in the Pool!" ); @@ -344,14 +344,14 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u if(bTitle && aNewAttr.GetItemState(EE_PARA_NUMBULLET) == SfxItemState::SET ) { - const SvxNumBulletItem* pBulletItem = static_cast<const SvxNumBulletItem*>( aNewAttr.GetItem(EE_PARA_NUMBULLET) ); + const SvxNumBulletItem* pBulletItem = aNewAttr.GetItem(EE_PARA_NUMBULLET); SvxNumRule* pLclRule = pBulletItem->GetNumRule(); if(pLclRule) { SvxNumRule aNewRule( *pLclRule ); aNewRule.SetFeatureFlag( SvxNumRuleFlags::NO_NUMBERS ); - SvxNumBulletItem aNewItem( aNewRule, EE_PARA_NUMBULLET ); + SvxNumBulletItem aNewItem( aNewRule, EE_PARA_NUMBULLET.Which() ); aNewAttr.Put(aNewItem); } } diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index fa14378f2da0..059ff5e61102 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -218,7 +218,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent ) {SID_ATTR_BORDER_SHADOW, SID_ATTR_BORDER_SHADOW}, {XATTR_FILL_FIRST, XATTR_FILL_LAST}, {SID_ATTR_PAGE_COLOR,SID_ATTR_PAGE_FILLSTYLE}, - {EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR}}); + {EE_PARA_WRITINGDIR.Which(), EE_PARA_WRITINGDIR.Which()}}); // Retrieve additional data for dialog @@ -229,7 +229,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent ) aNewAttr.Put( SvxFrameDirectionItem( mpDoc->GetDefaultWritingMode() == css::text::WritingMode_RL_TB ? SvxFrameDirection::Horizontal_RL_TB : SvxFrameDirection::Horizontal_LR_TB, - EE_PARA_WRITINGDIR ) ); + EE_PARA_WRITINGDIR.Which() ) ); // Retrieve page-data for dialog diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index 9600f35f89c7..36af7fa013b7 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -77,7 +77,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq ) aNewAttr.Put( aEditAttr ); // left border is offset - const long nOff = static_cast<const SvxLRSpaceItem&>(aNewAttr.Get( EE_PARA_LRSPACE ) ).GetTextLeft(); + const long nOff = aNewAttr.Get( EE_PARA_LRSPACE ).GetTextLeft(); // conversion since TabulatorTabPage always uses Twips! SfxInt32Item aOff( SID_ATTR_TABSTOP_OFFSET, nOff ); aNewAttr.Put( aOff ); diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index ff7eaa096ea8..191cd65c362f 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -420,7 +420,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) if(pFirstStyleSheet) { - pFirstStyleSheet->GetItemSet().Put( SvxNumBulletItem( aRule, EE_PARA_NUMBULLET )); + pFirstStyleSheet->GetItemSet().Put( SvxNumBulletItem( aRule, EE_PARA_NUMBULLET.Which() )); SdStyleSheet* pRealSheet = static_cast<SdStyleSheet*>(pFirstStyleSheet)->GetRealStyleSheet(); pRealSheet->Broadcast(SfxHint(SfxHintId::DataChanged)); } diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 2b4ca65526cb..3e3143f20dd6 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -843,8 +843,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) // one of the default set items from ImpSetAttributesForNewTextObject // needs to be adapted to non-block mode. const SfxItemSet& rSet = mpView->GetDefaultAttr(); - SvxFrameDirection eDirection = static_cast<const SvxFrameDirectionItem&>( - rSet.Get(EE_PARA_WRITINGDIR)).GetValue(); + SvxFrameDirection eDirection = rSet.Get(EE_PARA_WRITINGDIR).GetValue(); if(SvxFrameDirection::Horizontal_RL_TB == eDirection || SvxFrameDirection::Vertical_RL_TB == eDirection) { @@ -864,8 +863,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) // Look in the object defaults if left-to-right is wanted. If // yes, set text anchoring to right to let the box grow to left. const SfxItemSet& rSet = mpView->GetDefaultAttr(); - SvxFrameDirection eDirection = - static_cast<const SvxFrameDirectionItem&>(rSet.Get(EE_PARA_WRITINGDIR)).GetValue(); + SvxFrameDirection eDirection = rSet.Get(EE_PARA_WRITINGDIR).GetValue(); if(SvxFrameDirection::Horizontal_RL_TB == eDirection) { |