mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slideshow: sal_Bool->bool

Browse Source 
Change-Id: I0a8886fe164989661add0665c4744fd17a9ef40c
This commit is contained in:
Noel Grandin
2014-04-24 11:37:39 +02:00
parent 177d32b6b8
commit 7e9bb77c35
9 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slideshow/source/engine/animationnodes/basecontainernode.cxx
View File

@@ -172,7 +172,7 @@ bool BaseContainerNode::notifyDeactivatedChild(
bool BaseContainerNode::repeat() bool BaseContainerNode::repeat()
{ {
forEachChildNode( boost::mem_fn(&AnimationNode::end), ~ENDED ); forEachChildNode( boost::mem_fn(&AnimationNode::end), ~ENDED );
sal_Bool bState = init_children(); bool bState = init_children();
if( bState ) if( bState )
activate_st(); activate_st();
return bState; return bState;

8
slideshow/source/engine/color.cxx
View File

@@ -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() && return ( rLHS.getHue() == rRHS.getHue() &&
rLHS.getSaturation() == rRHS.getSaturation() && rLHS.getSaturation() == rRHS.getSaturation() &&
rLHS.getLuminance() == rRHS.getLuminance() ); rLHS.getLuminance() == rRHS.getLuminance() );
} }
sal_Bool operator!=( const HSLColor& rLHS, const HSLColor& rRHS ) bool operator!=( const HSLColor& rLHS, const HSLColor& rRHS )
{ {
return !( rLHS == rRHS ); return !( rLHS == rRHS );
} }
@@ -350,14 +350,14 @@ namespace slideshow
255 ); 255 );
} }
sal_Bool operator==( const RGBColor& rLHS, const RGBColor& rRHS ) bool operator==( const RGBColor& rLHS, const RGBColor& rRHS )
{ {
return ( rLHS.getRed() == rRHS.getRed() && return ( rLHS.getRed() == rRHS.getRed() &&
rLHS.getGreen() == rRHS.getGreen() && rLHS.getGreen() == rRHS.getGreen() &&
rLHS.getBlue() == rRHS.getBlue() ); rLHS.getBlue() == rRHS.getBlue() );
} }
sal_Bool operator!=( const RGBColor& rLHS, const RGBColor& rRHS ) bool operator!=( const RGBColor& rLHS, const RGBColor& rRHS )
{ {
return !( rLHS == rRHS ); return !( rLHS == rRHS );
} }

8
slideshow/source/engine/shapes/drawinglayeranimation.cxx
View File

@@ -159,8 +159,8 @@ private:
basegfx::B2DRectangle const& parentBounds ); basegfx::B2DRectangle const& parentBounds );
// Access to VisibleWhenSTarted flags // Access to VisibleWhenSTarted flags
sal_Bool IsVisibleWhenStarted() const { return mbVisibleWhenStarted; } bool IsVisibleWhenStarted() const { return mbVisibleWhenStarted; }
sal_Bool IsVisibleWhenStopped() const { return mbVisibleWhenStopped; } bool IsVisibleWhenStopped() const { return mbVisibleWhenStopped; }
// scroll horizontal? if sal_False, scroll is vertical. // scroll horizontal? if sal_False, scroll is vertical.
bool ScrollHorizontal() const { bool ScrollHorizontal() const {
@@ -270,7 +270,7 @@ double ActivityImpl::GetMixerState( sal_uInt32 nTime )
{ {
// from AInfoBlinkText: // from AInfoBlinkText:
double fRetval(0.0); double fRetval(0.0);
sal_Bool bDone(sal_False); bool bDone(false);
const sal_uInt32 nLoopTime(2 * mnFrequency); const sal_uInt32 nLoopTime(2 * mnFrequency);
if(mnRepeat) if(mnRepeat)
@@ -284,7 +284,7 @@ double ActivityImpl::GetMixerState( sal_uInt32 nTime )
else else
fRetval = 1.0; fRetval = 1.0;
bDone = sal_True; bDone = true;
} }
} }

4
slideshow/source/engine/shapes/viewmediashape.cxx
View File

@@ -380,13 +380,13 @@ namespace slideshow
if( rxProps.is() ) if( rxProps.is() )
{ {
sal_Bool bLoop( false ); bool bLoop( false );
getPropertyValue( bLoop, getPropertyValue( bLoop,
rxProps, rxProps,
OUString( "Loop" )); OUString( "Loop" ));
mxPlayer->setPlaybackLoop( bLoop ); mxPlayer->setPlaybackLoop( bLoop );
sal_Bool bMute( false ); bool bMute( false );
getPropertyValue( bMute, getPropertyValue( bMute,
rxProps, rxProps,
OUString( "Mute" )); OUString( "Mute" ));

6
slideshow/source/engine/slide/targetpropertiescreator.cxx
View File

@@ -259,7 +259,7 @@ namespace internal
// initially. This is currently the only place // initially. This is currently the only place
// where a shape effect influences shape // where a shape effect influences shape
// attributes outside it's effective duration. // attributes outside it's effective duration.
sal_Bool bVisible( sal_False ); bool bVisible( false );
if( xAnimateNode->getAttributeName().equalsIgnoreAsciiCase("visibility") ) if( xAnimateNode->getAttributeName().equalsIgnoreAsciiCase("visibility") )
{ {
@@ -277,12 +277,12 @@ namespace internal
if( aString.equalsIgnoreAsciiCase("true") || if( aString.equalsIgnoreAsciiCase("true") ||
aString.equalsIgnoreAsciiCase("on") ) aString.equalsIgnoreAsciiCase("on") )
{ {
bVisible = sal_True; bVisible = true;
} }
if( aString.equalsIgnoreAsciiCase("false") || if( aString.equalsIgnoreAsciiCase("false") ||
aString.equalsIgnoreAsciiCase("off") ) aString.equalsIgnoreAsciiCase("off") )
{ {
bVisible = sal_False; bVisible = false;
} }
} }
} }

14
slideshow/source/engine/slideshowimpl.cxx
View File

@@ -711,11 +711,11 @@ void SlideShowImpl::stopSlideTransitionSound()
SoundPlayerSharedPtr SlideShowImpl::resetSlideTransitionSound( const uno::Any& rSound, bool bLoopSound ) SoundPlayerSharedPtr SlideShowImpl::resetSlideTransitionSound( const uno::Any& rSound, bool bLoopSound )
{ {
sal_Bool bStopSound = sal_False; bool bStopSound = false;
OUString url; OUString url;
if( !(rSound >>= bStopSound) ) if( !(rSound >>= bStopSound) )
bStopSound = sal_False; bStopSound = false;
rSound >>= url; rSound >>= url;
if( !bStopSound && url.isEmpty() ) if( !bStopSound && url.isEmpty() )
@@ -810,7 +810,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
const RGBColor aTransitionFadeColor( unoColor2RGBColor( aUnoColor )); const RGBColor aTransitionFadeColor( unoColor2RGBColor( aUnoColor ));
uno::Any aSound; uno::Any aSound;
sal_Bool bLoopSound = sal_False; bool bLoopSound = false;
if( !getPropertyValue( aSound, xPropSet, "Sound") ) if( !getPropertyValue( aSound, xPropSet, "Sound") )
OSL_TRACE( "createSlideTransition(): Could not determine transition sound effect URL from XDrawPage - using no 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" ) if ( rProperty.Name == "AdvanceOnClick" )
{ {
sal_Bool bAdvanceOnClick = sal_False; bool bAdvanceOnClick = false;
if (! (rProperty.Value >>= bAdvanceOnClick)) if (! (rProperty.Value >>= bAdvanceOnClick))
return false; return false;
maUserEventQueue.setAdvanceOnClick( bAdvanceOnClick ); maUserEventQueue.setAdvanceOnClick( bAdvanceOnClick );
@@ -1699,10 +1699,10 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
if ( rProperty.Name == "DisableAnimationZOrder" ) if ( rProperty.Name == "DisableAnimationZOrder" )
{ {
sal_Bool bDisableAnimationZOrder = sal_False; bool bDisableAnimationZOrder = false;
if (! (rProperty.Value >>= bDisableAnimationZOrder)) if (! (rProperty.Value >>= bDisableAnimationZOrder))
return false; return false;
mbDisableAnimationZOrder = bDisableAnimationZOrder == sal_True; mbDisableAnimationZOrder = bDisableAnimationZOrder;
return true; return true;
} }
@@ -1817,7 +1817,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
{ {
uno::Sequence<uno::Any> aValues; uno::Sequence<uno::Any> aValues;
uno::Reference<presentation::XSlideShowView> xView; uno::Reference<presentation::XSlideShowView> xView;
sal_Bool bValue (false); bool bValue (false);
if ((rProperty.Value >>= aValues) if ((rProperty.Value >>= aValues)
&& aValues.getLength()==2 && aValues.getLength()==2
&& (aValues[0] >>= xView) && (aValues[0] >>= xView)

2
slideshow/source/engine/tools.cxx
View File

@@ -374,7 +374,7 @@ namespace slideshow
const ShapeSharedPtr& /*rShape*/, const ShapeSharedPtr& /*rShape*/,
const ::basegfx::B2DVector& /*rSlideBounds*/ ) const ::basegfx::B2DVector& /*rSlideBounds*/ )
{ {
sal_Bool nTmp = sal_Bool(); bool nTmp;
// try to extract bool value // try to extract bool value
if( (rSourceAny >>= nTmp) ) if( (rSourceAny >>= nTmp) )
{ {

4
slideshow/source/inc/hslcolor.hxx
View File

@@ -79,8 +79,8 @@ namespace slideshow
double mnMagicValue; double mnMagicValue;
}; };
sal_Bool operator==( const HSLColor& rLHS, const HSLColor& rRHS ); 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 );
HSLColor 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*( const HSLColor& rLHS, const HSLColor& rRHS );
HSLColor operator*( double nFactor, const HSLColor& rRHS ); HSLColor operator*( double nFactor, const HSLColor& rRHS );

4
slideshow/source/inc/rgbcolor.hxx
View File

@@ -75,8 +75,8 @@ namespace slideshow
RGBTriple maRGBTriple; RGBTriple maRGBTriple;
}; };
sal_Bool operator==( const RGBColor& rLHS, const RGBColor& rRHS ); 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 );
RGBColor 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*( const RGBColor& rLHS, const RGBColor& rRHS );
RGBColor operator*( double nFactor, const RGBColor& rRHS ); RGBColor operator*( double nFactor, const RGBColor& rRHS );