diff options
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r-- | svx/source/svdraw/svdattr.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdfmtf.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdibrow.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdotext.cxx | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index b9563d0f9f28..4b3eba91870f 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -1047,11 +1047,11 @@ bool SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres, bool SdrTextFitToSizeTypeItem::HasBoolValue() const { return true; } -bool SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; } +bool SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SdrFitToSizeType::NONE; } void SdrTextFitToSizeTypeItem::SetBoolValue(bool bVal) { - SetValue(sal::static_int_cast< sal_uInt16 >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); + SetValue(sal::static_int_cast< sal_uInt16 >(bVal ? SdrFitToSizeType::Proportional : SdrFitToSizeType::NONE)); } bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 42027a423a4f..146eaab14b38 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -1009,7 +1009,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt pText->ClearMergedItem( SDRATTR_TEXT_AUTOGROWWIDTH ); pText->SetMergedItem( makeSdrTextAutoGrowHeightItem( false ) ); // don't let the margins eat the space needed for the text - pText->SetMergedItem( SdrTextFitToSizeTypeItem( SDRTEXTFIT_ALLLINES ) ); + pText->SetMergedItem( SdrTextFitToSizeTypeItem( SdrFitToSizeType::AllLines ) ); } else { diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 5f373c7bbb85..0c4e458f5ee8 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -799,7 +799,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI case SDRATTR_TEXT_HORZADJUST: { if (ImpGetItem(*pSet,SDRATTR_TEXT_FITTOSIZE,pItem)) { SdrFitToSizeType eFit=static_cast<const SdrTextFitToSizeTypeItem*>(pItem)->GetValue(); - if (eFit!=SDRTEXTFIT_NONE) return true; + if (eFit!=SdrFitToSizeType::NONE) return true; } } break; diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index ddf5295951c1..54dda65b2f49 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1481,7 +1481,7 @@ void SdrTextObj::RestGeoData(const SdrObjGeoData& rGeo) SdrFitToSizeType SdrTextObj::GetFitToSize() const { - SdrFitToSizeType eType = SDRTEXTFIT_NONE; + SdrFitToSizeType eType = SdrFitToSizeType::NONE; if(!IsAutoGrowWidth()) eType = static_cast<const SdrTextFitToSizeTypeItem&>(GetObjectItem(SDRATTR_TEXT_FITTOSIZE)).GetValue(); @@ -1911,13 +1911,13 @@ GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle( // Access to TextAnimationAllowed flag bool SdrTextObj::IsAutoFit() const { - return GetFitToSize()==SDRTEXTFIT_AUTOFIT; + return GetFitToSize()==SdrFitToSizeType::Autofit; } bool SdrTextObj::IsFitToSize() const { const SdrFitToSizeType eFit=GetFitToSize(); - return (eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); + return (eFit==SdrFitToSizeType::Proportional || eFit==SdrFitToSizeType::AllLines); } void SdrTextObj::SetTextAnimationAllowed(bool bNew) |