diff options
author | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-01-11 11:37:33 -0200 |
---|---|---|
committer | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-01-11 18:43:07 -0200 |
commit | 806dce17d6631738c7388d8d68d8b5ac2e4c11a8 (patch) | |
tree | 0759954593c2fa8a85b94e5d3a4b4f40e913f091 /slideshow | |
parent | e33702442a22a72f96a093fbfdf8bfac217f416f (diff) |
Fix for fdo43460 Part XXXIV getLength() to isEmpty()
Part XXXIV
Modules
shell, slideshow, sot, starmath
Diffstat (limited to 'slideshow')
6 files changed, 9 insertions, 9 deletions
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index 82d850613d33..47e8464a3c83 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -644,7 +644,7 @@ AnimationActivitySharedPtr createActivity( // is a formula given? const ::rtl::OUString& rFormulaString( xNode->getFormula() ); - if( rFormulaString.getLength() ) + if( !rFormulaString.isEmpty() ) { // yep, parse and pass to ActivityParameters try diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx b/slideshow/source/engine/animationnodes/animationaudionode.cxx index f8e75dbbdc08..4f89afbc87b8 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.cxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx @@ -54,7 +54,7 @@ AnimationAudioNode::AnimationAudioNode( { mxAudioNode->getSource() >>= maSoundURL; - OSL_ENSURE( maSoundURL.getLength(), + OSL_ENSURE( !maSoundURL.isEmpty(), "could not extract sound source URL/empty URL string" ); ENSURE_OR_THROW( getContext().mxComponentContext.is(), diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index f9df63bfd83a..2c45996f18a3 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -80,7 +80,7 @@ bool importShapeGraphic( { rtl::OUString aURL; if( !getPropertyValue( aURL, xPropSet, OUSTR("GraphicURL")) || - aURL.getLength() == 0 ) + aURL.isEmpty() ) { // no or empty property - cannot import shape graphic return false; diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index f13e883ca9f6..72db64432829 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -291,7 +291,7 @@ namespace slideshow if ((xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "PrivateTempFileURL"))) >>= aURL) - && aURL.getLength()) + && !aURL.isEmpty()) { implInitializeMediaPlayer( aURL ); } @@ -394,7 +394,7 @@ namespace slideshow { try { - if( rMediaURL.getLength() ) + if( !rMediaURL.isEmpty() ) { mxPlayer.set( avmedia::MediaWindow::createPlayer( rMediaURL ), uno::UNO_QUERY ); diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index 5a940b244fd2..d0ef048c18ef 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -148,7 +148,7 @@ bool ShapeManagerImpl::handleMouseReleased( awt::MouseEvent const& e ) // first check for hyperlinks, because these have // highest prio: rtl::OUString const hyperlink( checkForHyperlink(aPosition) ); - if( hyperlink.getLength() > 0 ) + if( !hyperlink.isEmpty() ) { mrMultiplexer.notifyHyperlinkClicked(hyperlink); return true; // event consumed @@ -219,7 +219,7 @@ bool ShapeManagerImpl::handleMouseMoved( const awt::MouseEvent& e ) const ::basegfx::B2DPoint aPosition( e.X, e.Y ); sal_Int16 nNewCursor(-1); - if( checkForHyperlink(aPosition).getLength() > 0 ) + if( !checkForHyperlink(aPosition).isEmpty() ) { nNewCursor = awt::SystemPointer::REFHAND; } diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 4277280df36f..ffdf438ff33d 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -722,12 +722,12 @@ SoundPlayerSharedPtr SlideShowImpl::resetSlideTransitionSound( const uno::Any& r bStopSound = sal_False; rSound >>= url; - if( !bStopSound && (url.getLength() == 0) ) + if( !bStopSound && url.isEmpty() ) return SoundPlayerSharedPtr(); stopSlideTransitionSound(); - if (url.getLength() > 0) + if (!url.isEmpty()) { try { |