diff options
| author | Herbert Dürr <hdu@apache.org> | 2014-02-04 08:44:05 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-04 12:14:11 +0000 |
| commit | 59238ef422468756c4fb67d4a00bb8c5ad31ffbc (patch) | |
| tree | 314fa0b5d01f5a1f147ca6d002f423cbe793797e /avmedia | |
| parent | 24a00c43c2b59df9b3f29c76f2e898e43bbb27ba (diff) | |
Related: #i123862# use O*String's isEmpty() method...
to check for emptiness in modules starting with 'a'
Patch-by: j.nitschke@ok.de
Review-by: hdu@apache.org
(cherry picked from commit 40b2ffbb1036c2f2db50965525009213d8fd6343)
Conflicts:
accessibility/source/extended/accessibleiconchoicectrl.cxx
accessibility/source/extended/textwindowaccessibility.cxx
accessibility/source/standard/vclxaccessiblebox.cxx
accessibility/source/standard/vclxaccessibletoolboxitem.cxx
automation/source/server/recorder.cxx
automation/source/server/statemnt.cxx
avmedia/source/framework/mediacontrol.cxx
avmedia/source/framework/soundhandler.cxx
avmedia/source/gstreamer/gstplayer.cxx
avmedia/source/viewer/mediawindow.cxx
Change-Id: I8e6d6754282634f6931a2e7f73f08f70c23d452e
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/framework/soundhandler.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/quicktime/player.mm | 2 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/win/framegrabber.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/win/player.cxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 7facb1f26f1a..c0f28c08fd9f 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -285,7 +285,7 @@ void MediaControl::setState( const MediaItem& rItem ) void MediaControl::implUpdateToolboxes() { - const bool bValidURL = ( !maItem.getURL().isEmpty()); + const bool bValidURL = !maItem.getURL().isEmpty(); maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_INSERT, bValidURL ); maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_PLAY, bValidURL ); diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index a1b0a8389f8f..b0a7830e1cbf 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -349,7 +349,7 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::Property OUString sReferer = aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(), OUString()); if ( - (sURL.getLength() ) && + !sURL.isEmpty() && (avmedia::MediaWindow::isMediaURL(sURL, sReferer)) ) { diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm index 4755ad88601c..f12bf87a99dc 100644 --- a/avmedia/source/quicktime/player.mm +++ b/avmedia/source/quicktime/player.mm @@ -374,7 +374,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( ) uno::Reference< media::XFrameGrabber > xRet; OSL_TRACE ("Player::createFrameGrabber"); - if( maURL.getLength() > 0 ) + if( !maURL.isEmpty() ) { FrameGrabber* pGrabber = new FrameGrabber( mxMgr ); diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 2d3460eefe37..33c2618da68f 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -314,7 +314,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */, else if( !rURL.isEmpty() ) rURL = OUString(); - return( !rURL.isEmpty() ); + return !rURL.isEmpty(); } // ------------------------------------------------------------------------- diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx index 2f9e6aa36a46..b93720ffcd39 100644 --- a/avmedia/source/win/framegrabber.cxx +++ b/avmedia/source/win/framegrabber.cxx @@ -98,7 +98,7 @@ bool FrameGrabber::create( const OUString& rURL ) else maURL = OUString(); - return( maURL.getLength() > 0 ); + return !maURL.isEmpty(); } uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime ) diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index caab2e46c2b4..b76d0914a0aa 100644 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -462,7 +462,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( ) { uno::Reference< media::XFrameGrabber > xRet; - if( maURL.getLength() > 0 ) + if( !maURL.isEmpty() ) { FrameGrabber* pGrabber = new FrameGrabber( mxMgr ); |