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 /xmloff/source/transform | |
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 'xmloff/source/transform')
70 files changed, 279 insertions, 316 deletions
diff --git a/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx index 3a0de59726ac..d0a177bbea26 100644 --- a/xmloff/source/transform/ChartOASISTContext.cxx +++ b/xmloff/source/transform/ChartOASISTContext.cxx @@ -25,7 +25,6 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/ChartOASISTContext.hxx b/xmloff/source/transform/ChartOASISTContext.hxx index 498a096308aa..ec4157d0ddd5 100644 --- a/xmloff/source/transform/ChartOASISTContext.hxx +++ b/xmloff/source/transform/ChartOASISTContext.hxx @@ -28,7 +28,7 @@ public: TYPEINFO(); XMLChartOASISTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLChartOASISTransformerContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/transform/ChartOOoTContext.cxx b/xmloff/source/transform/ChartOOoTContext.cxx index 1fe094c3f971..de86f2895b0f 100644 --- a/xmloff/source/transform/ChartOOoTContext.cxx +++ b/xmloff/source/transform/ChartOOoTContext.cxx @@ -25,7 +25,6 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/ChartOOoTContext.hxx b/xmloff/source/transform/ChartOOoTContext.hxx index 642d11cc043e..16c9372c586b 100644 --- a/xmloff/source/transform/ChartOOoTContext.hxx +++ b/xmloff/source/transform/ChartOOoTContext.hxx @@ -28,7 +28,7 @@ public: TYPEINFO(); XMLChartOOoTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLChartOOoTransformerContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx index bccdb14a6f86..18a56b465a72 100644 --- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; class XMLAxisOASISContext : public XMLPersElemContentTContext { @@ -38,14 +37,14 @@ public: TYPEINFO(); XMLAxisOASISContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, ::rtl::Reference< XMLPersAttrListTContext > & rOutCategoriesContext ); ~XMLAxisOASISContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const Reference< xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const Reference< xml::sax::XAttributeList >& rAttrList ); @@ -62,7 +61,7 @@ TYPEINIT1( XMLAxisOASISContext, XMLPersElemContentTContext ); XMLAxisOASISContext::XMLAxisOASISContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, ::rtl::Reference< XMLPersAttrListTContext > & rOutCategoriesContext ) : XMLPersElemContentTContext( rTransformer, rQName ), m_rCategoriesContext( rOutCategoriesContext ), @@ -74,8 +73,8 @@ XMLAxisOASISContext::~XMLAxisOASISContext() XMLTransformerContext * XMLAxisOASISContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const Reference< xml::sax::XAttributeList >& xAttrList ) { XMLTransformerContext * pContext = 0; @@ -196,7 +195,7 @@ bool XMLAxisOASISContext::IsCategoryAxis() const TYPEINIT1( XMLChartPlotAreaOASISTContext, XMLProcAttrTransformerContext ); XMLChartPlotAreaOASISTContext::XMLChartPlotAreaOASISTContext( - XMLTransformerBase & rTransformer, const ::rtl::OUString & rQName ) : + XMLTransformerBase & rTransformer, const OUString & rQName ) : XMLProcAttrTransformerContext( rTransformer, rQName, OASIS_SHAPE_ACTIONS ) { } @@ -206,8 +205,8 @@ XMLChartPlotAreaOASISTContext::~XMLChartPlotAreaOASISTContext() XMLTransformerContext * XMLChartPlotAreaOASISTContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { XMLTransformerContext *pContext = 0; diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx index 79d6017bbf98..ce63a8c88127 100644 --- a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx +++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx @@ -29,12 +29,12 @@ public: TYPEINFO(); explicit XMLChartPlotAreaOASISTContext( - XMLTransformerBase & rTransformer, const ::rtl::OUString & rQName ); + XMLTransformerBase & rTransformer, const OUString & rQName ); virtual ~XMLChartPlotAreaOASISTContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx index 3feefcfcd758..65769067fe4b 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; class XMLAxisOOoContext : public XMLPersElemContentTContext { @@ -38,7 +37,7 @@ public: TYPEINFO(); XMLAxisOOoContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); ~XMLAxisOOoContext(); virtual void StartElement( const Reference< xml::sax::XAttributeList >& rAttrList ); @@ -53,7 +52,7 @@ TYPEINIT1( XMLAxisOOoContext, XMLPersElemContentTContext ); XMLAxisOOoContext::XMLAxisOOoContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ) : + const OUString& rQName ) : XMLPersElemContentTContext( rTransformer, rQName ), m_bIsCategoryAxis( false ) {} @@ -128,7 +127,7 @@ bool XMLAxisOOoContext::IsCategoryAxis() const TYPEINIT1( XMLChartPlotAreaOOoTContext, XMLProcAttrTransformerContext ) XMLChartPlotAreaOOoTContext::XMLChartPlotAreaOOoTContext( - XMLTransformerBase & rTransformer, const ::rtl::OUString & rQName ) : + XMLTransformerBase & rTransformer, const OUString & rQName ) : XMLProcAttrTransformerContext( rTransformer, rQName, OOO_SHAPE_ACTIONS ) { } @@ -138,8 +137,8 @@ XMLChartPlotAreaOOoTContext::~XMLChartPlotAreaOOoTContext() XMLTransformerContext * XMLChartPlotAreaOOoTContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { XMLTransformerContext *pContext = 0; diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx index 74623dcbc541..c7528033fb50 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx @@ -35,12 +35,12 @@ public: TYPEINFO(); explicit XMLChartPlotAreaOOoTContext( - XMLTransformerBase & rTransformer, const ::rtl::OUString & rQName ); + XMLTransformerBase & rTransformer, const OUString & rQName ); virtual ~XMLChartPlotAreaOOoTContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); virtual void ExportContent(); diff --git a/xmloff/source/transform/ControlOASISTContext.cxx b/xmloff/source/transform/ControlOASISTContext.cxx index f1508a2be68c..740b43cc8792 100644 --- a/xmloff/source/transform/ControlOASISTContext.cxx +++ b/xmloff/source/transform/ControlOASISTContext.cxx @@ -26,7 +26,6 @@ #include "TransformerBase.hxx" #include "ControlOASISTContext.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; diff --git a/xmloff/source/transform/ControlOASISTContext.hxx b/xmloff/source/transform/ControlOASISTContext.hxx index 2fbdcd9531eb..42a217c5ad3c 100644 --- a/xmloff/source/transform/ControlOASISTContext.hxx +++ b/xmloff/source/transform/ControlOASISTContext.hxx @@ -24,14 +24,14 @@ class XMLControlOASISTransformerContext : public XMLTransformerContext { - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; sal_Bool m_bCreateControl; public: TYPEINFO(); XMLControlOASISTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bCreateControl ); virtual ~XMLControlOASISTransformerContext(); diff --git a/xmloff/source/transform/ControlOOoTContext.cxx b/xmloff/source/transform/ControlOOoTContext.cxx index d9dea42969bf..2b1d3faaab76 100644 --- a/xmloff/source/transform/ControlOOoTContext.cxx +++ b/xmloff/source/transform/ControlOOoTContext.cxx @@ -26,7 +26,6 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/ControlOOoTContext.hxx b/xmloff/source/transform/ControlOOoTContext.hxx index a0c4115623ec..f37fd776d1eb 100644 --- a/xmloff/source/transform/ControlOOoTContext.hxx +++ b/xmloff/source/transform/ControlOOoTContext.hxx @@ -27,26 +27,26 @@ class XMLControlOOoTransformerContext : public XMLTransformerContext ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; public: TYPEINFO(); XMLControlOOoTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLControlOOoTransformerContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif // _XMLOFF_CONTROLOOOTCONTEXT_HXX diff --git a/xmloff/source/transform/CreateElemTContext.cxx b/xmloff/source/transform/CreateElemTContext.cxx index 42c66c30d8e1..09d3b8d78a63 100644 --- a/xmloff/source/transform/CreateElemTContext.cxx +++ b/xmloff/source/transform/CreateElemTContext.cxx @@ -26,7 +26,6 @@ #include "AttrTransformerAction.hxx" #include <xmloff/nmspmap.hxx> -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; diff --git a/xmloff/source/transform/CreateElemTContext.hxx b/xmloff/source/transform/CreateElemTContext.hxx index 69a7eae9454a..780a16d95522 100644 --- a/xmloff/source/transform/CreateElemTContext.hxx +++ b/xmloff/source/transform/CreateElemTContext.hxx @@ -35,7 +35,7 @@ public: TYPEINFO(); XMLCreateElemTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nActionMap ); virtual ~XMLCreateElemTransformerContext(); diff --git a/xmloff/source/transform/DeepTContext.cxx b/xmloff/source/transform/DeepTContext.cxx index f8ac54925ee5..7fb2d0f53aa9 100644 --- a/xmloff/source/transform/DeepTContext.cxx +++ b/xmloff/source/transform/DeepTContext.cxx @@ -25,7 +25,6 @@ #include "PersMixedContentTContext.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/DeepTContext.hxx b/xmloff/source/transform/DeepTContext.hxx index 1f2556b572ab..7155384eaf17 100644 --- a/xmloff/source/transform/DeepTContext.hxx +++ b/xmloff/source/transform/DeepTContext.hxx @@ -35,22 +35,22 @@ public: // element content persistence only XMLPersElemContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); // element content persistence + attribute processing XMLPersElemContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nActionMap ); // element content persistence + renaming XMLPersElemContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ); // element content persistence + renaming + attribute processing XMLPersElemContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nActionMap ); @@ -58,8 +58,8 @@ public: virtual ~XMLPersElemContentTContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); void AddContent( XMLTransformerContext *pContent ); diff --git a/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx index 4ce12e0cc63f..72d60397b40b 100644 --- a/xmloff/source/transform/DlgOASISTContext.cxx +++ b/xmloff/source/transform/DlgOASISTContext.cxx @@ -25,7 +25,6 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/DlgOASISTContext.hxx b/xmloff/source/transform/DlgOASISTContext.hxx index 5e660f72ceae..3e3cf9527988 100644 --- a/xmloff/source/transform/DlgOASISTContext.hxx +++ b/xmloff/source/transform/DlgOASISTContext.hxx @@ -28,7 +28,7 @@ public: TYPEINFO(); XMLDlgOASISTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLDlgOASISTransformerContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/transform/DocumentTContext.cxx b/xmloff/source/transform/DocumentTContext.cxx index 164e83fdea15..6b162736270a 100644 --- a/xmloff/source/transform/DocumentTContext.cxx +++ b/xmloff/source/transform/DocumentTContext.cxx @@ -31,7 +31,6 @@ #include "DocumentTContext.hxx" -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; @@ -83,7 +82,7 @@ void XMLDocumentTransformerContext::StartElement( const Reference< XAttributeLis }; for (int k=0; aTmp[k]; k++) { - ::rtl::OUString sTmpString = ::rtl::OUString::createFromAscii(aTmp[k]); + OUString sTmpString = OUString::createFromAscii(aTmp[k]); if( rValue.matchAsciiL( aTmp[k], sTmpString.getLength() ) ) { aClass = rValue.copy( sTmpString.getLength() ); diff --git a/xmloff/source/transform/DocumentTContext.hxx b/xmloff/source/transform/DocumentTContext.hxx index 5652d08e3e40..06c44215b500 100644 --- a/xmloff/source/transform/DocumentTContext.hxx +++ b/xmloff/source/transform/DocumentTContext.hxx @@ -32,7 +32,7 @@ public: // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLDocumentTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); // A contexts destructor does anything that is required if an element // ends. By default, nothing is done. diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index dc582a444708..99e3af1740a6 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -35,14 +35,13 @@ #include <boost/unordered_map.hpp> -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; class XMLTransformerOASISEventMap_Impl: - public ::boost::unordered_map< NameKey_Impl, ::rtl::OUString, + public ::boost::unordered_map< NameKey_Impl, OUString, NameHash_Impl, NameHash_Impl > { public: diff --git a/xmloff/source/transform/EventOASISTContext.hxx b/xmloff/source/transform/EventOASISTContext.hxx index 23e9d1aa20e4..6a8c38f81c18 100644 --- a/xmloff/source/transform/EventOASISTContext.hxx +++ b/xmloff/source/transform/EventOASISTContext.hxx @@ -30,14 +30,14 @@ public: TYPEINFO(); XMLEventOASISTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLEventOASISTransformerContext(); static XMLTransformerOASISEventMap_Impl *CreateFormEventMap(); static XMLTransformerOASISEventMap_Impl *CreateEventMap(); static void FlushEventMap( XMLTransformerOASISEventMap_Impl *p ); - static ::rtl::OUString GetEventName( sal_uInt16 nPrefix, - const ::rtl::OUString& rName, + static OUString GetEventName( sal_uInt16 nPrefix, + const OUString& rName, XMLTransformerOASISEventMap_Impl& rMap, XMLTransformerOASISEventMap_Impl* pMap2 ); diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index a648ba41afe2..6165c9fd184c 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -30,15 +30,13 @@ #include <boost/unordered_map.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; class XMLTransformerOOoEventMap_Impl: - public ::boost::unordered_map< ::rtl::OUString, NameKey_Impl, - ::rtl::OUStringHash, ::comphelper::UStringEqual > + public ::boost::unordered_map< OUString, NameKey_Impl, + OUStringHash, ::comphelper::UStringEqual > { public: diff --git a/xmloff/source/transform/EventOOoTContext.hxx b/xmloff/source/transform/EventOOoTContext.hxx index 4d936dbf34b5..76b955ae99d8 100644 --- a/xmloff/source/transform/EventOOoTContext.hxx +++ b/xmloff/source/transform/EventOOoTContext.hxx @@ -32,21 +32,21 @@ public: TYPEINFO(); XMLEventOOoTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bPersistent = sal_False ); virtual ~XMLEventOOoTransformerContext(); static XMLTransformerOOoEventMap_Impl *CreateEventMap(); static void FlushEventMap( XMLTransformerOOoEventMap_Impl *p ); - static sal_uInt16 GetEventName( const ::rtl::OUString& rName, - ::rtl::OUString& rNewName, + static sal_uInt16 GetEventName( const OUString& rName, + OUString& rNewName, XMLTransformerOOoEventMap_Impl& rMap ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual sal_Bool IsPersistent() const; diff --git a/xmloff/source/transform/FlatTContext.cxx b/xmloff/source/transform/FlatTContext.cxx index 8ec800964652..c591877ac470 100644 --- a/xmloff/source/transform/FlatTContext.cxx +++ b/xmloff/source/transform/FlatTContext.cxx @@ -20,7 +20,6 @@ #include "FlatTContext.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/FlatTContext.hxx b/xmloff/source/transform/FlatTContext.hxx index 256970de850a..2fd24b408def 100644 --- a/xmloff/source/transform/FlatTContext.hxx +++ b/xmloff/source/transform/FlatTContext.hxx @@ -25,7 +25,7 @@ class XMLPersTextContentTContext : public XMLPersAttrListTContext { - ::rtl::OUString m_aCharacters; + OUString m_aCharacters; public: TYPEINFO(); @@ -35,11 +35,11 @@ public: // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLPersTextContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); // attr list/text content persistence + renaming XMLPersTextContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ); @@ -51,11 +51,11 @@ public: // This method is called for all characters that are contained in the // current element. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void ExportContent(); - const ::rtl::OUString& GetTextContent() const { return m_aCharacters; } + const OUString& GetTextContent() const { return m_aCharacters; } }; #endif // _XMLOFF_FLATTCONTEXT_HXX diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx index 34e68e998590..56430f1df32e 100644 --- a/xmloff/source/transform/FormPropOASISTContext.cxx +++ b/xmloff/source/transform/FormPropOASISTContext.cxx @@ -26,7 +26,6 @@ #include "TransformerBase.hxx" #include "FormPropOASISTContext.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; diff --git a/xmloff/source/transform/FormPropOASISTContext.hxx b/xmloff/source/transform/FormPropOASISTContext.hxx index 898442d5a706..1dc4e7d02c40 100644 --- a/xmloff/source/transform/FormPropOASISTContext.hxx +++ b/xmloff/source/transform/FormPropOASISTContext.hxx @@ -28,13 +28,13 @@ class XMLFormPropOASISTransformerContext : sal_Bool m_bIsList; sal_Bool m_bIsListValue; - ::xmloff::token::XMLTokenEnum GetValueType( const ::rtl::OUString& rValue ); + ::xmloff::token::XMLTokenEnum GetValueType( const OUString& rValue ); public: TYPEINFO(); XMLFormPropOASISTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, ::xmloff::token::XMLTokenEnum eLocalName ); virtual ~XMLFormPropOASISTransformerContext(); diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx index 61f65494f501..2547fad99cfe 100644 --- a/xmloff/source/transform/FormPropOOoTContext.cxx +++ b/xmloff/source/transform/FormPropOOoTContext.cxx @@ -27,7 +27,6 @@ #include "TransformerBase.hxx" #include "FormPropOOoTContext.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; @@ -35,7 +34,7 @@ using namespace ::xmloff::token; class XMLFormPropValueTContext_Impl : public XMLTransformerContext { OUString m_aAttrQName; - ::rtl::OUString m_aCharacters; + OUString m_aCharacters; sal_Bool m_bPersistent; sal_Bool m_bIsVoid; @@ -56,19 +55,19 @@ public: virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual sal_Bool IsPersistent() const; sal_Bool IsVoid() const { return m_bIsVoid; } - const ::rtl::OUString& GetTextContent() const { return m_aCharacters; } + const OUString& GetTextContent() const { return m_aCharacters; } }; TYPEINIT1( XMLFormPropValueTContext_Impl, XMLTransformerContext ); XMLFormPropValueTContext_Impl::XMLFormPropValueTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ) : + const OUString& rQName ) : XMLTransformerContext( rTransformer, rQName ), m_bPersistent( sal_True ), m_bIsVoid( sal_False ) @@ -77,7 +76,7 @@ XMLFormPropValueTContext_Impl::XMLFormPropValueTContext_Impl( XMLFormPropValueTContext_Impl::XMLFormPropValueTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nAttrPrefix, XMLTokenEnum eAttrToken ) : XMLTransformerContext( rTransformer, rQName ), diff --git a/xmloff/source/transform/FormPropOOoTContext.hxx b/xmloff/source/transform/FormPropOOoTContext.hxx index 9b02cac4af84..e8c6f21f6f3a 100644 --- a/xmloff/source/transform/FormPropOOoTContext.hxx +++ b/xmloff/source/transform/FormPropOOoTContext.hxx @@ -32,7 +32,7 @@ class XMLFormPropOOoTransformerContext : public XMLTransformerContext ::rtl::Reference< XMLFormPropValueTContext_Impl > m_xValueContext; - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; sal_Int16 m_nValueTypeAttr; @@ -45,13 +45,13 @@ public: TYPEINFO(); XMLFormPropOOoTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLFormPropOOoTransformerContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/transform/FrameOASISTContext.cxx b/xmloff/source/transform/FrameOASISTContext.cxx index b0e8baaebbe7..20a825b82982 100644 --- a/xmloff/source/transform/FrameOASISTContext.cxx +++ b/xmloff/source/transform/FrameOASISTContext.cxx @@ -26,7 +26,6 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/FrameOASISTContext.hxx b/xmloff/source/transform/FrameOASISTContext.hxx index 31e7c60d6918..6128eb6e0072 100644 --- a/xmloff/source/transform/FrameOASISTContext.hxx +++ b/xmloff/source/transform/FrameOASISTContext.hxx @@ -27,12 +27,12 @@ class XMLFrameOASISTransformerContext : public XMLTransformerContext ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; bool m_bIgnoreElement; sal_Bool IsLinkedEmbeddedObject( - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rAttrList ); @@ -40,20 +40,20 @@ public: TYPEINFO(); XMLFrameOASISTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLFrameOASISTransformerContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif // _XMLOFF_FRAMEOASISTCONTEXT_HXX diff --git a/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx index ddb67c49d399..6e84be6533df 100644 --- a/xmloff/source/transform/FrameOOoTContext.cxx +++ b/xmloff/source/transform/FrameOOoTContext.cxx @@ -28,7 +28,6 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; diff --git a/xmloff/source/transform/FrameOOoTContext.hxx b/xmloff/source/transform/FrameOOoTContext.hxx index 0ce53074b8f5..6169cd313033 100644 --- a/xmloff/source/transform/FrameOOoTContext.hxx +++ b/xmloff/source/transform/FrameOOoTContext.hxx @@ -24,26 +24,26 @@ class XMLFrameOOoTransformerContext : public XMLPersElemContentTContext { - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; public: TYPEINFO(); XMLFrameOOoTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLFrameOOoTransformerContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual sal_Bool IsPersistent() const; }; diff --git a/xmloff/source/transform/IgnoreTContext.cxx b/xmloff/source/transform/IgnoreTContext.cxx index 2378ece7788e..75eae9cc1763 100644 --- a/xmloff/source/transform/IgnoreTContext.cxx +++ b/xmloff/source/transform/IgnoreTContext.cxx @@ -20,7 +20,6 @@ #include "IgnoreTContext.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -41,7 +40,7 @@ XMLIgnoreTransformerContext::XMLIgnoreTransformerContext( XMLIgnoreTransformerContext::XMLIgnoreTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bAllowCharactersRecursive ) : XMLTransformerContext( rTransformer, rQName ), m_bIgnoreCharacters( sal_False ), diff --git a/xmloff/source/transform/IgnoreTContext.hxx b/xmloff/source/transform/IgnoreTContext.hxx index 17630bfe999c..b5053a21beeb 100644 --- a/xmloff/source/transform/IgnoreTContext.hxx +++ b/xmloff/source/transform/IgnoreTContext.hxx @@ -38,7 +38,7 @@ public: // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLIgnoreTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bIgnoreCharacters, sal_Bool bIgnoreElements ); // A contexts constructor does anything that is required if an element @@ -46,7 +46,7 @@ public: // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLIgnoreTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bAllowCharactersRecursive ); // A contexts destructor does anything that is required if an element @@ -58,8 +58,8 @@ public: // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); // StartElement is called after a context has been constructed and @@ -74,7 +74,7 @@ public: // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif // _XMLOFF_IGNORETCONTEXT_HXX diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index 50330339b2c9..cbe26744ce26 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -26,7 +26,6 @@ #include "IgnoreTContext.hxx" #include "xmloff/xmlnmspe.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; @@ -37,15 +36,15 @@ public: TYPEINFO(); XMLParagraphTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLParagraphTransformerContext(); // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); // StartElement is called after a context has been constructed and @@ -60,7 +59,7 @@ public: // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; TYPEINIT1( XMLParagraphTransformerContext, XMLTransformerContext ); @@ -112,19 +111,19 @@ public: XMLPersTextContentRNGTransformTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ); virtual ~XMLPersTextContentRNGTransformTContext(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; TYPEINIT1( XMLPersTextContentRNGTransformTContext, XMLPersAttrListTContext ); XMLPersTextContentRNGTransformTContext::XMLPersTextContentRNGTransformTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ) : XMLPersTextContentTContext( @@ -134,7 +133,7 @@ XMLPersTextContentRNGTransformTContext::XMLPersTextContentRNGTransformTContext( XMLPersTextContentRNGTransformTContext::~XMLPersTextContentRNGTransformTContext() {} -void XMLPersTextContentRNGTransformTContext::Characters( const ::rtl::OUString& rChars ) +void XMLPersTextContentRNGTransformTContext::Characters( const OUString& rChars ) { OUString aConvChars( rChars ); GetTransformer().ConvertRNGDateTimeToISO( aConvChars ); diff --git a/xmloff/source/transform/MergeElemTContext.hxx b/xmloff/source/transform/MergeElemTContext.hxx index e276b9931601..557795c569ca 100644 --- a/xmloff/source/transform/MergeElemTContext.hxx +++ b/xmloff/source/transform/MergeElemTContext.hxx @@ -41,21 +41,21 @@ public: TYPEINFO(); XMLMergeElemTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nActionMap ); virtual ~XMLMergeElemTransformerContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif // _XMLOFF_MERGEELEMCONTEXT_HXX diff --git a/xmloff/source/transform/MetaTContext.cxx b/xmloff/source/transform/MetaTContext.cxx index 3a3f9c748bd8..b64e61d9a35f 100644 --- a/xmloff/source/transform/MetaTContext.cxx +++ b/xmloff/source/transform/MetaTContext.cxx @@ -29,7 +29,6 @@ #include "MutableAttrList.hxx" #include "MetaTContext.hxx" -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx index ada6e60dab37..3fbf4b5854bc 100644 --- a/xmloff/source/transform/MetaTContext.hxx +++ b/xmloff/source/transform/MetaTContext.hxx @@ -26,7 +26,7 @@ #include "FlatTContext.hxx" -typedef ::std::multimap< ::rtl::OUString, +typedef ::std::multimap< OUString, ::rtl::Reference< XMLPersTextContentTContext >, ::comphelper::UStringLess > XMLMetaContexts_Impl; @@ -43,7 +43,7 @@ public: // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLMetaTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); // A contexts destructor does anything that is required if an element // ends. By default, nothing is done. @@ -54,8 +54,8 @@ public: // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); // EndElement is called before a context will be destructed, but @@ -65,7 +65,7 @@ public: // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif // _XMLOFF_METATCONTEXT_HXX diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx index 084f9e106903..22607ee99650 100644 --- a/xmloff/source/transform/MutableAttrList.cxx +++ b/xmloff/source/transform/MutableAttrList.cxx @@ -25,7 +25,6 @@ #include <comphelper/servicehelper.hxx> #include "MutableAttrList.hxx" -using ::rtl::OUString; using namespace ::osl; using namespace ::com::sun::star::uno; @@ -139,7 +138,7 @@ Reference< XCloneable > XMLMutableAttributeList::createClone() } void XMLMutableAttributeList::SetValueByIndex( sal_Int16 i, - const ::rtl::OUString& rValue ) + const OUString& rValue ) { GetMutableAttrList()->SetValueByIndex( i, rValue ); } diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx index 41d83af42561..921cd2ba8f87 100644 --- a/xmloff/source/transform/MutableAttrList.hxx +++ b/xmloff/source/transform/MutableAttrList.hxx @@ -54,24 +54,24 @@ public: // ::com::sun::star::xml::sax::XAttributeList virtual sal_Int16 SAL_CALL getLength(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::util::XCloneable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw( ::com::sun::star::uno::RuntimeException ); // methods that are not contained in any interface - void SetValueByIndex( sal_Int16 i, const ::rtl::OUString& rValue ); - void AddAttribute( const ::rtl::OUString &sName , const ::rtl::OUString &sValue ); + void SetValueByIndex( sal_Int16 i, const OUString& rValue ); + void AddAttribute( const OUString &sName , const OUString &sValue ); // void Clear(); void RemoveAttributeByIndex( sal_Int16 i ); - void RenameAttributeByIndex( sal_Int16 i, const ::rtl::OUString& rNewName ); + void RenameAttributeByIndex( sal_Int16 i, const OUString& rNewName ); void AppendAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & ); - sal_Int16 GetIndexByName( const ::rtl::OUString& rName ) const; + sal_Int16 GetIndexByName( const OUString& rName ) const; }; diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx index ade3370c2f6a..19b52c6c5628 100644 --- a/xmloff/source/transform/NotesTContext.cxx +++ b/xmloff/source/transform/NotesTContext.cxx @@ -35,7 +35,6 @@ #include "NotesTContext.hxx" -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/NotesTContext.hxx b/xmloff/source/transform/NotesTContext.hxx index efd2354157c2..4666e824a433 100644 --- a/xmloff/source/transform/NotesTContext.hxx +++ b/xmloff/source/transform/NotesTContext.hxx @@ -32,15 +32,15 @@ public: TYPEINFO(); XMLNotesTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, ::xmloff::token::XMLTokenEnum m_eToken, sal_Bool bPersistent ); virtual ~XMLNotesTransformerContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index fc351f51fdd6..b4ac5caf2f9c 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -39,7 +39,6 @@ #include "TransformerActions.hxx" #include "OOo2Oasis.hxx" -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -1087,16 +1086,16 @@ static XMLTokenEnum aTokenMap[] = class XMLDocumentTransformerContext_Impl : public XMLTransformerContext { - ::rtl::OUString m_aElemQName; - ::rtl::OUString m_aOldClass; + OUString m_aElemQName; + OUString m_aOldClass; public: TYPEINFO(); XMLDocumentTransformerContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); XMLDocumentTransformerContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ); @@ -1245,7 +1244,7 @@ public: TYPEINFO(); XMLBodyTransformerContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLBodyTransformerContext_Impl(); @@ -1309,7 +1308,7 @@ public: TYPEINFO(); XMLTabStopOOoTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLTabStopOOoTContext_Impl(); @@ -1412,7 +1411,7 @@ public: TYPEINFO(); XMLTrackedChangesOOoTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, XMLTokenEnum eToken ); @@ -1484,13 +1483,13 @@ void XMLTrackedChangesOOoTContext_Impl::StartElement( class XMLTableOOoTransformerContext_Impl : public XMLTransformerContext { - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; public: TYPEINFO(); XMLTableOOoTransformerContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLTableOOoTransformerContext_Impl(); diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx index cfcc58cdfa3b..224e67b3881b 100644 --- a/xmloff/source/transform/OOo2Oasis.hxx +++ b/xmloff/source/transform/OOo2Oasis.hxx @@ -32,8 +32,8 @@ class OOo2OasisTransformer : public ::com::sun::star::document::XImporter, public ::com::sun::star::document::XFilter { - ::rtl::OUString m_aImplName; - ::rtl::OUString m_aSubServiceName; + OUString m_aImplName; + OUString m_aSubServiceName; XMLTransformerActions *m_aActions[MAX_OOO_ACTIONS]; XMLTransformerOOoEventMap_Impl *m_pEventMap; @@ -41,7 +41,7 @@ protected: virtual XMLTransformerContext *CreateUserDefinedContext( const TransformerAction_Impl& rAction, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bPersistent=sal_False ); virtual XMLTransformerActions *GetUserDefinedActions( sal_uInt16 n ); @@ -74,9 +74,9 @@ public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -97,7 +97,7 @@ public: virtual void SAL_CALL startDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString GetEventName( const ::rtl::OUString& rName, + virtual OUString GetEventName( const OUString& rName, sal_Bool bForm = sal_False ); }; diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index ea698e99588a..80edd1b0d5f2 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -43,8 +43,6 @@ #include <comphelper/servicehelper.hxx> #include "Oasis2OOo.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::osl; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; @@ -1150,13 +1148,13 @@ static XMLTokenEnum aTokenMap[] = class XMLTableTransformerContext_Impl : public XMLTransformerContext { - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; public: TYPEINFO(); XMLTableTransformerContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLTableTransformerContext_Impl(); @@ -1260,15 +1258,15 @@ public: TYPEINFO(); XMLBodyOASISTransformerContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLBodyOASISTransformerContext_Impl(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); }; @@ -1293,8 +1291,8 @@ void XMLBodyOASISTransformerContext_Impl::StartElement( } XMLTransformerContext* XMLBodyOASISTransformerContext_Impl::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) { if (!m_bFirstChild) @@ -1322,7 +1320,7 @@ public: TYPEINFO(); XMLTabStopOASISTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLTabStopOASISTContext_Impl(); @@ -1449,7 +1447,7 @@ void XMLTabStopOASISTContext_Impl::StartElement( class XMLConfigItemTContext_Impl : public XMLTransformerContext { - ::rtl::OUString m_aContent; + OUString m_aContent; sal_Bool m_bIsRedlineProtectionKey; sal_Bool m_bIsCursorX; sal_Bool m_bIsCursorY; @@ -1459,14 +1457,14 @@ public: TYPEINFO(); XMLConfigItemTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLConfigItemTContext_Impl(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; TYPEINIT1( XMLConfigItemTContext_Impl, XMLTransformerContext ); @@ -1521,9 +1519,9 @@ void XMLConfigItemTContext_Impl::StartElement( XMLTransformerContext::StartElement( xAttrList ); } -void XMLConfigItemTContext_Impl::Characters( const ::rtl::OUString& rChars ) +void XMLConfigItemTContext_Impl::Characters( const OUString& rChars ) { - rtl::OUString sChars(rChars); + OUString sChars(rChars); if (m_bIsRedlineProtectionKey) m_aContent += rChars; else if (m_bIsCursorX || m_bIsCursorY) @@ -1534,7 +1532,7 @@ void XMLConfigItemTContext_Impl::Characters( const ::rtl::OUString& rChars ) else if (m_bIsCursorY && nPos > 31999) nPos = 31999; - sChars = ::rtl::OUString::valueOf(nPos); + sChars = OUString::valueOf(nPos); } XMLTransformerContext::Characters( sChars ); @@ -1569,14 +1567,14 @@ void XMLConfigItemTContext_Impl::EndElement() class XMLTrackedChangesOASISTContext_Impl : public XMLTransformerContext { - ::rtl::OUString m_aAttrQName; + OUString m_aAttrQName; public: TYPEINFO(); XMLTrackedChangesOASISTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, XMLTokenEnum eToken ); diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx index c2e903edb99a..cb8b4e74a2e1 100644 --- a/xmloff/source/transform/Oasis2OOo.hxx +++ b/xmloff/source/transform/Oasis2OOo.hxx @@ -35,7 +35,7 @@ protected: virtual XMLTransformerContext *CreateUserDefinedContext( const TransformerAction_Impl& rAction, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bPersistent=sal_False ); virtual XMLTransformerActions *GetUserDefinedActions( sal_uInt16 n ); @@ -47,14 +47,14 @@ public: static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString GetEventName( const ::rtl::OUString& rName, + virtual OUString GetEventName( const OUString& rName, sal_Bool bForm ); }; diff --git a/xmloff/source/transform/PersAttrListTContext.cxx b/xmloff/source/transform/PersAttrListTContext.cxx index 702a8017afc6..14abd51cdc33 100644 --- a/xmloff/source/transform/PersAttrListTContext.cxx +++ b/xmloff/source/transform/PersAttrListTContext.cxx @@ -24,7 +24,6 @@ #include <xmloff/nmspmap.hxx> #include "PersAttrListTContext.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; @@ -44,7 +43,7 @@ void XMLPersAttrListTContext::AddAttribute( void XMLPersAttrListTContext::AddAttribute( sal_uInt16 nAPrefix, ::xmloff::token::XMLTokenEnum eAToken, - const ::rtl::OUString & rValue ) + const OUString & rValue ) { OUString aAttrQName( GetTransformer().GetNamespaceMap().GetQNameByKey( nAPrefix, ::xmloff::token::GetXMLToken( eAToken ) ) ); diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx index 5ff1e83e81c5..346c1bf7d284 100644 --- a/xmloff/source/transform/PersAttrListTContext.hxx +++ b/xmloff/source/transform/PersAttrListTContext.hxx @@ -29,12 +29,12 @@ class XMLPersAttrListTContext : public XMLTransformerContext ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; sal_uInt16 m_nActionMap; protected: - void SetExportQName( const ::rtl::OUString& r ) { m_aElemQName = r; } + void SetExportQName( const OUString& r ) { m_aElemQName = r; } public: TYPEINFO(); @@ -44,22 +44,22 @@ public: // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLPersAttrListTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); // attr list persistence + attribute processing XMLPersAttrListTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nActionMap ); // attr list persistence + renaming XMLPersAttrListTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ); // attr list persistence + renaming + attribute processing XMLPersAttrListTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nActionMap ); @@ -73,8 +73,8 @@ public: // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); // StartElement is called after a context has been constructed and @@ -89,13 +89,13 @@ public: // This method is called for all characters that are contained in the // current element. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual sal_Bool IsPersistent() const; virtual void Export(); virtual void ExportContent(); - const ::rtl::OUString& GetExportQName() const { return m_aElemQName; } + const OUString& GetExportQName() const { return m_aElemQName; } void AddAttribute( sal_uInt16 nAPrefix, ::xmloff::token::XMLTokenEnum eAToken, @@ -103,7 +103,7 @@ public: void AddAttribute( sal_uInt16 nAPrefix, ::xmloff::token::XMLTokenEnum eAToken, - const ::rtl::OUString & rValue ); + const OUString & rValue ); ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx index 0e83032b2060..7d20c02be1b1 100644 --- a/xmloff/source/transform/PersMixedContentTContext.cxx +++ b/xmloff/source/transform/PersMixedContentTContext.cxx @@ -21,33 +21,32 @@ #include "TransformerBase.hxx" #include "PersMixedContentTContext.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; //------------------------------------------------------------------------------ class XMLPersTextTContext_Impl : public XMLTransformerContext { - ::rtl::OUString m_aCharacters; + OUString m_aCharacters; public: TYPEINFO(); XMLPersTextTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rChars ); + const OUString& rChars ); virtual ~XMLPersTextTContext_Impl(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual sal_Bool IsPersistent() const; virtual void Export(); - const ::rtl::OUString& GetText() const { return m_aCharacters; } + const OUString& GetText() const { return m_aCharacters; } }; TYPEINIT1( XMLPersTextTContext_Impl, XMLTransformerContext ); diff --git a/xmloff/source/transform/PersMixedContentTContext.hxx b/xmloff/source/transform/PersMixedContentTContext.hxx index 48f5cd91372a..f0564fb4ea67 100644 --- a/xmloff/source/transform/PersMixedContentTContext.hxx +++ b/xmloff/source/transform/PersMixedContentTContext.hxx @@ -32,27 +32,27 @@ public: // mixed content persistence only XMLPersMixedContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); // mixed content persistence + attribute processing XMLPersMixedContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nActionMap ); // mixed content persistence + renaming XMLPersMixedContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ); // mixed content persistence + renaming + attribute processing XMLPersMixedContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nActionMap ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual ~XMLPersMixedContentTContext(); }; diff --git a/xmloff/source/transform/ProcAddAttrTContext.cxx b/xmloff/source/transform/ProcAddAttrTContext.cxx index 8bfb9e0cd8c8..0c7f4fc70478 100644 --- a/xmloff/source/transform/ProcAddAttrTContext.cxx +++ b/xmloff/source/transform/ProcAddAttrTContext.cxx @@ -22,7 +22,6 @@ #include "TransformerBase.hxx" #include <xmloff/nmspmap.hxx> -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/ProcAddAttrTContext.hxx b/xmloff/source/transform/ProcAddAttrTContext.hxx index c49043187ce6..cda05fe5e825 100644 --- a/xmloff/source/transform/ProcAddAttrTContext.hxx +++ b/xmloff/source/transform/ProcAddAttrTContext.hxx @@ -24,14 +24,14 @@ class XMLProcAddAttrTransformerContext : public XMLProcAttrTransformerContext { - ::rtl::OUString m_aAttrQName; - ::rtl::OUString m_aAttrValue; + OUString m_aAttrQName; + OUString m_aAttrValue; public: TYPEINFO(); XMLProcAddAttrTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nActionMap, diff --git a/xmloff/source/transform/ProcAttrTContext.cxx b/xmloff/source/transform/ProcAttrTContext.cxx index 0bf6adc41e54..4fc4de96f4b1 100644 --- a/xmloff/source/transform/ProcAttrTContext.cxx +++ b/xmloff/source/transform/ProcAttrTContext.cxx @@ -23,7 +23,6 @@ #include "TransformerActions.hxx" #include <xmloff/nmspmap.hxx> -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/ProcAttrTContext.hxx b/xmloff/source/transform/ProcAttrTContext.hxx index 214221f4200a..aa57ac1e2468 100644 --- a/xmloff/source/transform/ProcAttrTContext.hxx +++ b/xmloff/source/transform/ProcAttrTContext.hxx @@ -25,23 +25,23 @@ class XMLProcAttrTransformerContext : public XMLTransformerContext { - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; sal_uInt16 m_nActionMap; protected: - const ::rtl::OUString& GetElemQName() const { return m_aElemQName; } + const OUString& GetElemQName() const { return m_aElemQName; } sal_uInt16 GetActionMap() const { return m_nActionMap; } public: TYPEINFO(); XMLProcAttrTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nActionMap ); XMLProcAttrTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nActionMap ); diff --git a/xmloff/source/transform/RenameElemTContext.cxx b/xmloff/source/transform/RenameElemTContext.cxx index 3cc491efe96c..1b7544462694 100644 --- a/xmloff/source/transform/RenameElemTContext.cxx +++ b/xmloff/source/transform/RenameElemTContext.cxx @@ -22,7 +22,6 @@ #include "TransformerBase.hxx" #include <xmloff/nmspmap.hxx> -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/RenameElemTContext.hxx b/xmloff/source/transform/RenameElemTContext.hxx index 673acb8d4ba5..b33a018110dc 100644 --- a/xmloff/source/transform/RenameElemTContext.hxx +++ b/xmloff/source/transform/RenameElemTContext.hxx @@ -26,9 +26,9 @@ class XMLRenameElemTransformerContext : public XMLTransformerContext { - ::rtl::OUString m_aElemQName; - ::rtl::OUString m_aAttrQName; - ::rtl::OUString m_aAttrValue; + OUString m_aElemQName; + OUString m_aAttrQName; + OUString m_aAttrValue; public: TYPEINFO(); @@ -36,7 +36,7 @@ public: // The following consutructor renames the element names "rQName" // to bPrefix/eToken XMLRenameElemTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ); @@ -44,7 +44,7 @@ public: // to bPrefix/eToken and adds an attribute nAPrefix/eAToken that has // the value eVToken. XMLRenameElemTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nAPrefix, diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index fb05750b6e72..badf7df3af6d 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -37,7 +37,6 @@ #include "StyleOASISTContext.hxx" #include <xmloff/xmluconv.hxx> -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -70,11 +69,11 @@ class XMLPropertiesTContext_Impl : public XMLPersElemContentTContext XMLPropType m_ePropType; sal_Bool m_bControlStyle; - ::rtl::OUString m_aStyleFamily; + OUString m_aStyleFamily; public: - void SetQNameAndPropType( const ::rtl::OUString& rQName, + void SetQNameAndPropType( const OUString& rQName, XMLPropType ePropType ) { m_ePropType = ePropType; @@ -84,9 +83,9 @@ public: TYPEINFO(); XMLPropertiesTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, XMLPropType eP, - const ::rtl::OUString& rStyleFamily, + const OUString& rStyleFamily, sal_Bool _bControlStyle = sal_False ); virtual ~XMLPropertiesTContext_Impl(); @@ -108,7 +107,7 @@ TYPEINIT1( XMLPropertiesTContext_Impl, XMLPersElemContentTContext ); XMLPropertiesTContext_Impl::XMLPropertiesTContext_Impl( XMLTransformerBase& rImp, const OUString& rQName, XMLPropType eP, - const ::rtl::OUString& rStyleFamily, sal_Bool _bControlStyle ) : + const OUString& rStyleFamily, sal_Bool _bControlStyle ) : XMLPersElemContentTContext( rImp, rQName, XML_NAMESPACE_STYLE, XML_PROPERTIES), m_ePropType( eP ), @@ -465,7 +464,7 @@ void XMLPropertiesTContext_Impl::StartElement( if( nValue ) { nValue *= 100; - rtl::OUStringBuffer aOut; + OUStringBuffer aOut; ::sax::Converter::convertPercent(aOut, nValue); aAttrValue = aOut.makeStringAndClear(); } @@ -506,7 +505,7 @@ void XMLPropertiesTContext_Impl::StartElement( { if ( !aNewAttrValue.isEmpty() ) { - aNewAttrValue += rtl::OUString(" " ); + aNewAttrValue += OUString(" " ); } if ( IsXMLToken( aToken, XML_HORIZONTAL_ON_EVEN ) ) @@ -552,7 +551,7 @@ void XMLPropertiesTContext_Impl::StartElement( } nValue = 100 - nValue; - rtl::OUStringBuffer aOut; + OUStringBuffer aOut; ::sax::Converter::convertPercent(aOut, nValue); pAttrList->AddAttribute( rAttrName, aOut.makeStringAndClear() ); } @@ -587,7 +586,7 @@ void XMLPropertiesTContext_Impl::StartElement( if( nIntervalMinorDivisor != 0) fIntervalMinor = fIntervalMajor / static_cast< double >( nIntervalMinorDivisor ); - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; ::sax::Converter::convertDouble( aBuf, fIntervalMinor ); pAttrList->AddAttribute( GetTransformer().GetNamespaceMap().GetQNameByKey( diff --git a/xmloff/source/transform/StyleOASISTContext.hxx b/xmloff/source/transform/StyleOASISTContext.hxx index aba09c3c0e58..a037c58655ac 100644 --- a/xmloff/source/transform/StyleOASISTContext.hxx +++ b/xmloff/source/transform/StyleOASISTContext.hxx @@ -33,15 +33,15 @@ class XMLStyleOASISTContext : public XMLPersElemContentTContext sal_Bool m_bPersistent; sal_Bool m_bControlStyle; - ::rtl::OUString m_aStyleFamily; + OUString m_aStyleFamily; public: TYPEINFO(); XMLStyleOASISTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bPersistent=sal_False ); XMLStyleOASISTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_Bool bPersistent=sal_False ); @@ -49,13 +49,13 @@ public: virtual ~XMLStyleOASISTContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void ExportContent(); diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index 5f5930c44964..5432f85e5d61 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -42,7 +42,6 @@ #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -155,15 +154,15 @@ public: TYPEINFO(); XMLTypedPropertiesOOoTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLTypedPropertiesOOoTContext_Impl(); using XMLPersAttrListTContext::AddAttribute; - void AddAttribute( const ::rtl::OUString &sName , - const ::rtl::OUString &sValue ); + void AddAttribute( const OUString &sName , + const OUString &sValue ); void AddAttribute( sal_uInt16 nPrefix, XMLTokenEnum eToken, - const ::rtl::OUString &sValue ); + const OUString &sValue ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rAttrList ); @@ -185,8 +184,8 @@ XMLTypedPropertiesOOoTContext_Impl::~XMLTypedPropertiesOOoTContext_Impl() } void XMLTypedPropertiesOOoTContext_Impl::AddAttribute( - const ::rtl::OUString &sName , - const ::rtl::OUString &sValue ) + const OUString &sName , + const OUString &sValue ) { static_cast< XMLMutableAttributeList * >( m_xAttrList.get() ) ->AddAttribute( sName, sValue ); @@ -194,7 +193,7 @@ void XMLTypedPropertiesOOoTContext_Impl::AddAttribute( void XMLTypedPropertiesOOoTContext_Impl::AddAttribute( sal_uInt16 nPrefix, XMLTokenEnum eToken, - const ::rtl::OUString &sValue ) + const OUString &sValue ) { OUString sName( GetTransformer().GetNamespaceMap().GetQNameByKey( @@ -246,7 +245,7 @@ public: TYPEINFO(); XMLPropertiesOOoTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, XMLPropTypes& rTypes, sal_Bool bPersistent ); @@ -262,7 +261,7 @@ public: virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void Export(); @@ -344,20 +343,20 @@ XMLTypedPropertiesOOoTContext_Impl XML_PROP_TYPE_END==m_aPropTypes[1] || (i<MAX_PROP_TYPES && XML_PROP_TYPE_END!=m_aPropTypes[i]) ) ) { - ::rtl::OString aTmp("Didnt't find property: "); - const ::rtl::OUString& rPrefix = + OString aTmp("Didnt't find property: "); + const OUString& rPrefix = GetTransformer().GetNamespaceMap().GetPrefixByKey( nPrefix ); - aTmp += ::rtl::OString( rPrefix.getStr(), rPrefix.getLength(), + aTmp += OString( rPrefix.getStr(), rPrefix.getLength(), RTL_TEXTENCODING_ASCII_US ); - aTmp += ::rtl::OString::valueOf( ':' ); - aTmp += ::rtl::OString( rLocalName.getStr(), rLocalName.getLength(), + aTmp += OString::valueOf( ':' ); + aTmp += OString( rLocalName.getStr(), rLocalName.getLength(), RTL_TEXTENCODING_ASCII_US ); - aTmp += ::rtl::OString(", assuming <style:"); - const ::rtl::OUString& rName = + aTmp += OString(", assuming <style:"); + const OUString& rName = ::xmloff::token::GetXMLToken( aPropTokens[m_aPropTypes[0]] ); - aTmp += ::rtl::OString( rName.getStr(), rName.getLength(), + aTmp += OString( rName.getStr(), rName.getLength(), RTL_TEXTENCODING_ASCII_US ); - aTmp += ::rtl::OString::valueOf( '>' ); + aTmp += OString::valueOf( '>' ); OSL_FAIL(aTmp.getStr()); } @@ -875,7 +874,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( if( nValue ) { nValue /= 100; - rtl::OUStringBuffer aOut; + OUStringBuffer aOut; ::sax::Converter::convertPercent( aOut, nValue ); aAttrValue = aOut.makeStringAndClear(); } @@ -919,7 +918,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( { if ( !aStyleMirrorAttrValue.isEmpty() ) { - aStyleMirrorAttrValue += rtl::OUString(" " ); + aStyleMirrorAttrValue += OUString(" " ); } if ( IsXMLToken( aToken, XML_HORIZONTAL_ON_LEFT_PAGES ) ) @@ -944,7 +943,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( double fValue = sAttrValue.toDouble(); sal_Int32 nValue = (sal_Int32)((fValue * 100.0) + ( fValue > 0 ? 0.5 : - 0.5 ) ); - rtl::OUStringBuffer aOut; + OUStringBuffer aOut; ::sax::Converter::convertPercent( aOut, nValue ); OUString aAttrValue( aOut.makeStringAndClear() ); pContext->AddAttribute( sAttrName, aAttrValue ); @@ -963,7 +962,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( } nValue = 100 - nValue; - rtl::OUStringBuffer aOut; + OUStringBuffer aOut; ::sax::Converter::convertPercent( aOut, nValue ); pContext->AddAttribute( sAttrName, aOut.makeStringAndClear() ); } @@ -1021,7 +1020,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( sal_Int32 nIntervalMinorDivisor = static_cast< sal_Int32 >( ::rtl::math::round( fIntervalMajor / fIntervalMinor )); - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; ::sax::Converter::convertNumber( aBuf, nIntervalMinorDivisor ); pIntervalMinorDivisorContext->AddAttribute( GetTransformer().GetNamespaceMap().GetQNameByKey( diff --git a/xmloff/source/transform/StyleOOoTContext.hxx b/xmloff/source/transform/StyleOOoTContext.hxx index 4bad415410bb..351cc03166fa 100644 --- a/xmloff/source/transform/StyleOOoTContext.hxx +++ b/xmloff/source/transform/StyleOOoTContext.hxx @@ -37,11 +37,11 @@ public: TYPEINFO(); XMLStyleOOoTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, XMLFamilyType eType, sal_Bool bPersistent ); XMLStyleOOoTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, XMLFamilyType eType, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, @@ -50,13 +50,13 @@ public: virtual ~XMLStyleOOoTContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual sal_Bool IsPersistent() const; static XMLTransformerActions *CreateTransformerActions( sal_uInt16 nType ); diff --git a/xmloff/source/transform/TransformerActions.cxx b/xmloff/source/transform/TransformerActions.cxx index 2f065a11aafd..a89424af8695 100644 --- a/xmloff/source/transform/TransformerActions.cxx +++ b/xmloff/source/transform/TransformerActions.cxx @@ -20,7 +20,6 @@ #include "TransformerActions.hxx" -using ::rtl::OUString; using namespace ::osl; using namespace ::xmloff::token; diff --git a/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx index d8d876e8f279..03d272325d0a 100644 --- a/xmloff/source/transform/TransformerActions.hxx +++ b/xmloff/source/transform/TransformerActions.hxx @@ -30,7 +30,7 @@ struct NameKey_Impl { sal_uInt16 m_nPrefix; - ::rtl::OUString m_aLocalName; + OUString m_aLocalName; inline NameKey_Impl( sal_uInt16 nPrfx, ::xmloff::token::XMLTokenEnum eLclNm ) : @@ -39,7 +39,7 @@ struct NameKey_Impl { } - inline NameKey_Impl( sal_uInt16 nPrfx, const ::rtl::OUString& rLclNm ) : + inline NameKey_Impl( sal_uInt16 nPrfx, const OUString& rLclNm ) : m_nPrefix( nPrfx ), m_aLocalName( rLclNm ) { diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 00665efdeda2..5619a0d24da9 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -41,8 +41,6 @@ #include "TransformerBase.hxx" #include "TContextVector.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::osl; using namespace ::xmloff::token; using namespace ::com::sun::star; @@ -602,7 +600,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( ? ((nMeasure*127+36)/72) : ((nMeasure*127-36)/72) ); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertMeasure(aBuffer, nMeasure, util::MeasureUnit::MM_100TH, nDestUnit ); @@ -1235,14 +1233,14 @@ sal_Bool XMLTransformerBase::NegPercent( OUString& rValue ) return bRet; } -sal_Bool XMLTransformerBase::AddNamespacePrefix( ::rtl::OUString& rName, +sal_Bool XMLTransformerBase::AddNamespacePrefix( OUString& rName, sal_uInt16 nPrefix ) const { rName = GetNamespaceMap().GetQNameByKey( nPrefix, rName, sal_False ); return sal_True; } -sal_Bool XMLTransformerBase::RemoveNamespacePrefix( ::rtl::OUString& rName, +sal_Bool XMLTransformerBase::RemoveNamespacePrefix( OUString& rName, sal_uInt16 nPrefixOnly ) const { OUString aLocalName; @@ -1256,7 +1254,7 @@ sal_Bool XMLTransformerBase::RemoveNamespacePrefix( ::rtl::OUString& rName, return bRet; } -sal_Bool XMLTransformerBase::ConvertURIToOASIS( ::rtl::OUString& rURI, +sal_Bool XMLTransformerBase::ConvertURIToOASIS( OUString& rURI, sal_Bool bSupportPackage ) const { sal_Bool bRet = sal_False; @@ -1326,7 +1324,7 @@ sal_Bool XMLTransformerBase::ConvertURIToOASIS( ::rtl::OUString& rURI, return bRet; } -sal_Bool XMLTransformerBase::ConvertURIToOOo( ::rtl::OUString& rURI, +sal_Bool XMLTransformerBase::ConvertURIToOOo( OUString& rURI, sal_Bool bSupportPackage ) const { sal_Bool bRet = sal_False; @@ -1405,7 +1403,7 @@ sal_Bool XMLTransformerBase::RenameAttributeValue( } // static -bool XMLTransformerBase::ConvertRNGDateTimeToISO( ::rtl::OUString& rDateTime ) +bool XMLTransformerBase::ConvertRNGDateTimeToISO( OUString& rDateTime ) { if( !rDateTime.isEmpty() && rDateTime.indexOf( sal_Unicode('.')) != -1 ) diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx index a3f8b23f37fe..d8de75a1fb0f 100644 --- a/xmloff/source/transform/TransformerBase.hxx +++ b/xmloff/source/transform/TransformerBase.hxx @@ -59,8 +59,8 @@ class XMLTransformerBase : public XMLTransformer ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > xCharClass; - ::rtl::OUString m_aExtPathPrefix; - ::rtl::OUString m_aClass; + OUString m_aExtPathPrefix; + OUString m_aClass; SvXMLNamespaceMap *m_pNamespaceMap; SvXMLNamespaceMap *m_pReplaceNamespaceMap; @@ -74,8 +74,8 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. XMLTransformerContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName ); + const OUString& rLocalName, + const OUString& rQName ); // this method may return an empty reference when the transformer service // was created outside the xmloff environment. @@ -92,17 +92,17 @@ public: throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL startElement(const ::rtl::OUString& aName, + virtual void SAL_CALL startElement(const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL endElement(const ::rtl::OUString& aName) + virtual void SAL_CALL endElement(const OUString& aName) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL characters(const ::rtl::OUString& aChars) + virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL ignorableWhitespace(const ::rtl::OUString& aWhitespaces) + virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL processingInstruction(const ::rtl::OUString& aTarget, - const ::rtl::OUString& aData) + virtual void SAL_CALL processingInstruction(const OUString& aTarget, + const OUString& aData) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -110,11 +110,11 @@ public: // ::com::sun::star::xml::sax::XExtendedDocumentHandler virtual void SAL_CALL startCDATA(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endCDATA(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL comment(const ::rtl::OUString& sComment) + virtual void SAL_CALL comment(const OUString& sComment) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL allowLineBreak(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL unknown(const ::rtl::OUString& sString) + virtual void SAL_CALL unknown(const OUString& sString) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); // XInitialization @@ -134,9 +134,9 @@ public: virtual XMLTransformerActions *GetUserDefinedActions( sal_uInt16 n ); virtual XMLTransformerContext *CreateUserDefinedContext( const TransformerAction_Impl& rAction, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bPersistent=sal_False ) = 0; - virtual ::rtl::OUString GetEventName( const ::rtl::OUString& rName, + virtual OUString GetEventName( const OUString& rName, sal_Bool bForm = sal_False ) = 0; @@ -144,30 +144,30 @@ public: ::com::sun::star::xml::sax::XAttributeList >& rAttrList, sal_uInt16 nActionMap, sal_Bool bClone ); - static sal_Bool ReplaceSingleInchWithIn( ::rtl::OUString& rValue ); - static sal_Bool ReplaceSingleInWithInch( ::rtl::OUString& rValue ); - static sal_Bool ReplaceInchWithIn( ::rtl::OUString& rValue ); - static sal_Bool ReplaceInWithInch( ::rtl::OUString& rValue ); + static sal_Bool ReplaceSingleInchWithIn( OUString& rValue ); + static sal_Bool ReplaceSingleInWithInch( OUString& rValue ); + static sal_Bool ReplaceInchWithIn( OUString& rValue ); + static sal_Bool ReplaceInWithInch( OUString& rValue ); - sal_Bool EncodeStyleName( ::rtl::OUString& rName ) const; - static sal_Bool DecodeStyleName( ::rtl::OUString& rName ); - static sal_Bool NegPercent( ::rtl::OUString& rValue ); + sal_Bool EncodeStyleName( OUString& rName ) const; + static sal_Bool DecodeStyleName( OUString& rName ); + static sal_Bool NegPercent( OUString& rValue ); - sal_Bool AddNamespacePrefix( ::rtl::OUString& rName, + sal_Bool AddNamespacePrefix( OUString& rName, sal_uInt16 nPrefix ) const; - sal_Bool RemoveNamespacePrefix( ::rtl::OUString& rName, + sal_Bool RemoveNamespacePrefix( OUString& rName, sal_uInt16 nPrefixOnly=0xffffU ) const; - sal_Bool ConvertURIToOASIS( ::rtl::OUString& rURI, + sal_Bool ConvertURIToOASIS( OUString& rURI, sal_Bool bSupportPackage=sal_False ) const; - sal_Bool ConvertURIToOOo( ::rtl::OUString& rURI, + sal_Bool ConvertURIToOOo( OUString& rURI, sal_Bool bSupportPackage=sal_False ) const; /** renames the given rOutAttributeValue if one of the parameters contains a matching token in its lower 16 bits. The value is converted to the token that is given in the upper 16 bits of the matching parameter. */ - sal_Bool RenameAttributeValue( ::rtl::OUString& rOutAttributeValue, + sal_Bool RenameAttributeValue( OUString& rOutAttributeValue, sal_Int32 nParam1, sal_Int32 nParam2, sal_Int32 nParam3 ); @@ -180,16 +180,16 @@ public: was found. @return <TRUE/> if the given string was changed */ - static bool ConvertRNGDateTimeToISO( ::rtl::OUString& rDateTime ); + static bool ConvertRNGDateTimeToISO( OUString& rDateTime ); - ::xmloff::token::XMLTokenEnum GetToken( const ::rtl::OUString& rStr ) const; + ::xmloff::token::XMLTokenEnum GetToken( const OUString& rStr ) const; const XMLTransformerContext *GetCurrentContext() const; const XMLTransformerContext *GetAncestorContext( sal_uInt32 i ) const; // C++ - inline void SetClass( const ::rtl::OUString& r ) { m_aClass = r; } - inline const ::rtl::OUString& GetClass() const { return m_aClass; } + inline void SetClass( const OUString& r ) { m_aClass = r; } + inline const OUString& GetClass() const { return m_aClass; } bool isWriter() const; diff --git a/xmloff/source/transform/TransformerContext.cxx b/xmloff/source/transform/TransformerContext.cxx index b511ecec2778..a193c65d500d 100644 --- a/xmloff/source/transform/TransformerContext.cxx +++ b/xmloff/source/transform/TransformerContext.cxx @@ -27,7 +27,6 @@ #include "TransformerContext.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/TransformerContext.hxx b/xmloff/source/transform/TransformerContext.hxx index c05c6bb9d7ad..a5eb385ee912 100644 --- a/xmloff/source/transform/TransformerContext.hxx +++ b/xmloff/source/transform/TransformerContext.hxx @@ -36,7 +36,7 @@ class XMLTransformerContext : public ::salhelper::SimpleReferenceObject XMLTransformerBase& m_rTransformer; - ::rtl::OUString m_aQName; + OUString m_aQName; SvXMLNamespaceMap *m_pRewindMap; @@ -48,12 +48,12 @@ protected: XMLTransformerBase& GetTransformer() { return m_rTransformer; } const XMLTransformerBase& GetTransformer() const { return m_rTransformer; } - void SetQName( const ::rtl::OUString& rQName ) { m_aQName = rQName; } + void SetQName( const OUString& rQName ) { m_aQName = rQName; } public: TYPEINFO(); - const ::rtl::OUString& GetQName() const { return m_aQName; } + const OUString& GetQName() const { return m_aQName; } sal_Bool HasQName( sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ) const; sal_Bool HasNamespace( sal_uInt16 nPrefix ) const; @@ -63,7 +63,7 @@ public: // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); // A contexts destructor does anything that is required if an element // ends. By default, nothing is done. @@ -74,8 +74,8 @@ public: // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); // StartElement is called after a context has been constructed and @@ -90,7 +90,7 @@ public: // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); // Is the current context a persistent one (i.e. one that saves is content // rather than exporting it directly? diff --git a/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx index 02b65d9112df..d69373e17962 100644 --- a/xmloff/source/transform/TransformerTokenMap.hxx +++ b/xmloff/source/transform/TransformerTokenMap.hxx @@ -29,8 +29,8 @@ class XMLTransformerTokenMap : - public ::boost::unordered_map< ::rtl::OUString, ::xmloff::token::XMLTokenEnum, - ::rtl::OUStringHash, ::comphelper::UStringEqual > + public ::boost::unordered_map< OUString, ::xmloff::token::XMLTokenEnum, + OUStringHash, ::comphelper::UStringEqual > { public: XMLTransformerTokenMap( ::xmloff::token::XMLTokenEnum *pInit ); diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx index 95c3ddec2c4c..6bd93ff06249 100644 --- a/xmloff/source/transform/XMLFilterRegistration.cxx +++ b/xmloff/source/transform/XMLFilterRegistration.cxx @@ -25,8 +25,8 @@ using namespace ::com::sun::star; #define DECLARE_SERVICE( classname ) \ - extern ::rtl::OUString SAL_CALL classname##_getImplementationName() throw(); \ - extern uno::Sequence< ::rtl::OUString > SAL_CALL classname##_getSupportedServiceNames() throw(); \ + extern OUString SAL_CALL classname##_getImplementationName() throw(); \ + extern uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw(); \ extern uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance( \ const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); @@ -70,8 +70,8 @@ DECLARE_SERVICE( XMLImpressImportOOO ) // ---------------------------------------------------------------------------- namespace { - typedef ::rtl::OUString (SAL_CALL * GetImplementationName)(); - typedef uno::Sequence< ::rtl::OUString > (SAL_CALL * GetSupportedServiceNames)(); + typedef OUString (SAL_CALL * GetImplementationName)(); + typedef uno::Sequence< OUString > (SAL_CALL * GetSupportedServiceNames)(); typedef uno::Reference< ::uno::XInterface > (SAL_CALL * CreateInstance)( const uno::Reference< lang::XMultiServiceFactory >& ); |