From e2c85365dfa40c03c6ea04023627366d118bb530 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 18 Oct 2017 12:28:45 +0200 Subject: svx: remove pointless duplicate SdrFitToSizeType Change-Id: I7a59ecfdb8d09ecbc0b760003dbc453ac5646d1c --- cui/source/tabpages/textattr.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'cui') diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index a56710534587..d21dffa3ead7 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -38,6 +38,8 @@ #include #include +using namespace ::com::sun::star; + const sal_uInt16 SvxTextAttrPage::pRanges[] = { SDRATTR_MISC_FIRST @@ -309,9 +311,9 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs ) // adjust to border if ( rAttrs->GetItemState( SDRATTR_TEXT_FITTOSIZE ) != SfxItemState::DONTCARE ) { - SdrFitToSizeType eFTS = + drawing::TextFitToSizeType const eFTS = static_cast( rAttrs->Get( SDRATTR_TEXT_FITTOSIZE ) ).GetValue(); - if( eFTS == SdrFitToSizeType::Autofit || eFTS == SdrFitToSizeType::NONE ) + if (eFTS == drawing::TextFitToSizeType_AUTOFIT || eFTS == drawing::TextFitToSizeType_NONE) m_pTsbFitToSize->SetState( TRISTATE_FALSE ); else m_pTsbFitToSize->SetState( TRISTATE_TRUE ); @@ -407,14 +409,14 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs) eState = m_pTsbFitToSize->GetState(); if( m_pTsbFitToSize->IsValueChangedFromSaved() ) { - SdrFitToSizeType eFTS; + drawing::TextFitToSizeType eFTS; switch( eState ) { default: ; //prevent warning OSL_FAIL( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" ); SAL_FALLTHROUGH; - case TRISTATE_FALSE: eFTS = SdrFitToSizeType::Autofit; break; - case TRISTATE_TRUE: eFTS = SdrFitToSizeType::Proportional; break; + case TRISTATE_FALSE: eFTS = drawing::TextFitToSizeType_AUTOFIT; break; + case TRISTATE_TRUE: eFTS = drawing::TextFitToSizeType_PROPORTIONAL; break; } rAttrs->Put( SdrTextFitToSizeTypeItem( eFTS ) ); } -- cgit