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

Part XLI
Modules
ucbhelper, unodevtools

2 files changed, 16 insertions, 16 deletions

diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 676acd50ded1..59cc3997057e 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -1094,7 +1094,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
                                     Content& rNewContent )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
-    if ( rContentType.getLength() == 0 )
+    if ( rContentType.isEmpty() )
         return sal_False;
 
     // First, try it using "createNewContent" command -> the "new" way.
@@ -1157,7 +1157,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
                                     Content& rNewContent )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
-    if ( rContentType.getLength() == 0 )
+    if ( rContentType.isEmpty() )
         return sal_False;
 
     // First, try it using "createNewContent" command -> the "new" way.
@@ -1438,11 +1438,11 @@ void Content_Impl::disposing( const EventObject& Source )
 //=========================================================================
 const rtl::OUString& Content_Impl::getURL() const
 {
-    if ( !m_aURL.getLength() && m_xContent.is() )
+    if ( m_aURL.isEmpty() && m_xContent.is() )
     {
         osl::MutexGuard aGuard( m_aMutex );
 
-        if ( !m_aURL.getLength() && m_xContent.is() )
+        if ( m_aURL.isEmpty() && m_xContent.is() )
         {
             Reference< XContentIdentifier > xId = m_xContent->getIdentifier();
             if ( xId.is() )
@@ -1456,11 +1456,11 @@ const rtl::OUString& Content_Impl::getURL() const
 //=========================================================================
 Reference< XContent > Content_Impl::getContent()
 {
-    if ( !m_xContent.is() && m_aURL.getLength() )
+    if ( !m_xContent.is() && !m_aURL.isEmpty() )
     {
         osl::MutexGuard aGuard( m_aMutex );
 
-        if ( !m_xContent.is() && m_aURL.getLength() )
+        if ( !m_xContent.is() && !m_aURL.isEmpty() )
         {
             ContentBroker* pBroker = ContentBroker::get();
 
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index ffc785e524c8..61fdc12743d1 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -495,7 +495,7 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy(
         return m_aEmptyProxy;
     }
 
-    if ( rHost.getLength() && m_aNoProxyList.size() )
+    if ( !rHost.isEmpty() && m_aNoProxyList.size() )
     {
         //////////////////////////////////////////////////////////////////
         // First, try direct hostname match - #110515#
@@ -532,7 +532,7 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy(
         }
 
         // Error resolving name? -> fallback.
-        if ( !aFullyQualifiedHost.getLength() )
+        if ( aFullyQualifiedHost.isEmpty() )
             aFullyQualifiedHost = aHost;
 
         if ( aFullyQualifiedHost != aHost )
@@ -558,16 +558,16 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy(
     if ( rProtocol.toAsciiLowerCase()
             .equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ftp" ) ) )
     {
-        if ( m_aFtpProxy.aName.getLength() > 0 && m_aFtpProxy.nPort >= 0 )
+        if ( !m_aFtpProxy.aName.isEmpty() && m_aFtpProxy.nPort >= 0 )
             return m_aFtpProxy;
     }
     else if ( rProtocol.toAsciiLowerCase()
                   .equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "https" ) ) )
     {
-        if ( m_aHttpsProxy.aName.getLength() )
+        if ( !m_aHttpsProxy.aName.isEmpty() )
             return m_aHttpsProxy;
     }
-    else if ( m_aHttpProxy.aName.getLength() )
+    else if ( !m_aHttpProxy.aName.isEmpty() )
     {
         // All other protocols use the HTTP proxy.
         return m_aHttpProxy;
@@ -592,7 +592,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
         {
             const util::ElementChange& rElem = pElementChanges[ n ];
             rtl::OUString aKey;
-            if ( ( rElem.Accessor >>= aKey ) && aKey.getLength() )
+            if ( ( rElem.Accessor >>= aKey ) && !aKey.isEmpty() )
             {
                 if ( aKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
                                                     PROXY_TYPE_KEY ) ) )
@@ -702,7 +702,7 @@ void InternetProxyDecider_Impl::setNoProxyList(
 
     m_aNoProxyList.clear();
 
-    if ( rNoProxyList.getLength() )
+    if ( !rNoProxyList.isEmpty() )
     {
         // List of connection endpoints hostname[:port],
         // separated by semicolon. Wilcards allowed.
@@ -718,7 +718,7 @@ void InternetProxyDecider_Impl::setNoProxyList(
 
             rtl::OUString aToken = rNoProxyList.copy( nPos, nEnd - nPos );
 
-            if ( aToken.getLength() )
+            if ( !aToken.isEmpty() )
             {
                 rtl::OUString aServer;
                 rtl::OUString aPort;
@@ -757,7 +757,7 @@ void InternetProxyDecider_Impl::setNoProxyList(
                 }
 
                 rtl::OUStringBuffer aFullyQualifiedHost;
-                if ( aServer.getLength() )
+                if ( !aServer.isEmpty() )
                 {
                     // Remember fully qualified server name if current list
                     // entry specifies exactly one non-fully qualified server
@@ -840,7 +840,7 @@ bool InternetProxyDecider::shouldUseProxy( const rtl::OUString & rProtocol,
     const InternetProxyServer & rData = m_pImpl->getProxy( rProtocol,
                                                            rHost,
                                                            nPort );
-    return ( rData.aName.getLength() > 0 );
+    return !rData.aName.isEmpty();
 }
 
 //=========================================================================