summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-04 12:35:24 +0200
committerNoel Grandin <noel@peralex.com>2014-03-11 08:18:15 +0200
commit3df902ba28f6b142277a45b781a6d65389fad6b9 (patch)
treecba5c47d55da4cb4f920fb954617fd1633f079e6 /svx/source
parentcaf8f777e38e75641dcd13461053ba0bfd44500f (diff)
svx: sal_Bool->bool
Change-Id: I7588dbf9805cb89b0b13cfae379698038657c994
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/engine3d/float3d.cxx202
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx28
-rw-r--r--svx/source/fmcomp/fmgridif.cxx20
-rw-r--r--svx/source/form/fmpage.cxx10
-rw-r--r--svx/source/tbxctrls/fillctrl.cxx10
5 files changed, 135 insertions, 135 deletions
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 82e07ffd629d..18733132d110 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -213,7 +213,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
aImgLightOn ( SVX_RES( RID_SVXIMAGE_LIGHT_ON ) ),
aImgLightOff ( SVX_RES( RID_SVXIMAGE_LIGHT_OFF ) ),
- bUpdate ( sal_False ),
+ bUpdate ( false ),
eViewType ( VIEWTYPE_GEO ),
pModel ( NULL ),
@@ -226,7 +226,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
pConvertTo3DLatheItem(0L),
mpImpl ( new Svx3DWinImpl() ),
mpRemember2DAttributes(NULL),
- bOnly3DChanged ( sal_False )
+ bOnly3DChanged ( false )
{
OUString accname(SVX_RESSTR(RID_SVXFLOAT3D_COLOR_LIGHT_PRE));
aCtlLightPreview.SetAccessibleName(accname);
@@ -639,7 +639,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if(nValue != (sal_uInt32 )aNumHorizontal.GetValue())
{
aNumHorizontal.SetValue( nValue );
- bUpdate = sal_True;
+ bUpdate = true;
}
else if( aNumHorizontal.IsEmptyFieldValue() )
aNumHorizontal.SetValue( nValue );
@@ -649,7 +649,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aNumHorizontal.IsEmptyFieldValue() )
{
aNumHorizontal.SetEmptyFieldValue();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
}
@@ -664,7 +664,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( nValue != (sal_uInt32) aNumVertical.GetValue() )
{
aNumVertical.SetValue( nValue );
- bUpdate = sal_True;
+ bUpdate = true;
}
else if( aNumVertical.IsEmptyFieldValue() )
aNumVertical.SetValue( nValue );
@@ -674,7 +674,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aNumVertical.IsEmptyFieldValue() )
{
aNumVertical.SetEmptyFieldValue();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
}
@@ -693,7 +693,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
SetFieldUnit( aMtrDepth, eFUnit );
SetMetricValue( aMtrDepth, nValue, ePoolUnit );
- bUpdate = sal_True;
+ bUpdate = true;
}
else if( aMtrDepth.IsEmptyFieldValue() )
aMtrDepth.SetValue( aMtrDepth.GetValue() );
@@ -703,7 +703,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrDepth.IsEmptyFieldValue() )
{
aMtrDepth.SetEmptyFieldValue();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
}
@@ -716,7 +716,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( bValue != aBtnDoubleSided.IsChecked() )
{
aBtnDoubleSided.Check( bValue );
- bUpdate = sal_True;
+ bUpdate = true;
}
else if( aBtnDoubleSided.GetState() == TRISTATE_INDET )
aBtnDoubleSided.Check( bValue );
@@ -726,7 +726,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnDoubleSided.GetState() != TRISTATE_INDET )
{
aBtnDoubleSided.SetState( TRISTATE_INDET );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -740,7 +740,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( nValue != aMtrPercentDiagonal.GetValue() )
{
aMtrPercentDiagonal.SetValue( nValue );
- bUpdate = sal_True;
+ bUpdate = true;
}
else if( aMtrPercentDiagonal.IsEmptyFieldValue() )
aMtrPercentDiagonal.SetValue( nValue );
@@ -750,7 +750,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrPercentDiagonal.IsEmptyFieldValue() )
{
aMtrPercentDiagonal.SetEmptyFieldValue();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
}
@@ -765,7 +765,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( nValue != aMtrBackscale.GetValue() )
{
aMtrBackscale.SetValue( nValue );
- bUpdate = sal_True;
+ bUpdate = true;
}
else if( aMtrBackscale.IsEmptyFieldValue() )
aMtrBackscale.SetValue( nValue );
@@ -775,7 +775,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrBackscale.IsEmptyFieldValue() )
{
aMtrBackscale.SetEmptyFieldValue();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
}
@@ -790,7 +790,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( nValue != aMtrEndAngle.GetValue() )
{
aMtrEndAngle.SetValue( nValue );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -798,7 +798,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrEndAngle.IsEmptyFieldValue() )
{
aMtrEndAngle.SetEmptyFieldValue();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
}
@@ -816,7 +816,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
aBtnNormalsObj.Check( nValue == 0 );
aBtnNormalsFlat.Check( nValue == 1 );
aBtnNormalsSphere.Check( nValue == 2 );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -828,7 +828,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
aBtnNormalsObj.Check( false );
aBtnNormalsFlat.Check( false );
aBtnNormalsSphere.Check( false );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -840,7 +840,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( bValue != aBtnNormalsInvert.IsChecked() )
{
aBtnNormalsInvert.Check( bValue );
- bUpdate = sal_True;
+ bUpdate = true;
}
else if( aBtnNormalsInvert.GetState() == TRISTATE_INDET )
aBtnNormalsInvert.Check( bValue );
@@ -850,7 +850,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnNormalsInvert.GetState() != TRISTATE_INDET )
{
aBtnNormalsInvert.SetState( TRISTATE_INDET );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -862,7 +862,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( bValue != aBtnTwoSidedLighting.IsChecked() )
{
aBtnTwoSidedLighting.Check( bValue );
- bUpdate = sal_True;
+ bUpdate = true;
}
else if( aBtnTwoSidedLighting.GetState() == TRISTATE_INDET )
aBtnTwoSidedLighting.Check( bValue );
@@ -872,7 +872,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnTwoSidedLighting.GetState() != TRISTATE_INDET )
{
aBtnTwoSidedLighting.SetState( TRISTATE_INDET );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -885,7 +885,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( nValue != aLbShademode.GetSelectEntryPos() )
{
aLbShademode.SelectEntryPos( nValue );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -893,7 +893,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbShademode.GetSelectEntryCount() != 0 )
{
aLbShademode.SetNoSelection();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -907,7 +907,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
aBtnShadow3d.Check( bValue );
aFtSlant.Enable( bValue );
aMtrSlant.Enable( bValue );
- bUpdate = sal_True;
+ bUpdate = true;
}
else if( aBtnShadow3d.GetState() == TRISTATE_INDET )
aBtnShadow3d.Check( bValue );
@@ -917,7 +917,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnShadow3d.GetState() != TRISTATE_INDET )
{
aBtnShadow3d.SetState( TRISTATE_INDET );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -929,7 +929,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( nValue != aMtrSlant.GetValue() )
{
aMtrSlant.SetValue( nValue );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -937,7 +937,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrSlant.IsEmptyFieldValue() )
{
aMtrSlant.SetEmptyFieldValue();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -953,7 +953,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
SetFieldUnit( aMtrDistance, eFUnit );
SetMetricValue( aMtrDistance, nValue, ePoolUnit );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -961,7 +961,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrDepth.IsEmptyFieldValue() )
{
aMtrDepth.SetEmptyFieldValue();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -977,7 +977,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
SetFieldUnit( aMtrFocalLength, eFUnit );
SetMetricValue( aMtrFocalLength, nValue, ePoolUnit );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -985,7 +985,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrFocalLength.IsEmptyFieldValue() )
{
aMtrFocalLength.SetEmptyFieldValue();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -1001,7 +1001,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1009,7 +1009,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight1.GetSelectEntryCount() != 0 )
{
aLbLight1.SetNoSelection();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
// Light 1 (on/off)
@@ -1021,7 +1021,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight1 )) )
{
SetUILightState( aBtnLight1, bOn );
- bUpdate = sal_True;
+ bUpdate = true;
}
if( aBtnLight1.GetState() == TRISTATE_INDET )
aBtnLight1.Check( aBtnLight1.IsChecked() );
@@ -1031,14 +1031,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight1.GetState() != TRISTATE_INDET )
{
aBtnLight1.SetState( TRISTATE_INDET );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
// Light 1 (direction)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_1);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = sal_True;
+ bUpdate = true;
}
//Light 2 (color)
@@ -1050,7 +1050,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1058,7 +1058,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight2.GetSelectEntryCount() != 0 )
{
aLbLight2.SetNoSelection();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
// Light 2 (on/off)
@@ -1070,7 +1070,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight2 )) )
{
SetUILightState( aBtnLight2, bOn );
- bUpdate = sal_True;
+ bUpdate = true;
}
if( aBtnLight2.GetState() == TRISTATE_INDET )
aBtnLight2.Check( aBtnLight2.IsChecked() );
@@ -1080,14 +1080,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight2.GetState() != TRISTATE_INDET )
{
aBtnLight2.SetState( TRISTATE_INDET );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
//Light 2 (Direction)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_2);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = sal_True;
+ bUpdate = true;
}
//Light 3 (color)
@@ -1099,7 +1099,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1107,7 +1107,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight3.GetSelectEntryCount() != 0 )
{
aLbLight3.SetNoSelection();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
// Ligh 3 (on/off)
@@ -1119,7 +1119,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight3)) )
{
SetUILightState( aBtnLight3, bOn );
- bUpdate = sal_True;
+ bUpdate = true;
}
if( aBtnLight3.GetState() == TRISTATE_INDET )
aBtnLight3.Check( aBtnLight3.IsChecked() );
@@ -1129,14 +1129,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight3.GetState() != TRISTATE_INDET )
{
aBtnLight3.SetState( TRISTATE_INDET );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
// Light 3 (Direction)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_3);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = sal_True;
+ bUpdate = true;
}
// Light 4 (Color)
@@ -1148,7 +1148,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1156,7 +1156,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight4.GetSelectEntryCount() != 0 )
{
aLbLight4.SetNoSelection();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
// Light 4 (on/off)
@@ -1168,7 +1168,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight4 )) )
{
SetUILightState( aBtnLight4, bOn );
- bUpdate = sal_True;
+ bUpdate = true;
}
if( aBtnLight4.GetState() == TRISTATE_INDET )
aBtnLight4.Check( aBtnLight4.IsChecked() );
@@ -1178,14 +1178,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight4.GetState() != TRISTATE_INDET )
{
aBtnLight4.SetState( TRISTATE_INDET );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
// Light 4 (direction)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_4);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = sal_True;
+ bUpdate = true;
}
// Light 5 (color)
@@ -1197,7 +1197,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1205,7 +1205,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight5.GetSelectEntryCount() != 0 )
{
aLbLight5.SetNoSelection();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
// Light 5 (on/off)
@@ -1217,7 +1217,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight5 )) )
{
SetUILightState( aBtnLight5, bOn );
- bUpdate = sal_True;
+ bUpdate = true;
}
if( aBtnLight5.GetState() == TRISTATE_INDET )
aBtnLight5.Check( aBtnLight5.IsChecked() );
@@ -1227,14 +1227,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight5.GetState() != TRISTATE_INDET )
{
aBtnLight5.SetState( TRISTATE_INDET );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
// Light 5 (direction)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_5);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = sal_True;
+ bUpdate = true;
}
// Light 6 (color)
@@ -1246,7 +1246,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1254,7 +1254,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight6.GetSelectEntryCount() != 0 )
{
aLbLight6.SetNoSelection();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
// Light 6 (on/off)
@@ -1266,7 +1266,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight6 )) )
{
SetUILightState( aBtnLight6, bOn );
- bUpdate = sal_True;
+ bUpdate = true;
}
if( aBtnLight6.GetState() == TRISTATE_INDET )
aBtnLight6.Check( aBtnLight6.IsChecked() );
@@ -1276,14 +1276,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight6.GetState() != TRISTATE_INDET )
{
aBtnLight6.SetState( TRISTATE_INDET );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
// Light 6 (direction)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_6);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = sal_True;
+ bUpdate = true;
}
// Light 7 (color)
@@ -1295,7 +1295,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1303,7 +1303,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight7.GetSelectEntryCount() != 0 )
{
aLbLight7.SetNoSelection();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
// Light 7 (on/off)
@@ -1315,7 +1315,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight7 )) )
{
SetUILightState( aBtnLight7 , bOn );
- bUpdate = sal_True;
+ bUpdate = true;
}
if( aBtnLight7.GetState() == TRISTATE_INDET )
aBtnLight7.Check( aBtnLight7.IsChecked() );
@@ -1325,14 +1325,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight7.GetState() != TRISTATE_INDET )
{
aBtnLight7.SetState( TRISTATE_INDET );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
// Light 7 (direction)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_7);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = sal_True;
+ bUpdate = true;
}
// Light 8 (color)
@@ -1344,7 +1344,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1352,7 +1352,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight8.GetSelectEntryCount() != 0 )
{
aLbLight8.SetNoSelection();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
// Light 8 (on/off)
@@ -1364,7 +1364,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight8 )) )
{
SetUILightState( aBtnLight8, bOn );
- bUpdate = sal_True;
+ bUpdate = true;
}
if( aBtnLight8.GetState() == TRISTATE_INDET )
aBtnLight8.Check( aBtnLight8.IsChecked() );
@@ -1374,14 +1374,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight8.GetState() != TRISTATE_INDET )
{
aBtnLight8.SetState( TRISTATE_INDET );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
// Light 8 (direction)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_8);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = sal_True;
+ bUpdate = true;
}
// Ambient light
@@ -1393,7 +1393,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1401,7 +1401,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbAmbientlight.GetSelectEntryCount() != 0 )
{
aLbAmbientlight.SetNoSelection();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -1420,7 +1420,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
{
aBtnTexLuminance.Check( nValue == 1 );
aBtnTexColor.Check( nValue == 3 );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1430,7 +1430,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
{
aBtnTexLuminance.Check( false );
aBtnTexColor.Check( false );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -1445,7 +1445,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
{
aBtnTexReplace.Check( nValue == 1 );
aBtnTexModulate.Check( nValue == 2 );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1455,7 +1455,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
{
aBtnTexReplace.Check( false );
aBtnTexModulate.Check( false );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -1472,7 +1472,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
aBtnTexObjectX.Check( nValue == 0 );
aBtnTexParallelX.Check( nValue == 1 );
aBtnTexCircleX.Check( nValue == 2 );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1484,7 +1484,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
aBtnTexObjectX.Check( false );
aBtnTexParallelX.Check( false );
aBtnTexCircleX.Check( false );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -1501,7 +1501,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
aBtnTexObjectY.Check( nValue == 0 );
aBtnTexParallelY.Check( nValue == 1 );
aBtnTexCircleY.Check( nValue == 2 );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1513,7 +1513,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
aBtnTexObjectY.Check( false );
aBtnTexParallelY.Check( false );
aBtnTexCircleY.Check( false );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -1525,7 +1525,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( bValue != aBtnTexFilter.IsChecked() )
{
aBtnTexFilter.Check( bValue );
- bUpdate = sal_True;
+ bUpdate = true;
}
if( aBtnTexFilter.GetState() == TRISTATE_INDET )
aBtnTexFilter.Check( bValue );
@@ -1535,7 +1535,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnTexFilter.GetState() != TRISTATE_INDET )
{
aBtnTexFilter.SetState( TRISTATE_INDET );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
}
@@ -1553,7 +1553,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1561,7 +1561,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbMatColor.GetSelectEntryCount() != 0 )
{
aLbMatColor.SetNoSelection();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -1574,7 +1574,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1582,7 +1582,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbMatEmission.GetSelectEntryCount() != 0 )
{
aLbMatEmission.SetNoSelection();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -1595,7 +1595,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1603,7 +1603,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbMatSpecular.GetSelectEntryCount() != 0 )
{
aLbMatSpecular.SetNoSelection();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -1615,7 +1615,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( nValue != aMtrMatSpecularIntensity.GetValue() )
{
aMtrMatSpecularIntensity.SetValue( nValue );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
else
@@ -1623,7 +1623,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrMatSpecularIntensity.IsEmptyFieldValue() )
{
aMtrMatSpecularIntensity.SetEmptyFieldValue();
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -1638,7 +1638,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( aBtnPerspective.IsChecked() && ePT == PR_PARALLEL ) )
{
aBtnPerspective.Check( ePT == PR_PERSPECTIVE );
- bUpdate = sal_True;
+ bUpdate = true;
}
if( aBtnPerspective.GetState() == TRISTATE_INDET )
aBtnPerspective.Check( ePT == PR_PERSPECTIVE );
@@ -1648,7 +1648,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnPerspective.GetState() != TRISTATE_INDET )
{
aBtnPerspective.SetState( TRISTATE_INDET );
- bUpdate = sal_True;
+ bUpdate = true;
}
}
@@ -1656,7 +1656,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
{
// however the 2D attributes may be different. Compare these and decide
- bUpdate = sal_True;
+ bUpdate = true;
}
if( bUpdate || bOnly3DChanged )
@@ -3045,9 +3045,9 @@ IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl)
// Method to ensure that the LB is also associated with a color
// returns true if color was added
-sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
+bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
pLb->SetNoSelection();
pLb->SelectEntry( rColor );
@@ -3065,7 +3065,7 @@ sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
sal_uInt16 nPos = pLb->InsertEntry( rColor, aStr );
pLb->SelectEntryPos( nPos );
- bRet = sal_True;
+ bRet = true;
}
return( bRet );
}
@@ -3087,7 +3087,7 @@ void Svx3DWin::UpdatePreview()
SID_3D_STATE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
}
// Reset Flag
- bOnly3DChanged = sal_False;
+ bOnly3DChanged = false;
}
// Get Itemset
@@ -3264,13 +3264,13 @@ void Svx3DCtrlItem::StateChanged( sal_uInt16 /*nSId*/,
SvxConvertTo3DItem::SvxConvertTo3DItem(sal_uInt16 _nId, SfxBindings* _pBindings)
: SfxControllerItem(_nId, *_pBindings),
- bState(sal_False)
+ bState(false)
{
}
void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/)
{
- sal_Bool bNewState = (eState != SFX_ITEM_DISABLED);
+ bool bNewState = (eState != SFX_ITEM_DISABLED);
if(bNewState != bState)
{
bState = bNewState;
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index ed5670dd7a30..61cdb3be6a3a 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1008,8 +1008,8 @@ FmGridControl::FmGridControl(
,m_pPeer(_pPeer)
,m_nCurrentSelectedColumn(-1)
,m_nMarkedColumnId(BROWSER_INVALIDID)
- ,m_bSelecting(sal_False)
- ,m_bInColumnMove(sal_False)
+ ,m_bSelecting(false)
+ ,m_bInColumnMove(false)
{
EnableInteractiveRowHeight( );
}
@@ -1439,7 +1439,7 @@ void FmGridControl::markColumn(sal_uInt16 nId)
}
}
-sal_Bool FmGridControl::isColumnMarked(sal_uInt16 nId) const
+bool FmGridControl::isColumnMarked(sal_uInt16 nId) const
{
return m_nMarkedColumnId == nId;
}
@@ -1510,7 +1510,7 @@ void FmGridControl::EndCursorAction()
void FmGridControl::ColumnMoved(sal_uInt16 nId)
{
- m_bInColumnMove = sal_True;
+ m_bInColumnMove = true;
DbGridControl::ColumnMoved(nId);
Reference< ::com::sun::star::container::XIndexContainer > xColumns(GetPeer()->getColumns());
@@ -1546,7 +1546,7 @@ void FmGridControl::ColumnMoved(sal_uInt16 nId)
markColumn(nId); // ... -> mark it
}
- m_bInColumnMove = sal_False;
+ m_bInColumnMove = false;
}
void FmGridControl::InitColumnsByModels(const Reference< ::com::sun::star::container::XIndexContainer >& xColumns)
@@ -1714,10 +1714,10 @@ void FmGridControl::HideColumn(sal_uInt16 nId)
m_nMarkedColumnId = (sal_uInt16)-1;
}
-sal_Bool FmGridControl::isColumnSelected(sal_uInt16 /*nId*/,DbGridColumn* _pColumn)
+bool FmGridControl::isColumnSelected(sal_uInt16 /*nId*/,DbGridColumn* _pColumn)
{
OSL_ENSURE(_pColumn,"Column can not be null!");
- sal_Bool bSelected = sal_False;
+ bool bSelected = false;
// if the column which is shown here is selected ...
Reference< ::com::sun::star::view::XSelectionSupplier > xSelSupplier(GetPeer()->getColumns(), UNO_QUERY);
if ( xSelSupplier.is() )
@@ -1746,7 +1746,7 @@ void FmGridControl::ShowColumn(sal_uInt16 nId)
markColumn(nId); // ... -> mark it
}
-sal_Bool FmGridControl::selectBookmarks(const Sequence< Any >& _rBookmarks)
+bool FmGridControl::selectBookmarks(const Sequence< Any >& _rBookmarks)
{
SolarMutexGuard aGuard;
// need to lock the SolarMutex so that no paint call disturbs us ...
@@ -1754,7 +1754,7 @@ sal_Bool FmGridControl::selectBookmarks(const Sequence< Any >& _rBookmarks)
if ( !m_pSeekCursor )
{
OSL_FAIL( "FmGridControl::selectBookmarks: no seek cursor!" );
- return sal_False;
+ return false;
}
const Any* pBookmark = _rBookmarks.getConstArray();
@@ -1762,7 +1762,7 @@ sal_Bool FmGridControl::selectBookmarks(const Sequence< Any >& _rBookmarks)
SetNoSelection();
- sal_Bool bAllSuccessfull = sal_True;
+ bool bAllSuccessfull = true;
try
{
for (; pBookmark != pBookmarkEnd; ++pBookmark)
@@ -1771,13 +1771,13 @@ sal_Bool FmGridControl::selectBookmarks(const Sequence< Any >& _rBookmarks)
if (m_pSeekCursor->moveToBookmark(*pBookmark))
SelectRow( m_pSeekCursor->getRow() - 1);
else
- bAllSuccessfull = sal_False;
+ bAllSuccessfull = false;
}
}
catch(Exception&)
{
OSL_FAIL("FmGridControl::selectBookmarks: could not move to one of the bookmarks!");
- return sal_False;
+ return false;
}
return bAllSuccessfull;
@@ -1974,7 +1974,7 @@ void FmGridControl::Select()
if (!m_bSelecting)
{
- m_bSelecting = sal_True;
+ m_bSelecting = true;
try
{
@@ -2000,7 +2000,7 @@ void FmGridControl::Select()
}
- m_bSelecting = sal_False;
+ m_bSelecting = false;
}
}
}
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 933844cc13a0..29c7a8a662a4 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -362,7 +362,7 @@ FmXGridControl::FmXGridControl(const Reference< XComponentContext >& _rxContext)
,m_aSelectionListeners(*this, GetMutex())
,m_aGridControlListeners(*this, GetMutex())
,m_nPeerCreationLevel(0)
- ,m_bInDraw(sal_False)
+ ,m_bInDraw(false)
,m_xContext(_rxContext)
{
}
@@ -723,9 +723,9 @@ void SAL_CALL FmXGridControl::removeModifyListener(const Reference< ::com::sun::
void SAL_CALL FmXGridControl::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- m_bInDraw = sal_True;
+ m_bInDraw = true;
UnoControl::draw(x, y);
- m_bInDraw = sal_False;
+ m_bInDraw = false;
}
@@ -1100,7 +1100,7 @@ FmXGridPeer::FmXGridPeer(const Reference< XComponentContext >& _rxContext)
,m_aGridControlListeners(m_aMutex)
,m_aMode( getDataModeIdentifier() )
,m_nCursorListening(0)
- ,m_bInterceptingDispatch(sal_False)
+ ,m_bInterceptingDispatch(false)
,m_pStateCache(NULL)
,m_pDispatchers(NULL)
,m_pGridListener(NULL)
@@ -1215,7 +1215,7 @@ using namespace ::com::sun::star::util;
{
m_pDispatchers[i]->removeStatusListener( static_cast< ::com::sun::star::frame::XStatusListener* >( this ), *pSupportedURLs );
m_pDispatchers[i] = NULL;
- m_pStateCache[i] = 0;
+ m_pStateCache[i] = false;
bKnownSender = true;
}
}
@@ -2509,11 +2509,11 @@ Reference< ::com::sun::star::frame::XDispatch > FmXGridPeer::queryDispatch(cons
// first ask our interceptor chain
if (m_xFirstDispatchInterceptor.is() && !m_bInterceptingDispatch)
{
- m_bInterceptingDispatch = sal_True;
+ m_bInterceptingDispatch = true;
// safety against recursion : as we are master of the first chain element and slave of the last one we would
// have an infinite loop without this if no dispatcher can fullfill the request
xResult = m_xFirstDispatchInterceptor->queryDispatch(aURL, aTargetFrameName, nSearchFlags);
- m_bInterceptingDispatch = sal_False;
+ m_bInterceptingDispatch = false;
}
// then ask ourself : we don't have any dispatches
@@ -2810,14 +2810,14 @@ void FmXGridPeer::ConnectToDispatcher()
const Sequence< ::com::sun::star::util::URL>& aSupportedURLs = getSupportedURLs();
// _before_ adding the status listeners (as the add should result in a statusChanged-call) !
- m_pStateCache = new sal_Bool[aSupportedURLs.getLength()];
+ m_pStateCache = new bool[aSupportedURLs.getLength()];
m_pDispatchers = new Reference< ::com::sun::star::frame::XDispatch > [aSupportedURLs.getLength()];
sal_uInt16 nDispatchersGot = 0;
const ::com::sun::star::util::URL* pSupportedURLs = aSupportedURLs.getConstArray();
for (sal_uInt16 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
{
- m_pStateCache[i] = 0;
+ m_pStateCache[i] = false;
m_pDispatchers[i] = queryDispatch(*pSupportedURLs, OUString(), 0);
if (m_pDispatchers[i].is())
{
@@ -2874,7 +2874,7 @@ IMPL_LINK(FmXGridPeer, OnQueryGridSlotState, void*, pSlot)
if (!m_pDispatchers[i].is())
return -1; // nothing known about this slot
else
- return m_pStateCache[i];
+ return m_pStateCache[i] ? 1 : 0;
}
}
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 644c4ecf11e3..abf3a57c54d5 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -140,11 +140,11 @@ const Reference< css::form::XForms > & FmFormPage::GetForms( bool _bForceCreate
}
-sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
+bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
const HelpEvent& rEvt )
{
if( pView->IsAction() )
- return sal_False;
+ return false;
Point aPos = rEvt.GetMousePosPixel();
aPos = pWindow->ScreenToOutputPixel( aPos );
@@ -153,11 +153,11 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
SdrObject* pObj = NULL;
SdrPageView* pPV = NULL;
if ( !pView->PickObj( aPos, 0, pObj, pPV, SDRSEARCH_DEEP ) )
- return sal_False;
+ return false;
FmFormObj* pFormObject = FmFormObj::GetFormObject( pObj );
if ( !pFormObject )
- return sal_False;
+ return false;
OUString aHelpText;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xSet( pFormObject->GetUnoControlModel(), ::com::sun::star::uno::UNO_QUERY );
@@ -202,7 +202,7 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
else
Help::ShowQuickHelp( pWindow, aItemRect, aHelpText );
}
- return sal_True;
+ return true;
}
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 919fe820f6d7..305725a59290 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -64,7 +64,7 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId
pFillControl ( NULL ),
pFillTypeLB ( NULL ),
pFillAttrLB ( NULL ),
- bUpdate ( sal_False ),
+ bUpdate ( false ),
eLastXFS ( XFILL_NONE )
{
addStatusListener( OUString( ".uno:FillColor" ));
@@ -168,7 +168,7 @@ void SvxFillToolBoxControl::StateChanged(
if(eLastXFS != eXFS)
{
- bUpdate = sal_True;
+ bUpdate = true;
pFillTypeLB->SelectEntryPos( eXFS );
}
@@ -180,7 +180,7 @@ void SvxFillToolBoxControl::StateChanged(
//pFillTypeLB->Enable();
pFillAttrLB->Enable();
- bUpdate = sal_True;
+ bUpdate = true;
}
Update( pState );
@@ -193,7 +193,7 @@ void SvxFillToolBoxControl::StateChanged(
pFillTypeLB->SetNoSelection();
pFillAttrLB->Disable();
pFillAttrLB->SetNoSelection();
- bUpdate = sal_False;
+ bUpdate = false;
}
else
{
@@ -220,7 +220,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
{
if ( pStyleItem && pState && bUpdate )
{
- bUpdate = sal_False;
+ bUpdate = false;
XFillStyle eXFS = (XFillStyle)pStyleItem->GetValue();