[Libreoffice-commits] core.git: unoxml/source writerfilter/source xmlsecurity/source

Jelle van der Waa jelle at vdwaa.nl
Wed Jun 19 03:11:54 PDT 2013


 unoxml/source/dom/element.cxx                  |    2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    6 +++---
 xmlsecurity/source/dialogs/resourcemanager.cxx |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b5f3f55ce59b400f885c41413a3087e3406a424d
Author: Jelle van der Waa <jelle at vdwaa.nl>
Date:   Tue Jun 18 20:02:13 2013 +0200

    fdo#43460 unoxml,writerfilter,xmlsecurity: use isEmpty()
    
    Change-Id: Iba3b39086212803bc41384f5c8f51e42712a5249
    Reviewed-on: https://gerrit.libreoffice.org/4349
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>

diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index 50bb0bd..87dba8a 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -502,7 +502,7 @@ namespace DOM
         Reference< XAttr > aAttr;
         if (!oldAttr->getNamespaceURI().isEmpty()) {
             OUStringBuffer qname(oldAttr->getPrefix());
-            if (0 != qname.getLength()) {
+            if (!qname.isEmpty()) {
                 qname.append(sal_Unicode(':'));
             }
             qname.append(oldAttr->getName());
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8bd05dc..8849ed7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1237,7 +1237,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
                         aBuf.append(ch);
                     else if (bInKeyword && isspace(ch))
                         bInKeyword = false;
-                    if (aBuf.getLength() > 0 && !isalnum(ch))
+                    if (!aBuf.isEmpty() && !isalnum(ch))
                         bFoundCode = true;
                 }
                 Strm().Seek(nPos);
@@ -4649,12 +4649,12 @@ void RTFDocumentImpl::setSkipUnknown(bool bSkipUnknown)
 
 void RTFDocumentImpl::checkUnicode(bool bUnicode, bool bHex)
 {
-    if (bUnicode && m_aUnicodeBuffer.getLength() > 0)
+    if (bUnicode && !m_aUnicodeBuffer.isEmpty())
     {
         OUString aString = m_aUnicodeBuffer.makeStringAndClear();
         text(aString);
     }
-    if (bHex && m_aHexBuffer.getLength() > 0)
+    if (bHex && !m_aHexBuffer.isEmpty())
     {
         OUString aString = OStringToOUString(m_aHexBuffer.makeStringAndClear(), m_aStates.top().nCurrentEncoding);
         text(aString);
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 2611960..d9279b1 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -284,7 +284,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
                 }
             }
         }
-        if (sbufValue.getLength())
+        if (!sbufValue.isEmpty())
         {
             OSL_ASSERT(!sType.isEmpty());
             retVal.push_back(make_pair(sType, sbufValue.makeStringAndClear()));


More information about the Libreoffice-commits mailing list