accessibility/source/standard/vclxaccessiblebox.cxx | 4 ++-- avmedia/source/framework/mediacontrol.cxx | 2 +- avmedia/source/framework/soundhandler.cxx | 2 +- avmedia/source/quicktime/player.mm | 2 +- avmedia/source/viewer/mediawindow.cxx | 2 +- avmedia/source/win/framegrabber.cxx | 2 +- avmedia/source/win/player.cxx | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit 59238ef422468756c4fb67d4a00bb8c5ad31ffbc Author: Herbert Dürr <h...@apache.org> Date: Tue Feb 4 08:44:05 2014 +0000 Related: #i123862# use O*String's isEmpty() method... to check for emptiness in modules starting with 'a' Patch-by: j.nitsc...@ok.de Review-by: h...@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 diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index b9f3a3e..7509c98 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -182,7 +182,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven if ( xText.is() ) { ::rtl::OUString sText = xText->getSelectedText(); - if ( !sText.getLength() ) + if ( sText.isEmpty() ) sText = xText->getText(); pList->UpdateSelection_Acc (sText, m_bIsDropDownBox); //if(m_bIsDropDownBox && !pList->IsInDropDown()) @@ -573,7 +573,7 @@ void VCLXAccessibleBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& r sText = pSubEdit->GetText(); nEntryCount = pComboBox->GetEntryCount(); } - if (sText.getLength() == 0 && nEntryCount >0) + if ( sText.isEmpty() && nEntryCount > 0 ) rStateSet.AddState(AccessibleStateType::INDETERMINATE); } else if (m_aBoxType == LISTBOX && m_bIsDropDownBox == true) diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 7facb1f..c0f28c0 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 a1b0a83..b0a7830 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 4755ad8..f12bf87 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 2d3460e..33c2618 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 2f9e6aa..b93720f 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 caab2e4..b76d091 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 );
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits