diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-07-31 15:57:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-07-31 15:57:12 +0200 |
| commit | 68969cc61adecac481ae9656978ef952f435b310 (patch) | |
| tree | 823f5a951bd5ebf9e465fae8297ddc220cb6a2d5 /filter | |
| parent | 8b91280386f478f2e972e2aa71080f106783d762 (diff) | |
Consistency around SdrMetricItem
...where some instances of SDRATTR_TEXT_MINFRAMEHEIGHT etc. where SdrMetricItem
while others where of trivial derived classes SdrTextMinFrameHeightItem etc.,
that appear to only existed for better-named constructors.
Change-Id: If0af79fbb803275ed09fc7b950868c5de7d61615
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 0956d125faff..0fe240bfa227 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5122,9 +5122,9 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, if (GetPropertyValue(DFF_Prop_FitTextToShape) & 2) { aSet.Put( SdrTextAutoGrowHeightItem( true ) ); - aSet.Put( SdrTextMinFrameHeightItem( + aSet.Put( makeSdrTextMinFrameHeightItem( aNewRect.Bottom() - aNewRect.Top() ) ); - aSet.Put( SdrTextMinFrameWidthItem( + aSet.Put( makeSdrTextMinFrameWidthItem( aNewRect.Right() - aNewRect.Left() ) ); bFitText = true; } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 1426da8d0d77..475713517d64 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1088,12 +1088,12 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi if ( nMinFrameHeight < 0 ) nMinFrameHeight = 0; if ( !pTObj->ISA( SdrObjCustomShape ) ) - pTObj->SetMergedItem( SdrTextMinFrameHeightItem( nMinFrameHeight ) ); + pTObj->SetMergedItem( makeSdrTextMinFrameHeightItem( nMinFrameHeight ) ); if ( nMinFrameWidth < 0 ) nMinFrameWidth = 0; if ( !pTObj->ISA( SdrObjCustomShape ) ) - pTObj->SetMergedItem( SdrTextMinFrameWidthItem( nMinFrameWidth ) ); + pTObj->SetMergedItem( makeSdrTextMinFrameWidthItem( nMinFrameWidth ) ); // set margins at the borders of the textbox pTObj->SetMergedItem( SdrTextLeftDistItem( nTextLeft ) ); |