summaryrefslogtreecommitdiff
path: root/core/fxcrt/xml
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxcrt/xml')
-rw-r--r--core/fxcrt/xml/cfx_xmlelement.cpp14
-rw-r--r--core/fxcrt/xml/cxml_parser.cpp8
2 files changed, 10 insertions, 12 deletions
diff --git a/core/fxcrt/xml/cfx_xmlelement.cpp b/core/fxcrt/xml/cfx_xmlelement.cpp
index 75bf9ee593..eb60e68893 100644
--- a/core/fxcrt/xml/cfx_xmlelement.cpp
+++ b/core/fxcrt/xml/cfx_xmlelement.cpp
@@ -42,17 +42,15 @@ std::unique_ptr<CFX_XMLNode> CFX_XMLElement::Clone() {
}
CFX_WideString CFX_XMLElement::GetLocalTagName() const {
- FX_STRSIZE iFind = GetName().Find(L':', 0);
- if (iFind == FX_STRNPOS)
- return GetName();
- return GetName().Right(GetName().GetLength() - iFind - 1);
+ auto pos = GetName().Find(L':');
+ return pos.has_value()
+ ? GetName().Right(GetName().GetLength() - pos.value() - 1)
+ : GetName();
}
CFX_WideString CFX_XMLElement::GetNamespacePrefix() const {
- FX_STRSIZE iFind = GetName().Find(L':', 0);
- if (iFind == FX_STRNPOS)
- return CFX_WideString();
- return GetName().Left(iFind);
+ auto pos = GetName().Find(L':');
+ return pos.has_value() ? GetName().Left(pos.value()) : CFX_WideString();
}
CFX_WideString CFX_XMLElement::GetNamespaceURI() const {
diff --git a/core/fxcrt/xml/cxml_parser.cpp b/core/fxcrt/xml/cxml_parser.cpp
index ebd5873b33..18103dfc5e 100644
--- a/core/fxcrt/xml/cxml_parser.cpp
+++ b/core/fxcrt/xml/cxml_parser.cpp
@@ -82,12 +82,12 @@ void FX_XML_SplitQualifiedName(const CFX_ByteStringC& bsFullName,
if (bsFullName.IsEmpty())
return;
- FX_STRSIZE iStart = bsFullName.Find(':');
- if (iStart == FX_STRNPOS) {
+ auto iStart = bsFullName.Find(':');
+ if (!iStart.has_value()) {
bsName = bsFullName;
} else {
- bsSpace = bsFullName.Left(iStart);
- bsName = bsFullName.Right(bsFullName.GetLength() - (iStart + 1));
+ bsSpace = bsFullName.Left(iStart.value());
+ bsName = bsFullName.Right(bsFullName.GetLength() - (iStart.value() + 1));
}
}