[Libreoffice-commits] core.git: shell/source vcl/generic xmlreader/source

Jelle van der Waa jelle at vdwaa.nl
Mon Jun 24 02:00:39 PDT 2013


 shell/source/unix/exec/shellexec.cxx |    2 +-
 vcl/generic/fontmanager/helper.cxx   |    4 ++--
 xmlreader/source/pad.cxx             |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 34f50399f1bc896849a0e3fc3598ab1225d760c5
Author: Jelle van der Waa <jelle at vdwaa.nl>
Date:   Sat Jun 22 12:53:29 2013 +0200

    fdo#43460 shell,vcl,xmlreader: use isEmpty()
    
    Change-Id: Ie3d16da6c246b79c4c304b21476f84b2788f0d6e
    Reviewed-on: https://gerrit.libreoffice.org/4444
    Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>

diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index 6fe1c1e..b962f8a 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -236,7 +236,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
     }
 
     // Prefer DESKTOP_LAUNCH when available
-    if ( aLaunchBuffer.getLength() > 0 )
+    if ( !aLaunchBuffer.isEmpty() )
     {
         FILE *pLaunch = popen( aLaunchBuffer.makeStringAndClear().getStr(), "w" );
         if ( pLaunch != NULL )
diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx
index 33db298..fc582bd 100644
--- a/vcl/generic/fontmanager/helper.cxx
+++ b/vcl/generic/fontmanager/helper.cxx
@@ -115,7 +115,7 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub
 
     // append net path
     aPathBuffer.append( getOfficePath( psp::InstallationRootPath ) );
-    if( aPathBuffer.getLength() )
+    if( !aPathBuffer.isEmpty() )
     {
         aPathBuffer.appendAscii( "/share/psprint" );
         if( pSubDir )
@@ -127,7 +127,7 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub
     }
     // append user path
     aPathBuffer.append( getOfficePath( psp::UserPath ) );
-    if( aPathBuffer.getLength() )
+    if( !aPathBuffer.isEmpty() )
     {
         aPathBuffer.appendAscii( "/user/psprint" );
         if( pSubDir )
diff --git a/xmlreader/source/pad.cxx b/xmlreader/source/pad.cxx
index d489157..c7d9b4d 100644
--- a/xmlreader/source/pad.cxx
+++ b/xmlreader/source/pad.cxx
@@ -32,7 +32,7 @@ void Pad::add(char const * begin, sal_Int32 length) {
         begin != 0 && length >= 0 && !(span_.is() && buffer_.getLength() != 0));
     if (length != 0) {
         flushSpan();
-        if (buffer_.getLength() == 0) {
+        if (buffer_.isEmpty()) {
             span_ = Span(begin, length);
         } else {
             buffer_.append(begin, length);
@@ -59,7 +59,7 @@ Span Pad::get() const {
     assert(!(span_.is() && buffer_.getLength() != 0));
     if (span_.is()) {
         return span_;
-    } else if (buffer_.getLength() == 0) {
+    } else if (buffer_.isEmpty()) {
         return Span("");
     } else {
         return Span(buffer_.getStr(), buffer_.getLength());


More information about the Libreoffice-commits mailing list