summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-06 14:38:36 +0200
committerNoel Grandin <noel@peralex.com>2014-03-11 08:18:24 +0200
commitd1bffe3596d21f205cb7a2697bb5142f190b5627 (patch)
treed0e8e310bb9574fac992118739019c8c30c5b185
parent53c91a6db1cdaf3a91fba6ea328acdcc33c4088a (diff)
svx: sal_Bool->bool
Change-Id: I64d9c1bbe6ed85108783bf6a97329fcdc167ca62
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.cxx6
-rw-r--r--filter/source/msfilter/msdffimp.cxx10
-rw-r--r--filter/source/msfilter/svdfppt.cxx6
-rw-r--r--include/svx/sdrpaintwindow.hxx4
-rw-r--r--include/svx/sdshitm.hxx2
-rw-r--r--include/svx/sdtagitm.hxx4
-rw-r--r--include/svx/sdtaiitm.hxx4
-rw-r--r--include/svx/sdtcfitm.hxx2
-rw-r--r--include/svx/sdtfchim.hxx2
-rw-r--r--include/svx/sdynitm.hxx2
-rw-r--r--include/svx/srchdlg.hxx28
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx2
-rw-r--r--sc/source/core/data/postit.cxx4
-rw-r--r--sc/source/core/tool/detfunc.cxx2
-rw-r--r--sc/source/filter/excel/xiescher.cxx2
-rw-r--r--sc/source/ui/drawfunc/futext.cxx4
-rw-r--r--sd/source/core/drawdoc4.cxx8
-rw-r--r--sd/source/core/sdpage.cxx18
-rw-r--r--sd/source/core/stlpool.cxx4
-rw-r--r--sd/source/filter/ppt/pptin.cxx2
-rw-r--r--sd/source/ui/func/fuconcs.cxx2
-rw-r--r--sd/source/ui/func/fuconrec.cxx4
-rw-r--r--sd/source/ui/func/futext.cxx32
-rw-r--r--sd/source/ui/view/drviews2.cxx2
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.cxx6
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeFontWork.cxx2
-rw-r--r--svx/source/dialog/srchdlg.cxx66
-rw-r--r--svx/source/svdraw/svdattr.cxx2
-rw-r--r--svx/source/svdraw/svdedtv2.cxx2
-rw-r--r--svx/source/svdraw/svdoashp.cxx4
-rw-r--r--svx/source/svdraw/svdotext.cxx6
-rw-r--r--sw/source/core/frmedt/feshview.cxx8
-rw-r--r--sw/source/core/uibase/ribbar/concustomshape.cxx2
-rw-r--r--sw/source/core/uibase/ribbar/conrect.cxx8
-rw-r--r--sw/source/filter/html/htmldraw.cxx8
-rw-r--r--sw/source/filter/ww8/ww8par.cxx10
36 files changed, 140 insertions, 140 deletions
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 0fab17d472ff..5398e2e0d07b 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -175,7 +175,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj )
pObj->SetMergedItem( SvxAdjustItem( SVX_ADJUST_CENTER, 0 ) );
pObj->SetMergedItem( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
pObj->SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) );
- pObj->SetMergedItem( SdrTextAutoGrowHeightItem( sal_False ) );
+ pObj->SetMergedItem( SdrTextAutoGrowHeightItem( false ) );
SdrObjCustomShape* pShape(dynamic_cast< SdrObjCustomShape* >( pObj ));
assert(pShape);
@@ -515,8 +515,8 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
if ( bVertical )
{
SfxItemSet aSet( pDrawModelWrapper->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 ) );
pTextObj->SetMergedItemSet( aSet );
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 ) );
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index 27c546063c78..9e507ad1be86 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -121,10 +121,10 @@ public:
bool OutputToPrinter() const { return (OUTDEV_PRINTER == mrOutputDevice.GetOutDevType()); }
// Is OutDev a window?
- sal_Bool OutputToWindow() const { return (OUTDEV_WINDOW == mrOutputDevice.GetOutDevType()); }
+ bool OutputToWindow() const { return (OUTDEV_WINDOW == mrOutputDevice.GetOutDevType()); }
// Is OutDev a VirtualDevice?
- sal_Bool OutputToVirtualDevice() const { return (OUTDEV_VIRDEV == mrOutputDevice.GetOutDevType()); }
+ bool OutputToVirtualDevice() const { return (OUTDEV_VIRDEV == mrOutputDevice.GetOutDevType()); }
// Is OutDev a recording MetaFile?
bool OutputToRecordingMetaFile() const;
diff --git a/include/svx/sdshitm.hxx b/include/svx/sdshitm.hxx
index f55e3bcc03fa..7613870cabea 100644
--- a/include/svx/sdshitm.hxx
+++ b/include/svx/sdshitm.hxx
@@ -27,7 +27,7 @@
*/
class SdrShadowItem: public SdrOnOffItem {
public:
- SdrShadowItem(sal_Bool bShadow=sal_False): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {}
+ SdrShadowItem(bool bShadow=false): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {}
SdrShadowItem(SvStream& rIn): SdrOnOffItem(SDRATTR_SHADOW, rIn) {}
};
diff --git a/include/svx/sdtagitm.hxx b/include/svx/sdtagitm.hxx
index f51b1b10a355..65f90e91b06e 100644
--- a/include/svx/sdtagitm.hxx
+++ b/include/svx/sdtagitm.hxx
@@ -27,7 +27,7 @@
class SdrTextAutoGrowHeightItem: public SdrOnOffItem {
public:
- SdrTextAutoGrowHeightItem(sal_Bool bAuto=sal_True): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,bAuto) {}
+ SdrTextAutoGrowHeightItem(bool bAuto=true): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,bAuto) {}
SdrTextAutoGrowHeightItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,rIn) {}
};
@@ -36,7 +36,7 @@ public:
class SdrTextAutoGrowWidthItem: public SdrOnOffItem {
public:
- SdrTextAutoGrowWidthItem(sal_Bool bAuto=sal_False): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,bAuto) {}
+ SdrTextAutoGrowWidthItem(bool bAuto=false): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,bAuto) {}
SdrTextAutoGrowWidthItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,rIn) {}
};
diff --git a/include/svx/sdtaiitm.hxx b/include/svx/sdtaiitm.hxx
index a5396e9e3c74..31b84ee7a070 100644
--- a/include/svx/sdtaiitm.hxx
+++ b/include/svx/sdtaiitm.hxx
@@ -24,13 +24,13 @@
class SdrTextAniStartInsideItem: public SdrYesNoItem {
public:
- SdrTextAniStartInsideItem(sal_Bool bOn=sal_False): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {}
+ SdrTextAniStartInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {}
SdrTextAniStartInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,rIn) {}
};
class SdrTextAniStopInsideItem: public SdrYesNoItem {
public:
- SdrTextAniStopInsideItem(sal_Bool bOn=sal_False): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {}
+ SdrTextAniStopInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {}
SdrTextAniStopInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,rIn) {}
};
diff --git a/include/svx/sdtcfitm.hxx b/include/svx/sdtcfitm.hxx
index 96b89b33c667..8a9cb6172f62 100644
--- a/include/svx/sdtcfitm.hxx
+++ b/include/svx/sdtcfitm.hxx
@@ -27,7 +27,7 @@
*/
class SdrTextContourFrameItem: public SdrOnOffItem {
public:
- SdrTextContourFrameItem(sal_Bool bOn=sal_False): SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,bOn) {}
+ SdrTextContourFrameItem(bool bOn=false): SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,bOn) {}
SdrTextContourFrameItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,rIn) {}
};
diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx
index d77aaea8048b..2fa0a8163dd6 100644
--- a/include/svx/sdtfchim.hxx
+++ b/include/svx/sdtfchim.hxx
@@ -26,7 +26,7 @@ class SVX_DLLPUBLIC SdrTextFixedCellHeightItem : public SfxBoolItem
public:
TYPEINFO();
- SdrTextFixedCellHeightItem( sal_Bool bUseFixedCellHeight = sal_False );
+ SdrTextFixedCellHeightItem( bool bUseFixedCellHeight = false );
SVX_DLLPRIVATE SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion );
SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation,
diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx
index aebed63b3245..cb1142ee10fd 100644
--- a/include/svx/sdynitm.hxx
+++ b/include/svx/sdynitm.hxx
@@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrYesNoItem: public SfxBoolItem {
public:
TYPEINFO();
SdrYesNoItem(): SfxBoolItem() {}
- SdrYesNoItem(sal_uInt16 nId, sal_Bool bOn=sal_False): SfxBoolItem(nId,bOn) {}
+ SdrYesNoItem(sal_uInt16 nId, bool bOn=false): SfxBoolItem(nId,bOn) {}
SdrYesNoItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 319727e57b66..e4fb11fcbb02 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -132,8 +132,8 @@ public:
const SearchAttrItemList* GetReplaceItemList() const
{ return pReplaceList; }
- inline sal_Bool HasSearchAttributes() const;
- inline sal_Bool HasReplaceAttributes() const;
+ inline bool HasSearchAttributes() const;
+ inline bool HasReplaceAttributes() const;
PushButton& GetReplaceBtn() { return *m_pReplaceBtn; }
@@ -141,8 +141,8 @@ public:
void SetDocWin( Window* pDocWin ) { mpDocWin = pDocWin; }
Window* GetDocWin() { return mpDocWin; }
- void SetSrchFlag( sal_Bool bSuccess = sal_False ) { mbSuccess = bSuccess; }
- sal_Bool GetSrchFlag() { return mbSuccess; }
+ void SetSrchFlag( bool bSuccess = false ) { mbSuccess = bSuccess; }
+ bool GetSrchFlag() { return mbSuccess; }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
GetComponentInterface( sal_Bool bCreate );
@@ -152,7 +152,7 @@ public:
private:
Window* mpDocWin;
- sal_Bool mbSuccess;
+ bool mbSuccess;
VclFrame* m_pSearchFrame;
ComboBox* m_pSearchLB;
@@ -203,9 +203,9 @@ private:
CheckBox* m_pAllSheetsCB;
SfxBindings& rBindings;
- sal_Bool bWriter;
- sal_Bool bSearch;
- sal_Bool bFormat;
+ bool bWriter;
+ bool bSearch;
+ bool bFormat;
sal_uInt16 nOptions;
bool bSet;
bool bReadOnly;
@@ -250,9 +250,9 @@ private:
void Init_Impl( bool bHasItemSet );
void InitAttrList_Impl( const SfxItemSet* pSSet,
const SfxItemSet* pRSet );
- void Remember_Impl( const OUString &rStr,sal_Bool bSearch );
+ void Remember_Impl( const OUString &rStr, bool bSearch );
void PaintAttrText_Impl();
- OUString& BuildAttrText_Impl( OUString& rStr, sal_Bool bSrchFlag ) const;
+ OUString& BuildAttrText_Impl( OUString& rStr, bool bSrchFlag ) const;
void TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool );
void EnableControls_Impl( const sal_uInt16 nFlags );
@@ -265,15 +265,15 @@ private:
void ApplyTransliterationFlags_Impl( sal_Int32 nSettings );
};
-inline sal_Bool SvxSearchDialog::HasSearchAttributes() const
+inline bool SvxSearchDialog::HasSearchAttributes() const
{
- sal_Bool bLen = !m_pSearchAttrText->GetText().isEmpty();
+ bool bLen = !m_pSearchAttrText->GetText().isEmpty();
return ( m_pSearchAttrText->IsEnabled() && bLen );
}
-inline sal_Bool SvxSearchDialog::HasReplaceAttributes() const
+inline bool SvxSearchDialog::HasReplaceAttributes() const
{
- sal_Bool bLen = !m_pReplaceAttrText->GetText().isEmpty();
+ bool bLen = !m_pReplaceAttrText->GetText().isEmpty();
return ( m_pReplaceAttrText->IsEnabled() && bLen );
}
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 0b44813c2cd0..27f1a4ca5fea 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -679,7 +679,7 @@ void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj)
_pObj->SetMergedItem( SvxAdjustItem( SVX_ADJUST_CENTER ,ITEMID_ADJUST) );
_pObj->SetMergedItem( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
_pObj->SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) );
- _pObj->SetMergedItem( SdrTextAutoGrowHeightItem( sal_False ) );
+ _pObj->SetMergedItem( SdrTextAutoGrowHeightItem( false ) );
((SdrObjCustomShape*)_pObj)->MergeDefaultAttributes( &_sType );
}
}
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 2e6c96caf597..46716c98cebe 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -843,10 +843,10 @@ SdrCaptionObj* ScNoteUtil::CreateTempCaption(
ScCaptionUtil::SetDefaultItems( *pCaption, rDoc );
// adjust caption size to text size
long nMaxWidth = ::std::min< long >( aVisRect.GetWidth() * 2 / 3, SC_NOTECAPTION_MAXWIDTH_TEMP );
- pCaption->SetMergedItem( SdrTextAutoGrowWidthItem( sal_True ) );
+ pCaption->SetMergedItem( SdrTextAutoGrowWidthItem( true ) );
pCaption->SetMergedItem( SdrTextMinFrameWidthItem( SC_NOTECAPTION_WIDTH ) );
pCaption->SetMergedItem( SdrTextMaxFrameWidthItem( nMaxWidth ) );
- pCaption->SetMergedItem( SdrTextAutoGrowHeightItem( sal_True ) );
+ pCaption->SetMergedItem( SdrTextAutoGrowHeightItem( true ) );
pCaption->AdjustTextFrameWidthAndHeight();
}
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index fee886bc1c2a..0463972693ee 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -223,7 +223,7 @@ ScCommentData::ScCommentData( ScDocument& rDoc, SdrModel* pModel ) :
aCaptionSet.Put( SdrTextLowerDistItem( 100 ) );
aCaptionSet.Put( SdrTextAutoGrowWidthItem( false ) );
- aCaptionSet.Put( SdrTextAutoGrowHeightItem( sal_True ) );
+ aCaptionSet.Put( SdrTextAutoGrowHeightItem( true ) );
// do use the default cell style, so the user has a chance to
// modify the font for the annotations
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 2e704abca276..e00a064bebdc 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -767,7 +767,7 @@ void XclImpDrawObjBase::ConvertFrameStyle( SdrObject& rSdrObj, sal_uInt16 nFrame
{
if( ::get_flag( nFrameFlags, EXC_OBJ_FRAME_SHADOW ) )
{
- rSdrObj.SetMergedItem( SdrShadowItem( sal_True ) );
+ rSdrObj.SetMergedItem( SdrShadowItem( true ) );
rSdrObj.SetMergedItem( SdrShadowXDistItem( 35 ) );
rSdrObj.SetMergedItem( SdrShadowYDistItem( 35 ) );
rSdrObj.SetMergedItem( SdrShadowColorItem( GetPalette().GetColor( EXC_COLOR_WINDOWTEXT ) ) );
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 6374d536d8b9..a56f6c03a454 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -506,7 +506,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
pText->SetVerticalWriting(sal_True);
- aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
+ aSet.Put(SdrTextAutoGrowWidthItem(true));
aSet.Put(SdrTextAutoGrowHeightItem(false));
aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP));
aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
@@ -823,7 +823,7 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR
{
SfxItemSet aSet(pDrDoc->GetItemPool());
- aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
+ aSet.Put(SdrTextAutoGrowWidthItem(true));
aSet.Put(SdrTextAutoGrowHeightItem(false));
aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP));
aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 479730a86f7e..a6f939b7639d 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -174,7 +174,7 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put(XFillBitmapItem(pPool, Graphic(aNullBmp)));
// Shadow attributes (Drawing Engine)
- rISet.Put(SdrShadowItem(sal_False));
+ rISet.Put(SdrShadowItem(false));
rISet.Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
rISet.Put(SdrShadowXDistItem(200)); // 3 mm Shadow distance
rISet.Put(SdrShadowYDistItem(200));
@@ -282,7 +282,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHSHADOW );
pISet = &pSheet->GetItemSet();
- pISet->Put(SdrShadowItem(sal_True));
+ pISet->Put(SdrShadowItem(true));
pISet->Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
pISet->Put(SdrShadowXDistItem(200)); // 3 mm shadow distance
pISet->Put(SdrShadowYDistItem(200));
@@ -381,7 +381,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XFillStyleItem(XFILL_SOLID));
pISet->Put(XFillColorItem(OUString(), RGB_Color(COL_CYAN)));
- pISet->Put(SdrShadowItem(sal_True));
+ pISet->Put(SdrShadowItem(true));
pISet->Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
pISet->Put(SdrShadowXDistItem(200)); // 2 mm shadow distance
pISet->Put(SdrShadowYDistItem(200));
@@ -405,7 +405,7 @@ void SdDrawDocument::CreateLayoutTemplates()
Color aOrange4(255, 204, 153);
pISet->Put(XFillColorItem(OUString(), aOrange4));
- pISet->Put(SdrShadowItem(sal_True));
+ pISet->Put(SdrShadowItem(true));
pISet->Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
pISet->Put(SdrShadowXDistItem(200)); // 2 mm shadow distance
pISet->Put(SdrShadowYDistItem(200));
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index c25b658d6778..19efb97b2190 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -427,9 +427,9 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const
// potential problem: This action was still NOT
// adapted for vertical text. This sure needs to be done.
if(bVertical)
- aTempAttr.Put(SdrTextAutoGrowWidthItem(sal_False));
+ aTempAttr.Put(SdrTextAutoGrowWidthItem(false));
else
- aTempAttr.Put(SdrTextAutoGrowHeightItem(sal_False));
+ aTempAttr.Put(SdrTextAutoGrowHeightItem(false));
}
// check if we need another vertical adjustement than the default
@@ -533,7 +533,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const
eObjKind == PRESOBJ_GRAPHIC )
{
SfxItemSet aSet( ((SdDrawDocument*) pModel)->GetPool() );
- aSet.Put( SdrTextContourFrameItem( sal_True ) );
+ aSet.Put( SdrTextContourFrameItem( true ) );
aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) );
pSdrObj->SetMergedItemSet(aSet);
@@ -2245,13 +2245,13 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind,
SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() );
SdrTextMinFrameHeightItem aMinHeight( aRect.GetSize().Height() );
aTempAttr.Put( aMinHeight );
- aTempAttr.Put( SdrTextAutoGrowHeightItem(sal_False) );
+ aTempAttr.Put( SdrTextAutoGrowHeightItem(false) );
pTextObject->SetMergedItemSet(aTempAttr);
pTextObject->SetLogicRect(aRect);
// switch on AutoGrowHeight
SfxItemSet aAttr( ((SdDrawDocument*) pModel)->GetPool() );
- aAttr.Put( SdrTextAutoGrowHeightItem(sal_True) );
+ aAttr.Put( SdrTextAutoGrowHeightItem(true) );
pTextObject->SetMergedItemSet(aAttr);
}
@@ -2262,13 +2262,13 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind,
SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() );
SdrTextMinFrameWidthItem aMinWidth( aRect.GetSize().Width() );
aTempAttr.Put( aMinWidth );
- aTempAttr.Put( SdrTextAutoGrowWidthItem(sal_False) );
+ aTempAttr.Put( SdrTextAutoGrowWidthItem(false) );
pTextObject->SetMergedItemSet(aTempAttr);
pTextObject->SetLogicRect(aRect);
// switch on AutoGrowWidth
SfxItemSet aAttr( ((SdDrawDocument*) pModel)->GetPool() );
- aAttr.Put( SdrTextAutoGrowWidthItem(sal_True) );
+ aAttr.Put( SdrTextAutoGrowWidthItem(true) );
pTextObject->SetMergedItemSet(aAttr);
}
}
@@ -2289,8 +2289,8 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind,
if( bVertical && (( eObjKind == PRESOBJ_TITLE) || (eObjKind == PRESOBJ_OUTLINE)))
{
SfxItemSet aNewSet(pObj->GetMergedItemSet());
- aNewSet.Put( SdrTextAutoGrowWidthItem(sal_True) );
- aNewSet.Put( SdrTextAutoGrowHeightItem(sal_False) );
+ aNewSet.Put( SdrTextAutoGrowWidthItem(true) );
+ aNewSet.Put( SdrTextAutoGrowHeightItem(false) );
if( eObjKind == PRESOBJ_OUTLINE )
{
aNewSet.Put( SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP) );
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 5208bca56645..457350afd8b8 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -263,7 +263,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_
rSet.Put( XLineStyleItem(XLINE_NONE) );
rSet.Put( XFillStyleItem(XFILL_NONE) );
rSet.Put( SdrTextFitToSizeTypeItem(SDRTEXTFIT_AUTOFIT) );
- rSet.Put( SdrTextAutoGrowHeightItem(sal_False) );
+ rSet.Put( SdrTextAutoGrowHeightItem(false) );
// #i16874# enable kerning by default but only for new documents
rSet.Put( SvxAutoKernItem( true, EE_CHAR_PAIRKERNING ) );
@@ -491,7 +491,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_
pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUNDOBJECTS );
pSheet->SetParent( OUString() );
SfxItemSet& rBackgroundObjectsSet = pSheet->GetItemSet();
- rBackgroundObjectsSet.Put(SdrShadowItem(sal_False));
+ rBackgroundObjectsSet.Put(SdrShadowItem(false));
rBackgroundObjectsSet.Put(SdrShadowColorItem(Color(COL_GRAY)));
rBackgroundObjectsSet.Put(SdrShadowXDistItem(200)); // 3 mm shadow distance
rBackgroundObjectsSet.Put(SdrShadowYDistItem(200));
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index e80fc82781ad..10d9e7210ff6 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2286,7 +2286,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
SfxItemSet aTempAttr( mpDoc->GetPool() );
SdrTextMinFrameHeightItem aMinHeight( pText->GetLogicRect().GetSize().Height() );
aTempAttr.Put( aMinHeight );
- SdrTextAutoGrowHeightItem aAutoGrowHeight( sal_False );
+ SdrTextAutoGrowHeightItem aAutoGrowHeight( false );
aTempAttr.Put( aAutoGrowHeight );
pText->SetMergedItemSet(aTempAttr);
}
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index 8cc0c2b827f3..c782b6c67ef1 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -263,7 +263,7 @@ void FuConstructCustomShape::SetAttributes( SdrObject* pObj )
pObj->SetMergedItem( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) );
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/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 7e611a3a6a5a..dcbb9bded9f3 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -482,8 +482,8 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
Size aSize(pObj->GetLogicRect().GetSize());
rAttr.Put( SdrTextMinFrameHeightItem( aSize.Height() ) );
rAttr.Put( SdrTextMinFrameWidthItem( aSize.Width() ) );
- rAttr.Put( SdrTextAutoGrowHeightItem( sal_True ) );
- rAttr.Put( SdrTextAutoGrowWidthItem( sal_True ) );
+ rAttr.Put( SdrTextAutoGrowHeightItem( true ) );
+ rAttr.Put( SdrTextAutoGrowWidthItem( true ) );
// Support full with for vertical caption objects, too
if(SID_DRAW_CAPTION == nSlotId)
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 615ee4b04188..361315283bf5 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -495,8 +495,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
object, otherwise we draw to much */
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameHeightItem(0));
- aSet.Put(SdrTextAutoGrowWidthItem(sal_False));
- aSet.Put(SdrTextAutoGrowHeightItem(sal_True));
+ aSet.Put(SdrTextAutoGrowWidthItem(false));
+ aSet.Put(SdrTextAutoGrowHeightItem(true));
pTxtObj->SetMergedItemSet(aSet);
pTxtObj->AdjustTextFrameWidthAndHeight();
aSet.Put(SdrTextMaxFrameHeightItem(pTxtObj->GetLogicRect().GetSize().Height()));
@@ -506,8 +506,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
{
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameWidthItem(0));
- aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
- aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
+ aSet.Put(SdrTextAutoGrowWidthItem(true));
+ aSet.Put(SdrTextAutoGrowHeightItem(false));
// Needs to be set since default is SDRTEXTHORZADJUST_BLOCK
aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
@@ -524,8 +524,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
// draw text object, needs to be initialized when vertical text is used
SfxItemSet aSet(mpViewShell->GetPool());
- aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
- aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
+ aSet.Put(SdrTextAutoGrowWidthItem(true));
+ aSet.Put(SdrTextAutoGrowHeightItem(false));
// Set defaults for vertical klick-n'drag text object, pool defaults are:
// SdrTextVertAdjustItem: SDRTEXTVERTADJUST_TOP
@@ -545,8 +545,8 @@ void FuText::ImpSetAttributesFitToSize(SdrTextObj* pTxtObj)
SfxItemSet aSet(mpViewShell->GetPool(), SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH);
SdrFitToSizeType eFTS = SDRTEXTFIT_PROPORTIONAL;
aSet.Put(SdrTextFitToSizeTypeItem(eFTS));
- aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
- aSet.Put(SdrTextAutoGrowWidthItem(sal_False));
+ aSet.Put(SdrTextAutoGrowHeightItem(false));
+ aSet.Put(SdrTextAutoGrowWidthItem(false));
pTxtObj->SetMergedItemSet(aSet);
pTxtObj->AdjustTextFrameWidthAndHeight();
}
@@ -557,8 +557,8 @@ void FuText::ImpSetAttributesFitToSizeVertical(SdrTextObj* pTxtObj)
SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH);
SdrFitToSizeType eFTS = SDRTEXTFIT_PROPORTIONAL;
aSet.Put(SdrTextFitToSizeTypeItem(eFTS));
- aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
- aSet.Put(SdrTextAutoGrowWidthItem(sal_False));
+ aSet.Put(SdrTextAutoGrowHeightItem(false));
+ aSet.Put(SdrTextAutoGrowWidthItem(false));
pTxtObj->SetMergedItemSet(aSet);
pTxtObj->AdjustTextFrameWidthAndHeight();
}
@@ -574,8 +574,8 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj)
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameHeightItem(0));
aSet.Put(SdrTextMaxFrameHeightItem(0));
- aSet.Put(SdrTextAutoGrowHeightItem(sal_True));
- aSet.Put(SdrTextAutoGrowWidthItem(sal_False));
+ aSet.Put(SdrTextAutoGrowHeightItem(true));
+ aSet.Put(SdrTextAutoGrowWidthItem(false));
pTxtObj->SetMergedItemSet(aSet);
}
else if( nSlotId == SID_ATTR_CHAR_VERTICAL )
@@ -583,8 +583,8 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj)
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameWidthItem(0));
aSet.Put(SdrTextMaxFrameWidthItem(0));
- aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
- aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
+ aSet.Put(SdrTextAutoGrowWidthItem(true));
+ aSet.Put(SdrTextAutoGrowHeightItem(false));
pTxtObj->SetMergedItemSet(aSet);
}
@@ -803,8 +803,8 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameHeightItem(0));
aSet.Put(SdrTextMinFrameWidthItem(0));
- aSet.Put(SdrTextAutoGrowHeightItem(sal_True));
- aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
+ aSet.Put(SdrTextAutoGrowHeightItem(true));
+ aSet.Put(SdrTextAutoGrowWidthItem(true));
if(nSlotId == SID_ATTR_CHAR_VERTICAL)
{
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index faad29ae88c3..37c346a30f27 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1909,7 +1909,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
OutlinerParaObject* pOutlParaObject = pOutl->CreateParaObject();
SdrRectObj* pRectObj = new SdrRectObj( OBJ_TEXT );
- pRectObj->SetMergedItem(SdrTextAutoGrowWidthItem(sal_True));
+ pRectObj->SetMergedItem(SdrTextAutoGrowWidthItem(true));
pOutl->UpdateFields();
pOutl->SetUpdateMode( true );
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 6289eddbea26..299cc4c39433 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1988,7 +1988,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
aClosedPolyPolygon.setClosed(true);
SdrPathObj* pFill = new SdrPathObj(OBJ_POLY, aClosedPolyPolygon, dBrightness);
SfxItemSet aTempSet(*this);
- aTempSet.Put(SdrShadowItem(sal_False));
+ aTempSet.Put(SdrShadowItem(false));
aTempSet.Put(XLineStyleItem(XLINE_NONE));
pFill->SetMergedItemSet(aTempSet);
rObjectList.push_back(pFill);
@@ -2004,7 +2004,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
aNewB2DPolyPolygon.isClosed() ? OBJ_POLY : OBJ_PLIN,
aNewB2DPolyPolygon, dBrightness);
SfxItemSet aTempSet(*this);
- aTempSet.Put(SdrShadowItem(sal_False));
+ aTempSet.Put(SdrShadowItem(false));
aTempSet.Put(XFillStyleItem(XFILL_NONE));
pStroke->SetMergedItemSet(aTempSet);
rObjectList.push_back(pStroke);
@@ -2014,7 +2014,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
{
SdrPathObj* pObj = 0;
SfxItemSet aTempSet(*this);
- aTempSet.Put(SdrShadowItem(sal_False));
+ aTempSet.Put(SdrShadowItem(false));
if(bNoFill)
{
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 14b4685ffe81..e5278e3997d8 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -812,7 +812,7 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const Sd
SfxItemSet aSet( pCustomShape->GetMergedItemSet() );
aSet.ClearItem( SDRATTR_TEXTDIRECTION ); //SJ: vertical writing is not required, by removing this item no outliner is created
- aSet.Put(SdrShadowItem(sal_False)); // #i37011# NO shadow for FontWork geometry
+ aSet.Put(SdrShadowItem(false)); // #i37011# NO shadow for FontWork geometry
pRet->SetMergedItemSet( aSet ); // * otherwise we would crash, because the outliner tries to create a Paraobject, but there is no model
}
return pRet;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 8c490febd7cd..51e32d39f200 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -105,7 +105,7 @@ namespace
struct SearchDlg_Impl
{
- sal_Bool bSaveToModule : 1,
+ bool bSaveToModule : 1,
bFocusOnSearch : 1;
sal_uInt16* pRanges;
Timer aSelectionTimer;
@@ -546,7 +546,7 @@ void SvxSearchDialog::SetSaveToModule(bool b)
void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings )
{
nTransliterationFlags = nSettings;
- sal_Bool bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE);
+ bool bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE);
m_pMatchCaseCB->Check(!bVal );
bVal = 0 != (nSettings & TransliterationModules_IGNORE_WIDTH);
m_pJapMatchFullHalfWidthCB->Check( !bVal );
@@ -849,7 +849,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
if ( pViewShell )
{
- sal_Bool bText = !bSearchPattern;
+ bool bText = !bSearchPattern;
if ( pViewShell->HasSelection( bText ) )
EnableControl_Impl(m_pSelectionBtn);
@@ -984,9 +984,9 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
if ( m_pLayoutBtn->IsChecked() )
{
- pImpl->bSaveToModule = sal_False;
+ pImpl->bSaveToModule = false;
TemplateHdl_Impl(m_pLayoutBtn);
- pImpl->bSaveToModule = sal_True;
+ pImpl->bSaveToModule = true;
}
}
@@ -1026,10 +1026,10 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
{
pSearchList->Put( *pSSet );
- m_pSearchAttrText->SetText( BuildAttrText_Impl( aDesc, sal_True ) );
+ m_pSearchAttrText->SetText( BuildAttrText_Impl( aDesc, true ) );
if ( !aDesc.isEmpty() )
- bFormat |= sal_True;
+ bFormat |= true;
}
}
@@ -1042,10 +1042,10 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
{
pReplaceList->Put( *pRSet );
- m_pReplaceAttrText->SetText( BuildAttrText_Impl( aDesc, sal_False ) );
+ m_pReplaceAttrText->SetText( BuildAttrText_Impl( aDesc, false ) );
if ( !aDesc.isEmpty() )
- bFormat |= sal_True;
+ bFormat |= true;
}
}
}
@@ -1061,7 +1061,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
if (pCtrl == m_pSimilarityBox)
{
- sal_Bool bIsChecked = m_pSimilarityBox->IsChecked();
+ bool bIsChecked = m_pSimilarityBox->IsChecked();
if ( bIsChecked )
{
@@ -1159,7 +1159,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
if (m_pJapOptionsCB == pCtrl)
{
- sal_Bool bEnableJapOpt = m_pJapOptionsCB->IsChecked();
+ bool bEnableJapOpt = m_pJapOptionsCB->IsChecked();
m_pMatchCaseCB->Enable(!bEnableJapOpt );
m_pJapMatchFullHalfWidthCB->Enable(!bEnableJapOpt );
m_pJapOptionsBtn->Enable( bEnableJapOpt );
@@ -1192,13 +1192,13 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
pSearchItem->SetReplaceString( m_pReplaceLB->GetText() );
if ( pBtn == m_pReplaceBtn )
- Remember_Impl( m_pReplaceLB->GetText(), sal_False );
+ Remember_Impl( m_pReplaceLB->GetText(), false );
else
{
- Remember_Impl( m_pSearchLB->GetText(), sal_True );
+ Remember_Impl( m_pSearchLB->GetText(), true );
if ( pBtn == m_pReplaceAllBtn )
- Remember_Impl( m_pReplaceLB->GetText(), sal_False );
+ Remember_Impl( m_pReplaceLB->GetText(), false );
}
}
@@ -1261,11 +1261,11 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
OUString aStr( m_pSearchLB->GetText() );
if ( !aStr.isEmpty() )
- Remember_Impl( aStr, sal_True );
+ Remember_Impl( aStr, true );
aStr = m_pReplaceLB->GetText();
if ( !aStr.isEmpty() )
- Remember_Impl( aStr, sal_False );
+ Remember_Impl( aStr, false );
}
SaveToModule_Impl();
Close();
@@ -1449,8 +1449,8 @@ IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl)
m_pSearchTmplLB->Hide();
m_pReplaceTmplLB->Hide();
- m_pSearchAttrText->SetText( BuildAttrText_Impl( sDesc, sal_True ) );
- m_pReplaceAttrText->SetText( BuildAttrText_Impl( sDesc, sal_False ) );
+ m_pSearchAttrText->SetText( BuildAttrText_Impl( sDesc, true ) );
+ m_pReplaceAttrText->SetText( BuildAttrText_Impl( sDesc, false ) );
EnableControl_Impl(m_pFormatBtn);
EnableControl_Impl(m_pAttributeBtn);
@@ -1459,15 +1459,15 @@ IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl)
FocusHdl_Impl( bSearch ? m_pSearchLB : m_pReplaceLB );
}
bSet = true;
- pImpl->bSaveToModule = sal_False;
+ pImpl->bSaveToModule = false;
FlagHdl_Impl(m_pLayoutBtn);
- pImpl->bSaveToModule = sal_True;
+ pImpl->bSaveToModule = true;
return 0;
}
-void SvxSearchDialog::Remember_Impl( const OUString &rStr, sal_Bool _bSearch )
+void SvxSearchDialog::Remember_Impl( const OUString &rStr, bool _bSearch )
{
if ( rStr.isEmpty() )
return;
@@ -1555,7 +1555,7 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags )
Show();
bool bNoSearch = true;
- sal_Bool bEnableSearch = ( SEARCH_OPTIONS_SEARCH & nOptions ) != 0;
+ bool bEnableSearch = ( SEARCH_OPTIONS_SEARCH & nOptions ) != 0;
m_pSearchBtn->Enable(bEnableSearch);
if( bEnableSearch )
@@ -1762,9 +1762,9 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
if ( pCtrl == m_pSearchLB )
{
if ( pCtrl->HasChildPathFocus() )
- pImpl->bFocusOnSearch = sal_True;
+ pImpl->bFocusOnSearch = true;
pCtrl = m_pSearchLB;
- bSearch = sal_True;
+ bSearch = true;
if( nTxtLen )
EnableControl_Impl(m_pNoFormatBtn);
@@ -1774,9 +1774,9 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
}
else
{
- pImpl->bFocusOnSearch = sal_False;
+ pImpl->bFocusOnSearch = false;
pCtrl = m_pReplaceLB;
- bSearch = sal_False;
+ bSearch = false;
if (!m_pReplaceAttrText->GetText().isEmpty())
EnableControl_Impl(m_pNoFormatBtn);
@@ -1939,7 +1939,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl)
m_pLayoutBtn->SetText( aStylesStr );
}
- bFormat = sal_False;
+ bFormat = false;
m_pLayoutBtn->Check( false );
if ( bSearch )
@@ -1952,9 +1952,9 @@ IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl)
m_pReplaceAttrText->SetText( "" );
pReplaceList->Clear();
}
- pImpl->bSaveToModule = sal_False;
+ pImpl->bSaveToModule = false;
TemplateHdl_Impl(m_pLayoutBtn);
- pImpl->bSaveToModule = sal_True;
+ pImpl->bSaveToModule = true;
m_pNoFormatBtn->Disable();
return 0;
}
@@ -2002,7 +2002,7 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer )
OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr,
- sal_Bool bSrchFlag ) const
+ bool bSrchFlag ) const
{
if ( !rStr.isEmpty() )
rStr = "";
@@ -2078,7 +2078,7 @@ void SvxSearchDialog::PaintAttrText_Impl()
BuildAttrText_Impl( aDesc, bSearch );
if ( !bFormat && !aDesc.isEmpty() )
- bFormat = sal_True;
+ bFormat = true;
if ( bSearch )
{
@@ -2146,7 +2146,7 @@ void SvxSearchDialog::SaveToModule_Impl()
{
pSearchItem->SetSearchString ( m_pSearchLB->GetText() );
pSearchItem->SetReplaceString( m_pReplaceLB->GetText() );
- Remember_Impl( m_pSearchLB->GetText(), sal_True );
+ Remember_Impl( m_pSearchLB->GetText(), true );
}
pSearchItem->SetRegExp( false );
@@ -2241,7 +2241,7 @@ SvxSearchDialog *SvxSearchDialogWrapper::getDialog ()
SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const
{
SfxChildWinInfo aInfo = SfxChildWindow::GetInfo();
- aInfo.bVisible = sal_False;
+ aInfo.bVisible = false;
return aInfo;
}
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index cd5326b1aff2..570d5f4c75e6 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -1387,7 +1387,7 @@ SfxItemPresentation SdrTextAniAmountItem::GetPresentation(
}
TYPEINIT1_AUTOFACTORY( SdrTextFixedCellHeightItem, SfxBoolItem );
-SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( sal_Bool bUseFixedCellHeight )
+SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( bool bUseFixedCellHeight )
: SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, bUseFixedCellHeight )
{
}
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index c6e53420dea7..0a3bb17adc4a 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1543,7 +1543,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
{
if(pReplacement->ISA(SdrObjGroup))
{
- pCandidate->SetMergedItem(SdrShadowItem(sal_True));
+ pCandidate->SetMergedItem(SdrShadowItem(true));
}
}
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 2562697f6c42..db996ba1ef13 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -279,7 +279,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
aTempSet.Put( SvxWritingModeItem( com::sun::star::text::WritingMode_LR_TB, SDRATTR_TEXTDIRECTION ) );
// no shadow
- aTempSet.Put(SdrShadowItem(sal_False));
+ aTempSet.Put(SdrShadowItem(false));
aTempSet.Put(SdrShadowXDistItem(0L));
aTempSet.Put(SdrShadowYDistItem(0L));
@@ -2886,7 +2886,7 @@ SdrObject* SdrObjCustomShape::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText
const sal_Bool bShadow(((SdrShadowItem&)GetMergedItem(SDRATTR_SHADOW)).GetValue());
if(bShadow)
{
- pRetval->SetMergedItem(SdrShadowItem(sal_True));
+ pRetval->SetMergedItem(SdrShadowItem(true));
}
}
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index ec701aa5bd69..61779a33237a 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -553,7 +553,7 @@ bool SdrTextObj::NbcSetMinTextFrameHeight(long nHgt)
if(IsVerticalWriting() && bDisableAutoWidthOnDragging)
{
bDisableAutoWidthOnDragging = sal_False;
- SetObjectItem(SdrTextAutoGrowHeightItem(sal_False));
+ SetObjectItem(SdrTextAutoGrowHeightItem(false));
}
return true;
@@ -572,7 +572,7 @@ bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt)
if(!IsVerticalWriting() && bDisableAutoWidthOnDragging)
{
bDisableAutoWidthOnDragging = sal_False;
- SetObjectItem(SdrTextAutoGrowWidthItem(sal_False));
+ SetObjectItem(SdrTextAutoGrowWidthItem(false));
}
return true;
@@ -615,7 +615,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho
{
// force shadow off
SdrObject* pCopy = Clone();
- pCopy->SetMergedItem(SdrShadowItem(sal_False));
+ pCopy->SetMergedItem(SdrShadowItem(false));
*pContourPolyPolygon = pCopy->TakeContour();
SdrObject::Free( pCopy );
}
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:
;