diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-23 12:26:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-24 08:47:57 +0200 |
| commit | 92743c1da67485338aadfc9e9444146f9bacd6d1 (patch) | |
| tree | e0b858d6f41a5bac900b2ee046dd17c68524f820 /filter | |
| parent | 44b2afa192fbf78d337cf18840c26b7d04e91a4e (diff) | |
convert SdrFitToSizeType to scoped enum
Change-Id: Id732c74b590db7006058d1919be2438b649a795e
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index a3eda373d8fb..4bee4c1c9ffb 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -3486,7 +3486,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT case drawing::TextHorizontalAdjust_BLOCK: { SdrFitToSizeType eFTS( static_cast<const SdrTextFitToSizeTypeItem&>(pCustoShape->GetMergedItem( SDRATTR_TEXT_FITTOSIZE )).GetValue() ); - if ( eFTS == SDRTEXTFIT_ALLLINES) + if ( eFTS == SdrFitToSizeType::AllLines) { gTextAlign = mso_alignTextStretch; } diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index cc75a92da9fc..631d9bc63fd4 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4389,9 +4389,9 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r } aSet.Put( SdrTextHorzAdjustItem( eHorzAdjust ) ); - SdrFitToSizeType eFTS = SDRTEXTFIT_NONE; + SdrFitToSizeType eFTS = SdrFitToSizeType::NONE; if ( eGeoTextAlign == mso_alignTextStretch ) - eFTS = SDRTEXTFIT_ALLLINES; + eFTS = SdrFitToSizeType::AllLines; aSet.Put( SdrTextFitToSizeTypeItem( eFTS ) ); } if ( IsProperty( DFF_Prop_gtextSpacing ) ) diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 5590875f88c9..6e311048d984 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1097,7 +1097,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi //See fdo#41245 if (bAutoFit && !bAutoGrowHeight && !bAutoGrowWidth) { - pTObj->SetMergedItem( SdrTextFitToSizeTypeItem(SDRTEXTFIT_AUTOFIT) ); + pTObj->SetMergedItem( SdrTextFitToSizeTypeItem(SdrFitToSizeType::Autofit) ); } if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr ) |