summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-24 11:37:39 +0200
committerNoel Grandin <noel@peralex.com>2014-04-30 08:43:41 +0200
commit7e9bb77c356e3888e4bf697f4ecd69e642211c75 (patch)
tree033158ea248762e6eab7aa9b79a70064f41766bb /slideshow
parent177d32b6b8f3dcc9c82330f710452020798b8342 (diff)
slideshow: sal_Bool->bool
Change-Id: I0a8886fe164989661add0665c4744fd17a9ef40c
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/animationnodes/basecontainernode.cxx2
-rw-r--r--slideshow/source/engine/color.cxx8
-rw-r--r--slideshow/source/engine/shapes/drawinglayeranimation.cxx8
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx4
-rw-r--r--slideshow/source/engine/slide/targetpropertiescreator.cxx6
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx14
-rw-r--r--slideshow/source/engine/tools.cxx2
-rw-r--r--slideshow/source/inc/hslcolor.hxx4
-rw-r--r--slideshow/source/inc/rgbcolor.hxx4
9 files changed, 26 insertions, 26 deletions
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx
index fc0a889b8a25..5f565dbef9fe 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.cxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx
@@ -172,7 +172,7 @@ bool BaseContainerNode::notifyDeactivatedChild(
bool BaseContainerNode::repeat()
{
forEachChildNode( boost::mem_fn(&AnimationNode::end), ~ENDED );
- sal_Bool bState = init_children();
+ bool bState = init_children();
if( bState )
activate_st();
return bState;
diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx
index ee9b94910bc9..81483adf3abc 100644
--- a/slideshow/source/engine/color.cxx
+++ b/slideshow/source/engine/color.cxx
@@ -209,14 +209,14 @@ namespace slideshow
}
- sal_Bool operator==( const HSLColor& rLHS, const HSLColor& rRHS )
+ bool operator==( const HSLColor& rLHS, const HSLColor& rRHS )
{
return ( rLHS.getHue() == rRHS.getHue() &&
rLHS.getSaturation() == rRHS.getSaturation() &&
rLHS.getLuminance() == rRHS.getLuminance() );
}
- sal_Bool operator!=( const HSLColor& rLHS, const HSLColor& rRHS )
+ bool operator!=( const HSLColor& rLHS, const HSLColor& rRHS )
{
return !( rLHS == rRHS );
}
@@ -350,14 +350,14 @@ namespace slideshow
255 );
}
- sal_Bool operator==( const RGBColor& rLHS, const RGBColor& rRHS )
+ bool operator==( const RGBColor& rLHS, const RGBColor& rRHS )
{
return ( rLHS.getRed() == rRHS.getRed() &&
rLHS.getGreen() == rRHS.getGreen() &&
rLHS.getBlue() == rRHS.getBlue() );
}
- sal_Bool operator!=( const RGBColor& rLHS, const RGBColor& rRHS )
+ bool operator!=( const RGBColor& rLHS, const RGBColor& rRHS )
{
return !( rLHS == rRHS );
}
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 84193010dcac..fa5299bd6c5d 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -159,8 +159,8 @@ private:
basegfx::B2DRectangle const& parentBounds );
// Access to VisibleWhenSTarted flags
- sal_Bool IsVisibleWhenStarted() const { return mbVisibleWhenStarted; }
- sal_Bool IsVisibleWhenStopped() const { return mbVisibleWhenStopped; }
+ bool IsVisibleWhenStarted() const { return mbVisibleWhenStarted; }
+ bool IsVisibleWhenStopped() const { return mbVisibleWhenStopped; }
// scroll horizontal? if sal_False, scroll is vertical.
bool ScrollHorizontal() const {
@@ -270,7 +270,7 @@ double ActivityImpl::GetMixerState( sal_uInt32 nTime )
{
// from AInfoBlinkText:
double fRetval(0.0);
- sal_Bool bDone(sal_False);
+ bool bDone(false);
const sal_uInt32 nLoopTime(2 * mnFrequency);
if(mnRepeat)
@@ -284,7 +284,7 @@ double ActivityImpl::GetMixerState( sal_uInt32 nTime )
else
fRetval = 1.0;
- bDone = sal_True;
+ bDone = true;
}
}
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index da44d937542a..25226c1c802b 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -380,13 +380,13 @@ namespace slideshow
if( rxProps.is() )
{
- sal_Bool bLoop( false );
+ bool bLoop( false );
getPropertyValue( bLoop,
rxProps,
OUString( "Loop" ));
mxPlayer->setPlaybackLoop( bLoop );
- sal_Bool bMute( false );
+ bool bMute( false );
getPropertyValue( bMute,
rxProps,
OUString( "Mute" ));
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index 5902c2980a27..52541bc07ebb 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -259,7 +259,7 @@ namespace internal
// initially. This is currently the only place
// where a shape effect influences shape
// attributes outside it's effective duration.
- sal_Bool bVisible( sal_False );
+ bool bVisible( false );
if( xAnimateNode->getAttributeName().equalsIgnoreAsciiCase("visibility") )
{
@@ -277,12 +277,12 @@ namespace internal
if( aString.equalsIgnoreAsciiCase("true") ||
aString.equalsIgnoreAsciiCase("on") )
{
- bVisible = sal_True;
+ bVisible = true;
}
if( aString.equalsIgnoreAsciiCase("false") ||
aString.equalsIgnoreAsciiCase("off") )
{
- bVisible = sal_False;
+ bVisible = false;
}
}
}
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 8b4b491273ac..9463da95a88a 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -711,11 +711,11 @@ void SlideShowImpl::stopSlideTransitionSound()
SoundPlayerSharedPtr SlideShowImpl::resetSlideTransitionSound( const uno::Any& rSound, bool bLoopSound )
{
- sal_Bool bStopSound = sal_False;
+ bool bStopSound = false;
OUString url;
if( !(rSound >>= bStopSound) )
- bStopSound = sal_False;
+ bStopSound = false;
rSound >>= url;
if( !bStopSound && url.isEmpty() )
@@ -810,7 +810,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
const RGBColor aTransitionFadeColor( unoColor2RGBColor( aUnoColor ));
uno::Any aSound;
- sal_Bool bLoopSound = sal_False;
+ bool bLoopSound = false;
if( !getPropertyValue( aSound, xPropSet, "Sound") )
OSL_TRACE( "createSlideTransition(): Could not determine transition sound effect URL from XDrawPage - using no sound" );
@@ -1690,7 +1690,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
if ( rProperty.Name == "AdvanceOnClick" )
{
- sal_Bool bAdvanceOnClick = sal_False;
+ bool bAdvanceOnClick = false;
if (! (rProperty.Value >>= bAdvanceOnClick))
return false;
maUserEventQueue.setAdvanceOnClick( bAdvanceOnClick );
@@ -1699,10 +1699,10 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
if ( rProperty.Name == "DisableAnimationZOrder" )
{
- sal_Bool bDisableAnimationZOrder = sal_False;
+ bool bDisableAnimationZOrder = false;
if (! (rProperty.Value >>= bDisableAnimationZOrder))
return false;
- mbDisableAnimationZOrder = bDisableAnimationZOrder == sal_True;
+ mbDisableAnimationZOrder = bDisableAnimationZOrder;
return true;
}
@@ -1817,7 +1817,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
{
uno::Sequence<uno::Any> aValues;
uno::Reference<presentation::XSlideShowView> xView;
- sal_Bool bValue (false);
+ bool bValue (false);
if ((rProperty.Value >>= aValues)
&& aValues.getLength()==2
&& (aValues[0] >>= xView)
diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx
index 5cebacef137e..ea01de32691d 100644
--- a/slideshow/source/engine/tools.cxx
+++ b/slideshow/source/engine/tools.cxx
@@ -374,7 +374,7 @@ namespace slideshow
const ShapeSharedPtr& /*rShape*/,
const ::basegfx::B2DVector& /*rSlideBounds*/ )
{
- sal_Bool nTmp = sal_Bool();
+ bool nTmp;
// try to extract bool value
if( (rSourceAny >>= nTmp) )
{
diff --git a/slideshow/source/inc/hslcolor.hxx b/slideshow/source/inc/hslcolor.hxx
index cadd0f1099ef..67fc5c24e7ff 100644
--- a/slideshow/source/inc/hslcolor.hxx
+++ b/slideshow/source/inc/hslcolor.hxx
@@ -79,8 +79,8 @@ namespace slideshow
double mnMagicValue;
};
- sal_Bool operator==( const HSLColor& rLHS, const HSLColor& rRHS );
- sal_Bool operator!=( const HSLColor& rLHS, const HSLColor& rRHS );
+ bool operator==( const HSLColor& rLHS, const HSLColor& rRHS );
+ bool operator!=( const HSLColor& rLHS, const HSLColor& rRHS );
HSLColor operator+( const HSLColor& rLHS, const HSLColor& rRHS );
HSLColor operator*( const HSLColor& rLHS, const HSLColor& rRHS );
HSLColor operator*( double nFactor, const HSLColor& rRHS );
diff --git a/slideshow/source/inc/rgbcolor.hxx b/slideshow/source/inc/rgbcolor.hxx
index 28ae792860d7..1868f0ac4785 100644
--- a/slideshow/source/inc/rgbcolor.hxx
+++ b/slideshow/source/inc/rgbcolor.hxx
@@ -75,8 +75,8 @@ namespace slideshow
RGBTriple maRGBTriple;
};
- sal_Bool operator==( const RGBColor& rLHS, const RGBColor& rRHS );
- sal_Bool operator!=( const RGBColor& rLHS, const RGBColor& rRHS );
+ bool operator==( const RGBColor& rLHS, const RGBColor& rRHS );
+ bool operator!=( const RGBColor& rLHS, const RGBColor& rRHS );
RGBColor operator+( const RGBColor& rLHS, const RGBColor& rRHS );
RGBColor operator*( const RGBColor& rLHS, const RGBColor& rRHS );
RGBColor operator*( double nFactor, const RGBColor& rRHS );