summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-10 14:58:41 +0200
committerNoel Grandin <noel@peralex.com>2014-03-11 08:18:24 +0200
commit2ec560e3e687746735d9debb304e9f64384daa65 (patch)
tree5c7468258af7ab9ebdfd3aa54cfdf51580ffca7b /svx
parent6c97bc47177adc1c51f69f17e77b9fe2aeade122 (diff)
svx: sal_Bool->bool
Change-Id: I1b692a9ca5f2580b0815b881a33f3eded7267ac1
Diffstat (limited to 'svx')
-rw-r--r--svx/source/customshapes/EnhancedCustomShape3d.cxx22
-rw-r--r--svx/source/dialog/swframeexample.cxx2
-rw-r--r--svx/source/engine3d/svx3ditems.cxx38
-rw-r--r--svx/source/engine3d/view3d.cxx2
-rw-r--r--svx/source/unodraw/unopage.cxx4
5 files changed, 34 insertions, 34 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 869eec2b1042..692bec41be44 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -351,7 +351,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
{
aSet.Put( XLineStyleItem( XLINE_SOLID ) );
aSet.Put( XFillStyleItem ( XFILL_NONE ) );
- aSet.Put( Svx3DDoubleSidedItem( sal_True ) );
+ aSet.Put( Svx3DDoubleSidedItem( true ) );
}
else
{
@@ -370,8 +370,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
// get visible
if(bUseTwoFillStyles || (bIsMirroredX && !bIsMirroredY) || (!bIsMirroredX && bIsMirroredY))
{
- aSet.Put( Svx3DDoubleSidedItem( sal_True ) );
- pScene->GetProperties().SetObjectItem( Svx3DTwoSidedLightingItem( sal_True ) );
+ aSet.Put( Svx3DDoubleSidedItem( true ) );
+ pScene->GetProperties().SetObjectItem( Svx3DTwoSidedLightingItem( true ) );
}
}
@@ -544,8 +544,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
if ( bUseExtrusionColor )
p3DObj->SetMergedItem( XFillColorItem( "", ((XSecondaryFillColorItem&)pCustomShape->GetMergedItem( XATTR_SECONDARYFILLCOLOR )).GetColorValue() ) );
p3DObj->SetMergedItem( XFillStyleItem( XFILL_SOLID ) );
- p3DObj->SetMergedItem( Svx3DCloseFrontItem( sal_False ) );
- p3DObj->SetMergedItem( Svx3DCloseBackItem( sal_False ) );
+ p3DObj->SetMergedItem( Svx3DCloseFrontItem( false ) );
+ p3DObj->SetMergedItem( Svx3DCloseBackItem( false ) );
pScene->Insert3DObj( p3DObj );
// #i122777# depth 0 is okay for planes when using double-sided
@@ -567,9 +567,9 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
{
XLineColorItem& rLineColor = (XLineColorItem&)p3DObj->GetMergedItem( XATTR_LINECOLOR );
p3DObj->SetMergedItem( XFillColorItem( "", rLineColor.GetColorValue() ) );
- p3DObj->SetMergedItem( Svx3DDoubleSidedItem( sal_True ) );
- p3DObj->SetMergedItem( Svx3DCloseFrontItem( sal_False ) );
- p3DObj->SetMergedItem( Svx3DCloseBackItem( sal_False ) );
+ p3DObj->SetMergedItem( Svx3DDoubleSidedItem( true ) );
+ p3DObj->SetMergedItem( Svx3DCloseFrontItem( false ) );
+ p3DObj->SetMergedItem( Svx3DCloseBackItem( false ) );
}
pScene->Insert3DObj( p3DObj );
bSceneHasObjects = true;
@@ -702,7 +702,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
sal_uInt8 nSpotLight1 = (sal_uInt8)( fLightIntensity * 255.0 );
basegfx::B3DVector aSpotLight1( aFirstLightDirection.DirectionX, - ( aFirstLightDirection.DirectionY ), -( aFirstLightDirection.DirectionZ ) );
aSpotLight1.normalize();
- pScene->GetProperties().SetObjectItem( Svx3DLightOnOff1Item( sal_True ) );
+ pScene->GetProperties().SetObjectItem( Svx3DLightOnOff1Item( true ) );
Color aAmbientSpot1Color( nSpotLight1, nSpotLight1, nSpotLight1 );
pScene->GetProperties().SetObjectItem( Svx3DLightcolor1Item( aAmbientSpot1Color ) );
pScene->GetProperties().SetObjectItem( Svx3DLightDirection1Item( aSpotLight1 ) );
@@ -710,14 +710,14 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
sal_uInt8 nSpotLight2 = (sal_uInt8)( fLight2Intensity * 255.0 );
basegfx::B3DVector aSpotLight2( aSecondLightDirection.DirectionX, -aSecondLightDirection.DirectionY, -aSecondLightDirection.DirectionZ );
aSpotLight2.normalize();
- pScene->GetProperties().SetObjectItem( Svx3DLightOnOff2Item( sal_True ) );
+ pScene->GetProperties().SetObjectItem( Svx3DLightOnOff2Item( true ) );
Color aAmbientSpot2Color( nSpotLight2, nSpotLight2, nSpotLight2 );
pScene->GetProperties().SetObjectItem( Svx3DLightcolor2Item( aAmbientSpot2Color ) );
pScene->GetProperties().SetObjectItem( Svx3DLightDirection2Item( aSpotLight2 ) );
sal_uInt8 nSpotLight3 = 70;
basegfx::B3DVector aSpotLight3( 0.0, 0.0, 1.0 );
- pScene->GetProperties().SetObjectItem( Svx3DLightOnOff3Item( sal_True ) );
+ pScene->GetProperties().SetObjectItem( Svx3DLightOnOff3Item( true ) );
Color aAmbientSpot3Color( nSpotLight3, nSpotLight3, nSpotLight3 );
pScene->GetProperties().SetObjectItem( Svx3DLightcolor3Item( aAmbientSpot3Color ) );
pScene->GetProperties().SetObjectItem( Svx3DLightDirection3Item( aSpotLight3 ) );
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index 2c0abf8d10f3..8af0931419a5 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -45,7 +45,7 @@ SvxSwFrameExample::SvxSwFrameExample( Window *pParent, WinBits nStyle ) :
nVRel (RelOrientation::PRINT_AREA),
nWrap (WrapTextMode_NONE),
nAnchor (TextContentAnchorType_AT_PAGE),
- bTrans (sal_False),
+ bTrans (false),
aRelPos (Point(0,0))
{
InitColors_Impl();
diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx
index 38dbdaefdb08..68ca6f81da01 100644
--- a/svx/source/engine3d/svx3ditems.cxx
+++ b/svx/source/engine3d/svx3ditems.cxx
@@ -56,7 +56,7 @@ Svx3DEndAngleItem::Svx3DEndAngleItem(sal_uInt32 nVal)
: SfxUInt32Item(SDRATTR_3DOBJ_END_ANGLE, nVal)
{}
-Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(sal_Bool bVal)
+Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_DOUBLE_SIDED, bVal)
{}
@@ -64,7 +64,7 @@ Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(sal_Bool bVal)
// #i28528#
// Added extra Item (Bool) for chart2 to be able to show reduced line geometry
-Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(sal_Bool bVal)
+Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY, bVal)
{}
@@ -92,7 +92,7 @@ Svx3DNormalsKindItem::Svx3DNormalsKindItem(sal_uInt16 nVal)
: SfxUInt16Item(SDRATTR_3DOBJ_NORMALS_KIND, nVal)
{}
-Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(sal_Bool bVal)
+Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_NORMALS_INVERT, bVal)
{}
@@ -104,7 +104,7 @@ Svx3DTextureProjectionYItem::Svx3DTextureProjectionYItem(sal_uInt16 nVal)
: SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_Y, nVal)
{}
-Svx3DShadow3DItem::Svx3DShadow3DItem(sal_Bool bVal)
+Svx3DShadow3DItem::Svx3DShadow3DItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_SHADOW_3D, bVal)
{}
@@ -132,7 +132,7 @@ Svx3DTextureModeItem::Svx3DTextureModeItem(sal_uInt16 nVal)
: SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_MODE, nVal)
{}
-Svx3DTextureFilterItem::Svx3DTextureFilterItem(sal_Bool bVal)
+Svx3DTextureFilterItem::Svx3DTextureFilterItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_TEXTURE_FILTER, bVal)
{}
@@ -148,7 +148,7 @@ Svx3DFocalLengthItem::Svx3DFocalLengthItem(sal_uInt32 nVal)
: SfxUInt32Item(SDRATTR_3DSCENE_FOCAL_LENGTH, nVal)
{}
-Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(sal_Bool bVal)
+Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, bVal)
{}
@@ -188,35 +188,35 @@ Svx3DAmbientcolorItem::Svx3DAmbientcolorItem(const Color& rCol)
: SvxColorItem(rCol, SDRATTR_3DSCENE_AMBIENTCOLOR)
{}
-Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(sal_Bool bVal)
+Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_1, bVal)
{}
-Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(sal_Bool bVal)
+Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_2, bVal)
{}
-Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(sal_Bool bVal)
+Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_3, bVal)
{}
-Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(sal_Bool bVal)
+Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_4, bVal)
{}
-Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(sal_Bool bVal)
+Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_5, bVal)
{}
-Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(sal_Bool bVal)
+Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_6, bVal)
{}
-Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(sal_Bool bVal)
+Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_7, bVal)
{}
-Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(sal_Bool bVal)
+Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_8, bVal)
{}
@@ -263,7 +263,7 @@ Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal)
// #107245#
-Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(sal_Bool bVal)
+Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal)
{}
@@ -288,7 +288,7 @@ SfxPoolItem* Svx3DSmoothNormalsItem::Create(SvStream& rIn, sal_uInt16 nItemVersi
// #107245#
-Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(sal_Bool bVal)
+Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_LIDS, bVal)
{}
@@ -313,7 +313,7 @@ SfxPoolItem* Svx3DSmoothLidsItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
// #107245#
-Svx3DCharacterModeItem::Svx3DCharacterModeItem(sal_Bool bVal)
+Svx3DCharacterModeItem::Svx3DCharacterModeItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_CHARACTER_MODE, bVal)
{}
@@ -338,7 +338,7 @@ SfxPoolItem* Svx3DCharacterModeItem::Create(SvStream& rIn, sal_uInt16 nItemVersi
// #107245#
-Svx3DCloseFrontItem::Svx3DCloseFrontItem(sal_Bool bVal)
+Svx3DCloseFrontItem::Svx3DCloseFrontItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_CLOSE_FRONT, bVal)
{}
@@ -363,7 +363,7 @@ SfxPoolItem* Svx3DCloseFrontItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
// #107245#
-Svx3DCloseBackItem::Svx3DCloseBackItem(sal_Bool bVal)
+Svx3DCloseBackItem::Svx3DCloseBackItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_CLOSE_BACK, bVal)
{}
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 645adc8006be..39d47f285360 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -728,7 +728,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo
aDefault.SetDefaultExtrudeCloseFront(false);
aDefault.SetDefaultExtrudeCloseBack(false);
- aSet.Put(Svx3DDoubleSidedItem(sal_True));
+ aSet.Put(Svx3DDoubleSidedItem(true));
// Set fill attribute
aSet.Put(XFillStyleItem(XFILL_SOLID));
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index e2002c9ac3e6..26e04683fff8 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -503,7 +503,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject(const Reference< drawing::XShape > & xS
pObj->SetExtrudePolygon(basegfx::B2DPolyPolygon(aNewPolygon));
// #107245# pObj->SetExtrudeCharacterMode(sal_True);
- pObj->SetMergedItem(Svx3DCharacterModeItem(sal_True));
+ pObj->SetMergedItem(Svx3DCharacterModeItem(true));
}
else if(pNewObj->ISA(E3dLatheObj))
{
@@ -516,7 +516,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject(const Reference< drawing::XShape > & xS
pObj->SetPolyPoly2D(basegfx::B2DPolyPolygon(aNewPolygon));
// #107245# pObj->SetLatheCharacterMode(sal_True);
- pObj->SetMergedItem(Svx3DCharacterModeItem(sal_True));
+ pObj->SetMergedItem(Svx3DCharacterModeItem(true));
}
}
}