summaryrefslogtreecommitdiff
path: root/configmgr/source
diff options
context:
space:
mode:
Diffstat (limited to 'configmgr/source')
-rw-r--r--configmgr/source/valueparser.cxx22
-rw-r--r--configmgr/source/valueparser.hxx2
-rw-r--r--configmgr/source/writemodfile.cxx12
-rw-r--r--configmgr/source/xcsparser.cxx4
-rw-r--r--configmgr/source/xcuparser.cxx10
5 files changed, 25 insertions, 25 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;
diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx
index 3697b136fd80..45db2db9712b 100644
--- a/configmgr/source/valueparser.hxx
+++ b/configmgr/source/valueparser.hxx
@@ -66,7 +66,7 @@ public:
int getLayer() const;
Type type_;
- rtl::OString separator_;
+ OString separator_;
private:
template< typename T > com::sun::star::uno::Any convertItems();
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 191e45dd9d9e..daae55c2d860 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -57,11 +57,11 @@ class Components;
namespace {
-rtl::OString convertToUtf8(
+OString convertToUtf8(
OUString const & text, sal_Int32 offset, sal_Int32 length)
{
assert(offset <= text.getLength() && text.getLength() - offset >= length);
- rtl::OString s;
+ OString s;
if (!rtl_convertUStringToString(
&s.pData, text.pData->buffer + offset, length,
RTL_TEXTENCODING_UTF8,
@@ -115,7 +115,7 @@ void writeData(oslFileHandle handle, char const * begin, sal_Int32 length) {
}
}
-void writeData(oslFileHandle handle, rtl::OString const & text) {
+void writeData(oslFileHandle handle, OString const & text) {
writeData(handle, text.getStr(), text.getLength());
}
@@ -177,15 +177,15 @@ void writeValueContent(oslFileHandle handle, sal_Int16 value) {
}
void writeValueContent(oslFileHandle handle, sal_Int32 value) {
- writeData(handle, rtl::OString::valueOf(value));
+ writeData(handle, OString::valueOf(value));
}
void writeValueContent(oslFileHandle handle, sal_Int64 value) {
- writeData(handle, rtl::OString::valueOf(value));
+ writeData(handle, OString::valueOf(value));
}
void writeValueContent(oslFileHandle handle, double value) {
- writeData(handle, rtl::OString::valueOf(value));
+ writeData(handle, OString::valueOf(value));
}
void writeValueContent(oslFileHandle handle, OUString const & value) {
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx
index aee9fbaa675d..c0b4296d4dda 100644
--- a/configmgr/source/xcsparser.cxx
+++ b/configmgr/source/xcsparser.cxx
@@ -346,7 +346,7 @@ void XcsParser::characters(xmlreader::Span const & text) {
void XcsParser::handleComponentSchema(xmlreader::XmlReader & reader) {
//TODO: oor:version, xml:lang attributes
- rtl::OStringBuffer buf;
+ OStringBuffer buf;
buf.append('.');
bool hasPackage = false;
bool hasName = false;
@@ -531,7 +531,7 @@ void XcsParser::handlePropValue(
}
}
}
- valueParser_.separator_ = rtl::OString(
+ valueParser_.separator_ = OString(
attrSeparator.begin, attrSeparator.length);
valueParser_.start(property);
}
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 5a659d15b980..c8a2acfd1850 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -253,7 +253,7 @@ XcuParser::Operation XcuParser::parseOperation(xmlreader::Span const & text) {
}
void XcuParser::handleComponentData(xmlreader::XmlReader & reader) {
- rtl::OStringBuffer buf;
+ OStringBuffer buf;
buf.append('.');
bool hasPackage = false;
bool hasName = false;
@@ -417,7 +417,7 @@ void XcuParser::handlePropValue(
xmlreader::XmlReader & reader, PropertyNode * prop)
{
bool nil = false;
- rtl::OString separator;
+ OString separator;
OUString external;
for (;;) {
int attrNsId;
@@ -451,7 +451,7 @@ void XcuParser::handlePropValue(
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
- separator = rtl::OString(s.begin, s.length);
+ separator = OString(s.begin, s.length);
} else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("external")))
{
@@ -493,7 +493,7 @@ void XcuParser::handleLocpropValue(
{
OUString name;
bool nil = false;
- rtl::OString separator;
+ OString separator;
Operation op = OPERATION_FUSE;
for (;;) {
int attrNsId;
@@ -531,7 +531,7 @@ void XcuParser::handleLocpropValue(
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
- separator = rtl::OString(s.begin, s.length);
+ separator = OString(s.begin, s.length);
} else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 23:55:02 +0000