From d1bffe3596d21f205cb7a2697bb5142f190b5627 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 6 Mar 2014 14:38:36 +0200 Subject: svx: sal_Bool->bool Change-Id: I64d9c1bbe6ed85108783bf6a97329fcdc167ca62 --- sw/source/core/frmedt/feshview.cxx | 8 ++++---- sw/source/core/uibase/ribbar/concustomshape.cxx | 2 +- sw/source/core/uibase/ribbar/conrect.cxx | 8 ++++---- sw/source/filter/html/htmldraw.cxx | 8 ++++---- sw/source/filter/ww8/ww8par.cxx | 10 +++++----- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'sw') diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 19b446f5d8f2..4fb6bcaad2ac 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -2978,8 +2978,8 @@ long SwFEShell::GetSectionWidth( SwFmt& rFmt ) const if(bVertical) { SfxItemSet aSet(pDrawModel->GetItemPool()); - aSet.Put(SdrTextAutoGrowWidthItem(sal_True)); - aSet.Put(SdrTextAutoGrowHeightItem(sal_False)); + aSet.Put(SdrTextAutoGrowWidthItem(true)); + aSet.Put(SdrTextAutoGrowHeightItem(false)); aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP)); aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); pText->SetMergedItemSet(aSet); @@ -2988,8 +2988,8 @@ long SwFEShell::GetSectionWidth( SwFmt& rFmt ) const if(bMarquee) { SfxItemSet aSet(pDrawModel->GetItemPool(), SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST); - aSet.Put( SdrTextAutoGrowWidthItem( sal_False ) ); - aSet.Put( SdrTextAutoGrowHeightItem( sal_False ) ); + aSet.Put( SdrTextAutoGrowWidthItem( false ) ); + aSet.Put( SdrTextAutoGrowHeightItem( false ) ); aSet.Put( SdrTextAniKindItem( SDRTEXTANI_SLIDE ) ); aSet.Put( SdrTextAniDirectionItem( SDRTEXTANI_LEFT ) ); aSet.Put( SdrTextAniCountItem( 1 ) ); diff --git a/sw/source/core/uibase/ribbar/concustomshape.cxx b/sw/source/core/uibase/ribbar/concustomshape.cxx index 58e3747e5237..1b623ee19197 100644 --- a/sw/source/core/uibase/ribbar/concustomshape.cxx +++ b/sw/source/core/uibase/ribbar/concustomshape.cxx @@ -166,7 +166,7 @@ void ConstCustomShape::SetAttributes( SdrObject* pObj ) pObj->SetMergedItem( SvxAdjustItem( SVX_ADJUST_CENTER, RES_PARATR_ADJUST ) ); pObj->SetMergedItem( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) ); pObj->SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) ); - pObj->SetMergedItem( SdrTextAutoGrowHeightItem( sal_False ) ); + pObj->SetMergedItem( SdrTextAutoGrowHeightItem( false ) ); ((SdrObjCustomShape*)pObj)->MergeDefaultAttributes( &aCustomShape ); } } diff --git a/sw/source/core/uibase/ribbar/conrect.cxx b/sw/source/core/uibase/ribbar/conrect.cxx index 383ff7e8310d..b6646827c1b1 100644 --- a/sw/source/core/uibase/ribbar/conrect.cxx +++ b/sw/source/core/uibase/ribbar/conrect.cxx @@ -84,8 +84,8 @@ sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) SfxItemSet aItemSet( pSdrView->GetModel()->GetItemPool(), SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST); - aItemSet.Put( SdrTextAutoGrowWidthItem( sal_False ) ); - aItemSet.Put( SdrTextAutoGrowHeightItem( sal_False ) ); + aItemSet.Put( SdrTextAutoGrowWidthItem( false ) ); + aItemSet.Put( SdrTextAutoGrowHeightItem( false ) ); aItemSet.Put( SdrTextAniKindItem( SDRTEXTANI_SCROLL ) ); aItemSet.Put( SdrTextAniDirectionItem( SDRTEXTANI_LEFT ) ); aItemSet.Put( SdrTextAniCountItem( 0 ) ); @@ -102,8 +102,8 @@ sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) pText->SetVerticalWriting(sal_True); - aSet.Put(SdrTextAutoGrowWidthItem(sal_True)); - aSet.Put(SdrTextAutoGrowHeightItem(sal_False)); + aSet.Put(SdrTextAutoGrowWidthItem(true)); + aSet.Put(SdrTextAutoGrowHeightItem(false)); aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP)); aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx index 6636a77e40e5..382c6624505e 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -389,8 +389,8 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) EE_CHAR_START, EE_CHAR_END, 0 }; SfxItemSet aItemSet( pModel->GetItemPool(), aWhichMap ); - aItemSet.Put( SdrTextAutoGrowWidthItem( sal_False ) ); - aItemSet.Put( SdrTextAutoGrowHeightItem( sal_True ) ); + aItemSet.Put( SdrTextAutoGrowWidthItem( false ) ); + aItemSet.Put( SdrTextAutoGrowHeightItem( true ) ); aItemSet.Put( SdrTextAniKindItem( eAniKind ) ); aItemSet.Put( SdrTextAniDirectionItem( eAniDir ) ); aItemSet.Put( SdrTextAniCountItem( nCount ) ); @@ -399,8 +399,8 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) if( SDRTEXTANI_ALTERNATE==eAniKind ) { // (Nur) Alternate startet und stoppt per default Inside - aItemSet.Put( SdrTextAniStartInsideItem(sal_True) ); - aItemSet.Put( SdrTextAniStopInsideItem(sal_True) ); + aItemSet.Put( SdrTextAniStartInsideItem(true) ); + aItemSet.Put( SdrTextAniStopInsideItem(true) ); if( SDRTEXTANI_LEFT==eAniDir ) aItemSet.Put( SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT) ); } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 053134e03a5e..6f1a3442c066 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -830,7 +830,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, 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( @@ -838,19 +838,19 @@ SdrObject* SwMSDffManager::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 ) ); pImpRec->bAutoWidth = true; break; case mso_wrapByPoints : - aSet.Put( SdrTextContourFrameItem( sal_True ) ); + aSet.Put( SdrTextContourFrameItem( true ) ); break; default: ; -- cgit