summaryrefslogtreecommitdiff
path: root/sax/source/expatwrap
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 /sax/source/expatwrap
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 'sax/source/expatwrap')
-rw-r--r--sax/source/expatwrap/attrlistimpl.hxx14
-rw-r--r--sax/source/expatwrap/sax_expat.cxx2
-rw-r--r--sax/source/expatwrap/saxwriter.cxx20
-rw-r--r--sax/source/expatwrap/xml2utf.cxx1
4 files changed, 18 insertions, 19 deletions
diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx
index 52187f9826cd..2828651ad19a 100644
--- a/sax/source/expatwrap/attrlistimpl.hxx
+++ b/sax/source/expatwrap/attrlistimpl.hxx
@@ -42,22 +42,22 @@ public:
AttributeList( const AttributeList & );
virtual ~AttributeList();
- void addAttribute( const ::rtl::OUString &sName ,
- const ::rtl::OUString &sType , const ::rtl::OUString &sValue );
+ void addAttribute( const OUString &sName ,
+ const OUString &sType , const OUString &sValue );
void clear();
public:
// XAttributeList
virtual sal_Int16 SAL_CALL getLength(void)
throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i)
+ virtual OUString SAL_CALL getNameByIndex(sal_Int16 i)
throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTypeByIndex(sal_Int16 i)
+ virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i)
throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName)
+ virtual OUString SAL_CALL getTypeByName(const OUString& aName)
throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i)
+ virtual OUString SAL_CALL getValueByIndex(sal_Int16 i)
throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName)
+ virtual OUString SAL_CALL getValueByName(const OUString& aName)
throw( ::com::sun::star::uno::RuntimeException);
// XCloneable
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 72b84e2ffae0..4661256854c4 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -199,7 +199,7 @@ Reference< XInterface > SAL_CALL SaxExpatParser_CreateInstance(
Sequence< OUString > SaxExpatParser::getSupportedServiceNames_Static(void) throw ()
{
Sequence<OUString> aRet(1);
- aRet.getArray()[0] = ::rtl::OUString( SERVICE_NAME );
+ aRet.getArray()[0] = OUString( SERVICE_NAME );
return aRet;
}
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index cfdf61982adb..20660eb150d8 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -118,7 +118,7 @@ public:
// returns whether it works correct or invalid characters were in the string
// If there are invalid characters in the string it returns sal_False.
// Than the calling method has to throw the needed Exception.
- inline sal_Bool writeString(const rtl::OUString& rWriteOutString,
+ inline sal_Bool writeString(const OUString& rWriteOutString,
sal_Bool bDoNormalization,
sal_Bool bNormalizeWhitespace) throw( SAXException );
@@ -130,26 +130,26 @@ public:
// returns whether it works correct or invalid characters were in the strings
// If there are invalid characters in one of the strings it returns sal_False.
// Than the calling method has to throw the needed Exception.
- inline SaxInvalidCharacterError startElement(const rtl::OUString& rName, const Reference< XAttributeList >& xAttribs) throw( SAXException );
+ inline SaxInvalidCharacterError startElement(const OUString& rName, const Reference< XAttributeList >& xAttribs) throw( SAXException );
inline sal_Bool FinishEmptyElement() throw( SAXException );
// returns whether it works correct or invalid characters were in the string
// If there are invalid characters in the string it returns sal_False.
// Than the calling method has to throw the needed Exception.
- inline sal_Bool endElement(const rtl::OUString& rName) throw( SAXException );
+ inline sal_Bool endElement(const OUString& rName) throw( SAXException );
inline void endDocument() throw( SAXException );
// returns whether it works correct or invalid characters were in the strings
// If there are invalid characters in the string it returns sal_False.
// Than the calling method has to throw the needed Exception.
- inline sal_Bool processingInstruction(const rtl::OUString& rTarget, const rtl::OUString& rData) throw( SAXException );
+ inline sal_Bool processingInstruction(const OUString& rTarget, const OUString& rData) throw( SAXException );
inline void startCDATA() throw( SAXException );
inline void endCDATA() throw( SAXException );
// returns whether it works correct or invalid characters were in the strings
// If there are invalid characters in the string it returns sal_False.
// Than the calling method has to throw the needed Exception.
- inline sal_Bool comment(const rtl::OUString& rComment) throw( SAXException );
+ inline sal_Bool comment(const OUString& rComment) throw( SAXException );
inline void clearBuffer() throw( SAXException );
};
@@ -503,7 +503,7 @@ inline void SaxWriterHelper::insertIndentation(sal_uInt32 m_nLevel) throw( SAXEx
}
}
-inline sal_Bool SaxWriterHelper::writeString( const rtl::OUString& rWriteOutString,
+inline sal_Bool SaxWriterHelper::writeString( const OUString& rWriteOutString,
sal_Bool bDoNormalization,
sal_Bool bNormalizeWhitespace ) throw( SAXException )
{
@@ -538,7 +538,7 @@ inline void SaxWriterHelper::startDocument() throw( SAXException )
nCurrentPos = writeSequence();
}
-inline SaxInvalidCharacterError SaxWriterHelper::startElement(const rtl::OUString& rName, const Reference< XAttributeList >& xAttribs) throw( SAXException )
+inline SaxInvalidCharacterError SaxWriterHelper::startElement(const OUString& rName, const Reference< XAttributeList >& xAttribs) throw( SAXException )
{
FinishStartElement();
mp_Sequence[nCurrentPos] = '<';
@@ -605,7 +605,7 @@ inline sal_Bool SaxWriterHelper::FinishEmptyElement() throw( SAXException )
return sal_True;
}
-inline sal_Bool SaxWriterHelper::endElement(const rtl::OUString& rName) throw( SAXException )
+inline sal_Bool SaxWriterHelper::endElement(const OUString& rName) throw( SAXException )
{
FinishStartElement();
mp_Sequence[nCurrentPos] = '<';
@@ -650,7 +650,7 @@ inline void SaxWriterHelper::clearBuffer() throw( SAXException )
}
}
-inline sal_Bool SaxWriterHelper::processingInstruction(const rtl::OUString& rTarget, const rtl::OUString& rData) throw( SAXException )
+inline sal_Bool SaxWriterHelper::processingInstruction(const OUString& rTarget, const OUString& rData) throw( SAXException )
{
FinishStartElement();
mp_Sequence[nCurrentPos] = '<';
@@ -712,7 +712,7 @@ inline void SaxWriterHelper::endCDATA() throw( SAXException )
nCurrentPos = writeSequence();
}
-inline sal_Bool SaxWriterHelper::comment(const rtl::OUString& rComment) throw( SAXException )
+inline sal_Bool SaxWriterHelper::comment(const OUString& rComment) throw( SAXException )
{
FinishStartElement();
mp_Sequence[nCurrentPos] = '<';
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 69065c64720e..76713d99ef84 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -30,7 +30,6 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::io;
-using ::rtl::OString;
#include "xml2utf.hxx"