diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-10-18 12:28:45 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-10-18 12:34:03 +0200 |
| commit | e2c85365dfa40c03c6ea04023627366d118bb530 (patch) | |
| tree | 55e6c673869f4278e17cd83bea04bb782a2519d0 /filter/source/msfilter | |
| parent | 8304de4701eca8a41f0dd70c84e437707cbb43cf (diff) | |
svx: remove pointless duplicate SdrFitToSizeType
Change-Id: I7a59ecfdb8d09ecbc0b760003dbc453ac5646d1c
Diffstat (limited to 'filter/source/msfilter')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 5 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 187661fa05cc..4efaa4fffcc6 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -3447,8 +3447,9 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT break; case drawing::TextHorizontalAdjust_BLOCK: { - SdrFitToSizeType eFTS( static_cast<const SdrTextFitToSizeTypeItem&>(pCustoShape->GetMergedItem( SDRATTR_TEXT_FITTOSIZE )).GetValue() ); - if ( eFTS == SdrFitToSizeType::AllLines) + drawing::TextFitToSizeType const eFTS( + static_cast<const SdrTextFitToSizeTypeItem&>(pCustoShape->GetMergedItem( SDRATTR_TEXT_FITTOSIZE )).GetValue() ); + if (eFTS == drawing::TextFitToSizeType_ALLLINES) { gTextAlign = mso_alignTextStretch; } diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 48d2f2952121..164f66dcc5f9 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4396,9 +4396,9 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r } aSet.Put( SdrTextHorzAdjustItem( eHorzAdjust ) ); - SdrFitToSizeType eFTS = SdrFitToSizeType::NONE; + drawing::TextFitToSizeType eFTS = drawing::TextFitToSizeType_NONE; if ( eGeoTextAlign == mso_alignTextStretch ) - eFTS = SdrFitToSizeType::AllLines; + eFTS = drawing::TextFitToSizeType_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 48e2a98ea1e5..f3e7887bfda9 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1092,7 +1092,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi //See fdo#41245 if (bAutoFit && !bAutoGrowHeight && !bAutoGrowWidth) { - pTObj->SetMergedItem( SdrTextFitToSizeTypeItem(SdrFitToSizeType::Autofit) ); + pTObj->SetMergedItem( SdrTextFitToSizeTypeItem(drawing::TextFitToSizeType_AUTOFIT) ); } if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr ) |