[PATCH] String cleanup in oox

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1969

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/1969/1

String cleanup in oox

Change-Id: Ib06b6defdb82c5d62be9cbd59f02827c07a320d8
Signed-off-by: José Guilherme Vanz <guilherme.sft@gmail.com>
---
M oox/source/mathml/importutils.cxx
1 file changed, 12 insertions(+), 13 deletions(-)



diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx
index d3c4782..5350d58 100644
--- a/oox/source/mathml/importutils.cxx
+++ b/oox/source/mathml/importutils.cxx
@@ -41,7 +41,6 @@
 #define CLOSING( token ) XML_STREAM_CLOSING( token )
 
 using namespace com::sun::star;
-using rtl::OUString;
 
 namespace oox
 {
@@ -117,7 +116,7 @@
 
 rtl::OUString XmlStream::AttributeList::attribute( int token, const rtl::OUString& def ) const
 {
-    std::map< int, rtl::OUString >::const_iterator find = attrs.find( token );
+    std::map< int, OUString >::const_iterator find = attrs.find( token );
     if( find != attrs.end())
         return find->second;
     return def;
@@ -125,19 +124,19 @@
 
 bool XmlStream::AttributeList::attribute( int token, bool def ) const
 {
-    std::map< int, rtl::OUString >::const_iterator find = attrs.find( token );
+    std::map< int, OUString >::const_iterator find = attrs.find( token );
     if( find != attrs.end())
     {
-        const rtl::OUString sValue = find->second;
-        if( sValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ||
-            sValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("on")) ||
-            sValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("t")) ||
-            sValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("1")) )
+        const OUString sValue = find->second;
+        if( sValue.equalsIgnoreAsciiCaseAscii("true") ||
+            sValue.equalsIgnoreAsciiCaseAscii("on") ||
+            sValue.equalsIgnoreAsciiCaseAscii("t") ||
+            sValue.equalsIgnoreAsciiCaseAscii("1") )
             return true;
-        if( sValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("false")) ||
-            sValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("off")) ||
-            sValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("f")) ||
-            sValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("0")) )
+        if( sValue.equalsIgnoreAsciiCaseAscii("false") ||
+            sValue.equalsIgnoreAsciiCaseAscii("off") ||
+            sValue.equalsIgnoreAsciiCaseAscii("f") ||
+            sValue.equalsIgnoreAsciiCaseAscii("0") )
             return false;
         SAL_WARN( "oox.xmlstream", "Cannot convert \'" << sValue << "\' to bool." );
     }
@@ -146,7 +145,7 @@
 
 sal_Unicode XmlStream::AttributeList::attribute( int token, sal_Unicode def ) const
 {
-    std::map< int, rtl::OUString >::const_iterator find = attrs.find( token );
+    std::map< int, OUString >::const_iterator find = attrs.find( token );
     if( find != attrs.end())
     {
         if( !find->second.isEmpty() )

-- 
To view, visit https://gerrit.libreoffice.org/1969
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib06b6defdb82c5d62be9cbd59f02827c07a320d8
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: José Guilherme Vanz <guilherme.sft@gmail.com>