diff options
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/page.cxx | 37 | ||||
| -rw-r--r-- | cui/source/tabpages/paragrph.cxx | 20 |
2 files changed, 6 insertions, 51 deletions
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 437cdb41a0e5..147242fe1df1 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -1163,14 +1163,6 @@ void SvxPageDescPage::ResetBackground_Impl(const SfxItemSet& rSet) } m_pBspWin->setHeaderFillAttributes(aHeaderFillAttributes); - nWhich = GetWhich(SID_ATTR_BORDER_OUTER); - - if(rTmpSet.GetItemState(nWhich) == SfxItemState::SET) - { - const SvxBoxItem& rItem = - static_cast<const SvxBoxItem&>(rTmpSet.Get( nWhich )); - m_pBspWin->SetHdBorder( rItem ); - } } } @@ -1207,13 +1199,6 @@ void SvxPageDescPage::ResetBackground_Impl(const SfxItemSet& rSet) } m_pBspWin->setFooterFillAttributes(aFooterFillAttributes); - nWhich = GetWhich(SID_ATTR_BORDER_OUTER); - - if(rTmpSet.GetItemState(nWhich) == SfxItemState::SET) - { - const SvxBoxItem& rItem = static_cast< const SvxBoxItem& >(rTmpSet.Get(nWhich)); - m_pBspWin->SetFtBorder(rItem); - } } } @@ -1241,12 +1226,6 @@ void SvxPageDescPage::ResetBackground_Impl(const SfxItemSet& rSet) } m_pBspWin->setPageFillAttributes(aPageFillAttributes); - pItem = GetItem(rSet, SID_ATTR_BORDER_OUTER); - - if(pItem) - { - m_pBspWin->SetBorder(static_cast< const SvxBoxItem& >(*pItem)); - } } void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet ) @@ -1311,14 +1290,6 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet ) } m_pBspWin->setHeaderFillAttributes(aHeaderFillAttributes); - const sal_uInt16 nWhich(GetWhich(SID_ATTR_BORDER_OUTER)); - - if ( rHeaderSet.GetItemState( nWhich ) >= SfxItemState::DEFAULT ) - { - const SvxBoxItem& rItem = - static_cast<const SvxBoxItem&>(rHeaderSet.Get( nWhich )); - m_pBspWin->SetHdBorder( rItem ); - } } // evaluate footer attributes @@ -1373,14 +1344,6 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet ) } m_pBspWin->setFooterFillAttributes(aFooterFillAttributes); - const sal_uInt16 nWhich(GetWhich(SID_ATTR_BORDER_OUTER)); - - if ( rFooterSet.GetItemState( nWhich ) >= SfxItemState::DEFAULT ) - { - const SvxBoxItem& rItem = - static_cast<const SvxBoxItem&>(rFooterSet.Get( nWhich )); - m_pBspWin->SetFtBorder( rItem ); - } } } diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 986f433852e0..38827706dec8 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -609,11 +609,11 @@ void SvxStdParagraphTabPage::EnableRelativeMode() { DBG_ASSERT( GetItemSet().GetParent(), "RelativeMode, but no parent-set!" ); - m_pLeftIndent->EnableRelativeMode( 0, 999, 5 ); - m_pFLineIndent->EnableRelativeMode( 0, 999, 5 ); - m_pRightIndent->EnableRelativeMode( 0, 999, 5 ); - m_pTopDist->EnableRelativeMode( 0, 999, 5 ); - m_pBottomDist->EnableRelativeMode( 0, 999, 5 ); + m_pLeftIndent->EnableRelativeMode( 0, 999 ); + m_pFLineIndent->EnableRelativeMode( 0, 999 ); + m_pRightIndent->EnableRelativeMode( 0, 999 ); + m_pTopDist->EnableRelativeMode( 0, 999 ); + m_pBottomDist->EnableRelativeMode( 0, 999 ); bRelativeMode = true; } @@ -895,19 +895,11 @@ void SvxStdParagraphTabPage::UpdateExample_Impl() case LLINESPACE_115: case LLINESPACE_15: case LLINESPACE_2: - m_pExampleWin->SetLineSpace( (SvxPrevLineSpace)nPos ); - break; - case LLINESPACE_PROP: - m_pExampleWin->SetLineSpace( (SvxPrevLineSpace)nPos, - (sal_uInt16)m_pLineDistAtPercentBox->Denormalize( m_pLineDistAtPercentBox->GetValue() ) ); - break; - case LLINESPACE_MIN: case LLINESPACE_DURCH: case LLINESPACE_FIX: - m_pExampleWin->SetLineSpace( (SvxPrevLineSpace)nPos, - (sal_uInt16)GetCoreValue( *m_pLineDistAtMetricBox, MapUnit::MapTwip ) ); + m_pExampleWin->SetLineSpace( (SvxPrevLineSpace)nPos ); break; } m_pExampleWin->Invalidate(); |