1 files changed, 18 insertions, 45 deletions

diff --git a/configmgr/source/xmldata.cxx b/configmgr/source/xmldata.cxx
index 6323f5d65b86..e919d08e7824 100644
--- a/configmgr/source/xmldata.cxx
+++ b/configmgr/source/xmldata.cxx
@@ -43,82 +43,55 @@ Type parseType(
     assert(text.is());
     sal_Int32 i = rtl_str_indexOfChar_WithLength(text.begin, text.length, ':');
     if (i >= 0) {
+        xmlreader::Span token(text.begin + i + 1, text.length - (i + 1));
         switch (reader.getNamespaceId(xmlreader::Span(text.begin, i))) {
         case ParseManager::NAMESPACE_OOR:
-            if (xmlreader::Span(text.begin + i + 1, text.length - (i + 1)).
-                equals("any"))
+            if (token == "any")
             {
                 return TYPE_ANY;
-            } else if (xmlreader::Span(
-                           text.begin + i + 1, text.length - (i + 1)).
-                       equals("boolean-list"))
+            } else if (token == "boolean-list")
             {
                 return TYPE_BOOLEAN_LIST;
-            } else if (xmlreader::Span(
-                           text.begin + i + 1, text.length - (i + 1)).
-                       equals("short-list"))
+            } else if (token == "short-list")
             {
                 return TYPE_SHORT_LIST;
-            } else if (xmlreader::Span(
-                           text.begin + i + 1, text.length - (i + 1)).
-                       equals("int-list"))
+            } else if (token == "int-list")
             {
                 return TYPE_INT_LIST;
-            } else if (xmlreader::Span(
-                           text.begin + i + 1, text.length - (i + 1)).
-                       equals("long-list"))
+            } else if (token == "long-list")
             {
                 return TYPE_LONG_LIST;
-            } else if (xmlreader::Span(
-                           text.begin + i + 1, text.length - (i + 1)).
-                       equals("double-list"))
+            } else if (token == "double-list")
             {
                 return TYPE_DOUBLE_LIST;
-            } else if (xmlreader::Span(
-                           text.begin + i + 1, text.length - (i + 1)).
-                       equals("string-list"))
+            } else if (token == "string-list")
             {
                 return TYPE_STRING_LIST;
-            } else if (xmlreader::Span(
-                           text.begin + i + 1, text.length - (i + 1)).
-                       equals("hexBinary-list"))
+            } else if (token == "hexBinary-list")
             {
                 return TYPE_HEXBINARY_LIST;
             }
             break;
         case ParseManager::NAMESPACE_XS:
-            if (xmlreader::Span(text.begin + i + 1, text.length - (i + 1)).
-                equals("boolean"))
+            if (token == "boolean")
             {
                 return TYPE_BOOLEAN;
-            } else if (xmlreader::Span(
-                           text.begin + i + 1, text.length - (i + 1)).
-                       equals("short"))
+            } else if (token =="short")
             {
                 return TYPE_SHORT;
-            } else if (xmlreader::Span(
-                           text.begin + i + 1, text.length - (i + 1)).
-                       equals("int"))
+            } else if (token =="int")
             {
                 return TYPE_INT;
-            } else if (xmlreader::Span(
-                           text.begin + i + 1, text.length - (i + 1)).
-                       equals("long"))
+            } else if (token =="long")
             {
                 return TYPE_LONG;
-            } else if (xmlreader::Span(
-                           text.begin + i + 1, text.length - (i + 1)).
-                       equals("double"))
+            } else if (token =="double")
             {
                 return TYPE_DOUBLE;
-            } else if (xmlreader::Span(
-                           text.begin + i + 1, text.length - (i + 1)).
-                       equals("string"))
+            } else if (token =="string")
             {
                 return TYPE_STRING;
-            } else if (xmlreader::Span(
-                           text.begin + i + 1, text.length - (i + 1)).
-                       equals("hexBinary"))
+            } else if (token =="hexBinary")
             {
                 return TYPE_HEXBINARY;
             }
@@ -133,10 +106,10 @@ Type parseType(
 
 bool parseBoolean(xmlreader::Span const & text) {
     assert(text.is());
-    if (text.equals("true")) {
+    if (text == "true") {
         return true;
     }
-    if (text.equals("false")) {
+    if (text == "false") {
         return false;
     }
     throw css::uno::RuntimeException(