diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-07-21 19:21:44 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2012-07-21 19:22:18 +0200 |
commit | 75c0acd024e225699f47a4225453b92cdad54531 (patch) | |
tree | e35b15dda0bf5e2289d29c164c103f48fe5e16ca /writerfilter/source/resourcemodel | |
parent | 2747303afeef33f3b71b33642b6bde259194e867 (diff) |
writerfilter: rtl::OUString -> OUString
Change-Id: I1577c1bb8a3dc498b647b930d405c90f80eafaf9
Diffstat (limited to 'writerfilter/source/resourcemodel')
5 files changed, 14 insertions, 14 deletions
diff --git a/writerfilter/source/resourcemodel/LoggedResources.cxx b/writerfilter/source/resourcemodel/LoggedResources.cxx index 53b7dfedcac4..f94bd921993b 100644 --- a/writerfilter/source/resourcemodel/LoggedResources.cxx +++ b/writerfilter/source/resourcemodel/LoggedResources.cxx @@ -46,7 +46,7 @@ void LoggedResourcesHelper::endElement(const string & /*sElement*/) mpLogger->endElement(); } -void LoggedResourcesHelper::chars(const ::rtl::OUString & rChars) +void LoggedResourcesHelper::chars(const OUString & rChars) { mpLogger->chars(rChars); } @@ -165,7 +165,7 @@ void LoggedStream::text(const sal_uInt8 * data, size_t len) #ifdef DEBUG_LOGGING mHelper.startElement("text"); - ::rtl::OUString sText( (const sal_Char*) data, len, RTL_TEXTENCODING_MS_1252 ); + OUString sText( (const sal_Char*) data, len, RTL_TEXTENCODING_MS_1252 ); mHelper.startElement("data"); mHelper.chars(sText); @@ -185,8 +185,8 @@ void LoggedStream::utext(const sal_uInt8 * data, size_t len) mHelper.startElement("utext"); mHelper.startElement("data"); - ::rtl::OUString sText; - ::rtl::OUStringBuffer aBuffer = ::rtl::OUStringBuffer(len); + OUString sText; + OUStringBuffer aBuffer = OUStringBuffer(len); aBuffer.append( (const sal_Unicode *) data, len); sText = aBuffer.makeStringAndClear(); diff --git a/writerfilter/source/resourcemodel/Protocol.cxx b/writerfilter/source/resourcemodel/Protocol.cxx index a9c015c0e6a1..c85a75826e05 100644 --- a/writerfilter/source/resourcemodel/Protocol.cxx +++ b/writerfilter/source/resourcemodel/Protocol.cxx @@ -78,7 +78,7 @@ void StreamProtocol::endCharacterGroup() void StreamProtocol::text(const sal_uInt8 * data, size_t len) { - ::rtl::OUString sText((const sal_Char*) data, len, + OUString sText((const sal_Char*) data, len, RTL_TEXTENCODING_MS_1252); m_pTagLogger->startElement("protocol-text"); m_pTagLogger->chars(sText); @@ -89,8 +89,8 @@ void StreamProtocol::text(const sal_uInt8 * data, size_t len) void StreamProtocol::utext(const sal_uInt8 * data, size_t len) { - ::rtl::OUString sText; - ::rtl::OUStringBuffer aBuffer = ::rtl::OUStringBuffer(len); + OUString sText; + OUStringBuffer aBuffer = OUStringBuffer(len); aBuffer.append( (const sal_Unicode *) data, len); sText = aBuffer.makeStringAndClear(); diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx index 426c3be91cba..247a41c04fe1 100644 --- a/writerfilter/source/resourcemodel/TagLogger.cxx +++ b/writerfilter/source/resourcemodel/TagLogger.cxx @@ -123,7 +123,7 @@ namespace writerfilter for (int i = 0; i < aProps.getLength(); ++i) { startElement( "property" ); - ::rtl::OUString sName(aProps[i].Name); + OUString sName(aProps[i].Name); attribute( "name", sName ); try @@ -167,7 +167,7 @@ namespace writerfilter } #if OSL_DEBUG_LEVEL > 1 - void TagLogger::attribute(const string & name, const ::rtl::OUString & value) + void TagLogger::attribute(const string & name, const OUString & value) { attribute( name, OUStringToOString( value, RTL_TEXTENCODING_ASCII_US ).getStr() ); } @@ -188,7 +188,7 @@ namespace writerfilter sal_Int32 nInt = 0; float nFloat = 0.0; - ::rtl::OUString aStr; + OUString aStr; xmlChar* xmlName = xmlCharStrdup( name.c_str() ); if ( aAny >>= nInt ) @@ -215,7 +215,7 @@ namespace writerfilter xmlFree( xmlChars ); } - void TagLogger::chars(const ::rtl::OUString & rChars) + void TagLogger::chars(const OUString & rChars) { chars(OUStringToOString(rChars, RTL_TEXTENCODING_ASCII_US).getStr()); } diff --git a/writerfilter/source/resourcemodel/resourcemodel.cxx b/writerfilter/source/resourcemodel/resourcemodel.cxx index cc5eea46230b..bf70a98c1390 100644 --- a/writerfilter/source/resourcemodel/resourcemodel.cxx +++ b/writerfilter/source/resourcemodel/resourcemodel.cxx @@ -63,7 +63,7 @@ void dump(OutputWithDepth<string> & o, const char * name, sal_uInt32 n) } void dump(OutputWithDepth<string> & /*o*/, const char * /*name*/, - const rtl::OUString & /*str*/) + const OUString & /*str*/) { } @@ -408,7 +408,7 @@ void WW8StreamHandler::info(const string & info_) void WW8PropertiesHandler::attribute(Id name, Value & val) { boost::shared_ptr<rtl::OString> pStr(new ::rtl::OString()); - ::rtl::OUString aStr = val.getString(); + OUString aStr = val.getString(); aStr.convertToString(pStr.get(), RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS); string sXMLValue = xmlify(pStr->getStr()); diff --git a/writerfilter/source/resourcemodel/util.cxx b/writerfilter/source/resourcemodel/util.cxx index a68f0f43cea7..70b99ac31c7a 100644 --- a/writerfilter/source/resourcemodel/util.cxx +++ b/writerfilter/source/resourcemodel/util.cxx @@ -94,7 +94,7 @@ string toString(uno::Reference< text::XTextRange > textRange) if (textRange.get()) { - rtl::OUString aOUStr = textRange->getString(); + OUString aOUStr = textRange->getString(); rtl::OString aOStr(aOUStr.getStr(), aOUStr.getLength(), RTL_TEXTENCODING_ASCII_US ); result = aOStr.getStr(); |