diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /filter/source/xsltfilter | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (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 'filter/source/xsltfilter')
-rw-r--r-- | filter/source/xsltfilter/LibXSLTTransformer.cxx | 4 | ||||
-rw-r--r-- | filter/source/xsltfilter/OleHandler.cxx | 8 | ||||
-rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index 85eaf7b1caea..29b0faf25a67 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -179,7 +179,7 @@ namespace XSLT xmlXPathObjectPtr streamName = valuePop(ctxt); streamName = ensureStringValue(streamName, ctxt); - oh->insertByName(::rtl::OUString::createFromAscii((sal_Char*) streamName->stringval), ::rtl::OString((sal_Char*) value->stringval)); + oh->insertByName(OUString::createFromAscii((sal_Char*) streamName->stringval), OString((sal_Char*) value->stringval)); valuePush(ctxt, xmlXPathNewCString("")); } @@ -220,7 +220,7 @@ namespace XSLT OleHandler * oh = static_cast<OleHandler*> (data); xmlXPathObjectPtr streamName = valuePop(ctxt); streamName = ensureStringValue(streamName, ctxt); - const OString content = oh->getByName(::rtl::OUString::createFromAscii((sal_Char*) streamName->stringval)); + const OString content = oh->getByName(OUString::createFromAscii((sal_Char*) streamName->stringval)); valuePush(ctxt, xmlXPathNewCString(content.getStr())); xmlXPathFreeObject(streamName); } diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index f109011a38b1..151777ce6345 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -95,7 +95,7 @@ namespace XSLT void SAL_CALL OleHandler::initRootStorageFromBase64(const OString& content) { Sequence<sal_Int8> oleData; - ::sax::Converter::decodeBase64(oleData, ::rtl::OStringToOUString( + ::sax::Converter::decodeBase64(oleData, OStringToOUString( content, RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS)); m_rootStream = createTempFile(); Reference<XOutputStream> xOutput = m_rootStream->getOutputStream(); @@ -155,7 +155,7 @@ namespace XSLT //return the base64 string of the uncompressed data OUStringBuffer buf(oleLength); ::sax::Converter::encodeBase64(buf, result); - return ::rtl::OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8); + return OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8); } void SAL_CALL @@ -188,7 +188,7 @@ namespace XSLT //return the base64 encoded string OUStringBuffer buf(oleLength); ::sax::Converter::encodeBase64(buf, oledata); - return ::rtl::OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8); + return OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8); } return encodeSubStorage(streamName); } @@ -199,7 +199,7 @@ namespace XSLT //decode the base64 string Sequence<sal_Int8> oledata; ::sax::Converter::decodeBase64(oledata, - rtl::OStringToOUString(content, RTL_TEXTENCODING_ASCII_US)); + OStringToOUString(content, RTL_TEXTENCODING_ASCII_US)); //create a temp stream to write data to Reference<XStream> subStream = createTempFile(); Reference<XInputStream> xInput = subStream->getInputStream(); diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 6feebdd08460..9eea215f9f2d 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -124,7 +124,7 @@ namespace XSLT OUString expandUrl(const OUString&); - css::uno::Reference<xslt::XXSLTTransformer> impl_createTransformer(const rtl::OUString& rTransformer, const Sequence<Any>& rArgs); + css::uno::Reference<xslt::XXSLTTransformer> impl_createTransformer(const OUString& rTransformer, const Sequence<Any>& rArgs); public: @@ -179,10 +179,10 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) { } - ::rtl::OUString - XSLTFilter::expandUrl(const ::rtl::OUString& sUrl) + OUString + XSLTFilter::expandUrl(const OUString& sUrl) { - ::rtl::OUString sExpandedUrl; + OUString sExpandedUrl; try { css::uno::Reference<XComponentContext> xContext( @@ -201,7 +201,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) } css::uno::Reference<xslt::XXSLTTransformer> - XSLTFilter::impl_createTransformer(const rtl::OUString& rTransformer, const Sequence<Any>& rArgs) + XSLTFilter::impl_createTransformer(const OUString& rTransformer, const Sequence<Any>& rArgs) { css::uno::Reference<xslt::XXSLTTransformer> xTransformer; @@ -379,7 +379,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) if (xInterActionHandler.is()) { Sequence<Any> excArgs(0); ::com::sun::star::ucb::InteractiveAugmentedIOException exc( - rtl::OUString("Timeout!"), + OUString("Timeout!"), static_cast< OWeakObject * >( this ), InteractionClassification_ERROR, ::com::sun::star::ucb::IOErrorCode_GENERAL, |