Fix for fdo43460 Part XXXVII getLength() to isEmpty()

Part XXXVII
Modules
svtools

4 files changed, 5 insertions, 5 deletions

diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index b1d1050721ff..a2441c9a0336 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -401,7 +401,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
                             aMimeType = ::rtl::OUString::createFromAscii( pMimeType );
                     }
 
-                    if( !aMimeType.getLength() && ( mpGraphic->GetType() != GRAPHIC_NONE ) )
+                    if( aMimeType.isEmpty() && ( mpGraphic->GetType() != GRAPHIC_NONE ) )
                         aMimeType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VCLGRAPHIC ));
                 }
                 else
diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx
index 9a8ed3ac32cb..9de8155ef261 100644
--- a/svtools/source/graphic/graphicunofactory.cxx
+++ b/svtools/source/graphic/graphicunofactory.cxx
@@ -59,7 +59,7 @@ GObjectImpl::GObjectImpl( uno::Sequence< uno::Any > const & args, uno::Reference
     if ( args.getLength() == 1 )
     {
         rtl::OUString sId;
-        if ( !( args[ 0 ] >>= sId ) || sId.getLength() == 0 )
+        if ( !( args[ 0 ] >>= sId ) || sId.isEmpty() )
             throw lang::IllegalArgumentException();
         rtl::OString bsId(rtl::OUStringToOString(sId, RTL_TEXTENCODING_UTF8));
         mpGObject.reset( new GraphicObject( bsId ) );
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 3b4bfc44ff37..2c4997532451 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1195,7 +1195,7 @@ GraphicObject::InspectForGraphicObjectImageURL( const Reference< XInterface >& x
         {
             rtl::OUString sURL;
             xProps->getPropertyValue( sImageURL ) >>= sURL;
-            if ( sURL.getLength() && sURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 )
+            if ( !sURL.isEmpty() && sURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 )
                 rvEmbedImgUrls.push_back( sURL );
         }
     }
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index 047f4dff2352..d5bcf46d990b 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -298,7 +298,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const :
             const ::rtl::OUString   aResourceType( rResourceURL.getToken( 0, '/', nIndex ) );
             const ResId             aResId( rResourceURL.getToken( 0, '/', nIndex ).toInt32(), *pResMgr );
 
-            if( aResourceType.getLength() )
+            if( !aResourceType.isEmpty() )
             {
                 BitmapEx aBmpEx;
 
@@ -395,7 +395,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc
         pDescriptor->init( xIStm, aURL );
         xRet = pDescriptor;
     }
-    else if( aURL.getLength() )
+    else if( !aURL.isEmpty() )
     {
         uno::Reference< ::graphic::XGraphic > xGraphic( implLoadMemory( aURL ) );
         if( !xGraphic.is() )