diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-08-04 19:22:55 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-08-04 19:22:55 +0200 |
commit | 151fbebf8ced85ee8582fe1ad8a8176e061845a6 (patch) | |
tree | 1615fcdaf075969b08302c5fb33e0f10d31d4d1e /filter | |
parent | 013744a5b475e151ca0918565fb369e22dfbc1db (diff) |
Consistency around SdrOnOffItem in svx/sdtagitm.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 "Remove unused ctors" and
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."
Change-Id: I6d8b3709d6d55bd6958d38f262141c43779dfdcc
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 14 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index c5bdd59f5758..73a73d72b7c6 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -1502,7 +1502,7 @@ void DffPropertyReader::ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const rSet.Put( makeSdrTextLowerDistItem( nTextBottom ) ); rSet.Put( SdrTextWordWrapItem( (MSO_WrapMode)GetPropertyValue( DFF_Prop_WrapText, mso_wrapSquare ) != mso_wrapNone ? sal_True : sal_False ) ); - rSet.Put( SdrTextAutoGrowHeightItem( ( GetPropertyValue( DFF_Prop_FitTextToShape ) & 2 ) != 0 ) ); + rSet.Put( makeSdrTextAutoGrowHeightItem( ( GetPropertyValue( DFF_Prop_FitTextToShape ) & 2 ) != 0 ) ); } void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxItemSet& rSet, const DffObjData& rObjData ) const @@ -4330,8 +4330,8 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r aSet.Put( SvxKerningItem( 1, EE_CHAR_KERNING ) ); // #i119496# the resize autoshape to fit text attr of word art in MS PPT is always false - aSet.Put(SdrTextAutoGrowHeightItem(false)); - aSet.Put(SdrTextAutoGrowWidthItem(false)); + aSet.Put(makeSdrTextAutoGrowHeightItem(false)); + aSet.Put(makeSdrTextAutoGrowWidthItem(false)); } pRet->SetMergedItemSet( aSet ); @@ -5121,7 +5121,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, bool bFitText = false; if (GetPropertyValue(DFF_Prop_FitTextToShape) & 2) { - aSet.Put( SdrTextAutoGrowHeightItem( true ) ); + aSet.Put( makeSdrTextAutoGrowHeightItem( true ) ); aSet.Put( makeSdrTextMinFrameHeightItem( aNewRect.Bottom() - aNewRect.Top() ) ); aSet.Put( makeSdrTextMinFrameWidthItem( @@ -5130,15 +5130,15 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, } else { - aSet.Put( SdrTextAutoGrowHeightItem( false ) ); - aSet.Put( SdrTextAutoGrowWidthItem( false ) ); + aSet.Put( makeSdrTextAutoGrowHeightItem( false ) ); + aSet.Put( makeSdrTextAutoGrowWidthItem( false ) ); } switch ( (MSO_WrapMode) GetPropertyValue( DFF_Prop_WrapText, mso_wrapSquare ) ) { case mso_wrapNone : - aSet.Put( SdrTextAutoGrowWidthItem( true ) ); + aSet.Put( makeSdrTextAutoGrowWidthItem( true ) ); if (bFitText) { //can't do autowidth in flys #i107184# diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index bd869b2c1e5a..8698fb6401cf 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1073,13 +1073,13 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi if ( !pTObj->ISA( SdrObjCustomShape ) ) { - pTObj->SetMergedItem( SdrTextAutoGrowWidthItem( bAutoGrowWidth ) ); - pTObj->SetMergedItem( SdrTextAutoGrowHeightItem( bAutoGrowHeight ) ); + pTObj->SetMergedItem( makeSdrTextAutoGrowWidthItem( bAutoGrowWidth ) ); + pTObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( bAutoGrowHeight ) ); } else { pTObj->SetMergedItem( SdrTextWordWrapItem( bWordWrap ) ); - pTObj->SetMergedItem( SdrTextAutoGrowHeightItem( bFitShapeToText ) ); + pTObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( bFitShapeToText ) ); } pTObj->SetMergedItem( SdrTextVertAdjustItem( eTVA ) ); |