summaryrefslogtreecommitdiff
path: root/configmgr/source/valueparser.cxx
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /configmgr/source/valueparser.cxx
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'configmgr/source/valueparser.cxx')
-rw-r--r--configmgr/source/valueparser.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index 76d4ec088eb8..15b756c30dca 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -90,10 +90,10 @@ bool parseValue(xmlreader::Span const & text, sal_Int16 * value) {
rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
text.begin, text.length, RTL_CONSTASCII_STRINGPARAM("0X"),
RTL_CONSTASCII_LENGTH("0X")) == 0 ?
- rtl::OString(
+ OString(
text.begin + RTL_CONSTASCII_LENGTH("0X"),
text.length - RTL_CONSTASCII_LENGTH("0X")).toInt32(16) :
- rtl::OString(text.begin, text.length).toInt32();
+ OString(text.begin, text.length).toInt32();
//TODO: check valid lexical representation
if (n >= SAL_MIN_INT16 && n <= SAL_MAX_INT16) {
*value = static_cast< sal_Int16 >(n);
@@ -109,10 +109,10 @@ bool parseValue(xmlreader::Span const & text, sal_Int32 * value) {
rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
text.begin, text.length, RTL_CONSTASCII_STRINGPARAM("0X"),
RTL_CONSTASCII_LENGTH("0X")) == 0 ?
- rtl::OString(
+ OString(
text.begin + RTL_CONSTASCII_LENGTH("0X"),
text.length - RTL_CONSTASCII_LENGTH("0X")).toInt32(16) :
- rtl::OString(text.begin, text.length).toInt32();
+ OString(text.begin, text.length).toInt32();
//TODO: check valid lexical representation
return true;
}
@@ -124,17 +124,17 @@ bool parseValue(xmlreader::Span const & text, sal_Int64 * value) {
rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
text.begin, text.length, RTL_CONSTASCII_STRINGPARAM("0X"),
RTL_CONSTASCII_LENGTH("0X")) == 0 ?
- rtl::OString(
+ OString(
text.begin + RTL_CONSTASCII_LENGTH("0X"),
text.length - RTL_CONSTASCII_LENGTH("0X")).toInt64(16) :
- rtl::OString(text.begin, text.length).toInt64();
+ OString(text.begin, text.length).toInt64();
//TODO: check valid lexical representation
return true;
}
bool parseValue(xmlreader::Span const & text, double * value) {
assert(text.is() && value != 0);
- *value = rtl::OString(text.begin, text.length).toDouble();
+ *value = OString(text.begin, text.length).toDouble();
//TODO: check valid lexical representation
return true;
}
@@ -180,7 +180,7 @@ template< typename T > css::uno::Any parseSingleValue(
}
template< typename T > css::uno::Any parseListValue(
- rtl::OString const & separator, xmlreader::Span const & text)
+ OString const & separator, xmlreader::Span const & text)
{
comphelper::SequenceAsVector< T > seq;
xmlreader::Span sep;
@@ -213,7 +213,7 @@ template< typename T > css::uno::Any parseListValue(
}
css::uno::Any parseValue(
- rtl::OString const & separator, xmlreader::Span const & text, Type type)
+ OString const & separator, xmlreader::Span const & text, Type type)
{
switch (type) {
case TYPE_ANY:
@@ -418,7 +418,7 @@ bool ValueParser::endElement() {
assert(false); // this cannot happen
break;
}
- separator_ = rtl::OString();
+ separator_ = OString();
node_.clear();
}
break;
@@ -428,7 +428,7 @@ bool ValueParser::endElement() {
break;
case STATE_IT:
items_.push_back(
- parseValue(rtl::OString(), pad_.get(), elementType(type_)));
+ parseValue(OString(), pad_.get(), elementType(type_)));
pad_.clear();
state_ = STATE_TEXT;
break;