summaryrefslogtreecommitdiff
path: root/configmgr
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
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')
-rw-r--r--configmgr/qa/unit/test.cxx184
-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
6 files changed, 117 insertions, 117 deletions
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index 1b6a9e426b5d..1e609a302277 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -58,15 +58,15 @@
namespace {
void normalize(
- rtl::OUString const & path, rtl::OUString const & relative,
- rtl::OUString * normalizedPath, rtl::OUString * name)
+ OUString const & path, OUString const & relative,
+ OUString * normalizedPath, OUString * name)
{
sal_Int32 i = relative.lastIndexOf('/');
if (i == -1) {
*normalizedPath = path;
*name = relative;
} else {
- rtl::OUStringBuffer buf(path);
+ OUStringBuffer buf(path);
buf.append(sal_Unicode('/'));
buf.append(relative.copy(0, i));
*normalizedPath = buf.makeStringAndClear();
@@ -89,19 +89,19 @@ public:
void testCrossThreads();
css::uno::Any getKey(
- rtl::OUString const & path, rtl::OUString const & relative) const;
+ OUString const & path, OUString const & relative) const;
void setKey(
- rtl::OUString const & path, rtl::OUString const & name,
+ OUString const & path, OUString const & name,
css::uno::Any const & value) const;
- bool resetKey(rtl::OUString const & path, rtl::OUString const & name) const;
+ bool resetKey(OUString const & path, OUString const & name) const;
css::uno::Reference< css::uno::XInterface > createViewAccess(
- rtl::OUString const & path) const;
+ OUString const & path) const;
css::uno::Reference< css::uno::XInterface > createUpdateAccess(
- rtl::OUString const & path) const;
+ OUString const & path) const;
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testKeyFetch);
@@ -159,20 +159,20 @@ void TestThread::run() {
class ReaderThread: public TestThread {
public:
ReaderThread(
- osl::Condition & stop, Test const & test, rtl::OUString const & path,
- rtl::OUString const & relative);
+ osl::Condition & stop, Test const & test, OUString const & path,
+ OUString const & relative);
private:
virtual bool iteration();
Test const & test_;
- rtl::OUString path_;
- rtl::OUString relative_;
+ OUString path_;
+ OUString relative_;
};
ReaderThread::ReaderThread(
- osl::Condition & stop, Test const & test, rtl::OUString const & path,
- rtl::OUString const & relative):
+ osl::Condition & stop, Test const & test, OUString const & path,
+ OUString const & relative):
TestThread(stop), test_(test), path_(path), relative_(relative)
{
create();
@@ -185,21 +185,21 @@ bool ReaderThread::iteration() {
class WriterThread: public TestThread {
public:
WriterThread(
- osl::Condition & stop, Test const & test, rtl::OUString const & path,
- rtl::OUString const & relative);
+ osl::Condition & stop, Test const & test, OUString const & path,
+ OUString const & relative);
private:
virtual bool iteration();
Test const & test_;
- rtl::OUString path_;
- rtl::OUString name_;
+ OUString path_;
+ OUString name_;
std::size_t index_;
};
WriterThread::WriterThread(
- osl::Condition & stop, Test const & test, rtl::OUString const & path,
- rtl::OUString const & relative):
+ osl::Condition & stop, Test const & test, OUString const & path,
+ OUString const & relative):
TestThread(stop), test_(test), index_(0)
{
normalize(path, relative, &path_, &name_);
@@ -207,13 +207,13 @@ WriterThread::WriterThread(
}
bool WriterThread::iteration() {
- rtl::OUString options[] = {
- rtl::OUString("fish"),
- rtl::OUString("chips"),
- rtl::OUString("kippers"),
- rtl::OUString("bloaters") };
+ OUString options[] = {
+ OUString("fish"),
+ OUString("chips"),
+ OUString("kippers"),
+ OUString("bloaters") };
test_.setKey(path_, name_, css::uno::makeAny(options[index_]));
- index_ = (index_ + 1) % (sizeof options / sizeof (rtl::OUString));
+ index_ = (index_ + 1) % (sizeof options / sizeof (OUString));
return true;
}
@@ -253,13 +253,13 @@ RecursiveTest::RecursiveTest(
void RecursiveTest::test() {
properties_ = css::uno::Reference< css::beans::XPropertySet >(
test_.createUpdateAccess(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
"dotuno:WebHtml"))),
css::uno::UNO_QUERY_THROW);
properties_->addPropertyChangeListener(
- rtl::OUString("Label"), this);
+ OUString("Label"), this);
step();
CPPUNIT_ASSERT(count_ == 0);
css::uno::Reference< css::lang::XComponent >(
@@ -302,12 +302,12 @@ SimpleRecursiveTest::SimpleRecursiveTest(
void SimpleRecursiveTest::step() const {
test_.setKey(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
"dotuno:WebHtml")),
- rtl::OUString("Label"),
- css::uno::makeAny(rtl::OUString("step")));
+ OUString("Label"),
+ css::uno::makeAny(OUString("step")));
}
class CrossThreadTest: public RecursiveTest {
@@ -328,17 +328,17 @@ void CrossThreadTest::step() const {
stop.set();
WriterThread(
stop, test_,
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
"dotuno:WebHtml")),
- rtl::OUString("Label")).join();
+ OUString("Label")).join();
test_.resetKey(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
"dotuno:WebHtml")),
- rtl::OUString("Label"));
+ OUString("Label"));
}
void Test::setUp() {
@@ -354,9 +354,9 @@ void Test::setUp() {
context_ = css::uno::Reference< css::uno::XComponentContext >(
css::uno::Reference< css::beans::XPropertySet >(
cppu::createRegistryServiceFactory(
- rtl::OUString(registry, SAL_NO_ACQUIRE)),
+ OUString(registry, SAL_NO_ACQUIRE)),
css::uno::UNO_QUERY_THROW)->getPropertyValue(
- rtl::OUString("DefaultContext")),
+ OUString("DefaultContext")),
css::uno::UNO_QUERY_THROW);
provider_ = css::configuration::theDefaultProvider::get(context_);
}
@@ -367,74 +367,74 @@ void Test::tearDown() {
}
void Test::testKeyFetch() {
- rtl::OUString s;
+ OUString s;
CPPUNIT_ASSERT(
getKey(
- rtl::OUString("/org.openoffice.Setup"),
- rtl::OUString("L10N/ooLocale")) >>=
+ OUString("/org.openoffice.Setup"),
+ OUString("L10N/ooLocale")) >>=
s);
CPPUNIT_ASSERT(
getKey(
- rtl::OUString("/org.openoffice.Setup"),
- rtl::OUString("Test/AString")) >>=
+ OUString("/org.openoffice.Setup"),
+ OUString("Test/AString")) >>=
s);
}
void Test::testKeySet() {
setKey(
- rtl::OUString("/org.openoffice.Setup/Test"),
- rtl::OUString("AString"),
- css::uno::makeAny(rtl::OUString("baa")));
- rtl::OUString s;
+ OUString("/org.openoffice.Setup/Test"),
+ OUString("AString"),
+ css::uno::makeAny(OUString("baa")));
+ OUString s;
CPPUNIT_ASSERT(
getKey(
- rtl::OUString("/org.openoffice.Setup/Test"),
- rtl::OUString("AString")) >>=
+ OUString("/org.openoffice.Setup/Test"),
+ OUString("AString")) >>=
s);
CPPUNIT_ASSERT( s == "baa" );
}
void Test::testKeyReset() {
if (resetKey(
- rtl::OUString("/org.openoffice.Setup/Test"),
- rtl::OUString("AString")))
+ OUString("/org.openoffice.Setup/Test"),
+ OUString("AString")))
{
- rtl::OUString s;
+ OUString s;
CPPUNIT_ASSERT(
getKey(
- rtl::OUString("/org.openoffice.Setup/Test"),
- rtl::OUString("AString")) >>=
+ OUString("/org.openoffice.Setup/Test"),
+ OUString("AString")) >>=
s);
CPPUNIT_ASSERT( s == "Foo" );
}
}
void Test::testSetSetMemberName() {
- rtl::OUString s;
+ OUString s;
CPPUNIT_ASSERT(
getKey(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
".uno:FontworkShapeType")),
- rtl::OUString("Label")) >>=
+ OUString("Label")) >>=
s);
CPPUNIT_ASSERT( s == "Fontwork Shape" );
css::uno::Reference< css::container::XNameAccess > access(
createUpdateAccess(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"/org.openoffice.UI.GenericCommands/UserInterface/"
"Commands"))),
css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::container::XNamed > member;
access->getByName(
- rtl::OUString(".uno:FontworkGalleryFloater")) >>=
+ OUString(".uno:FontworkGalleryFloater")) >>=
member;
CPPUNIT_ASSERT(member.is());
member->setName(
- rtl::OUString(".uno:FontworkShapeType"));
+ OUString(".uno:FontworkShapeType"));
css::uno::Reference< css::util::XChangesBatch >(
access, css::uno::UNO_QUERY_THROW)->commitChanges();
css::uno::Reference< css::lang::XComponent >(
@@ -442,11 +442,11 @@ void Test::testSetSetMemberName() {
CPPUNIT_ASSERT(
getKey(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
".uno:FontworkShapeType")),
- rtl::OUString("Label")) >>=
+ OUString("Label")) >>=
s);
CPPUNIT_ASSERT( s == "Fontwork Gallery" );
}
@@ -454,12 +454,12 @@ void Test::testSetSetMemberName() {
void Test::testReadCommands() {
css::uno::Reference< css::container::XNameAccess > access(
createViewAccess(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"/org.openoffice.UI.GenericCommands/UserInterface/"
"Commands"))),
css::uno::UNO_QUERY_THROW);
- css::uno::Sequence< rtl::OUString > names(access->getElementNames());
+ css::uno::Sequence< OUString > names(access->getElementNames());
CPPUNIT_ASSERT(names.getLength() == 695);
// testSetSetMemberName() already removed ".uno:FontworkGalleryFloater"
sal_uInt32 n = osl_getGlobalTimer();
@@ -469,11 +469,11 @@ void Test::testReadCommands() {
if (access->getByName(names[j]) >>= child) {
CPPUNIT_ASSERT(child.is());
child->getByName(
- rtl::OUString("Label"));
+ OUString("Label"));
child->getByName(
- rtl::OUString("ContextLabel"));
+ OUString("ContextLabel"));
child->getByName(
- rtl::OUString("Properties"));
+ OUString("Properties"));
}
}
}
@@ -484,28 +484,28 @@ void Test::testReadCommands() {
}
void Test::testThreads() {
- struct Entry { rtl::OUString path; rtl::OUString relative; };
+ struct Entry { OUString path; OUString relative; };
Entry list[] = {
- { rtl::OUString("/org.openoffice.Setup"),
- rtl::OUString("Test/AString") },
- { rtl::OUString("/org.openoffice.Setup"),
- rtl::OUString("Test/AString") },
- { rtl::OUString(
+ { OUString("/org.openoffice.Setup"),
+ OUString("Test/AString") },
+ { OUString("/org.openoffice.Setup"),
+ OUString("Test/AString") },
+ { OUString(
"/org.openoffice.UI.GenericCommands"),
- rtl::OUString(
+ OUString(
"UserInterface/Commands/dotuno:WebHtml/Label") },
- { rtl::OUString(
+ { OUString(
"/org.openoffice.UI.GenericCommands"),
- rtl::OUString(
+ OUString(
"UserInterface/Commands/dotuno:NewPresentation/Label") },
- { rtl::OUString(
+ { OUString(
"/org.openoffice.UI.GenericCommands"),
- rtl::OUString(
+ OUString(
"UserInterface/Commands/dotuno:RecentFileList/Label") },
- { rtl::OUString("/org.openoffice.Setup"),
- rtl::OUString("L10N/ooLocale") },
- { rtl::OUString("/org.openoffice.Setup"),
- rtl::OUString("Test/ABoolean") }
+ { OUString("/org.openoffice.Setup"),
+ OUString("L10N/ooLocale") },
+ { OUString("/org.openoffice.Setup"),
+ OUString("Test/ABoolean") }
};
std::size_t const numReaders = sizeof list / sizeof (Entry);
std::size_t const numWriters = numReaders - 2;
@@ -523,8 +523,8 @@ void Test::testThreads() {
}
for (int i = 0; i < 5; ++i) {
for (std::size_t j = 0; j < numReaders; ++j) {
- rtl::OUString path;
- rtl::OUString name;
+ OUString path;
+ OUString name;
normalize(list[j].path, list[j].relative, &path, &name);
resetKey(path, name);
osl::Thread::yield();
@@ -560,7 +560,7 @@ void Test::testCrossThreads() {
}
css::uno::Any Test::getKey(
- rtl::OUString const & path, rtl::OUString const & relative) const
+ OUString const & path, OUString const & relative) const
{
css::uno::Reference< css::container::XHierarchicalNameAccess > access(
createViewAccess(path), css::uno::UNO_QUERY_THROW);
@@ -571,7 +571,7 @@ css::uno::Any Test::getKey(
}
void Test::setKey(
- rtl::OUString const & path, rtl::OUString const & name,
+ OUString const & path, OUString const & name,
css::uno::Any const & value) const
{
css::uno::Reference< css::container::XNameReplace > access(
@@ -583,7 +583,7 @@ void Test::setKey(
access, css::uno::UNO_QUERY_THROW)->dispose();
}
-bool Test::resetKey(rtl::OUString const & path, rtl::OUString const & name)
+bool Test::resetKey(OUString const & path, OUString const & name)
const
{
//TODO: support setPropertyToDefault
@@ -602,29 +602,29 @@ bool Test::resetKey(rtl::OUString const & path, rtl::OUString const & name)
}
css::uno::Reference< css::uno::XInterface > Test::createViewAccess(
- rtl::OUString const & path) const
+ OUString const & path) const
{
css::uno::Any arg(
css::uno::makeAny(
css::beans::NamedValue(
- rtl::OUString("nodepath"),
+ OUString("nodepath"),
css::uno::makeAny(path))));
return provider_->createInstanceWithArguments(
- rtl::OUString(
+ OUString(
"com.sun.star.configuration.ConfigurationAccess"),
css::uno::Sequence< css::uno::Any >(&arg, 1));
}
css::uno::Reference< css::uno::XInterface > Test::createUpdateAccess(
- rtl::OUString const & path) const
+ OUString const & path) const
{
css::uno::Any arg(
css::uno::makeAny(
css::beans::NamedValue(
- rtl::OUString("nodepath"),
+ OUString("nodepath"),
css::uno::makeAny(path))));
return provider_->createInstanceWithArguments(
- rtl::OUString(
+ OUString(
"com.sun.star.configuration.ConfigurationUpdateAccess"),
css::uno::Sequence< css::uno::Any >(&arg, 1));
}
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")))
{