diff options
| author | Noel Grandin <noel@peralex.com> | 2014-03-06 14:38:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-03-11 08:18:24 +0200 |
| commit | d1bffe3596d21f205cb7a2697bb5142f190b5627 (patch) | |
| tree | d0e8e310bb9574fac992118739019c8c30c5b185 /filter | |
| parent | 53c91a6db1cdaf3a91fba6ea328acdcc33c4088a (diff) | |
svx: sal_Bool->bool
Change-Id: I64d9c1bbe6ed85108783bf6a97329fcdc167ca62
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 10 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index ccf0dffcb72b..079a165ae9fb 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5116,7 +5116,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, bool bFitText = false; if (GetPropertyValue(DFF_Prop_FitTextToShape) & 2) { - aSet.Put( SdrTextAutoGrowHeightItem( sal_True ) ); + aSet.Put( SdrTextAutoGrowHeightItem( true ) ); aSet.Put( SdrTextMinFrameHeightItem( aNewRect.Bottom() - aNewRect.Top() ) ); aSet.Put( SdrTextMinFrameWidthItem( @@ -5125,15 +5125,15 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, } else { - aSet.Put( SdrTextAutoGrowHeightItem( sal_False ) ); - aSet.Put( SdrTextAutoGrowWidthItem( sal_False ) ); + aSet.Put( SdrTextAutoGrowHeightItem( false ) ); + aSet.Put( SdrTextAutoGrowWidthItem( false ) ); } switch ( (MSO_WrapMode) GetPropertyValue( DFF_Prop_WrapText, mso_wrapSquare ) ) { case mso_wrapNone : - aSet.Put( SdrTextAutoGrowWidthItem( sal_True ) ); + aSet.Put( SdrTextAutoGrowWidthItem( true ) ); if (bFitText) { //can't do autowidth in flys #i107184# @@ -5141,7 +5141,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, } break; case mso_wrapByPoints : - aSet.Put( SdrTextContourFrameItem( sal_True ) ); + aSet.Put( SdrTextContourFrameItem( true ) ); break; default: break; } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 7b4551bad159..089ae8ae8093 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -709,7 +709,7 @@ void SdrEscherImport::RecolorGraphic( SvStream& rSt, sal_uInt32 nRecLen, Graphic SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pOriginalObj ) { if ( pOriginalObj && pOriginalObj->ISA( SdrObjCustomShape ) ) - pOriginalObj->SetMergedItem( SdrTextFixedCellHeightItem( sal_True ) ); + pOriginalObj->SetMergedItem( SdrTextFixedCellHeightItem( true ) ); // we are initializing our return value with the object that was imported by our escher import SdrObject* pRet = pOriginalObj; @@ -1096,7 +1096,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi pTObj->SetMergedItem( SdrTextRightDistItem( nTextRight ) ); pTObj->SetMergedItem( SdrTextUpperDistItem( nTextTop ) ); pTObj->SetMergedItem( SdrTextLowerDistItem( nTextBottom ) ); - pTObj->SetMergedItem( SdrTextFixedCellHeightItem( sal_True ) ); + pTObj->SetMergedItem( SdrTextFixedCellHeightItem( true ) ); if ( !pTObj->ISA( SdrObjCustomShape ) ) pTObj->SetSnapRect( rTextRect ); @@ -6153,7 +6153,7 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& pPortion->GetAttrib( PPT_CharAttr_FontHeight, nFontHeight, nDestinationInstance ); nVal2 = -(sal_Int16)( ( nFontHeight * nVal * 8 ) / 100 ); } - rSet.Put( SdrTextFixedCellHeightItem( sal_True ), SDRATTR_TEXT_USEFIXEDCELLHEIGHT ); + rSet.Put( SdrTextFixedCellHeightItem( true ), SDRATTR_TEXT_USEFIXEDCELLHEIGHT ); SvxLineSpacingItem aItem( 200, EE_PARA_SBL ); if ( nVal2 <= 0 ) { aItem.SetLineHeight( (sal_uInt16)( rManager.ScalePoint( -nVal2 ) / 8 ) ); |