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 | |
| 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')
649 files changed, 4445 insertions, 4882 deletions
diff --git a/xmloff/inc/AttributeContainerHandler.hxx b/xmloff/inc/AttributeContainerHandler.hxx index acd276dba74b..f8aef32d5a79 100644 --- a/xmloff/inc/AttributeContainerHandler.hxx +++ b/xmloff/inc/AttributeContainerHandler.hxx @@ -32,8 +32,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_ATTRIBUTECONTAINERHANDLER_HXX diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx index 8d473c104cb8..5ec4ed355359 100644 --- a/xmloff/inc/DomBuilderContext.hxx +++ b/xmloff/inc/DomBuilderContext.hxx @@ -54,12 +54,12 @@ public: /** default constructor: create new DOM tree */ DomBuilderContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); /** constructor: create DOM subtree under the given node */ DomBuilderContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode>& ); virtual ~DomBuilderContext(); @@ -79,7 +79,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( @@ -87,7 +87,7 @@ public: virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif diff --git a/xmloff/inc/EnhancedCustomShapeToken.hxx b/xmloff/inc/EnhancedCustomShapeToken.hxx index 42d95abca597..573bd917e993 100644 --- a/xmloff/inc/EnhancedCustomShapeToken.hxx +++ b/xmloff/inc/EnhancedCustomShapeToken.hxx @@ -152,8 +152,8 @@ namespace xmloff { namespace EnhancedCustomShapeToken { EAS_NotFound }; - EnhancedCustomShapeTokenEnum EASGet( const rtl::OUString& ); - rtl::OUString EASGet( const EnhancedCustomShapeTokenEnum ); + EnhancedCustomShapeTokenEnum EASGet( const OUString& ); + OUString EASGet( const EnhancedCustomShapeTokenEnum ); } } diff --git a/xmloff/inc/MetaExportComponent.hxx b/xmloff/inc/MetaExportComponent.hxx index 2d4881a0f01e..f9cd2af67982 100644 --- a/xmloff/inc/MetaExportComponent.hxx +++ b/xmloff/inc/MetaExportComponent.hxx @@ -56,11 +56,11 @@ protected: // global functions to support the component -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL +::com::sun::star::uno::Sequence< OUString > SAL_CALL XMLMetaExportComponent_getSupportedServiceNames() throw(); -::rtl::OUString SAL_CALL XMLMetaExportComponent_getImplementationName() +OUString SAL_CALL XMLMetaExportComponent_getImplementationName() throw(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL diff --git a/xmloff/inc/MetaImportComponent.hxx b/xmloff/inc/MetaImportComponent.hxx index 27568e9cf19f..42b53aed3fe5 100644 --- a/xmloff/inc/MetaImportComponent.hxx +++ b/xmloff/inc/MetaImportComponent.hxx @@ -46,7 +46,7 @@ protected: virtual SvXMLImportContext* CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -58,11 +58,11 @@ protected: // global functions to support the component -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL +::com::sun::star::uno::Sequence< OUString > SAL_CALL XMLMetaImportComponent_getSupportedServiceNames() throw(); -::rtl::OUString SAL_CALL XMLMetaImportComponent_getImplementationName() +OUString SAL_CALL XMLMetaImportComponent_getImplementationName() throw(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx index b1f115aa48e1..452ff19939a1 100644 --- a/xmloff/inc/MultiPropertySetHelper.hxx +++ b/xmloff/inc/MultiPropertySetHelper.hxx @@ -55,14 +55,14 @@ namespace com { namespace sun { namespace star { class MultiPropertySetHelper { /// names of all properties - ::rtl::OUString* pPropertyNames; + OUString* pPropertyNames; /// length of pPropertyNames array sal_Int16 nLength; /// the sequence of property names that the current (multi) /// property set implementation supports - ::com::sun::star::uno::Sequence< ::rtl::OUString > aPropertySequence; + ::com::sun::star::uno::Sequence< OUString > aPropertySequence; /// an array of indices that maps from pPropertyNames indices to /// aPropertySequence indices diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx index e22f48db789f..7cfc6142a93b 100644 --- a/xmloff/inc/PageMasterImportContext.hxx +++ b/xmloff/inc/PageMasterImportContext.hxx @@ -25,19 +25,19 @@ class PageStyleContext : public XMLPropStyleContext { - ::rtl::OUString sPageUsage; + OUString sPageUsage; protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); PageStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_Bool bDefaultStyle=sal_False); @@ -45,7 +45,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void FillPropertySet( diff --git a/xmloff/inc/RDFaExportHelper.hxx b/xmloff/inc/RDFaExportHelper.hxx index 1ba599433269..2dd144089e78 100644 --- a/xmloff/inc/RDFaExportHelper.hxx +++ b/xmloff/inc/RDFaExportHelper.hxx @@ -45,14 +45,14 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XDocumentRepository> m_xRepository; - typedef ::std::map< ::rtl::OUString, ::rtl::OUString > + typedef ::std::map< OUString, OUString > BlankNodeMap_t; BlankNodeMap_t m_BlankNodeMap; long m_Counter; - ::rtl::OUString + OUString LookupBlankNode( ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XBlankNode> const & i_xBlankNode); diff --git a/xmloff/inc/RDFaImportHelper.hxx b/xmloff/inc/RDFaImportHelper.hxx index 3ebd96a5edb0..6d710aa97fe3 100644 --- a/xmloff/inc/RDFaImportHelper.hxx +++ b/xmloff/inc/RDFaImportHelper.hxx @@ -25,9 +25,7 @@ #include <boost/shared_ptr.hpp> #include <com/sun/star/uno/Reference.h> - - -namespace rtl { class OUString; } +#include <rtl/ustring.hxx> namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } @@ -62,10 +60,10 @@ public: /** Parse RDFa attributes */ ::boost::shared_ptr<ParsedRDFaAttributes> ParseRDFa( - ::rtl::OUString const & i_rAbout, - ::rtl::OUString const & i_rProperty, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype); + OUString const & i_rAbout, + OUString const & i_rProperty, + OUString const & i_rContent, + OUString const & i_rDatatype); /** Add a RDFa statement; must have been parsed with ParseRDFa */ void AddRDFa( @@ -77,10 +75,10 @@ public: void ParseAndAddRDFa( ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable> const & i_xObject, - ::rtl::OUString const & i_rAbout, - ::rtl::OUString const & i_rProperty, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype); + OUString const & i_rAbout, + OUString const & i_rProperty, + OUString const & i_rContent, + OUString const & i_rDatatype); /** Insert all added statements into the RDF repository. <p> This is done <em>after</em> the input file has been read, diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx index 46f63c9aa5af..a585eecb46f9 100644 --- a/xmloff/inc/SchXMLExport.hxx +++ b/xmloff/inc/SchXMLExport.hxx @@ -62,7 +62,7 @@ public: UniReference< XMLPropertySetMapper > GetPropertySetMapper() const; // XServiceInfo ( : SvXMLExport ) - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); }; #endif // SCH_XMLEXPORT_HXX_ diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx index ad9efe967d27..d1e7b85dc159 100644 --- a/xmloff/inc/SchXMLImport.hxx +++ b/xmloff/inc/SchXMLImport.hxx @@ -159,7 +159,7 @@ private: protected: virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); public: @@ -171,9 +171,9 @@ public: virtual ~SchXMLImport() throw (); // XServiceInfo ( : SvXMLExport ) - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - SvXMLImportContext* CreateStylesContext( const ::rtl::OUString& rLocalName, + SvXMLImportContext* CreateStylesContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); // XImporter diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx index 5195c5ce155d..f71b530a45f6 100644 --- a/xmloff/inc/StyleMap.hxx +++ b/xmloff/inc/StyleMap.hxx @@ -27,10 +27,10 @@ struct StyleNameKey_Impl { sal_uInt16 m_nFamily; - ::rtl::OUString m_aName; + OUString m_aName; inline StyleNameKey_Impl( sal_uInt16 nFamily, - const ::rtl::OUString& rName ) : + const OUString& rName ) : m_nFamily( nFamily ), m_aName( rName ) { @@ -64,7 +64,7 @@ inline bool StyleNameHash_Impl::operator()( class StyleMap : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XUnoTunnel>, - public ::boost::unordered_map< StyleNameKey_Impl, ::rtl::OUString, + public ::boost::unordered_map< StyleNameKey_Impl, OUString, StyleNameHash_Impl, StyleNameHash_Impl > { diff --git a/xmloff/inc/TransGradientStyle.hxx b/xmloff/inc/TransGradientStyle.hxx index 075e81f31ce8..f991cc83089b 100644 --- a/xmloff/inc/TransGradientStyle.hxx +++ b/xmloff/inc/TransGradientStyle.hxx @@ -22,6 +22,7 @@ #include <sal/types.h> +#include <rtl/ustring.hxx> class SvXMLImport; class SvXMLExport; @@ -30,7 +31,6 @@ namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } namespace uno { class Any; } } } } -namespace rtl { class OUString; } class XMLTransGradientStyleImport @@ -45,7 +45,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, - ::rtl::OUString& rStrName ); + OUString& rStrName ); }; class XMLTransGradientStyleExport @@ -56,7 +56,7 @@ public: XMLTransGradientStyleExport( SvXMLExport& rExport ); ~XMLTransGradientStyleExport(); - sal_Bool exportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); + sal_Bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); }; #endif // _XMLOFF_TRANSGRADIENTSTYLE_HXX diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx index b391632805cc..1f84f6520ed0 100644 --- a/xmloff/inc/XMLBackgroundImageContext.hxx +++ b/xmloff/inc/XMLBackgroundImageContext.hxx @@ -34,8 +34,8 @@ class XMLBackgroundImageContext : public XMLElementPropertyContext XMLPropertyState aTransparencyProp; ::com::sun::star::style::GraphicLocation ePos; - ::rtl::OUString sURL; - ::rtl::OUString sFilter; + OUString sURL; + OUString sFilter; sal_Int8 nTransparency; ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xBase64Stream; @@ -51,7 +51,7 @@ public: XMLBackgroundImageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const XMLPropertyState& rProp, @@ -63,7 +63,7 @@ public: virtual ~XMLBackgroundImageContext(); SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); diff --git a/xmloff/inc/XMLBackgroundImageExport.hxx b/xmloff/inc/XMLBackgroundImageExport.hxx index a87393a1b893..583d17c50a64 100644 --- a/xmloff/inc/XMLBackgroundImageExport.hxx +++ b/xmloff/inc/XMLBackgroundImageExport.hxx @@ -47,7 +47,7 @@ public: const ::com::sun::star::uno::Any *pFilter, const ::com::sun::star::uno::Any *pTransparency, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); }; diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx index 09013db7f19c..795b8d15d58c 100644 --- a/xmloff/inc/XMLBasicExportFilter.hxx +++ b/xmloff/inc/XMLBasicExportFilter.hxx @@ -46,16 +46,16 @@ public: throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endDocument() 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); diff --git a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx index 03fa669af6a7..afed18063218 100644 --- a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx +++ b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx @@ -40,13 +40,13 @@ public: /// Imports the given value in cas of the given XML-data-type virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; /// Exports the given value in cas of the given XML-data-type virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx index 6ab3a0f8a518..a42281ebbff5 100644 --- a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx +++ b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx @@ -32,8 +32,8 @@ struct SvXMLEnumMapEntry; class XMLBitmapRepeatOffsetPropertyHandler: public XMLPropertyHandler { sal_Bool mbX; - ::rtl::OUString msVertical; - ::rtl::OUString msHorizontal; + OUString msVertical; + OUString msHorizontal; public: XMLBitmapRepeatOffsetPropertyHandler( sal_Bool bX ); @@ -43,13 +43,13 @@ public: /// Imports the given value in cas of the given XML-data-type virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; /// Exports the given value in cas of the given XML-data-type virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx index 1735ef9a7d4d..c6805ac32e68 100644 --- a/xmloff/inc/XMLChartPropertySetMapper.hxx +++ b/xmloff/inc/XMLChartPropertySetMapper.hxx @@ -57,8 +57,8 @@ public: class XMLChartExportPropertyMapper : public SvXMLExportPropertyMapper { private: - const rtl::OUString msTrue; - const rtl::OUString msFalse; + const OUString msTrue; + const OUString msFalse; bool mbAdaptPercentage; SvXMLExport& mrExport; @@ -107,7 +107,7 @@ public: virtual bool handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const; diff --git a/xmloff/inc/XMLChartStyleContext.hxx b/xmloff/inc/XMLChartStyleContext.hxx index 2d8897547b39..3caac13fd6c0 100644 --- a/xmloff/inc/XMLChartStyleContext.hxx +++ b/xmloff/inc/XMLChartStyleContext.hxx @@ -24,22 +24,22 @@ class XMLChartStyleContext : public XMLShapeStyleContext { private: - ::rtl::OUString msDataStyleName; - ::rtl::OUString msPercentageDataStyleName; + OUString msDataStyleName; + OUString msPercentageDataStyleName; SvXMLStylesContext& mrStyles; protected: /// is called when an attribute at the (auto)style element is found virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); XMLChartStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily ); virtual ~XMLChartStyleContext(); @@ -52,7 +52,7 @@ public: /// necessary for property context (element-property symbol-image) virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; diff --git a/xmloff/inc/XMLClipPropertyHandler.hxx b/xmloff/inc/XMLClipPropertyHandler.hxx index d37c3f6235f6..2df7f08bd596 100644 --- a/xmloff/inc/XMLClipPropertyHandler.hxx +++ b/xmloff/inc/XMLClipPropertyHandler.hxx @@ -33,8 +33,8 @@ public: virtual ~XMLClipPropertyHandler(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_BASICTYPES_HXX diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx index 67cf2e4c5fad..a9472c7bfbfa 100644 --- a/xmloff/inc/XMLElementPropertyContext.hxx +++ b/xmloff/inc/XMLElementPropertyContext.hxx @@ -46,7 +46,7 @@ public: TYPEINFO(); XMLElementPropertyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ); diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx index 39cac6b56a5f..4c3d08b6df43 100644 --- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx +++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx @@ -33,33 +33,33 @@ class XMLEmbeddedObjectImportContext : public SvXMLImportContext ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp; - ::rtl::OUString sFilterService; + OUString sFilterService; // #100592# - ::rtl::OUString sCLSID; + OUString sCLSID; public: TYPEINFO(); - const ::rtl::OUString& GetFilterServiceName() const { return sFilterService; } + const OUString& GetFilterServiceName() const { return sFilterService; } // #100592# - const ::rtl::OUString& GetFilterCLSID() const { return sCLSID; } + const OUString& GetFilterCLSID() const { return sCLSID; } XMLEmbeddedObjectImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLEmbeddedObjectImportContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, 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 ); sal_Bool SetComponent( ::com::sun::star::uno::Reference< diff --git a/xmloff/inc/XMLEventImportHelper.hxx b/xmloff/inc/XMLEventImportHelper.hxx index 871b496867ca..5d5455fa5195 100644 --- a/xmloff/inc/XMLEventImportHelper.hxx +++ b/xmloff/inc/XMLEventImportHelper.hxx @@ -35,8 +35,8 @@ class XMLEventContextFactory; class XMLEventsImportContext; struct XMLEventNameTranslation; -typedef ::std::map< ::rtl::OUString, XMLEventContextFactory* > FactoryMap; -typedef ::std::map< XMLEventName, ::rtl::OUString > NameMap; +typedef ::std::map< OUString, XMLEventContextFactory* > FactoryMap; +typedef ::std::map< XMLEventName, OUString > NameMap; typedef ::std::list< NameMap* > NameMapList; @@ -70,7 +70,7 @@ public: ~XMLEventImportHelper(); /// register a handler for a particular language type - void RegisterFactory( const ::rtl::OUString& rLanguage, + void RegisterFactory( const OUString& rLanguage, XMLEventContextFactory* aFactory ); /// add event name translation to the internal table @@ -86,12 +86,12 @@ public: SvXMLImportContext* CreateContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList, XMLEventsImportContext* rEvents, - const ::rtl::OUString& rXmlEventName, - const ::rtl::OUString& rLanguage); + const OUString& rXmlEventName, + const OUString& rLanguage); }; diff --git a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx index e058a04d7b84..6f562179434e 100644 --- a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx +++ b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx @@ -40,13 +40,13 @@ public: /// Imports the given value in cas of the given XML-data-type virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; /// Exports the given value in cas of the given XML-data-type virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx index 4058a8d66343..d99441edabdc 100644 --- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx +++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx @@ -33,29 +33,29 @@ class SvXMLImport; /// import footnote and endnote configuration elements class XMLFootnoteConfigurationImportContext : public SvXMLStyleContext { - const ::rtl::OUString sPropertyAnchorCharStyleName; - const ::rtl::OUString sPropertyCharStyleName; - const ::rtl::OUString sPropertyNumberingType; - const ::rtl::OUString sPropertyPageStyleName; - const ::rtl::OUString sPropertyParagraphStyleName; - const ::rtl::OUString sPropertyPrefix; - const ::rtl::OUString sPropertyStartAt; - const ::rtl::OUString sPropertySuffix; - const ::rtl::OUString sPropertyPositionEndOfDoc; - const ::rtl::OUString sPropertyFootnoteCounting; - const ::rtl::OUString sPropertyEndNotice; - const ::rtl::OUString sPropertyBeginNotice; - - ::rtl::OUString sCitationStyle; - ::rtl::OUString sAnchorStyle; - ::rtl::OUString sDefaultStyle; - ::rtl::OUString sPageStyle; - ::rtl::OUString sPrefix; - ::rtl::OUString sSuffix; - ::rtl::OUString sNumFormat; - ::rtl::OUString sNumSync; - ::rtl::OUString sBeginNotice; - ::rtl::OUString sEndNotice; + const OUString sPropertyAnchorCharStyleName; + const OUString sPropertyCharStyleName; + const OUString sPropertyNumberingType; + const OUString sPropertyPageStyleName; + const OUString sPropertyParagraphStyleName; + const OUString sPropertyPrefix; + const OUString sPropertyStartAt; + const OUString sPropertySuffix; + const OUString sPropertyPositionEndOfDoc; + const OUString sPropertyFootnoteCounting; + const OUString sPropertyEndNotice; + const OUString sPropertyBeginNotice; + + OUString sCitationStyle; + OUString sAnchorStyle; + OUString sDefaultStyle; + OUString sPageStyle; + OUString sPrefix; + OUString sSuffix; + OUString sNumFormat; + OUString sNumSync; + OUString sBeginNotice; + OUString sEndNotice; SvXMLTokenMap* pAttrTokenMap; @@ -71,7 +71,7 @@ public: XMLFootnoteConfigurationImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList); @@ -85,7 +85,7 @@ public: /// for footnotes, also parse begin and end notices virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); @@ -104,10 +104,10 @@ public: ::com::sun::star::beans::XPropertySet> & rConfig); /// for helper class: set begin notice - void SetBeginNotice( ::rtl::OUString sText); + void SetBeginNotice( OUString sText); /// for helper class: set end notice - void SetEndNotice( ::rtl::OUString sText); + void SetEndNotice( OUString sText); }; #endif diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx index 9e5a84f6f9fa..ffacc723f735 100644 --- a/xmloff/inc/XMLImageMapContext.hxx +++ b/xmloff/inc/XMLImageMapContext.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { class XMLImageMapContext : public SvXMLImportContext { - const ::rtl::OUString sImageMap; + const OUString sImageMap; /// the image map to be imported ::com::sun::star::uno::Reference< @@ -50,7 +50,7 @@ public: XMLImageMapContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropertySet); @@ -58,7 +58,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/inc/XMLImageMapExport.hxx b/xmloff/inc/XMLImageMapExport.hxx index 5c7fa58f0eba..ceb132bbb731 100644 --- a/xmloff/inc/XMLImageMapExport.hxx +++ b/xmloff/inc/XMLImageMapExport.hxx @@ -35,17 +35,17 @@ class SvXMLExport; */ class XMLImageMapExport { - const ::rtl::OUString msBoundary; - const ::rtl::OUString msCenter; - const ::rtl::OUString msDescription; - const ::rtl::OUString msImageMap; - const ::rtl::OUString msIsActive; - const ::rtl::OUString msName; - const ::rtl::OUString msPolygon; - const ::rtl::OUString msRadius; - const ::rtl::OUString msTarget; - const ::rtl::OUString msURL; - const ::rtl::OUString msTitle; + const OUString msBoundary; + const OUString msCenter; + const OUString msDescription; + const OUString msImageMap; + const OUString msIsActive; + const OUString msName; + const OUString msPolygon; + const OUString msRadius; + const OUString msTarget; + const OUString msURL; + const OUString msTitle; SvXMLExport& mrExport; diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx index f3b732694c24..2c6e67110dc7 100644 --- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx +++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx @@ -42,20 +42,20 @@ namespace com { namespace sun { namespace star { */ class XMLIndexBibliographyConfigurationContext : public SvXMLStyleContext { - const ::rtl::OUString sFieldMaster_Bibliography; - const ::rtl::OUString sBracketBefore; - const ::rtl::OUString sBracketAfter; - const ::rtl::OUString sIsNumberEntries; - const ::rtl::OUString sIsSortByPosition; - const ::rtl::OUString sSortKeys; - const ::rtl::OUString sSortKey; - const ::rtl::OUString sIsSortAscending; - const ::rtl::OUString sSortAlgorithm; - const ::rtl::OUString sLocale; - - ::rtl::OUString sSuffix; - ::rtl::OUString sPrefix; - ::rtl::OUString sAlgorithm; + const OUString sFieldMaster_Bibliography; + const OUString sBracketBefore; + const OUString sBracketAfter; + const OUString sIsNumberEntries; + const OUString sIsSortByPosition; + const OUString sSortKeys; + const OUString sSortKey; + const OUString sIsSortAscending; + const OUString sSortAlgorithm; + const OUString sLocale; + + OUString sSuffix; + OUString sPrefix; + OUString sAlgorithm; ::com::sun::star::lang::Locale aLocale; sal_Bool bNumberedEntries; sal_Bool bSortByPosition; @@ -70,7 +70,7 @@ public: XMLIndexBibliographyConfigurationContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList); @@ -86,14 +86,14 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); void ProcessAttribute( sal_uInt16 nPrefix, - const ::rtl::OUString sLocalName, - const ::rtl::OUString sValue); + const OUString sLocalName, + const OUString sValue); }; #endif diff --git a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx index cb6609408d68..e2691960595b 100644 --- a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx +++ b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx @@ -32,11 +32,11 @@ public: virtual ~XMLIsPercentagePropertyHandler (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx index c9fed5d134e9..ae3e6dd17016 100644 --- a/xmloff/inc/XMLLineNumberingImportContext.hxx +++ b/xmloff/inc/XMLLineNumberingImportContext.hxx @@ -50,22 +50,22 @@ enum LineNumberingToken /** import <text:linenumbering-configuration> elements */ class XMLLineNumberingImportContext : public SvXMLStyleContext { - const ::rtl::OUString sCharStyleName; - const ::rtl::OUString sCountEmptyLines; - const ::rtl::OUString sCountLinesInFrames; - const ::rtl::OUString sDistance; - const ::rtl::OUString sInterval; - const ::rtl::OUString sSeparatorText; - const ::rtl::OUString sNumberPosition; - const ::rtl::OUString sNumberingType; - const ::rtl::OUString sIsOn; - const ::rtl::OUString sRestartAtEachPage; - const ::rtl::OUString sSeparatorInterval; - - ::rtl::OUString sStyleName; - ::rtl::OUString sNumFormat; - ::rtl::OUString sNumLetterSync; - ::rtl::OUString sSeparator; + const OUString sCharStyleName; + const OUString sCountEmptyLines; + const OUString sCountLinesInFrames; + const OUString sDistance; + const OUString sInterval; + const OUString sSeparatorText; + const OUString sNumberPosition; + const OUString sNumberingType; + const OUString sIsOn; + const OUString sRestartAtEachPage; + const OUString sSeparatorInterval; + + OUString sStyleName; + OUString sNumFormat; + OUString sNumLetterSync; + OUString sSeparator; sal_Int32 nOffset; sal_Int16 nNumberPosition; sal_Int16 nIncrement; @@ -82,14 +82,14 @@ public: XMLLineNumberingImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList); ~XMLLineNumberingImportContext(); // to be used by child context: set separator info - void SetSeparatorText(const ::rtl::OUString& sText); + void SetSeparatorText(const OUString& sText); void SetSeparatorIncrement(sal_Int16 nIncr); protected: @@ -100,19 +100,19 @@ protected: void ProcessAttribute( enum LineNumberingToken eToken, - ::rtl::OUString sValue); + OUString sValue); virtual void CreateAndInsert(sal_Bool bOverwrite); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); void ProcessAttribute( - const ::rtl::OUString sLocalName, - const ::rtl::OUString sValue); + const OUString sLocalName, + const OUString sValue); }; #endif diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx index 2e39d1752448..afc000e6b4a3 100644 --- a/xmloff/inc/XMLNumberStylesImport.hxx +++ b/xmloff/inc/XMLNumberStylesImport.hxx @@ -44,14 +44,14 @@ private: bool compareStyle( const SdXMLFixedDataStyle* pStyle, sal_Int16& nIndex ) const; protected: - void add( rtl::OUString& rNumberStyle, sal_Bool bLong, sal_Bool bTextual, sal_Bool bDecimal02, rtl::OUString& rText ); + void add( OUString& rNumberStyle, sal_Bool bLong, sal_Bool bTextual, sal_Bool bDecimal02, OUString& rText ); public: TYPEINFO(); SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles); @@ -59,7 +59,7 @@ public: virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); sal_Int32 GetDrawKey() const { return mnKey; } diff --git a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx index 687754d2268f..a7f94b43ac87 100644 --- a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx +++ b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx @@ -34,11 +34,11 @@ public: virtual ~XMLPercentOrMeasurePropertyHandler (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/XMLRectangleMembersHandler.hxx b/xmloff/inc/XMLRectangleMembersHandler.hxx index f175f0521ff8..8c1be6c4c439 100644 --- a/xmloff/inc/XMLRectangleMembersHandler.hxx +++ b/xmloff/inc/XMLRectangleMembersHandler.hxx @@ -42,13 +42,13 @@ public: /// Imports the given value in cas of the given XML-data-type virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; /// Exports the given value in cas of the given XML-data-type virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx index cb1508b10ddd..419693d7784d 100644 --- a/xmloff/inc/XMLReplacementImageContext.hxx +++ b/xmloff/inc/XMLReplacementImageContext.hxx @@ -35,8 +35,8 @@ class XMLReplacementImageContext : public SvXMLImportContext ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > m_xPropSet; - ::rtl::OUString m_sHRef; - const ::rtl::OUString m_sGraphicURL; + OUString m_sHRef; + const OUString m_sGraphicURL; public: @@ -44,7 +44,7 @@ public: XMLReplacementImageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & rAttrList, const ::com::sun::star::uno::Reference < @@ -54,7 +54,7 @@ public: virtual void EndElement(); SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); diff --git a/xmloff/inc/XMLScriptContextFactory.hxx b/xmloff/inc/XMLScriptContextFactory.hxx index cdefc788f359..15d5668d0b18 100644 --- a/xmloff/inc/XMLScriptContextFactory.hxx +++ b/xmloff/inc/XMLScriptContextFactory.hxx @@ -33,9 +33,9 @@ class XMLEventsImportContext; class XMLScriptContextFactory : public XMLEventContextFactory { - const ::rtl::OUString sEventType; - const ::rtl::OUString sScript; - const ::rtl::OUString sURL; + const OUString sEventType; + const OUString sScript; + const OUString sURL; public: XMLScriptContextFactory(); @@ -44,16 +44,16 @@ public: virtual SvXMLImportContext * CreateContext(SvXMLImport & rImport, /// import context sal_uInt16 nPrefix, /// element: namespace prefix - const ::rtl::OUString & rLocalName, /// element: local name + const OUString & rLocalName, /// element: local name /// attribute list const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList, /// the context for the enclosing <script:events> element XMLEventsImportContext * rEvents, /// the event name (as understood by the API) - const ::rtl::OUString & rApiEventName, + const OUString & rApiEventName, /// the event type name (as registered) - const ::rtl::OUString & rLanguage); + const OUString & rLanguage); }; #endif // _XMLOFF_XMLSCRIPTCONTEXTFACTORY_HXX diff --git a/xmloff/inc/XMLScriptExportHandler.hxx b/xmloff/inc/XMLScriptExportHandler.hxx index a34bcc1d7bdf..e1963e7e83c6 100644 --- a/xmloff/inc/XMLScriptExportHandler.hxx +++ b/xmloff/inc/XMLScriptExportHandler.hxx @@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { class XMLScriptExportHandler : public XMLEventExportHandler { - const ::rtl::OUString sURL; + const OUString sURL; public: XMLScriptExportHandler(); @@ -42,7 +42,7 @@ public: virtual void Export( SvXMLExport& rExport, - const ::rtl::OUString& rEventName, + const OUString& rEventName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rValues, sal_Bool bUseWhitespace); diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx index 35092774cab8..54c28ca372c2 100644 --- a/xmloff/inc/XMLShapePropertySetContext.hxx +++ b/xmloff/inc/XMLShapePropertySetContext.hxx @@ -32,7 +32,7 @@ public: TYPEINFO(); XMLShapePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFam, @@ -45,7 +45,7 @@ public: using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp); diff --git a/xmloff/inc/XMLStarBasicContextFactory.hxx b/xmloff/inc/XMLStarBasicContextFactory.hxx index 31d0a63599fd..d4d6654a647d 100644 --- a/xmloff/inc/XMLStarBasicContextFactory.hxx +++ b/xmloff/inc/XMLStarBasicContextFactory.hxx @@ -34,10 +34,10 @@ class XMLEventsImportContext; class XMLStarBasicContextFactory : public XMLEventContextFactory { - const ::rtl::OUString sEventType; - const ::rtl::OUString sLibrary; - const ::rtl::OUString sMacroName; - const ::rtl::OUString sStarBasic; + const OUString sEventType; + const OUString sLibrary; + const OUString sMacroName; + const OUString sStarBasic; public: XMLStarBasicContextFactory(); @@ -46,15 +46,15 @@ public: virtual SvXMLImportContext* CreateContext( SvXMLImport& rImport, /// import context sal_uInt16 nPrefix, /// element: namespace prefix - const ::rtl::OUString& rLocalName, /// element: local name + const OUString& rLocalName, /// element: local name const ::com::sun::star::uno::Reference< /// attribute list ::com::sun::star::xml::sax::XAttributeList> & xAttrList, /// the context for the enclosing <script:events> element XMLEventsImportContext* rEvents, /// the event name (as understood by the API) - const ::rtl::OUString& rApiEventName, + const OUString& rApiEventName, /// the event type name (as registered) - const ::rtl::OUString& rLanguage); + const OUString& rLanguage); }; #endif diff --git a/xmloff/inc/XMLStarBasicExportHandler.hxx b/xmloff/inc/XMLStarBasicExportHandler.hxx index fae36291fc24..1ba34a9577ab 100644 --- a/xmloff/inc/XMLStarBasicExportHandler.hxx +++ b/xmloff/inc/XMLStarBasicExportHandler.hxx @@ -34,11 +34,11 @@ namespace com { namespace sun { namespace star { class XMLStarBasicExportHandler : public XMLEventExportHandler { - const ::rtl::OUString sStarBasic; - const ::rtl::OUString sLibrary; - const ::rtl::OUString sMacroName; - const ::rtl::OUString sStarOffice; - const ::rtl::OUString sApplication; + const OUString sStarBasic; + const OUString sLibrary; + const OUString sMacroName; + const OUString sStarOffice; + const OUString sApplication; public: XMLStarBasicExportHandler(); @@ -46,7 +46,7 @@ public: virtual void Export( SvXMLExport& rExport, - const ::rtl::OUString& rEventName, + const OUString& rEventName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rValues, sal_Bool bUseWhitespace); diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx index b0d9e1a015bf..d710de80e13e 100644 --- a/xmloff/inc/XMLStringBufferImportContext.hxx +++ b/xmloff/inc/XMLStringBufferImportContext.hxx @@ -32,7 +32,7 @@ */ class XMLStringBufferImportContext : public SvXMLImportContext { - ::rtl::OUStringBuffer& rTextBuffer; + OUStringBuffer& rTextBuffer; public: @@ -41,19 +41,19 @@ public: XMLStringBufferImportContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& sLocalName, - ::rtl::OUStringBuffer& rBuffer); + const OUString& sLocalName, + OUStringBuffer& rBuffer); virtual ~XMLStringBufferImportContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void Characters( - const ::rtl::OUString& rChars ); + const OUString& rChars ); virtual void EndElement(); }; diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx index 46c796cde163..d1c39181ae72 100644 --- a/xmloff/inc/XMLTextColumnsContext.hxx +++ b/xmloff/inc/XMLTextColumnsContext.hxx @@ -30,14 +30,14 @@ class SvXMLTokenMap; class XMLTextColumnsContext :public XMLElementPropertyContext { - const ::rtl::OUString sSeparatorLineIsOn; - const ::rtl::OUString sSeparatorLineWidth; - const ::rtl::OUString sSeparatorLineColor; - const ::rtl::OUString sSeparatorLineRelativeHeight; - const ::rtl::OUString sSeparatorLineVerticalAlignment; - const ::rtl::OUString sIsAutomatic; - const ::rtl::OUString sAutomaticDistance; - const ::rtl::OUString sSeparatorLineStyle; + const OUString sSeparatorLineIsOn; + const OUString sSeparatorLineWidth; + const OUString sSeparatorLineColor; + const OUString sSeparatorLineRelativeHeight; + const OUString sSeparatorLineVerticalAlignment; + const OUString sIsAutomatic; + const OUString sAutomaticDistance; + const OUString sSeparatorLineStyle; XMLTextColumnsArray_Impl *pColumns; @@ -53,7 +53,7 @@ public: XMLTextColumnsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const XMLPropertyState& rProp, @@ -62,7 +62,7 @@ public: virtual ~XMLTextColumnsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); diff --git a/xmloff/inc/XMLTextColumnsExport.hxx b/xmloff/inc/XMLTextColumnsExport.hxx index aabfe82756fb..c931b92298a1 100644 --- a/xmloff/inc/XMLTextColumnsExport.hxx +++ b/xmloff/inc/XMLTextColumnsExport.hxx @@ -27,14 +27,14 @@ class XMLTextColumnsExport { SvXMLExport& rExport; - const ::rtl::OUString sSeparatorLineIsOn; - const ::rtl::OUString sSeparatorLineWidth; - const ::rtl::OUString sSeparatorLineColor; - const ::rtl::OUString sSeparatorLineRelativeHeight; - const ::rtl::OUString sSeparatorLineVerticalAlignment; - const ::rtl::OUString sIsAutomatic; - const ::rtl::OUString sAutomaticDistance; - const ::rtl::OUString sSeparatorLineStyle; + const OUString sSeparatorLineIsOn; + const OUString sSeparatorLineWidth; + const OUString sSeparatorLineColor; + const OUString sSeparatorLineRelativeHeight; + const OUString sSeparatorLineVerticalAlignment; + const OUString sIsAutomatic; + const OUString sAutomaticDistance; + const OUString sSeparatorLineStyle; protected: diff --git a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx index a3caad1e4ddb..6a533e7080fc 100644 --- a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx +++ b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx @@ -36,11 +36,11 @@ public: /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx index 73102fc7d4c2..18a407970cee 100644 --- a/xmloff/inc/XMLTextHeaderFooterContext.hxx +++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx @@ -34,12 +34,12 @@ class XMLTextHeaderFooterContext: public SvXMLImportContext ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > xPropSet; - const ::rtl::OUString sOn; - const ::rtl::OUString sShareContent; - const ::rtl::OUString sShareContentFirst; - const ::rtl::OUString sText; - const ::rtl::OUString sTextFirst; - const ::rtl::OUString sTextLeft; + const OUString sOn; + const OUString sShareContent; + const OUString sShareContentFirst; + const OUString sText; + const OUString sTextFirst; + const OUString sTextLeft; sal_Bool bInsertContent : 1; sal_Bool bLeft : 1; @@ -49,7 +49,7 @@ public: TYPEINFO(); XMLTextHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const ::com::sun::star::uno::Reference < @@ -60,7 +60,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx index 655487b1cd33..eacbea8b3c42 100644 --- a/xmloff/inc/animationimport.hxx +++ b/xmloff/inc/animationimport.hxx @@ -45,14 +45,14 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xParentNode, SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, AnimationsImportHelperImpl* mpImpl = NULL ); virtual ~AnimationNodeContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); static void postProcessRootNode( SvXMLImport& rImport, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPageProps ); diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx index 5b9ed8511e79..2b381700b2e1 100644 --- a/xmloff/inc/animimp.hxx +++ b/xmloff/inc/animimp.hxx @@ -37,11 +37,11 @@ public: XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~XMLAnimationsContext(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/inc/forms/property_handler.hxx b/xmloff/inc/forms/property_handler.hxx index cf423d27c9f2..25c3d4544ea6 100644 --- a/xmloff/inc/forms/property_handler.hxx +++ b/xmloff/inc/forms/property_handler.hxx @@ -44,18 +44,18 @@ namespace xmloff public: /** retrieves the XML attribute value for the given property values */ - virtual ::rtl::OUString + virtual OUString getAttributeValue( const PropertyValues& i_propertyValues ) const = 0; /** is a convenience method for XML attributes whose value comprises of only one UNO API property */ - virtual ::rtl::OUString + virtual OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const = 0; /** retrieves the values of the properties controlled by an XML attributed, described by a given attribute value */ virtual bool - getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const = 0; + getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const = 0; virtual ~IPropertyHandler() { } }; diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx index a83b61ed02cc..2297e94233f5 100644 --- a/xmloff/inc/txtflde.hxx +++ b/xmloff/inc/txtflde.hxx @@ -157,7 +157,7 @@ class XMLTextFieldExport /// store used text field master names (NULL means: don't collect) ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >, - ::std::set< ::rtl::OUString > > * + ::std::set< OUString > > * pUsedMasters; public: @@ -207,7 +207,7 @@ public: static enum ::xmloff::token::XMLTokenEnum MapReferenceSource(sal_Int16 nType); static enum ::xmloff::token::XMLTokenEnum MapReferenceType(sal_Int16 nType); static enum ::xmloff::token::XMLTokenEnum MapCountFieldName(FieldIdEnum nToken); - static enum ::xmloff::token::XMLTokenEnum MapBibliographyFieldName(::rtl::OUString sName); + static enum ::xmloff::token::XMLTokenEnum MapBibliographyFieldName(OUString sName); static enum ::xmloff::token::XMLTokenEnum MapMeasureKind(sal_Int16 nKind); enum ::xmloff::token::XMLTokenEnum MapPageNumberName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xPropSet, @@ -239,14 +239,14 @@ protected: /// export an element with string content void ExportElement(enum ::xmloff::token::XMLTokenEnum eElement, /// element token - const ::rtl::OUString& sContent, /// element content + const OUString& sContent, /// element content sal_Bool bAddSpace = sal_False); /// add blanks around /// element? /// export a macro (as used in the macro field) void ExportMacro( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, - const ::rtl::OUString& rContent); + const OUString& rContent); /// export text:meta-field (RDF metadata) void ExportMetaField( const ::com::sun::star::uno::Reference< @@ -273,7 +273,7 @@ protected: /// export a string attribute void ProcessString( enum ::xmloff::token::XMLTokenEnum eXmlName, /// attribute token (namespace text) - const ::rtl::OUString& sValue, /// attribute value + const OUString& sValue, /// attribute value sal_Bool bOmitEmpty = sal_False, /// omit attribute, if value is empty sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix @@ -281,7 +281,7 @@ protected: void ProcessString( enum ::xmloff::token::XMLTokenEnum eXmlName, /// attribute token (namespace text) sal_uInt16 nValuePrefix, - const ::rtl::OUString& sValue, /// attribute value + const OUString& sValue, /// attribute value sal_Bool bOmitEmpty = sal_False, /// omit attribute, if value is empty sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix @@ -289,16 +289,16 @@ protected: /// export a string attribute, omit if default void ProcessString( enum ::xmloff::token::XMLTokenEnum eXmlName, /// attribute token (namespace text) - const ::rtl::OUString& sValue, /// attribute value - const ::rtl::OUString& sDefault, /// default value; omit if equal + const OUString& sValue, /// attribute value + const OUString& sDefault, /// default value; omit if equal sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix /// export a string attribute, omit if default void ProcessString( enum ::xmloff::token::XMLTokenEnum eXmlName, /// attribute token (namespace text) sal_uInt16 nValuePrefix, - const ::rtl::OUString& sValue, /// attribute value - const ::rtl::OUString& sDefault, /// default value; omit if equal + const OUString& sValue, /// attribute value + const OUString& sDefault, /// default value; omit if equal sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix /// export a string attribute @@ -318,7 +318,7 @@ protected: /// export a string as a sequence of paragraphs void ProcessParagraphSequence( /// string containing the paragraphs - const ::rtl::OUString& sParagraphSequence); + const OUString& sParagraphSequence); /// export a numbering format (numeric, roman, alphabetic, etc.) void ProcessNumberingType( @@ -333,8 +333,8 @@ protected: void ProcessValueAndType( sal_Bool bIsString, /// do we process a string or a number? sal_Int32 nFormatKey, /// format key for NumberFormatter; possibly -1 - const ::rtl::OUString& sContent, /// string content; possibly invalid - const ::rtl::OUString& sDefault, /// default string + const OUString& sContent, /// string content; possibly invalid + const OUString& sDefault, /// default string double fValue, /// float content; possibly invalid sal_Bool bExportValue, /// export value attribute? sal_Bool bExportValueType, /// export value-type attribute? @@ -377,17 +377,17 @@ protected: sal_Int32 nCommandType); /// com::sun::star::sdb::CommandType void ProcessStringSequence( - const ::com::sun::star::uno::Sequence<rtl::OUString>& rSequence, - const rtl::OUString sSelected ); + const ::com::sun::star::uno::Sequence<OUString>& rSequence, + const OUString sSelected ); void ProcessStringSequence( - const ::com::sun::star::uno::Sequence<rtl::OUString>& rSequence, + const ::com::sun::star::uno::Sequence<OUString>& rSequence, sal_Int32 nSelected ); /// export attributes that describe a data source void ExportDataBaseElement( enum ::xmloff::token::XMLTokenEnum eElement, - const ::rtl::OUString& sContent, + const OUString& sContent, const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropertySet, const ::com::sun::star::uno::Reference < @@ -413,7 +413,7 @@ protected: ::com::sun::star::beans::XPropertySet > & xPropSet); /// get field ID from XTextField service name (and it's PropertySet) - enum FieldIdEnum MapFieldName(const ::rtl::OUString& sFieldName, + enum FieldIdEnum MapFieldName(const OUString& sFieldName, const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet> & xPropSet); @@ -425,100 +425,100 @@ protected: /// explode a field master name into field type and field name sal_Bool ExplodeFieldMasterName( - const ::rtl::OUString& sMasterName, /// name as returned by SO API - ::rtl::OUString& sFieldType, /// out: field type - ::rtl::OUString& sVarName); /// out: variable name + const OUString& sMasterName, /// name as returned by SO API + OUString& sFieldType, /// out: field type + OUString& sVarName); /// out: variable name /// make reference name for a foot- or endnote - static ::rtl::OUString MakeFootnoteRefName(sal_Int16 nSeqNo); + static OUString MakeFootnoteRefName(sal_Int16 nSeqNo); /// make reference name for a sequence field - static ::rtl::OUString MakeSequenceRefName(sal_Int16 nSeqNo, - const ::rtl::OUString& rSeqName); + static OUString MakeSequenceRefName(sal_Int16 nSeqNo, + const OUString& rSeqName); private: // constants // service names - const ::rtl::OUString sServicePrefix; - const ::rtl::OUString sFieldMasterPrefix; - const ::rtl::OUString sPresentationServicePrefix; + const OUString sServicePrefix; + const OUString sFieldMasterPrefix; + const OUString sPresentationServicePrefix; // property names - const ::rtl::OUString sPropertyAdjust; - const ::rtl::OUString sPropertyAuthor; - const ::rtl::OUString sPropertyChapterFormat; - const ::rtl::OUString sPropertyChapterNumberingLevel; - const ::rtl::OUString sPropertyCharStyleNames; - const ::rtl::OUString sPropertyCondition; - const ::rtl::OUString sPropertyContent; - const ::rtl::OUString sPropertyDataBaseName; - const ::rtl::OUString sPropertyDataBaseURL; - const ::rtl::OUString sPropertyDataColumnName; - const ::rtl::OUString sPropertyDataCommandType; - const ::rtl::OUString sPropertyDataTableName; - const ::rtl::OUString sPropertyDate; - const ::rtl::OUString sPropertyDateTime; - const ::rtl::OUString sPropertyDateTimeValue; - const ::rtl::OUString sPropertyDDECommandElement; - const ::rtl::OUString sPropertyDDECommandFile; - const ::rtl::OUString sPropertyDDECommandType; - const ::rtl::OUString sPropertyDependentTextFields; - const ::rtl::OUString sPropertyFalseContent; - const ::rtl::OUString sPropertyFields; - const ::rtl::OUString sPropertyFieldSubType; - const ::rtl::OUString sPropertyFileFormat; - const ::rtl::OUString sPropertyFullName; - const ::rtl::OUString sPropertyHint; - const ::rtl::OUString sPropertyInitials; - const ::rtl::OUString sPropertyInstanceName; - const ::rtl::OUString sPropertyIsAutomaticUpdate; - const ::rtl::OUString sPropertyIsConditionTrue; - const ::rtl::OUString sPropertyIsDataBaseFormat; - const ::rtl::OUString sPropertyIsDate; - const ::rtl::OUString sPropertyIsExpression; - const ::rtl::OUString sPropertyIsFixed; - const ::rtl::OUString sPropertyIsFixedLanguage; - const ::rtl::OUString sPropertyIsHidden; - const ::rtl::OUString sPropertyIsInput; - const ::rtl::OUString sPropertyIsShowFormula; - const ::rtl::OUString sPropertyIsVisible; - const ::rtl::OUString sPropertyItems; - const ::rtl::OUString sPropertyLevel; - const ::rtl::OUString sPropertyMacro; - const ::rtl::OUString sPropertyMeasureKind; - const ::rtl::OUString sPropertyName; - const ::rtl::OUString sPropertyNumberFormat; - const ::rtl::OUString sPropertyNumberingSeparator; - const ::rtl::OUString sPropertyNumberingType; - const ::rtl::OUString sPropertyOffset; - const ::rtl::OUString sPropertyOn; - const ::rtl::OUString sPropertyPlaceholder; - const ::rtl::OUString sPropertyPlaceholderType; - const ::rtl::OUString sPropertyReferenceFieldPart; - const ::rtl::OUString sPropertyReferenceFieldSource; - const ::rtl::OUString sPropertyReferenceFieldType; - const ::rtl::OUString sPropertyRevision; - const ::rtl::OUString sPropertyScriptType; - const ::rtl::OUString sPropertySelectedItem; - const ::rtl::OUString sPropertySequenceNumber; - const ::rtl::OUString sPropertySequenceValue; - const ::rtl::OUString sPropertySetNumber; - const ::rtl::OUString sPropertySourceName; - const ::rtl::OUString sPropertySubType; - const ::rtl::OUString sPropertyTargetFrame; - const ::rtl::OUString sPropertyTrueContent; - const ::rtl::OUString sPropertyURL; - const ::rtl::OUString sPropertyURLContent; - const ::rtl::OUString sPropertyUserText; - const ::rtl::OUString sPropertyValue; - const ::rtl::OUString sPropertyVariableName; - const ::rtl::OUString sPropertyVariableSubType; - const ::rtl::OUString sPropertyHelp; - const ::rtl::OUString sPropertyTooltip; - const ::rtl::OUString sPropertyTextRange; - - const ::rtl::OUString sEmpty; + const OUString sPropertyAdjust; + const OUString sPropertyAuthor; + const OUString sPropertyChapterFormat; + const OUString sPropertyChapterNumberingLevel; + const OUString sPropertyCharStyleNames; + const OUString sPropertyCondition; + const OUString sPropertyContent; + const OUString sPropertyDataBaseName; + const OUString sPropertyDataBaseURL; + const OUString sPropertyDataColumnName; + const OUString sPropertyDataCommandType; + const OUString sPropertyDataTableName; + const OUString sPropertyDate; + const OUString sPropertyDateTime; + const OUString sPropertyDateTimeValue; + const OUString sPropertyDDECommandElement; + const OUString sPropertyDDECommandFile; + const OUString sPropertyDDECommandType; + const OUString sPropertyDependentTextFields; + const OUString sPropertyFalseContent; + const OUString sPropertyFields; + const OUString sPropertyFieldSubType; + const OUString sPropertyFileFormat; + const OUString sPropertyFullName; + const OUString sPropertyHint; + const OUString sPropertyInitials; + const OUString sPropertyInstanceName; + const OUString sPropertyIsAutomaticUpdate; + const OUString sPropertyIsConditionTrue; + const OUString sPropertyIsDataBaseFormat; + const OUString sPropertyIsDate; + const OUString sPropertyIsExpression; + const OUString sPropertyIsFixed; + const OUString sPropertyIsFixedLanguage; + const OUString sPropertyIsHidden; + const OUString sPropertyIsInput; + const OUString sPropertyIsShowFormula; + const OUString sPropertyIsVisible; + const OUString sPropertyItems; + const OUString sPropertyLevel; + const OUString sPropertyMacro; + const OUString sPropertyMeasureKind; + const OUString sPropertyName; + const OUString sPropertyNumberFormat; + const OUString sPropertyNumberingSeparator; + const OUString sPropertyNumberingType; + const OUString sPropertyOffset; + const OUString sPropertyOn; + const OUString sPropertyPlaceholder; + const OUString sPropertyPlaceholderType; + const OUString sPropertyReferenceFieldPart; + const OUString sPropertyReferenceFieldSource; + const OUString sPropertyReferenceFieldType; + const OUString sPropertyRevision; + const OUString sPropertyScriptType; + const OUString sPropertySelectedItem; + const OUString sPropertySequenceNumber; + const OUString sPropertySequenceValue; + const OUString sPropertySetNumber; + const OUString sPropertySourceName; + const OUString sPropertySubType; + const OUString sPropertyTargetFrame; + const OUString sPropertyTrueContent; + const OUString sPropertyURL; + const OUString sPropertyURLContent; + const OUString sPropertyUserText; + const OUString sPropertyValue; + const OUString sPropertyVariableName; + const OUString sPropertyVariableSubType; + const OUString sPropertyHelp; + const OUString sPropertyTooltip; + const OUString sPropertyTextRange; + + const OUString sEmpty; XMLPropertyState* pCombinedCharactersPropertyState; diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 691de3d07a46..43b8b1ba510d 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -731,7 +731,7 @@ protected: /** import user docinfo field (<text:user-defined>) */ class XMLUserDocInfoImportContext : public XMLSimpleDocInfoImportContext { - rtl::OUString aName; + OUString aName; const OUString sPropertyName; const OUString sPropertyNumberFormat; const OUString sPropertyIsFixedLanguage; @@ -1450,20 +1450,20 @@ protected: /** dropdown field (filter legacy) */ class XMLDropDownFieldImportContext : public XMLTextFieldImportContext { - std::vector<rtl::OUString> aLabels; - rtl::OUString sName; - rtl::OUString sHelp; - rtl::OUString sHint; + std::vector<OUString> aLabels; + OUString sName; + OUString sHelp; + OUString sHint; sal_Int32 nSelected; bool bNameOK; bool bHelpOK; bool bHintOK; - const rtl::OUString sPropertyItems; - const rtl::OUString sPropertySelectedItem; - const rtl::OUString sPropertyName; - const rtl::OUString sPropertyHelp; - const rtl::OUString sPropertyToolTip; + const OUString sPropertyItems; + const OUString sPropertySelectedItem; + const OUString sPropertyName; + const OUString sPropertyHelp; + const OUString sPropertyToolTip; public: TYPEINFO(); diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx index f079ae47e623..bff6a0bedf96 100644 --- a/xmloff/inc/txtlists.hxx +++ b/xmloff/inc/txtlists.hxx @@ -58,35 +58,35 @@ class XMLTextListsHelper : private boost::noncopyable // keeping track of processed lists for import and export // Add optional parameter <sListStyleDefaultListId> (#i92811#) - void KeepListAsProcessed( ::rtl::OUString sListId, - ::rtl::OUString sListStyleName, - ::rtl::OUString sContinueListId, - ::rtl::OUString sListStyleDefaultListId = ::rtl::OUString() ); + void KeepListAsProcessed( OUString sListId, + OUString sListStyleName, + OUString sContinueListId, + OUString sListStyleDefaultListId = OUString() ); - sal_Bool IsListProcessed( const ::rtl::OUString sListId ) const; - ::rtl::OUString GetListStyleOfProcessedList( - const ::rtl::OUString sListId ) const; - ::rtl::OUString GetContinueListIdOfProcessedList( - const ::rtl::OUString sListId ) const; - const ::rtl::OUString& GetLastProcessedListId() const; - const ::rtl::OUString& GetListStyleOfLastProcessedList() const; + sal_Bool IsListProcessed( const OUString sListId ) const; + OUString GetListStyleOfProcessedList( + const OUString sListId ) const; + OUString GetContinueListIdOfProcessedList( + const OUString sListId ) const; + const OUString& GetLastProcessedListId() const; + const OUString& GetListStyleOfLastProcessedList() const; - ::rtl::OUString GenerateNewListId() const; + OUString GenerateNewListId() const; // Provide list id for a certain list block for import (#i92811#) - ::rtl::OUString GetListIdForListBlock( XMLTextListBlockContext& rListBlock ); + OUString GetListIdForListBlock( XMLTextListBlockContext& rListBlock ); // keep track of continue list chain for export - void StoreLastContinuingList( ::rtl::OUString sListId, - ::rtl::OUString sContinuingListId ); + void StoreLastContinuingList( OUString sListId, + OUString sContinuingListId ); - ::rtl::OUString GetLastContinuingListId( ::rtl::OUString sListId ) const; + OUString GetLastContinuingListId( OUString sListId ) const; // keep track of opened list elements of a certain list for export - void PushListOnStack( ::rtl::OUString sListId, - ::rtl::OUString sListStyleName ); + void PushListOnStack( OUString sListId, + OUString sListStyleName ); void PopListFromStack(); - sal_Bool EqualsToTopListStyleOnStack( const ::rtl::OUString sListId ) const; + sal_Bool EqualsToTopListStyleOnStack( const OUString sListId ) const; /** for importing numbered-paragraph note that the ID namespace for numbered-paragraph and regular list @@ -96,13 +96,13 @@ class XMLTextListsHelper : private boost::noncopyable ::com::sun::star::container::XIndexReplace> EnsureNumberedParagraph( SvXMLImport & i_rImport, - const ::rtl::OUString i_ListId, - sal_Int16 & io_rLevel, const ::rtl::OUString i_StyleName); + const OUString i_ListId, + sal_Int16 & io_rLevel, const OUString i_StyleName); /// get ID of the last numbered-paragraph iff it has given style-name - ::rtl::OUString GetNumberedParagraphListId( + OUString GetNumberedParagraphListId( const sal_uInt16 i_Level, - const ::rtl::OUString i_StyleName); + const OUString i_StyleName); /** Creates a NumRule from given style-name. @param i_rImport the SvXMLImport @@ -118,8 +118,8 @@ class XMLTextListsHelper : private boost::noncopyable SvXMLImport & i_rImport, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>& i_xNumRule, - const ::rtl::OUString i_ParentStyleName, - const ::rtl::OUString i_StyleName, + const OUString i_ParentStyleName, + const OUString i_StyleName, sal_Int16 & io_rLevel, sal_Bool* o_pRestartNumbering = 0, sal_Bool* io_pSetDefaults = 0); @@ -137,12 +137,12 @@ class XMLTextListsHelper : private boost::noncopyable // container type for processed lists: // map with <ListId> as key and pair( <ListStyleName, ContinueListId> ) // as value - typedef ::std::map< ::rtl::OUString, - ::std::pair< ::rtl::OUString, ::rtl::OUString >, + typedef ::std::map< OUString, + ::std::pair< OUString, OUString >, ::comphelper::UStringLess > tMapForLists; tMapForLists* mpProcessedLists; - ::rtl::OUString msLastProcessedListId; - ::rtl::OUString msListStyleOfLastProcessedList; + OUString msLastProcessedListId; + OUString msListStyleOfLastProcessedList; /* additional container for processed lists. map with <ListStyleName> as key and pair( <ListId, ListStyleDefaultListId> ) @@ -153,28 +153,28 @@ class XMLTextListsHelper : private boost::noncopyable // container type to build up continue list chain: // map with <ListId> of master list as key and <ListId> of last list // continuing the master list as value - typedef ::std::map< ::rtl::OUString, ::rtl::OUString, + typedef ::std::map< OUString, OUString, ::comphelper::UStringLess > tMapForContinuingLists; tMapForContinuingLists* mpContinuingLists; // stack type for opened list elements and its list style: // vector with pair( <ListId>, <ListStyleName> ) as value - typedef ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > + typedef ::std::vector< ::std::pair< OUString, OUString > > tStackForLists; tStackForLists* mpListStack; /// to connect numbered-paragraphs that have no list-id attribute: /// vector of pair of style-name and list-id (indexed by level) - typedef ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > + typedef ::std::vector< ::std::pair< OUString, OUString > > LastNumberedParagraphs_t; LastNumberedParagraphs_t mLastNumberedParagraphs; /// numbered-paragraphs - typedef ::std::vector< ::std::pair< ::rtl::OUString, + typedef ::std::vector< ::std::pair< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > > > NumParaList_t; - ::std::map< ::rtl::OUString, NumParaList_t > mNPLists; + ::std::map< OUString, NumParaList_t > mNPLists; }; #endif diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index 9fb15011a4e5..95f2391aa30c 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -46,20 +46,20 @@ enum VarType class XMLValueImportHelper { - const ::rtl::OUString sPropertyContent; - const ::rtl::OUString sPropertyValue; - const ::rtl::OUString sPropertyFormula; - const ::rtl::OUString sPropertyNumberFormat; - const ::rtl::OUString sPropertyIsFixedLanguage; + const OUString sPropertyContent; + const OUString sPropertyValue; + const OUString sPropertyFormula; + const OUString sPropertyNumberFormat; + const OUString sPropertyIsFixedLanguage; SvXMLImport& rImport; XMLTextImportHelper& rHelper; - ::rtl::OUString sValue; /// string value (only valid if bStringValueOK) + OUString sValue; /// string value (only valid if bStringValueOK) double fValue; /// double value (only valid if bFloatValueOK) sal_Int32 nFormatKey; /// format key (only valid of bFormatOK) - ::rtl::OUString sFormula; /// formula string - ::rtl::OUString sDefault; /// default (see bStringDefault/bFormulaDef.) + OUString sFormula; /// formula string + OUString sDefault; /// default (see bStringDefault/bFormulaDef.) sal_Bool bIsDefaultLanguage;/// format (of nFormatKey) has system language? sal_Bool bStringType; /// is this a string (or a float) type? @@ -90,7 +90,7 @@ public: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ); + const OUString& sAttrValue ); /// prepare XTextField for insertion into document virtual void PrepareField( @@ -103,7 +103,7 @@ public: /// has format been read? inline sal_Bool IsFormatOK() { return bFormatOK; } - inline void SetDefault(const ::rtl::OUString& sStr) { sDefault = sStr; } + inline void SetDefault(const OUString& sStr) { sDefault = sStr; } }; @@ -135,20 +135,20 @@ public: class XMLVarFieldImportContext : public XMLTextFieldImportContext { protected: - const ::rtl::OUString sPropertyContent; - const ::rtl::OUString sPropertyHint; - const ::rtl::OUString sPropertyHelp; - const ::rtl::OUString sPropertyTooltip; - const ::rtl::OUString sPropertyIsVisible; - const ::rtl::OUString sPropertyIsDisplayFormula; - const ::rtl::OUString sPropertyCurrentPresentation; + const OUString sPropertyContent; + const OUString sPropertyHint; + const OUString sPropertyHelp; + const OUString sPropertyTooltip; + const OUString sPropertyIsVisible; + const OUString sPropertyIsDisplayFormula; + const OUString sPropertyCurrentPresentation; private: - ::rtl::OUString sName; /// name attribute - ::rtl::OUString sFormula; /// formula attribute - ::rtl::OUString sDescription; /// description - ::rtl::OUString sHelp; /// help text - ::rtl::OUString sHint; /// hint + OUString sName; /// name attribute + OUString sFormula; /// formula attribute + OUString sDescription; /// description + OUString sHelp; /// help text + OUString sHint; /// hint XMLValueImportHelper aValueHelper; /// value, value-type, and style sal_Bool bDisplayFormula; /// display formula?(rather than value) sal_Bool bDisplayNone; /// hide field? @@ -179,7 +179,7 @@ public: XMLTextImportHelper& rHlp, /// text import helper const sal_Char* pServiceName, /// name of SO API service sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName, /// element name w/o prefix + const OUString& rLocalName, /// element name w/o prefix // config variables for PrepareField behavior: sal_Bool bFormula, /// set Formula property sal_Bool bFormulaDefault, /// use content as default for formula @@ -196,7 +196,7 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ); + const OUString& sAttrValue ); /// prepare XTextField for insertion into document virtual void PrepareField( @@ -204,7 +204,7 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); // various accessor methods: - inline ::rtl::OUString GetName() { return sName; } + inline OUString GetName() { return sName; } inline sal_Bool IsStringValue() { return aValueHelper.IsStringValue();} inline sal_Bool IsNameOK() { return bNameOK; } inline sal_Bool IsFormulaOK() { return bFormulaOK; } @@ -217,7 +217,7 @@ protected: /** import variable get fields (<text:variable-get>) */ class XMLVariableGetFieldImportContext : public XMLVarFieldImportContext { - const ::rtl::OUString sPropertySubType; + const OUString sPropertySubType; public: @@ -227,7 +227,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix protected: @@ -242,7 +242,7 @@ protected: /** import expression fields (<text:expression>) */ class XMLExpressionFieldImportContext : public XMLVarFieldImportContext { - const ::rtl::OUString sPropertySubType; + const OUString sPropertySubType; public: @@ -252,7 +252,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& sLocalName); /// element name w/o prefix + const OUString& sLocalName); /// element name w/o prefix protected: virtual void PrepareField( @@ -263,7 +263,7 @@ protected: /*** import text input fields (<text:text-input>) */ class XMLTextInputFieldImportContext : public XMLVarFieldImportContext { - const ::rtl::OUString sPropertyContent; + const OUString sPropertyContent; public: @@ -273,7 +273,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& sLocalName); /// element name w/o prefix + const OUString& sLocalName); /// element name w/o prefix protected: virtual void PrepareField( @@ -304,7 +304,7 @@ public: XMLTextImportHelper& rHlp, /// see XMLTextFieldImportContext const sal_Char* pServiceName, /// see XMLTextFieldImportContext sal_uInt16 nPrfx, /// see XMLTextFieldImportContext - const ::rtl::OUString& rLocalName, /// see XMLTextFieldImportContext + const OUString& rLocalName, /// see XMLTextFieldImportContext // for finding appropriate field master (see EndElement()) VarType eVarType, /// variable type // config variables: @@ -337,7 +337,7 @@ protected: /** import variable set fields (<text:variable-set>) */ class XMLVariableSetFieldImportContext : public XMLSetVarFieldImportContext { - const ::rtl::OUString sPropertySubType; + const OUString sPropertySubType; public: @@ -347,7 +347,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix protected: /// prepare XTextField for insertion into document @@ -361,8 +361,8 @@ protected: /** variable input fields (<text:variable-input>) */ class XMLVariableInputFieldImportContext : public XMLSetVarFieldImportContext { - const ::rtl::OUString sPropertySubType; - const ::rtl::OUString sPropertyIsInput; + const OUString sPropertySubType; + const OUString sPropertyIsInput; public: @@ -372,7 +372,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix protected: @@ -396,7 +396,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix }; /** user input fields (<text:user-field-input>) */ @@ -411,7 +411,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix virtual void PrepareField( const ::com::sun::star::uno::Reference< @@ -423,13 +423,13 @@ public: /** sequence fields (<text:sequence>) */ class XMLSequenceFieldImportContext : public XMLSetVarFieldImportContext { - const ::rtl::OUString sPropertyFormula; - const ::rtl::OUString sPropertyNumberFormat; - const ::rtl::OUString sPropertySequenceValue; - ::rtl::OUString sFormula; - ::rtl::OUString sNumFormat; - ::rtl::OUString sNumFormatSync; - ::rtl::OUString sRefName; + const OUString sPropertyFormula; + const OUString sPropertyNumberFormat; + const OUString sPropertySequenceValue; + OUString sFormula; + OUString sNumFormat; + OUString sNumFormatSync; + OUString sRefName; sal_Bool bRefNameOK; @@ -441,13 +441,13 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ); + const OUString& sAttrValue ); /// prepare XTextField for insertion into document virtual void PrepareField( @@ -477,12 +477,12 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName, /// element name w/o prefix + const OUString& rLocalName, /// element name w/o prefix enum VarType eVarType); /// variable type virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; @@ -493,13 +493,13 @@ public: */ class XMLVariableDeclImportContext : public SvXMLImportContext { - const ::rtl::OUString sPropertyName; - const ::rtl::OUString sPropertySubType; - const ::rtl::OUString sPropertyNumberingLevel; - const ::rtl::OUString sPropertyNumberingSeparator; - const ::rtl::OUString sPropertyIsExpression; + const OUString sPropertyName; + const OUString sPropertySubType; + const OUString sPropertyNumberingLevel; + const OUString sPropertyNumberingSeparator; + const OUString sPropertyIsExpression; - ::rtl::OUString sName; + OUString sName; XMLValueImportHelper aValueHelper; sal_Int8 nNumLevel; sal_Unicode cSeparationChar; @@ -512,7 +512,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName, /// element name w/o prefix + const OUString& rLocalName, /// element name w/o prefix const ::com::sun::star::uno::Reference< /// list of element attributes ::com::sun::star::xml::sax::XAttributeList> & xAttrList, enum VarType eVarType); /// variable type @@ -522,7 +522,7 @@ public: ::com::sun::star::beans::XPropertySet> & xMaster, SvXMLImport& rImport, XMLTextImportHelper& rHelper, - const ::rtl::OUString& sVarName, + const OUString& sVarName, enum VarType eVarType); }; @@ -531,14 +531,14 @@ public: /** import table formula fields (deprecated; for Writer 2.0 compatibility) */ class XMLTableFormulaImportContext : public XMLTextFieldImportContext { - const ::rtl::OUString sPropertyNumberFormat; - const ::rtl::OUString sPropertyContent; - const ::rtl::OUString sPropertyIsShowFormula; - const ::rtl::OUString sPropertyCurrentPresentation; + const OUString sPropertyNumberFormat; + const OUString sPropertyContent; + const OUString sPropertyIsShowFormula; + const OUString sPropertyCurrentPresentation; XMLValueImportHelper aValueHelper; - ::rtl::OUString sFormula; + OUString sFormula; sal_Bool bIsShowFormula; @@ -550,14 +550,14 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix virtual ~XMLTableFormulaImportContext(); protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ); + const OUString& sAttrValue ); /// prepare XTextField for insertion into document virtual void PrepareField( @@ -570,14 +570,14 @@ protected: /** import database display fields (<text:database-display>) */ class XMLDatabaseDisplayImportContext : public XMLDatabaseFieldImportContext { - const ::rtl::OUString sPropertyColumnName; - const ::rtl::OUString sPropertyDatabaseFormat; - const ::rtl::OUString sPropertyCurrentPresentation; - const ::rtl::OUString sPropertyIsVisible; + const OUString sPropertyColumnName; + const OUString sPropertyDatabaseFormat; + const OUString sPropertyCurrentPresentation; + const OUString sPropertyIsVisible; XMLValueImportHelper aValueHelper; - ::rtl::OUString sColumnName; + OUString sColumnName; sal_Bool bColumnOK; sal_Bool bDisplay; @@ -591,13 +591,13 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ); + const OUString& sAttrValue ); /// create, prepare and insert database field master and database field virtual void EndElement(); diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx index 661884de81b6..b17b85c63415 100644 --- a/xmloff/inc/xexptran.hxx +++ b/xmloff/inc/xexptran.hxx @@ -56,7 +56,7 @@ typedef ::std::vector< ImpSdXMLExpTransObj3DBase* > ImpSdXMLExpTransObj3DBaseLis class SdXMLImExTransform2D { ImpSdXMLExpTransObj2DBaseList maList; - rtl::OUString msString; + OUString msString; void EmptyList(); @@ -70,8 +70,8 @@ public: bool NeedsAction() const { return !maList.empty(); } void GetFullTransform(::basegfx::B2DHomMatrix& rFullTrans); - const rtl::OUString& GetExportString(const SvXMLUnitConverter& rConv); - void SetString(const rtl::OUString& rNew, const SvXMLUnitConverter& rConv); + const OUString& GetExportString(const SvXMLUnitConverter& rConv); + void SetString(const OUString& rNew, const SvXMLUnitConverter& rConv); }; ////////////////////////////////////////////////////////////////////////////// @@ -79,13 +79,13 @@ public: class SdXMLImExTransform3D { ImpSdXMLExpTransObj3DBaseList maList; - rtl::OUString msString; + OUString msString; void EmptyList(); public: SdXMLImExTransform3D() {} - SdXMLImExTransform3D(const rtl::OUString& rNew, const SvXMLUnitConverter& rConv); + SdXMLImExTransform3D(const OUString& rNew, const SvXMLUnitConverter& rConv); ~SdXMLImExTransform3D() { EmptyList(); } void AddMatrix(const ::basegfx::B3DHomMatrix& rNew); @@ -94,15 +94,15 @@ public: bool NeedsAction() const { return !maList.empty(); } void GetFullTransform(::basegfx::B3DHomMatrix& rFullTrans); bool GetFullHomogenTransform(com::sun::star::drawing::HomogenMatrix& xHomMat); - const rtl::OUString& GetExportString(const SvXMLUnitConverter& rConv); - void SetString(const rtl::OUString& rNew, const SvXMLUnitConverter& rConv); + const OUString& GetExportString(const SvXMLUnitConverter& rConv); + void SetString(const OUString& rNew, const SvXMLUnitConverter& rConv); }; ////////////////////////////////////////////////////////////////////////////// class SdXMLImExViewBox { - rtl::OUString msString; + OUString msString; sal_Int32 mnX; sal_Int32 mnY; sal_Int32 mnW; @@ -110,20 +110,20 @@ class SdXMLImExViewBox public: SdXMLImExViewBox(sal_Int32 nX = 0L, sal_Int32 nY = 0L, sal_Int32 nW = 1000L, sal_Int32 nH = 1000L); - SdXMLImExViewBox(const rtl::OUString& rNew, const SvXMLUnitConverter& rConv); + SdXMLImExViewBox(const OUString& rNew, const SvXMLUnitConverter& rConv); sal_Int32 GetX() const { return mnX; } sal_Int32 GetY() const { return mnY; } sal_Int32 GetWidth() const { return mnW; } sal_Int32 GetHeight() const { return mnH; } - const rtl::OUString& GetExportString(); + const OUString& GetExportString(); }; ////////////////////////////////////////////////////////////////////////////// class SdXMLImExPointsElement { - rtl::OUString msString; + OUString msString; com::sun::star::drawing::PointSequenceSequence maPoly; public: @@ -133,13 +133,13 @@ public: const com::sun::star::awt::Size& rObjectSize, // #96328# const bool bClosed = true); - SdXMLImExPointsElement(const rtl::OUString& rNew, + SdXMLImExPointsElement(const OUString& rNew, const SdXMLImExViewBox& rViewBox, const com::sun::star::awt::Point& rObjectPos, const com::sun::star::awt::Size& rObjectSize, const SvXMLUnitConverter& rConv); - const rtl::OUString& GetExportString() const { return msString; } + const OUString& GetExportString() const { return msString; } const com::sun::star::drawing::PointSequenceSequence& GetPointSequenceSequence() const { return maPoly; } }; @@ -147,7 +147,7 @@ public: class SdXMLImExSvgDElement { - rtl::OUString msString; + OUString msString; const SdXMLImExViewBox& mrViewBox; bool mbIsClosed; bool mbIsCurve; @@ -159,7 +159,7 @@ class SdXMLImExSvgDElement public: SdXMLImExSvgDElement(const SdXMLImExViewBox& rViewBox, const SvXMLExport& rExport); - SdXMLImExSvgDElement(const rtl::OUString& rNew, + SdXMLImExSvgDElement(const OUString& rNew, const SdXMLImExViewBox& rViewBox, const com::sun::star::awt::Point& rObjectPos, const com::sun::star::awt::Size& rObjectSize, @@ -172,7 +172,7 @@ public: const com::sun::star::awt::Size& rObjectSize, bool bClosed = false); - const rtl::OUString& GetExportString() const { return msString; } + const OUString& GetExportString() const { return msString; } bool IsClosed() const { return mbIsClosed; } bool IsCurve() const { return mbIsCurve; } const com::sun::star::drawing::PointSequenceSequence& GetPointSequenceSequence() const { return maPoly.Coordinates; } diff --git a/xmloff/inc/xmloff/DashStyle.hxx b/xmloff/inc/xmloff/DashStyle.hxx index 6d1b801eb34d..91c51d96f946 100644 --- a/xmloff/inc/xmloff/DashStyle.hxx +++ b/xmloff/inc/xmloff/DashStyle.hxx @@ -46,7 +46,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, - ::rtl::OUString& rStrName ); + OUString& rStrName ); }; @@ -58,7 +58,7 @@ public: XMLDashStyleExport( SvXMLExport& rExport ); ~XMLDashStyleExport(); - sal_Bool exportXML( const ::rtl::OUString& rStrName, + sal_Bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); }; diff --git a/xmloff/inc/xmloff/DocumentSettingsContext.hxx b/xmloff/inc/xmloff/DocumentSettingsContext.hxx index d45a3017fe8d..a9277946ca9a 100644 --- a/xmloff/inc/xmloff/DocumentSettingsContext.hxx +++ b/xmloff/inc/xmloff/DocumentSettingsContext.hxx @@ -35,13 +35,13 @@ class XMLOFF_DLLPUBLIC XMLDocumentSettingsContext : public SvXMLImportContext ::std::auto_ptr< XMLDocumentSettingsContext_Data > m_pData; public: - XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~XMLDocumentSettingsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); diff --git a/xmloff/inc/xmloff/EnumPropertyHdl.hxx b/xmloff/inc/xmloff/EnumPropertyHdl.hxx index 9084b6884e3a..f2ef26d4c974 100644 --- a/xmloff/inc/xmloff/EnumPropertyHdl.hxx +++ b/xmloff/inc/xmloff/EnumPropertyHdl.hxx @@ -37,8 +37,8 @@ public: XMLEnumPropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ) : mpEnumMap( pEnumMap ), mrType( rType ) {} virtual ~XMLEnumPropertyHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_ENUMPROPERTYHANDLER_HXX diff --git a/xmloff/inc/xmloff/GradientStyle.hxx b/xmloff/inc/xmloff/GradientStyle.hxx index 95153d204f16..145ba554505d 100644 --- a/xmloff/inc/xmloff/GradientStyle.hxx +++ b/xmloff/inc/xmloff/GradientStyle.hxx @@ -23,6 +23,7 @@ #include "sal/config.h" #include "xmloff/dllapi.h" #include <sal/types.h> +#include <rtl/ustring.hxx> class SvXMLImport; class SvXMLExport; @@ -31,7 +32,6 @@ namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } namespace uno { class Any; } } } } -namespace rtl { class OUString; } class XMLOFF_DLLPUBLIC XMLGradientStyleImport @@ -46,7 +46,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, - ::rtl::OUString& rStrName ); + OUString& rStrName ); }; @@ -59,7 +59,7 @@ public: ~XMLGradientStyleExport(); sal_Bool exportXML( - const ::rtl::OUString& rStrName, + const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); }; diff --git a/xmloff/inc/xmloff/HatchStyle.hxx b/xmloff/inc/xmloff/HatchStyle.hxx index 7ae6870dba9e..6cdceb618f10 100644 --- a/xmloff/inc/xmloff/HatchStyle.hxx +++ b/xmloff/inc/xmloff/HatchStyle.hxx @@ -23,6 +23,7 @@ #include "sal/config.h" #include "xmloff/dllapi.h" #include <sal/types.h> +#include <rtl/ustring.hxx> class SvXMLImport; class SvXMLExport; @@ -31,7 +32,6 @@ namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } namespace uno { class Any; } } } } -namespace rtl { class OUString; } class XMLOFF_DLLPUBLIC XMLHatchStyleImport @@ -46,7 +46,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ::com::sun::star::uno::Any& rValue, - ::rtl::OUString& rStrName ); + OUString& rStrName ); }; class XMLOFF_DLLPUBLIC XMLHatchStyleExport @@ -57,7 +57,7 @@ public: XMLHatchStyleExport( SvXMLExport& rExport ); ~XMLHatchStyleExport(); - sal_Bool exportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); + sal_Bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); }; #endif // _XMLOFF_HATCHELEMENT_HXX diff --git a/xmloff/inc/xmloff/ImageStyle.hxx b/xmloff/inc/xmloff/ImageStyle.hxx index c09bb760a599..5c0dfd6ff820 100644 --- a/xmloff/inc/xmloff/ImageStyle.hxx +++ b/xmloff/inc/xmloff/ImageStyle.hxx @@ -37,15 +37,15 @@ public: XMLImageStyle(); ~XMLImageStyle(); - sal_Bool exportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SvXMLExport& rExport ); - sal_Bool importXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, ::rtl::OUString& rStrName, SvXMLImport& rImport ); + sal_Bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SvXMLExport& rExport ); + sal_Bool importXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport ); private: - SAL_DLLPRIVATE sal_Bool ImpExportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue, + SAL_DLLPRIVATE sal_Bool ImpExportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SvXMLExport& rExport ); SAL_DLLPRIVATE sal_Bool ImpImportXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, - ::com::sun::star::uno::Any& rValue, ::rtl::OUString& rStrName, + ::com::sun::star::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport ); }; diff --git a/xmloff/inc/xmloff/MarkerStyle.hxx b/xmloff/inc/xmloff/MarkerStyle.hxx index b3bc3d0e2870..5cff7cb23745 100644 --- a/xmloff/inc/xmloff/MarkerStyle.hxx +++ b/xmloff/inc/xmloff/MarkerStyle.hxx @@ -23,6 +23,7 @@ #include "sal/config.h" #include "xmloff/dllapi.h" #include <sal/types.h> +#include <rtl/ustring.hxx> class SvXMLImport; class SvXMLExport; @@ -31,7 +32,6 @@ namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } namespace uno { class Any; } } } } -namespace rtl { class OUString; } class XMLOFF_DLLPUBLIC XMLMarkerStyleImport @@ -46,7 +46,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, - ::rtl::OUString& rStrName ); + OUString& rStrName ); }; class XMLOFF_DLLPUBLIC XMLMarkerStyleExport @@ -58,7 +58,7 @@ public: ~XMLMarkerStyleExport(); sal_Bool exportXML( - const ::rtl::OUString& rStrName, + const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); }; diff --git a/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx b/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx index 349f11dc421a..e6dc49c20fff 100644 --- a/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx +++ b/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx @@ -31,11 +31,11 @@ class XMLNamedBoolPropertyHdl : public XMLPropertyHandler { private: - const ::rtl::OUString maTrueStr; - const ::rtl::OUString maFalseStr; + const OUString maTrueStr; + const OUString maFalseStr; public: - XMLNamedBoolPropertyHdl( const ::rtl::OUString& rTrueStr, const ::rtl::OUString& rFalseStr ) : maTrueStr( rTrueStr ), maFalseStr( rFalseStr ) {} + XMLNamedBoolPropertyHdl( const OUString& rTrueStr, const OUString& rFalseStr ) : maTrueStr( rTrueStr ), maFalseStr( rFalseStr ) {} XMLNamedBoolPropertyHdl( ::xmloff::token::XMLTokenEnum eTrue, @@ -47,8 +47,8 @@ public: virtual ~XMLNamedBoolPropertyHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_NAMEDBOOLPROPERTYHANDLER_HXX diff --git a/xmloff/inc/xmloff/ProgressBarHelper.hxx b/xmloff/inc/xmloff/ProgressBarHelper.hxx index e558b0f6b29d..e34e6a07919d 100644 --- a/xmloff/inc/xmloff/ProgressBarHelper.hxx +++ b/xmloff/inc/xmloff/ProgressBarHelper.hxx @@ -48,7 +48,7 @@ public: const sal_Bool bStrict); ~ProgressBarHelper(); - void SetText(::rtl::OUString& rText) { if (xStatusIndicator.is()) xStatusIndicator->setText(rText); } + void SetText(OUString& rText) { if (xStatusIndicator.is()) xStatusIndicator->setText(rText); } void SetRange(sal_Int32 nVal) { nRange = nVal; } void SetReference(sal_Int32 nVal) { nReference = nVal; } void SetValue(sal_Int32 nValue); diff --git a/xmloff/inc/xmloff/SchXMLExportHelper.hxx b/xmloff/inc/xmloff/SchXMLExportHelper.hxx index 5b31acf19a53..7413438fe8f7 100644 --- a/xmloff/inc/xmloff/SchXMLExportHelper.hxx +++ b/xmloff/inc/xmloff/SchXMLExportHelper.hxx @@ -50,7 +50,7 @@ public: virtual ~SchXMLExportHelper(); /// returns the string corresponding to the current FileFormat CLSID for Chart - const rtl::OUString& getChartCLSID(); + const OUString& getChartCLSID(); private: SchXMLExportHelper(); // not defined diff --git a/xmloff/inc/xmloff/SchXMLImportHelper.hxx b/xmloff/inc/xmloff/SchXMLImportHelper.hxx index 24718d13acc7..5981597c68bd 100644 --- a/xmloff/inc/xmloff/SchXMLImportHelper.hxx +++ b/xmloff/inc/xmloff/SchXMLImportHelper.hxx @@ -91,7 +91,7 @@ public: */ SvXMLImportContext* CreateChartContext( SvXMLImport& rImport, - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::frame::XModel > xChartModel, const com::sun::star::uno::Reference< @@ -138,7 +138,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xDoc, sal_Int32 nCoordinateSystemIndex, - const ::rtl::OUString & rChartTypeName, + const OUString & rChartTypeName, bool bPushLastChartType = false ); static void DeleteDataSeries( diff --git a/xmloff/inc/xmloff/SettingsExportHelper.hxx b/xmloff/inc/xmloff/SettingsExportHelper.hxx index 5b950317906e..e790e09860da 100644 --- a/xmloff/inc/xmloff/SettingsExportHelper.hxx +++ b/xmloff/inc/xmloff/SettingsExportHelper.hxx @@ -46,49 +46,49 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringSubstitution > mxStringSubsitution; - const rtl::OUString msPrinterIndependentLayout; - const rtl::OUString msColorTableURL; - const rtl::OUString msLineEndTableURL; - const rtl::OUString msHatchTableURL; - const rtl::OUString msDashTableURL; - const rtl::OUString msGradientTableURL; - const rtl::OUString msBitmapTableURL; + const OUString msPrinterIndependentLayout; + const OUString msColorTableURL; + const OUString msLineEndTableURL; + const OUString msHatchTableURL; + const OUString msDashTableURL; + const OUString msGradientTableURL; + const OUString msBitmapTableURL; - void ManipulateSetting( com::sun::star::uno::Any& rAny, const rtl::OUString& rName ) const; + void ManipulateSetting( com::sun::star::uno::Any& rAny, const OUString& rName ) const; void CallTypeFunction(const com::sun::star::uno::Any& rAny, - const rtl::OUString& rName) const; - - void exportBool(const sal_Bool bValue, const rtl::OUString& rName) const; - void exportByte(const sal_Int8 nValue, const rtl::OUString& rName) const; - void exportShort(const sal_Int16 nValue, const rtl::OUString& rName) const; - void exportInt(const sal_Int32 nValue, const rtl::OUString& rName) const; - void exportLong(const sal_Int64 nValue, const rtl::OUString& rName) const; - void exportDouble(const double fValue, const rtl::OUString& rName) const; - void exportString(const rtl::OUString& sValue, const rtl::OUString& rName) const; - void exportDateTime(const com::sun::star::util::DateTime& aValue, const rtl::OUString& rName) const; + const OUString& rName) const; + + void exportBool(const sal_Bool bValue, const OUString& rName) const; + void exportByte(const sal_Int8 nValue, const OUString& rName) const; + void exportShort(const sal_Int16 nValue, const OUString& rName) const; + void exportInt(const sal_Int32 nValue, const OUString& rName) const; + void exportLong(const sal_Int64 nValue, const OUString& rName) const; + void exportDouble(const double fValue, const OUString& rName) const; + void exportString(const OUString& sValue, const OUString& rName) const; + void exportDateTime(const com::sun::star::util::DateTime& aValue, const OUString& rName) const; void exportSequencePropertyValue( const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps, - const rtl::OUString& rName) const; + const OUString& rName) const; void exportbase64Binary( const com::sun::star::uno::Sequence<sal_Int8>& aProps, - const rtl::OUString& rName) const; + const OUString& rName) const; void exportMapEntry(const com::sun::star::uno::Any& rAny, - const rtl::OUString& rName, + const OUString& rName, const sal_Bool bNameAccess) const; void exportNameAccess( const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& aNamed, - const rtl::OUString& rName) const; + const OUString& rName) const; void exportIndexAccess( const com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> aIndexed, - const rtl::OUString rName) const; + const OUString rName) const; void exportSymbolDescriptors( const com::sun::star::uno::Sequence < com::sun::star::formula::SymbolDescriptor > &rProps, - const rtl::OUString rName) const; + const OUString rName) const; void exportForbiddenCharacters( const com::sun::star::uno::Any &rAny, - const rtl::OUString rName) const; + const OUString rName) const; public: XMLSettingsExportHelper( ::xmloff::XMLSettingsExportContext& i_rContext ); @@ -96,7 +96,7 @@ public: void exportAllSettings( const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps, - const rtl::OUString& rName) const; + const OUString& rName) const; }; #endif diff --git a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx b/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx index e59820ea98e7..576339d9c9de 100644 --- a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx +++ b/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx @@ -36,11 +36,11 @@ SinglePropertySetInfoMap_Impl; class SinglePropertySetInfoCache : private SinglePropertySetInfoMap_Impl { - ::rtl::OUString sName; + OUString sName; public: - inline SinglePropertySetInfoCache( const ::rtl::OUString& rName ); + inline SinglePropertySetInfoCache( const OUString& rName ); ~SinglePropertySetInfoCache() {}; sal_Bool hasProperty( @@ -54,7 +54,7 @@ public: }; inline SinglePropertySetInfoCache::SinglePropertySetInfoCache( - const ::rtl::OUString& rName ) : + const OUString& rName ) : sName( rName ) { } diff --git a/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx b/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx index 7fa4e8014b91..6430b8258c6e 100644 --- a/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx +++ b/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx @@ -38,8 +38,8 @@ public: XMLWordWrapPropertyHdl( SvXMLImport* pImport ); virtual ~XMLWordWrapPropertyHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_NAMEDBOOLPROPERTYHANDLER_HXX diff --git a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx b/xmloff/inc/xmloff/XMLBase64ImportContext.hxx index f18137f6c026..d2804928a324 100644 --- a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx +++ b/xmloff/inc/xmloff/XMLBase64ImportContext.hxx @@ -32,13 +32,13 @@ class XMLOFF_DLLPUBLIC XMLBase64ImportContext : public SvXMLImportContext { ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOut; - ::rtl::OUString sBase64CharsLeft; + OUString sBase64CharsLeft; public: TYPEINFO(); XMLBase64ImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, const ::com::sun::star::uno::Reference< @@ -48,7 +48,7 @@ public: virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; diff --git a/xmloff/inc/xmloff/XMLCharContext.hxx b/xmloff/inc/xmloff/XMLCharContext.hxx index 085e44b52062..644b03877d64 100644 --- a/xmloff/inc/xmloff/XMLCharContext.hxx +++ b/xmloff/inc/xmloff/XMLCharContext.hxx @@ -38,14 +38,14 @@ public: XMLCharContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_Unicode c, sal_Bool bCount ); XMLCharContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_Int16 nControl ); @@ -57,7 +57,7 @@ public: virtual void EndElement(); virtual void InsertControlCharacter(sal_Int16 _nControl); - virtual void InsertString(const ::rtl::OUString& _sString); + virtual void InsertString(const OUString& _sString); }; // --------------------------------------------------------------------- #endif // INCLUDED__XMLOFF_CHARCONTEXT_HXX diff --git a/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx b/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx index 01545fc519c3..cad125159d11 100644 --- a/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx +++ b/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx @@ -47,13 +47,13 @@ public: /// Imports the given value in cas of the given XML-data-type virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; /// Exports the given value in cas of the given XML-data-type virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx b/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx index df02b80b0d5d..40f42b6be202 100644 --- a/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx +++ b/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx @@ -45,17 +45,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 ); @@ -63,20 +63,20 @@ 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 virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // 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); }; diff --git a/xmloff/inc/xmloff/XMLEventExport.hxx b/xmloff/inc/xmloff/XMLEventExport.hxx index 6a942fb8e738..52b77daa8764 100644 --- a/xmloff/inc/xmloff/XMLEventExport.hxx +++ b/xmloff/inc/xmloff/XMLEventExport.hxx @@ -38,8 +38,8 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -typedef ::std::map< ::rtl::OUString, XMLEventExportHandler* > HandlerMap; -typedef ::std::map< ::rtl::OUString, XMLEventName > NameMap; +typedef ::std::map< OUString, XMLEventExportHandler* > HandlerMap; +typedef ::std::map< OUString, XMLEventName > NameMap; /** * Export instances of EventsSupplier services. To use this class you @@ -58,7 +58,7 @@ typedef ::std::map< ::rtl::OUString, XMLEventName > NameMap; */ class XMLOFF_DLLPUBLIC XMLEventExport { - const ::rtl::OUString sEventType; + const OUString sEventType; SvXMLExport& rExport; @@ -77,7 +77,7 @@ public: /// The handlers will be deleted when the object is destroyed, hence /// no pointers to a handler registered with AddHandler() should be /// held by anyone. - void AddHandler( const ::rtl::OUString& rName, + void AddHandler( const OUString& rName, XMLEventExportHandler* rHandler ); /// register additional event names @@ -108,7 +108,7 @@ public: void ExportSingleEvent( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rEventValues, - const ::rtl::OUString& rApiEventName, + const OUString& rApiEventName, sal_Bool bUseWhitespace = sal_True ); private: diff --git a/xmloff/inc/xmloff/XMLEventsImportContext.hxx b/xmloff/inc/xmloff/XMLEventsImportContext.hxx index 179b97b1c09a..aa093714ae56 100644 --- a/xmloff/inc/xmloff/XMLEventsImportContext.hxx +++ b/xmloff/inc/xmloff/XMLEventsImportContext.hxx @@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star { namespace rtl { class OUString; } typedef ::std::pair< - ::rtl::OUString, + OUString, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> > EventNameValuesPair; @@ -70,26 +70,26 @@ public: XMLEventsImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName); + const OUString& rLocalName); XMLEventsImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventsSupplier> & xEventsSupplier); XMLEventsImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace> & xNameRepl); ~XMLEventsImportContext(); void AddEventValues( - const ::rtl::OUString& rEventName, + const OUString& rEventName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rValues); @@ -108,7 +108,7 @@ public: /// if the import operates indelayed mode, you can use this method /// to obtain the value sequence for a specific event sal_Bool GetEventSequence( - const ::rtl::OUString& rName, + const OUString& rName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rSequence ); @@ -122,7 +122,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx index ad6a46d81b8e..8ee84d8686df 100644 --- a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx +++ b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx @@ -28,7 +28,7 @@ #include <set> class XMLFontAutoStylePool_Impl; -typedef std::set<rtl::OUString> XMLFontAutoStylePoolNames_Impl; +typedef std::set<OUString> XMLFontAutoStylePoolNames_Impl; class SvXMLExport; class XMLOFF_DLLPUBLIC XMLFontAutoStylePool : public UniRefBase @@ -50,20 +50,20 @@ public: XMLFontAutoStylePool( SvXMLExport& rExport, bool tryToEmbedFonts = false ); ~XMLFontAutoStylePool(); - ::rtl::OUString Add( - const ::rtl::OUString& rFamilyName, - const ::rtl::OUString& rStyleName, + OUString Add( + const OUString& rFamilyName, + const OUString& rStyleName, FontFamily nFamily, FontPitch nPitch, rtl_TextEncoding eEnc ); - ::rtl::OUString Find( - const ::rtl::OUString& rFamilyName, - const ::rtl::OUString& rStyleName, + OUString Find( + const OUString& rFamilyName, + const OUString& rStyleName, FontFamily nFamily, FontPitch nPitch, rtl_TextEncoding eEnc )const; - ::rtl::OUString Find( const ::rtl::OUString& rInternalName ) const; + OUString Find( const OUString& rInternalName ) const; void exportXML(); }; diff --git a/xmloff/inc/xmloff/XMLFontStylesContext.hxx b/xmloff/inc/xmloff/XMLFontStylesContext.hxx index afd495c17b44..c04d5c12230a 100644 --- a/xmloff/inc/xmloff/XMLFontStylesContext.hxx +++ b/xmloff/inc/xmloff/XMLFontStylesContext.hxx @@ -47,7 +47,7 @@ class XMLOFF_DLLPUBLIC XMLFontStylesContext : public SvXMLStylesContext protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -56,7 +56,7 @@ public: TYPEINFO(); XMLFontStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, rtl_TextEncoding eDfltEnc ); @@ -67,7 +67,7 @@ public: return *pFontStyleAttrTokenMap; } - sal_Bool FillProperties( const ::rtl::OUString& rName, + sal_Bool FillProperties( const OUString& rName, ::std::vector< XMLPropertyState > &rProps, sal_Int32 nFamilyNameIdx, sal_Int32 nStyleNameIdx, diff --git a/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx b/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx index 068fb89bc9cf..06fee705d04d 100644 --- a/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx +++ b/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx @@ -35,7 +35,7 @@ public: TYPEINFO(); XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, SvXMLStylesContext& rStyles); @@ -44,7 +44,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); // This method is called for every default style diff --git a/xmloff/inc/xmloff/XMLPageExport.hxx b/xmloff/inc/xmloff/XMLPageExport.hxx index ae2e1c497f6e..c30dbe43d786 100644 --- a/xmloff/inc/xmloff/XMLPageExport.hxx +++ b/xmloff/inc/xmloff/XMLPageExport.hxx @@ -44,8 +44,8 @@ class SvXMLExportPropertyMapper; struct XMLPageExportNameEntry { - ::rtl::OUString sPageMasterName; - ::rtl::OUString sStyleName; + OUString sPageMasterName; + OUString sStyleName; }; //______________________________________________________________________________ @@ -54,14 +54,14 @@ class XMLOFF_DLLPUBLIC XMLPageExport : public UniRefBase { SvXMLExport& rExport; - const ::rtl::OUString sIsPhysical; - const ::rtl::OUString sFollowStyle; + const OUString sIsPhysical; + const OUString sFollowStyle; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xPageStyles; ::std::vector< XMLPageExportNameEntry > aNameVector; - SAL_DLLPRIVATE sal_Bool findPageMasterName( const ::rtl::OUString& rStyleName, ::rtl::OUString& rPMName ) const; + SAL_DLLPRIVATE sal_Bool findPageMasterName( const OUString& rStyleName, OUString& rPMName ) const; UniReference < XMLPropertyHandlerFactory > xPageMasterPropHdlFactory; UniReference < XMLPropertySetMapper > xPageMasterPropSetMapper; @@ -74,7 +74,7 @@ protected: virtual void collectPageMasterAutoStyle( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, - ::rtl::OUString& rPageMasterName ); + OUString& rPageMasterName ); virtual void exportMasterPageContent( const ::com::sun::star::uno::Reference < diff --git a/xmloff/inc/xmloff/XMLSettingsExportContext.hxx b/xmloff/inc/xmloff/XMLSettingsExportContext.hxx index 46e51baa69aa..819da2b41d77 100644 --- a/xmloff/inc/xmloff/XMLSettingsExportContext.hxx +++ b/xmloff/inc/xmloff/XMLSettingsExportContext.hxx @@ -36,7 +36,7 @@ namespace xmloff { public: virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, - const ::rtl::OUString& i_rValue ) = 0; + const OUString& i_rValue ) = 0; virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, enum ::xmloff::token::XMLTokenEnum i_eValue ) = 0; @@ -44,7 +44,7 @@ namespace xmloff const sal_Bool i_bIgnoreWhitespace ) = 0; virtual void EndElement( const sal_Bool i_bIgnoreWhitespace ) = 0; - virtual void Characters( const ::rtl::OUString& i_rCharacters ) = 0; + virtual void Characters( const OUString& i_rCharacters ) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > GetComponentContext() const = 0; diff --git a/xmloff/inc/xmloff/XMLShapeStyleContext.hxx b/xmloff/inc/xmloff/XMLShapeStyleContext.hxx index 720d300cb5cf..2f39eee0e08f 100644 --- a/xmloff/inc/xmloff/XMLShapeStyleContext.hxx +++ b/xmloff/inc/xmloff/XMLShapeStyleContext.hxx @@ -33,21 +33,21 @@ class SvXMLImport; class XMLOFF_DLLPUBLIC XMLShapeStyleContext: public XMLPropStyleContext { protected: - ::rtl::OUString m_sControlDataStyleName; - ::rtl::OUString m_sListStyleName; + OUString m_sControlDataStyleName; + OUString m_sListStyleName; sal_Bool m_bIsNumRuleAlreadyConverted; protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); XMLShapeStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily = XML_STYLE_FAMILY_SD_GRAPHICS_ID); @@ -55,7 +55,7 @@ public: SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void Finish( sal_Bool bOverwrite ); diff --git a/xmloff/inc/xmloff/XMLStringVector.hxx b/xmloff/inc/xmloff/XMLStringVector.hxx index 7d42bb747123..863ec7aa4d3e 100644 --- a/xmloff/inc/xmloff/XMLStringVector.hxx +++ b/xmloff/inc/xmloff/XMLStringVector.hxx @@ -24,7 +24,7 @@ #include <vector> -typedef ::std::vector < ::rtl::OUString> XMLStringVector; +typedef ::std::vector < OUString> XMLStringVector; #endif // _XMLOFF_XMLSTRINGVECTOR_HXX diff --git a/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx index aabe1f4612a6..d8a209c795ac 100644 --- a/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx +++ b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx @@ -33,7 +33,7 @@ namespace rtl { class OUString; } class XMLTextListAutoStylePool_Impl; -typedef std::set<rtl::OUString> XMLTextListAutoStylePoolNames_Impl; +typedef std::set<OUString> XMLTextListAutoStylePoolNames_Impl; class XMLTextListAutoStylePoolEntry_Impl; class SvXMLExport; @@ -41,7 +41,7 @@ class XMLOFF_DLLPUBLIC XMLTextListAutoStylePool { SvXMLExport& rExport; - ::rtl::OUString sPrefix; + OUString sPrefix; XMLTextListAutoStylePool_Impl *pPool; XMLTextListAutoStylePoolNames_Impl m_aNames; @@ -58,16 +58,16 @@ public: XMLTextListAutoStylePool( SvXMLExport& rExport ); ~XMLTextListAutoStylePool(); - void RegisterName( const ::rtl::OUString& rName ); + void RegisterName( const OUString& rName ); - ::rtl::OUString Add( + OUString Add( const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexReplace > & rNumRules ); - ::rtl::OUString Find( + OUString Find( const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexReplace > & rNumRules ) const; - ::rtl::OUString Find( const ::rtl::OUString& rInternalName ) const; + OUString Find( const OUString& rInternalName ) const; void exportXML() const; }; diff --git a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx index 16ae31080147..c0965e7564f9 100644 --- a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx +++ b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx @@ -31,11 +31,11 @@ namespace com { namespace sun { namespace star { class XMLOFF_DLLPUBLIC XMLTextMasterPageContext : public SvXMLStyleContext { - const ::rtl::OUString sIsPhysical; - const ::rtl::OUString sPageStyleLayout; - const ::rtl::OUString sFollowStyle; - ::rtl::OUString sFollow; - ::rtl::OUString sPageMasterName; + const OUString sIsPhysical; + const OUString sPageStyleLayout; + const OUString sFollowStyle; + OUString sFollow; + OUString sPageMasterName; ::com::sun::star::uno::Reference < ::com::sun::star::style::XStyle > xStyle; @@ -62,7 +62,7 @@ public: TYPEINFO(); XMLTextMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_Bool bOverwrite ); @@ -70,12 +70,12 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateHeaderFooterContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bFooter, const sal_Bool bLeft, diff --git a/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx b/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx index cad00c29728c..8ef0dcaef6a6 100644 --- a/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx +++ b/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx @@ -32,19 +32,19 @@ namespace com { namespace sun { namespace star { class XMLOFF_DLLPUBLIC XMLTextMasterPageExport : public XMLPageExport { - const ::rtl::OUString sHeaderText; - const ::rtl::OUString sHeaderOn; - const ::rtl::OUString sHeaderShareContent; - const ::rtl::OUString sHeaderTextFirst; - const ::rtl::OUString sHeaderTextLeft; + const OUString sHeaderText; + const OUString sHeaderOn; + const OUString sHeaderShareContent; + const OUString sHeaderTextFirst; + const OUString sHeaderTextLeft; - const ::rtl::OUString sFirstShareContent; + const OUString sFirstShareContent; - const ::rtl::OUString sFooterText; - const ::rtl::OUString sFooterOn; - const ::rtl::OUString sFooterShareContent; - const ::rtl::OUString sFooterTextFirst; - const ::rtl::OUString sFooterTextLeft; + const OUString sFooterText; + const OUString sFooterOn; + const OUString sFooterShareContent; + const OUString sFooterTextFirst; + const OUString sFooterTextLeft; protected: diff --git a/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx b/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx index dfcf1df2f045..9d03c401b900 100644 --- a/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx +++ b/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx @@ -28,12 +28,12 @@ class XMLOFF_DLLPUBLIC XMLTextMasterStylesContext : public SvXMLStylesContext { protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -43,7 +43,7 @@ public: TYPEINFO(); XMLTextMasterStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList); diff --git a/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx b/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx index 556b035fff12..46d77a487297 100644 --- a/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx +++ b/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx @@ -28,9 +28,9 @@ class XMLOFF_DLLPUBLIC XMLTextShapeImportHelper : public XMLShapeImportHelper { SvXMLImport& rImport; - const ::rtl::OUString sAnchorType; - const ::rtl::OUString sAnchorPageNo; - const ::rtl::OUString sVertOrientPosition; + const OUString sAnchorType; + const OUString sAnchorPageNo; + const OUString sVertOrientPosition; public: diff --git a/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx b/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx index e8916051579d..922153a9188a 100644 --- a/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx +++ b/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx @@ -25,7 +25,7 @@ class XMLOFF_DLLPUBLIC XMLTextShapeStyleContext : public XMLShapeStyleContext { - const ::rtl::OUString sIsAutoUpdate; + const OUString sIsAutoUpdate; sal_Bool bAutoUpdate : 1; @@ -34,15 +34,15 @@ class XMLOFF_DLLPUBLIC XMLTextShapeStyleContext : public XMLShapeStyleContext protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); XMLTextShapeStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, @@ -51,7 +51,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); sal_Bool IsAutoUpdate() const { return bAutoUpdate; } diff --git a/xmloff/inc/xmloff/XMLTextTableContext.hxx b/xmloff/inc/xmloff/XMLTextTableContext.hxx index 42fbef77be38..c0a3df1aa88c 100644 --- a/xmloff/inc/xmloff/XMLTextTableContext.hxx +++ b/xmloff/inc/xmloff/XMLTextTableContext.hxx @@ -41,7 +41,7 @@ public: XMLTextTableContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName ); + const OUString& rLName ); virtual ~XMLTextTableContext(); virtual ::com::sun::star::uno::Reference < diff --git a/xmloff/inc/xmloff/attrlist.hxx b/xmloff/inc/xmloff/attrlist.hxx index 69b56b54b2d5..cc0d6aa14f65 100644 --- a/xmloff/inc/xmloff/attrlist.hxx +++ b/xmloff/inc/xmloff/attrlist.hxx @@ -57,27 +57,27 @@ 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 AddAttribute( const ::rtl::OUString &sName , const ::rtl::OUString &sValue ); + void AddAttribute( const OUString &sName , const OUString &sValue ); void Clear(); - void RemoveAttribute( const ::rtl::OUString sName ); + void RemoveAttribute( const OUString sName ); void AppendAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & ); - void SetValueByIndex( sal_Int16 i, const ::rtl::OUString& rValue ); + void SetValueByIndex( sal_Int16 i, const OUString& rValue ); void RemoveAttributeByIndex( sal_Int16 i ); - void RenameAttributeByIndex( sal_Int16 i, const ::rtl::OUString& rNewName ); - sal_Int16 GetIndexByName( const ::rtl::OUString& rName ) const; + void RenameAttributeByIndex( sal_Int16 i, const OUString& rNewName ); + sal_Int16 GetIndexByName( const OUString& rName ) const; private: - const ::rtl::OUString sType; // "CDATA" + const OUString sType; // "CDATA" }; diff --git a/xmloff/inc/xmloff/controlpropertyhdl.hxx b/xmloff/inc/xmloff/controlpropertyhdl.hxx index 6f2dbcc45820..3e2cbfd51e23 100644 --- a/xmloff/inc/xmloff/controlpropertyhdl.hxx +++ b/xmloff/inc/xmloff/controlpropertyhdl.hxx @@ -46,8 +46,8 @@ namespace xmloff public: ORotationAngleHandler(); - virtual sal_Bool importXML( const ::rtl::OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; }; //===================================================================== @@ -58,8 +58,8 @@ namespace xmloff public: OFontWidthHandler(); - virtual sal_Bool importXML( const ::rtl::OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; }; //===================================================================== @@ -76,8 +76,8 @@ namespace xmloff OControlBorderHandler( const BorderFacet _eFacet ); - virtual sal_Bool importXML( const ::rtl::OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; private: BorderFacet m_eFacet; @@ -91,8 +91,8 @@ namespace xmloff public: OControlTextEmphasisHandler(); - virtual sal_Bool importXML( const ::rtl::OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; }; //===================================================================== diff --git a/xmloff/inc/xmloff/formlayerexport.hxx b/xmloff/inc/xmloff/formlayerexport.hxx index 405e1849da10..5774988f42d8 100644 --- a/xmloff/inc/xmloff/formlayerexport.hxx +++ b/xmloff/inc/xmloff/formlayerexport.hxx @@ -88,7 +88,7 @@ namespace xmloff @see seekPage */ - ::rtl::OUString getControlId( + OUString getControlId( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl); /** retrieves the style name for the control's number style. @@ -102,7 +102,7 @@ namespace xmloff @see examineForms @see seekPage */ - ::rtl::OUString getControlNumberStyle( + OUString getControlNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl ); /** examines the forms collection given. diff --git a/xmloff/inc/xmloff/formlayerimport.hxx b/xmloff/inc/xmloff/formlayerimport.hxx index ea582b78863e..9a05b73c9ec0 100644 --- a/xmloff/inc/xmloff/formlayerimport.hxx +++ b/xmloff/inc/xmloff/formlayerimport.hxx @@ -68,7 +68,7 @@ namespace xmloff SvXMLImportContext* createOfficeFormsContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName); + const OUString& _rLocalName); /** create an <type>SvXMLImportContext</type> instance which is able to import the <form:form> element. @@ -80,7 +80,7 @@ namespace xmloff */ SvXMLImportContext* createContext( const sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName, + const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttribs); /** lookup a control given by id. @@ -92,7 +92,7 @@ namespace xmloff @see startPage */ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - lookupControl(const ::rtl::OUString& _rId); + lookupControl(const OUString& _rId); /** end importing the forms of the current page @@ -115,7 +115,7 @@ namespace xmloff */ void applyControlNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rControlNumerStyleName + const OUString& _rControlNumerStyleName ); /** to be called when the document has been completely imported diff --git a/xmloff/inc/xmloff/i18nmap.hxx b/xmloff/inc/xmloff/i18nmap.hxx index 6b83bac09649..22b8ad862a29 100644 --- a/xmloff/inc/xmloff/i18nmap.hxx +++ b/xmloff/inc/xmloff/i18nmap.hxx @@ -29,9 +29,9 @@ class SvI18NMapEntry_Key { sal_uInt16 nKind; - rtl::OUString aName; + OUString aName; public: - SvI18NMapEntry_Key( sal_uInt16 nKnd, const rtl::OUString& rName ) : + SvI18NMapEntry_Key( sal_uInt16 nKnd, const OUString& rName ) : nKind( nKnd ), aName( rName ) { @@ -51,7 +51,7 @@ public: } }; -typedef std::map<SvI18NMapEntry_Key, rtl::OUString> SvI18NMap_Impl; +typedef std::map<SvI18NMapEntry_Key, OUString> SvI18NMap_Impl; class XMLOFF_DLLPUBLIC SvI18NMap { @@ -59,13 +59,13 @@ class XMLOFF_DLLPUBLIC SvI18NMap public: // Add a name mapping - bool Add( sal_uInt16 nKind, const rtl::OUString& rName, - const rtl::OUString& rNewName ); + bool Add( sal_uInt16 nKind, const OUString& rName, + const OUString& rNewName ); // Return a mapped name. If the name could not be found, return the // original name. - const rtl::OUString& Get( sal_uInt16 nKind, - const rtl::OUString& rName ) const; + const OUString& Get( sal_uInt16 nKind, + const OUString& rName ) const; }; #endif // _XMLOFF_I18NMAP_HXX diff --git a/xmloff/inc/xmloff/nmspmap.hxx b/xmloff/inc/xmloff/nmspmap.hxx index 5adb38662627..fe7492cf5e75 100644 --- a/xmloff/inc/xmloff/nmspmap.hxx +++ b/xmloff/inc/xmloff/nmspmap.hxx @@ -43,17 +43,17 @@ class NameSpaceEntry : public cppu::OWeakObject { public: // sName refers to the full namespace name - ::rtl::OUString sName; + OUString sName; // sPrefix is the prefix used to declare a given item to be from a given namespace - ::rtl::OUString sPrefix; + OUString sPrefix; // nKey is the unique identifier of a namespace sal_uInt16 nKey; }; struct OUStringEqFunc { - sal_Bool operator()( const rtl::OUString &r1, - const rtl::OUString &r2) const + sal_Bool operator()( const OUString &r1, + const OUString &r2) const { return r1 == r2; } @@ -67,7 +67,7 @@ struct uInt32lt return r1 < r2; } }; -typedef ::std::pair < sal_uInt16, rtl::OUString > QNamePair; +typedef ::std::pair < sal_uInt16, OUString > QNamePair; struct QNamePairHash { @@ -77,20 +77,20 @@ struct QNamePairHash } }; -typedef ::boost::unordered_map < QNamePair, ::rtl::OUString, QNamePairHash > QNameCache; -typedef ::boost::unordered_map < ::rtl::OUString, ::rtl::Reference <NameSpaceEntry >, rtl::OUStringHash, OUStringEqFunc > NameSpaceHash; +typedef ::boost::unordered_map < QNamePair, OUString, QNamePairHash > QNameCache; +typedef ::boost::unordered_map < OUString, ::rtl::Reference <NameSpaceEntry >, OUStringHash, OUStringEqFunc > NameSpaceHash; typedef ::std::map < sal_uInt16, ::rtl::Reference < NameSpaceEntry >, uInt32lt > NameSpaceMap; class XMLOFF_DLLPUBLIC SvXMLNamespaceMap { - const ::rtl::OUString sXMLNS; - const ::rtl::OUString sEmpty; + const OUString sXMLNS; + const OUString sEmpty; NameSpaceHash aNameHash; mutable NameSpaceHash aNameCache; NameSpaceMap aNameMap; mutable QNameCache aQNameCache; - SAL_DLLPRIVATE sal_uInt16 _Add( const rtl::OUString& rPrefix, const rtl::OUString &rName, sal_uInt16 nKey ); + SAL_DLLPRIVATE sal_uInt16 _Add( const OUString& rPrefix, const OUString &rName, sal_uInt16 nKey ); public: @@ -102,34 +102,34 @@ public: void operator =( const SvXMLNamespaceMap& rCmp ); int operator ==( const SvXMLNamespaceMap& rCmp ) const; - sal_uInt16 Add( const ::rtl::OUString& rPrefix, - const ::rtl::OUString& rName, + sal_uInt16 Add( const OUString& rPrefix, + const OUString& rName, sal_uInt16 nKey = XML_NAMESPACE_UNKNOWN ); - sal_uInt16 AddIfKnown( const ::rtl::OUString& rPrefix, - const ::rtl::OUString& rName ); + sal_uInt16 AddIfKnown( const OUString& rPrefix, + const OUString& rName ); - sal_uInt16 GetKeyByName( const ::rtl::OUString& rName ) const; - const ::rtl::OUString& GetNameByKey( sal_uInt16 nKey ) const; + sal_uInt16 GetKeyByName( const OUString& rName ) const; + const OUString& GetNameByKey( sal_uInt16 nKey ) const; - sal_uInt16 GetKeyByPrefix( const ::rtl::OUString& rPrefix ) const; - const ::rtl::OUString& GetPrefixByKey( sal_uInt16 nKey ) const; + sal_uInt16 GetKeyByPrefix( const OUString& rPrefix ) const; + const OUString& GetPrefixByKey( sal_uInt16 nKey ) const; - ::rtl::OUString GetQNameByKey( sal_uInt16 nKey, - const ::rtl::OUString& rLocalName, + OUString GetQNameByKey( sal_uInt16 nKey, + const OUString& rLocalName, sal_Bool bCache = sal_True) const; - ::rtl::OUString GetAttrNameByKey( sal_uInt16 nKey ) const; + OUString GetAttrNameByKey( sal_uInt16 nKey ) const; /* This will replace the version with the unused 5th default parameter */ - sal_uInt16 _GetKeyByAttrName( const ::rtl::OUString& rAttrName, - ::rtl::OUString *pPrefix, - ::rtl::OUString *pLocalName, - ::rtl::OUString *pNamespace = 0, + sal_uInt16 _GetKeyByAttrName( const OUString& rAttrName, + OUString *pPrefix, + OUString *pLocalName, + OUString *pNamespace = 0, sal_Bool bCache = sal_True) const; /* This will replace the version with the unused 3rd default parameter */ - sal_uInt16 _GetKeyByAttrName( const ::rtl::OUString& rAttrName, - ::rtl::OUString *pLocalName = 0, + sal_uInt16 _GetKeyByAttrName( const OUString& rAttrName, + OUString *pLocalName = 0, sal_Bool bCache = sal_True) const; sal_uInt16 GetFirstKey() const; @@ -140,28 +140,28 @@ public: This might be replaced by a better interface later. */ const NameSpaceHash& GetAllEntries() const { return aNameHash; } - static sal_Bool NormalizeOasisURN( ::rtl::OUString& rName ); - static sal_Bool NormalizeW3URI( ::rtl::OUString& rName ); - static sal_Bool NormalizeURI( ::rtl::OUString& rName ); + static sal_Bool NormalizeOasisURN( OUString& rName ); + static sal_Bool NormalizeW3URI( OUString& rName ); + static sal_Bool NormalizeURI( OUString& rName ); -/* deprecated */ sal_Bool AddAtIndex( sal_uInt16 nIdx, const ::rtl::OUString& rPrefix, - const ::rtl::OUString& rName, sal_uInt16 nKey = XML_NAMESPACE_UNKNOWN ); +/* deprecated */ sal_Bool AddAtIndex( sal_uInt16 nIdx, const OUString& rPrefix, + const OUString& rName, sal_uInt16 nKey = XML_NAMESPACE_UNKNOWN ); /* deprecated */ sal_uInt16 GetIndexByKey( sal_uInt16 nKey ) const; -/* deprecated */ sal_uInt16 GetIndexByPrefix( const ::rtl::OUString& rPrefix ) const; +/* deprecated */ sal_uInt16 GetIndexByPrefix( const OUString& rPrefix ) const; /* deprecated */ sal_uInt16 GetFirstIndex() const; /* deprecated */ sal_uInt16 GetNextIndex( sal_uInt16 nOldIdx ) const; -/* deprecated */ const ::rtl::OUString& GetPrefixByIndex( sal_uInt16 nIdx ) const; -/* deprecated */ const ::rtl::OUString& GetNameByIndex( sal_uInt16 nIdx ) const; -/* deprecated */ ::rtl::OUString GetAttrNameByIndex( sal_uInt16 nIdx ) const; -/* deprecated */ ::rtl::OUString GetQNameByIndex( sal_uInt16 nIdx, - const ::rtl::OUString& rLocalName ) const; -/* deprecated */ sal_uInt16 GetKeyByAttrName( const ::rtl::OUString& rAttrName, - ::rtl::OUString *pPrefix, - ::rtl::OUString *pLocalName, - ::rtl::OUString *pNamespace=0, +/* deprecated */ const OUString& GetPrefixByIndex( sal_uInt16 nIdx ) const; +/* deprecated */ const OUString& GetNameByIndex( sal_uInt16 nIdx ) const; +/* deprecated */ OUString GetAttrNameByIndex( sal_uInt16 nIdx ) const; +/* deprecated */ OUString GetQNameByIndex( sal_uInt16 nIdx, + const OUString& rLocalName ) const; +/* deprecated */ sal_uInt16 GetKeyByAttrName( const OUString& rAttrName, + OUString *pPrefix, + OUString *pLocalName, + OUString *pNamespace=0, sal_uInt16 nIdxGuess = USHRT_MAX ) const; -/* deprecated */ sal_uInt16 GetKeyByAttrName( const ::rtl::OUString& rAttrName, - ::rtl::OUString *pLocalName = 0, +/* deprecated */ sal_uInt16 GetKeyByAttrName( const OUString& rAttrName, + OUString *pLocalName = 0, sal_uInt16 nIdxGuess = USHRT_MAX ) const; }; diff --git a/xmloff/inc/xmloff/numehelp.hxx b/xmloff/inc/xmloff/numehelp.hxx index 3cc3404de346..00b5a7a7988b 100644 --- a/xmloff/inc/xmloff/numehelp.hxx +++ b/xmloff/inc/xmloff/numehelp.hxx @@ -36,12 +36,12 @@ namespace rtl struct XMLNumberFormat { - rtl::OUString sCurrency; + OUString sCurrency; sal_Int32 nNumberFormat; sal_Int16 nType; sal_Bool bIsStandard : 1; XMLNumberFormat() : nNumberFormat(0), nType(0) {} - XMLNumberFormat(const rtl::OUString& sTempCurrency, sal_Int32 nTempFormat, + XMLNumberFormat(const OUString& sTempCurrency, sal_Int32 nTempFormat, sal_Int16 nTempType) : sCurrency(sTempCurrency), nNumberFormat(nTempFormat), nType(nTempType) {} }; @@ -60,18 +60,18 @@ class XMLOFF_DLLPUBLIC XMLNumberFormatAttributesExportHelper { ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > xNumberFormats; SvXMLExport* pExport; - const rtl::OUString sEmpty; - const rtl::OUString sStandardFormat; - const rtl::OUString sType; - const rtl::OUString sAttrValueType; - const rtl::OUString sAttrValue; - const rtl::OUString sAttrDateValue; - const rtl::OUString sAttrTimeValue; - const rtl::OUString sAttrBooleanValue; - const rtl::OUString sAttrStringValue; - const rtl::OUString sAttrCurrency; - const rtl::OUString msCurrencySymbol; - const rtl::OUString msCurrencyAbbreviation; + const OUString sEmpty; + const OUString sStandardFormat; + const OUString sType; + const OUString sAttrValueType; + const OUString sAttrValue; + const OUString sAttrDateValue; + const OUString sAttrTimeValue; + const OUString sAttrBooleanValue; + const OUString sAttrStringValue; + const OUString sAttrCurrency; + const OUString msCurrencySymbol; + const OUString msCurrencyAbbreviation; XMLNumberFormatSet aNumberFormats; public : XMLNumberFormatAttributesExportHelper(::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier); @@ -80,13 +80,13 @@ public : ~XMLNumberFormatAttributesExportHelper(); void SetExport(SvXMLExport* pExp) { this->pExport = pExp; } - sal_Int16 GetCellType(const sal_Int32 nNumberFormat, rtl::OUString& sCurrency, bool& bIsStandard); + sal_Int16 GetCellType(const sal_Int32 nNumberFormat, OUString& sCurrency, bool& bIsStandard); static void WriteAttributes(SvXMLExport& rXMLExport, const sal_Int16 nTypeKey, const double& rValue, - const rtl::OUString& rCurrencySymbol, + const OUString& rCurrencySymbol, sal_Bool bExportValue = sal_True); - static sal_Bool GetCurrencySymbol(const sal_Int32 nNumberFormat, rtl::OUString& rCurrencySymbol, + static sal_Bool GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& rCurrencySymbol, ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier); static sal_Int16 GetCellType(const sal_Int32 nNumberFormat, sal_Bool& bIsStandard, ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier); @@ -95,22 +95,22 @@ public : const double& rValue, sal_Bool bExportValue = sal_True); static void SetNumberFormatAttributes(SvXMLExport& rXMLExport, - const rtl::OUString& rValue, - const rtl::OUString& rCharacters, + const OUString& rValue, + const OUString& rCharacters, sal_Bool bExportValue = sal_True, sal_Bool bExportTypeAttribute = sal_True); - sal_Bool GetCurrencySymbol(const sal_Int32 nNumberFormat, rtl::OUString& rCurrencySymbol); + sal_Bool GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& rCurrencySymbol); sal_Int16 GetCellType(const sal_Int32 nNumberFormat, bool& bIsStandard); void WriteAttributes(const sal_Int16 nTypeKey, const double& rValue, - const rtl::OUString& rCurrencySymbol, + const OUString& rCurrencySymbol, sal_Bool bExportValue = sal_True); void SetNumberFormatAttributes(const sal_Int32 nNumberFormat, const double& rValue, sal_Bool bExportValue = sal_True); - void SetNumberFormatAttributes(const rtl::OUString& rValue, - const rtl::OUString& rCharacters, + void SetNumberFormatAttributes(const OUString& rValue, + const OUString& rCharacters, sal_Bool bExportValue = sal_True, sal_Bool bExportTypeAttribute = sal_True); }; diff --git a/xmloff/inc/xmloff/prstylei.hxx b/xmloff/inc/xmloff/prstylei.hxx index 1f144b4db54e..3ec8114c6507 100644 --- a/xmloff/inc/xmloff/prstylei.hxx +++ b/xmloff/inc/xmloff/prstylei.hxx @@ -35,8 +35,8 @@ namespace com { namespace sun { namespace star { class XMLOFF_DLLPUBLIC XMLPropStyleContext : public SvXMLStyleContext { - const ::rtl::OUString msIsPhysical; - const ::rtl::OUString msFollowStyle; + const OUString msIsPhysical; + const OUString msFollowStyle; ::std::vector< XMLPropertyState > maProperties; ::com::sun::star::uno::Reference < ::com::sun::star::style::XStyle > mxStyle; SvXMLImportContextRef mxStyles; @@ -47,8 +47,8 @@ class XMLOFF_DLLPUBLIC XMLPropStyleContext : public SvXMLStyleContext protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); SvXMLStylesContext *GetStyles() { return (SvXMLStylesContext *)&mxStyles; } ::std::vector< XMLPropertyState > & GetProperties() { return maProperties; } @@ -63,7 +63,7 @@ public: TYPEINFO(); XMLPropStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily = 0, sal_Bool bDefaultStyle=sal_False ); @@ -71,7 +71,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void FillPropertySet( diff --git a/xmloff/inc/xmloff/shapeexport.hxx b/xmloff/inc/xmloff/shapeexport.hxx index 55cc16037b65..8dfaa0f89d5e 100644 --- a/xmloff/inc/xmloff/shapeexport.hxx +++ b/xmloff/inc/xmloff/shapeexport.hxx @@ -126,8 +126,8 @@ enum XmlShapeType /** caches style and type info after a collectShapeAutostyle for later use in exportShape */ struct ImplXMLShapeExportInfo { - rtl::OUString msStyleName; - rtl::OUString msTextStyleName; + OUString msStyleName; + OUString msTextStyleName; sal_Int32 mnFamily; XmlShapeType meShapeType; @@ -168,7 +168,7 @@ private: sal_Bool mbExportLayer; ImplXMLShapeExportInfoVector maShapeInfos; ImplXMLShapeExportInfoVector::iterator maCurrentInfo; - rtl::OUString msPresentationStylePrefix; + OUString msPresentationStylePrefix; // #88546# possibility to swich progress bar handling on/off sal_Bool mbHandleProgressBar; @@ -182,30 +182,30 @@ private: SAL_DLLPRIVATE UniReference< SvXMLExportPropertyMapper > GetPropertySetMapper() const { return mxPropertySetMapper; } - const rtl::OUString msZIndex; - const rtl::OUString msPrintable; - const rtl::OUString msVisible; - - const rtl::OUString msEmptyPres; - const rtl::OUString msModel; - const rtl::OUString msStartShape; - const rtl::OUString msEndShape; - const rtl::OUString msOnClick; - const rtl::OUString msEventType; - const rtl::OUString msPresentation; - const rtl::OUString msMacroName; - const rtl::OUString msScript; - const rtl::OUString msLibrary; - const rtl::OUString msClickAction; - const rtl::OUString msBookmark; - const rtl::OUString msEffect; - const rtl::OUString msPlayFull; - const rtl::OUString msVerb; - const rtl::OUString msSoundURL; - const rtl::OUString msSpeed; - const rtl::OUString msStarBasic; - - rtl::OUStringBuffer msBuffer; + const OUString msZIndex; + const OUString msPrintable; + const OUString msVisible; + + const OUString msEmptyPres; + const OUString msModel; + const OUString msStartShape; + const OUString msEndShape; + const OUString msOnClick; + const OUString msEventType; + const OUString msPresentation; + const OUString msMacroName; + const OUString msScript; + const OUString msLibrary; + const OUString msClickAction; + const OUString msBookmark; + const OUString msEffect; + const OUString msPlayFull; + const OUString msVerb; + const OUString msSoundURL; + const OUString msSpeed; + const OUString msStarBasic; + + OUStringBuffer msBuffer; SAL_DLLPRIVATE void ImpCalcShapeType(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType& eShapeType); @@ -213,7 +213,7 @@ private: SAL_DLLPRIVATE void ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& rMatrix, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet); SAL_DLLPRIVATE void ImpExportNewTrans_DecomposeAndRefPoint(const ::basegfx::B2DHomMatrix& rMat, ::basegfx::B2DTuple& rTRScale, double& fTRShear, double& fTRRotate, ::basegfx::B2DTuple& rTRTranslate, com::sun::star::awt::Point* pRefPoint); SAL_DLLPRIVATE void ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTRScale, double fTRShear, double fTRRotate, ::basegfx::B2DTuple& rTRTranslate, const sal_Int32 nFeatures); - SAL_DLLPRIVATE sal_Bool ImpExportPresentationAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet, const rtl::OUString& rClass ); + SAL_DLLPRIVATE sal_Bool ImpExportPresentationAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet, const OUString& rClass ); SAL_DLLPRIVATE void ImpExportText( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); SAL_DLLPRIVATE void ImpExportEvents( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); SAL_DLLPRIVATE void ImpExportDescription( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); // #i68101# @@ -304,7 +304,7 @@ public: void enableHandleProgressBar( sal_Bool bEnable = sal_True ) { mbHandleProgressBar = bEnable; } sal_Bool IsHandleProgressBarEnabled() const { return mbHandleProgressBar; } - void setPresentationStylePrefix( const rtl::OUString& rPrefix ) { msPresentationStylePrefix = rPrefix; } + void setPresentationStylePrefix( const OUString& rPrefix ) { msPresentationStylePrefix = rPrefix; } /** helper for chart that adds all attributes of a 3d scene element to the export */ void export3DSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ); diff --git a/xmloff/inc/xmloff/shapeimport.hxx b/xmloff/inc/xmloff/shapeimport.hxx index 361ec0539f20..6de02130f243 100644 --- a/xmloff/inc/xmloff/shapeimport.hxx +++ b/xmloff/inc/xmloff/shapeimport.hxx @@ -188,7 +188,7 @@ public: SdXML3DLightContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual ~SdXML3DLightContext(); @@ -234,10 +234,10 @@ public: ~SdXML3DSceneAttributesHelper(); /** creates a 3d ligth context and adds it to the internal list for later processing */ - SvXMLImportContext * create3DLightContext( sal_uInt16 nPrfx, const rtl::OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); + SvXMLImportContext * create3DLightContext( sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); /** this should be called for each scene attribute */ - void processSceneAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + void processSceneAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); /** this sets the scene attributes at this propertyset */ void setSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ); @@ -250,17 +250,17 @@ class SvXMLShapeContext : public SvXMLImportContext protected: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; sal_Bool mbTemporaryShape; - rtl::OUString msHyperlink; + OUString msHyperlink; public: SvXMLShapeContext( SvXMLImport& rImp, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, sal_Bool bTemporaryShape ) : SvXMLImportContext( rImp, nPrfx, rLName ), mbTemporaryShape(bTemporaryShape) {} + const OUString& rLName, sal_Bool bTemporaryShape ) : SvXMLImportContext( rImp, nPrfx, rLName ), mbTemporaryShape(bTemporaryShape) {} TYPEINFO(); const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& getShape() const { return mxShape; } - void setHyperlink( const ::rtl::OUString& rHyperlink ); + void setHyperlink( const OUString& rHyperlink ); }; ////////////////////////////////////////////////////////////////////////////// @@ -299,10 +299,10 @@ class XMLOFF_DLLPUBLIC XMLShapeImportHelper : public UniRefBase SvXMLTokenMap* mpPathShapeAttrTokenMap; SvXMLTokenMap* mpPolygonShapeAttrTokenMap; - const ::rtl::OUString msStartShape; - const ::rtl::OUString msEndShape; - const ::rtl::OUString msStartGluePointIndex; - const ::rtl::OUString msEndGluePointIndex; + const OUString msStartShape; + const OUString msEndShape; + const OUString msStartGluePointIndex; + const OUString msEndGluePointIndex; rtl::Reference< XMLTableImport > mxShapeTableImport; @@ -317,22 +317,22 @@ public: ~XMLShapeImportHelper(); SvXMLShapeContext* CreateGroupChildContext( - SvXMLImport& rImport, sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape = sal_False); SvXMLShapeContext* CreateFrameChildContext( - SvXMLImport& rImport, sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xFrameAttrList); SvXMLImportContext* CreateFrameChildContext( - SvXMLImportContext *pThisContext, sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + SvXMLImportContext *pThisContext, sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); SvXMLShapeContext* Create3DSceneChildContext( - SvXMLImport& rImport, sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); @@ -379,7 +379,7 @@ public: void addShapeConnection( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rConnectorShape, sal_Bool bStart, - const rtl::OUString& rDestShapeId, + const OUString& rDestShapeId, sal_Int32 nDestGlueId ); /** adds a mapping for a glue point identifier from an xml file to the identifier created after inserting diff --git a/xmloff/inc/xmloff/styleexp.hxx b/xmloff/inc/xmloff/styleexp.hxx index 076b4128be05..367c6d44b402 100644 --- a/xmloff/inc/xmloff/styleexp.hxx +++ b/xmloff/inc/xmloff/styleexp.hxx @@ -52,18 +52,18 @@ class XMLOFF_DLLPUBLIC XMLStyleExport : public UniRefBase { SvXMLExport& rExport; protected: - const ::rtl::OUString sIsPhysical; - const ::rtl::OUString sIsAutoUpdate; - const ::rtl::OUString sFollowStyle; - const ::rtl::OUString sNumberingStyleName; - const ::rtl::OUString sOutlineLevel; + const OUString sIsPhysical; + const OUString sIsAutoUpdate; + const OUString sFollowStyle; + const OUString sNumberingStyleName; + const OUString sOutlineLevel; SvXMLExport& GetExport() { return rExport; } const SvXMLExport& GetExport() const { return rExport; } private: - const ::rtl::OUString sPoolStyleName; + const OUString sPoolStyleName; SvXMLAutoStylePoolP *pAutoStylePool; @@ -72,10 +72,10 @@ protected: virtual sal_Bool exportStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > & rStyle, - const ::rtl::OUString& rXMLFamily, + const OUString& rXMLFamily, const UniReference < SvXMLExportPropertyMapper >& rPropMapper, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xStyles, - const ::rtl::OUString* pPrefix = 0L ); + const OUString* pPrefix = 0L ); virtual void exportStyleAttributes( const ::com::sun::star::uno::Reference< @@ -87,39 +87,39 @@ protected: public: XMLStyleExport( SvXMLExport& rExp, - const ::rtl::OUString& rPoolStyleName, + const OUString& rPoolStyleName, SvXMLAutoStylePoolP *pAutoStyleP=0 ); virtual ~XMLStyleExport(); // void exportStyleFamily( -// const ::rtl::OUString& rFamily, const ::rtl::OUString& rXMLFamily, +// const OUString& rFamily, const OUString& rXMLFamily, // const UniReference < XMLPropertySetMapper >& rPropMapper, // sal_Bool bUsed, sal_uInt16 nFamily = 0, -// const ::rtl::OUString* pPrefix = 0L); +// const OUString* pPrefix = 0L); // void exportStyleFamily( -// const sal_Char *pFamily, const ::rtl::OUString& rXMLFamily, +// const sal_Char *pFamily, const OUString& rXMLFamily, // const UniReference < XMLPropertySetMapper >& rPropMapper, // sal_Bool bUsed, sal_uInt16 nFamily = 0, -// const ::rtl::OUString* pPrefix = 0L); +// const OUString* pPrefix = 0L); virtual sal_Bool exportDefaultStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xPropSet, - const ::rtl::OUString& rXMLFamily, + const OUString& rXMLFamily, const UniReference < SvXMLExportPropertyMapper >& rPropMapper ); void exportStyleFamily( - const ::rtl::OUString& rFamily, const ::rtl::OUString& rXMLFamily, + const OUString& rFamily, const OUString& rXMLFamily, const UniReference < SvXMLExportPropertyMapper >& rPropMapper, sal_Bool bUsed, sal_uInt16 nFamily = 0, - const ::rtl::OUString* pPrefix = 0L); + const OUString* pPrefix = 0L); void exportStyleFamily( - const sal_Char *pFamily, const ::rtl::OUString& rXMLFamily, + const sal_Char *pFamily, const OUString& rXMLFamily, const UniReference < SvXMLExportPropertyMapper >& rPropMapper, sal_Bool bUsed, sal_uInt16 nFamily = 0, - const ::rtl::OUString* pPrefix = 0L); + const OUString* pPrefix = 0L); }; #endif diff --git a/xmloff/inc/xmloff/table/XMLTableExport.hxx b/xmloff/inc/xmloff/table/XMLTableExport.hxx index 588d5ab0532b..e93c0a244a51 100644 --- a/xmloff/inc/xmloff/table/XMLTableExport.hxx +++ b/xmloff/inc/xmloff/table/XMLTableExport.hxx @@ -49,14 +49,14 @@ class SvXMLExport; class SvXMLExportPropertyMapper; -typedef ::std::map< const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >, rtl::OUString > TableStyleMap; +typedef ::std::map< const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >, OUString > TableStyleMap; struct XMLTableInfo { TableStyleMap maColumnStyleMap; TableStyleMap maRowStyleMap; TableStyleMap maCellStyleMap; - std::vector< ::rtl::OUString > maDefaultRowCellStyles; + std::vector< OUString > maDefaultRowCellStyles; }; typedef ::std::map< const ::com::sun::star::uno::Reference< com::sun::star::table::XColumnRowRange >, boost::shared_ptr< XMLTableInfo > > TableInfoMap; @@ -96,7 +96,7 @@ private: SAL_DLLPRIVATE void ImpExportText( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell ); - void ExportCell( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell, const boost::shared_ptr< XMLTableInfo >& pTableInfo, const ::rtl::OUString& sDefaultCellStyle ); + void ExportCell( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell, const boost::shared_ptr< XMLTableInfo >& pTableInfo, const OUString& sDefaultCellStyle ); void ExportTableColumns( const com::sun::star::uno::Reference < com::sun::star::container::XIndexAccess >& xtableColumns, const boost::shared_ptr< XMLTableInfo >& pTableInfo ); }; diff --git a/xmloff/inc/xmloff/table/XMLTableImport.hxx b/xmloff/inc/xmloff/table/XMLTableImport.hxx index 3d61dde50c2a..fec6b37e0eaa 100644 --- a/xmloff/inc/xmloff/table/XMLTableImport.hxx +++ b/xmloff/inc/xmloff/table/XMLTableImport.hxx @@ -35,8 +35,8 @@ class SvXMLStyleContext; -typedef std::map< ::rtl::OUString, ::rtl::OUString > XMLTableTemplate; -typedef std::map < ::rtl::OUString, boost::shared_ptr< XMLTableTemplate > > XMLTableTemplateMap; +typedef std::map< OUString, OUString > XMLTableTemplate; +typedef std::map < OUString, boost::shared_ptr< XMLTableTemplate > > XMLTableTemplateMap; class XMLTableImport : public UniRefBase { @@ -46,16 +46,16 @@ public: XMLTableImport( SvXMLImport& rImport, const rtl::Reference< XMLPropertySetMapper >& xCellPropertySetMapper, const rtl::Reference< XMLPropertyHandlerFactory >& xFactoryRef ); virtual ~XMLTableImport(); - SvXMLImportContext* CreateTableContext( sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + SvXMLImportContext* CreateTableContext( sal_uInt16 nPrfx, const OUString& rLName, ::com::sun::star::uno::Reference< ::com::sun::star::table::XColumnRowRange >& xColumnRowRange ); - SvXMLStyleContext* CreateTableTemplateContext( sal_uInt16 nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + SvXMLStyleContext* CreateTableTemplateContext( sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); rtl::Reference< SvXMLImportPropertyMapper > GetCellImportPropertySetMapper() const { return mxCellImportPropertySetMapper; } rtl::Reference< SvXMLImportPropertyMapper > GetRowImportPropertySetMapper() const { return mxRowImportPropertySetMapper; } rtl::Reference< SvXMLImportPropertyMapper > GetColumnImportPropertySetMapper() const { return mxColumnImportPropertySetMapper; } - void addTableTemplate( const rtl::OUString& rsStyleName, XMLTableTemplate& xTableTemplate ); + void addTableTemplate( const OUString& rsStyleName, XMLTableTemplate& xTableTemplate ); void finishStyles(); private: diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx index 000399109615..2ac668de2d5a 100644 --- a/xmloff/inc/xmloff/txtimp.hxx +++ b/xmloff/inc/xmloff/txtimp.hxx @@ -380,7 +380,7 @@ private: protected: virtual SvXMLImportContext *CreateTableChildContext( SvXMLImport& rImport, - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -388,7 +388,7 @@ protected: // Code is implemented in XMLPropertyBackpatcher.cxx inline XMLPropertyBackpatcher<sal_Int16>& GetFootnoteBP(); inline XMLPropertyBackpatcher<sal_Int16>& GetSequenceIdBP(); - inline XMLPropertyBackpatcher< ::rtl::OUString> & GetSequenceNameBP(); + inline XMLPropertyBackpatcher< OUString> & GetSequenceNameBP(); public: @@ -414,7 +414,7 @@ public: SvXMLImportContext *CreateTextChildContext( SvXMLImport& rImport, - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, XMLTextType eType = XML_TEXT_TYPE_SHAPE ); @@ -445,15 +445,15 @@ public: bool IsOrganizerMode() const; bool IsProgress() const; - ::rtl::OUString ConvertStarFonts( const ::rtl::OUString& rChars, - const ::rtl::OUString& rStyleName, + OUString ConvertStarFonts( const OUString& rChars, + const OUString& rStyleName, sal_uInt8& rFlags, sal_Bool bPara, SvXMLImport& rImport ) const; // insert a string without special whitespace processing enabled - void InsertString( const ::rtl::OUString& rChars ); + void InsertString( const OUString& rChars ); // insert a string with special whitespace processing enabled - void InsertString( const ::rtl::OUString& rChars, + void InsertString( const OUString& rChars, sal_Bool& rIgnoreLeadingSpace ); // Delete current paragraph void DeleteParagraph(); @@ -464,11 +464,11 @@ public: // Add parameter <bOutlineLevelAttrFound> (#i73509#) // Add parameter <bSetListAttrs> in order to suppress the handling of the list attributes (#i80724#) - ::rtl::OUString SetStyleAndAttrs( + OUString SetStyleAndAttrs( SvXMLImport& rImport, const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor >& rCursor, - const ::rtl::OUString& rStyleName, + const OUString& rStyleName, sal_Bool bPara, sal_Bool bOutlineLevelAttrFound = sal_False, sal_Int8 nOutlineLevel = -1, @@ -479,12 +479,12 @@ public: * name for that level. Otherwise, leave rStyleName unmodified. */ // Adjust 2nd parameter (#i69629#) - void FindOutlineStyleName( ::rtl::OUString& rStyleName, + void FindOutlineStyleName( OUString& rStyleName, sal_Int8 nOutlineLevel ); // Change method name to reflect change of data structure (#i69629#) void AddOutlineStyleCandidate( const sal_Int8 nOutlineLevel, - const ::rtl::OUString& rStyleName ); + const OUString& rStyleName ); void SetOutlineStyles( sal_Bool bSetEmpty ); @@ -492,34 +492,34 @@ public: SvXMLImport& rImport, const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor >& rCursor, - const ::rtl::OUString& rHRef, - const ::rtl::OUString& rName, - const ::rtl::OUString& rTargetFrameName, - const ::rtl::OUString& rStyleName, - const ::rtl::OUString& rVisitedStyleName, + const OUString& rHRef, + const OUString& rName, + const OUString& rTargetFrameName, + const OUString& rStyleName, + const OUString& rVisitedStyleName, XMLEventsImportContext* pEvents = NULL); void SetRuby( SvXMLImport& rImport, const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor >& rCursor, - const ::rtl::OUString& rStyleName, - const ::rtl::OUString& rTextStyleName, - const ::rtl::OUString& rText ); + const OUString& rStyleName, + const OUString& rTextStyleName, + const OUString& rText ); /// return key appropriate for use with NumberFormat property /// return -1 if style is not found /// (may return whether data style uses the system language) - sal_Int32 GetDataStyleKey( const ::rtl::OUString& sStyleName, + sal_Int32 GetDataStyleKey( const OUString& sStyleName, sal_Bool* pIsSystemLanguage = NULL ); const SvxXMLListStyleContext *FindAutoListStyle( - const ::rtl::OUString& rName ) const; + const OUString& rName ) const; XMLPropStyleContext *FindAutoFrameStyle( - const ::rtl::OUString& rName ) const; + const OUString& rName ) const; XMLPropStyleContext* FindSectionStyle( - const ::rtl::OUString& rName ) const; + const OUString& rName ) const; XMLPropStyleContext* FindPageMaster( - const ::rtl::OUString& rName ) const; + const OUString& rName ) const; const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer> & GetParaStyles() const; @@ -541,9 +541,9 @@ public: ::com::sun::star::container::XIndexReplace > & GetChapterNumbering() const; - sal_Bool HasFrameByName( const ::rtl::OUString& rName ) const; - void ConnectFrameChains( const ::rtl::OUString& rFrmName, - const ::rtl::OUString& rNextFrmName, + sal_Bool HasFrameByName( const OUString& rName ) const; + void ConnectFrameChains( const OUString& rFrmName, + const OUString& rNextFrmName, const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& rFrmPropSet ); @@ -566,56 +566,56 @@ public: /// save the start of a range reference void InsertBookmarkStartRange( - const ::rtl::OUString & sName, + const OUString & sName, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & rRange, - ::rtl::OUString const& i_rXmlId, + OUString const& i_rXmlId, ::boost::shared_ptr< ::xmloff::ParsedRDFaAttributes > & i_rpRDFaAttributes); /// process the start of a range reference sal_Bool FindAndRemoveBookmarkStartRange( - const ::rtl::OUString & sName, + const OUString & sName, ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & o_rRange, - ::rtl::OUString & o_rXmlId, + OUString & o_rXmlId, ::boost::shared_ptr< ::xmloff::ParsedRDFaAttributes > & o_rpRDFaAttributes); - ::rtl::OUString FindActiveBookmarkName(); + OUString FindActiveBookmarkName(); - void pushFieldCtx( ::rtl::OUString name, ::rtl::OUString type ); + void pushFieldCtx( OUString name, OUString type ); void popFieldCtx(); - void addFieldParam( ::rtl::OUString name, ::rtl::OUString value ); + void addFieldParam( OUString name, OUString value ); void setCurrentFieldParamsTo(::com::sun::star::uno::Reference< ::com::sun::star::text::XFormField> &xFormField); - ::rtl::OUString getCurrentFieldType(); + OUString getCurrentFieldType(); bool hasCurrentFieldCtx(); /// insert new footnote ID. /// Also fixup open references from the backpatch list to this ID. // Code is implemented in XMLPropertyBackpatcher.cxx - void InsertFootnoteID(const ::rtl::OUString& sXMLId, sal_Int16 nAPIId); + void InsertFootnoteID(const OUString& sXMLId, sal_Int16 nAPIId); /// set the proper footnote reference ID, /// or put into backpatch list if ID is unknown // Code is implemented in XMLPropertyBackpatcher.cxx void ProcessFootnoteReference( - const ::rtl::OUString& sXMLId, + const OUString& sXMLId, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xPropSet); /// insert new sequence ID /// Also fixup open references from backpatch list to this ID. // Code is implemented in XMLPropertyBackpatcher.cxx - void InsertSequenceID(const ::rtl::OUString& sXMLId, - const ::rtl::OUString& sName, + void InsertSequenceID(const OUString& sXMLId, + const OUString& sName, sal_Int16 nAPIId); /// set sequence ID or insert into backpatch list // Code is implemented in XMLPropertyBackpatcher.cxx void ProcessSequenceReference( - const ::rtl::OUString& sXMLId, + const OUString& sXMLId, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xPropSet); @@ -625,47 +625,47 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertOLEObject( SvXMLImport& rImport, - const ::rtl::OUString& rHRef, - const ::rtl::OUString &rStyleName, - const ::rtl::OUString &rTblName, + const OUString& rHRef, + const OUString &rStyleName, + const OUString &rTblName, sal_Int32 nWidth, sal_Int32 nHeight ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertOOoLink( SvXMLImport& rImport, - const ::rtl::OUString& rHRef, - const ::rtl::OUString &rStyleName, - const ::rtl::OUString &rTblName, + const OUString& rHRef, + const OUString &rStyleName, + const OUString &rTblName, sal_Int32 nWidth, sal_Int32 nHeight ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertApplet( - const ::rtl::OUString &rName, - const ::rtl::OUString &rCode, + const OUString &rName, + const OUString &rCode, sal_Bool bMayScript, - const ::rtl::OUString& rHRef, + const OUString& rHRef, sal_Int32 nWidth, sal_Int32 nHeight ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertPlugin( - const ::rtl::OUString &rMimeType, - const ::rtl::OUString& rHRef, + const OUString &rMimeType, + const OUString& rHRef, sal_Int32 nWidth, sal_Int32 nHeight ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertFloatingFrame( - const ::rtl::OUString &rName, - const ::rtl::OUString &rHRef, - const ::rtl::OUString &rStyleName, + const OUString &rName, + const OUString &rHRef, + const OUString &rStyleName, sal_Int32 nWidth, sal_Int32 nHeight ); virtual void endAppletOrPlugin( const com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> &rPropSet, - ::std::map < const ::rtl::OUString, ::rtl::OUString, ::comphelper::UStringLess > &rParamMap ); + ::std::map < const OUString, OUString, ::comphelper::UStringLess > &rParamMap ); // applet helper methods // implemented in sw/filter/xml/txtparai.hxx @@ -674,19 +674,19 @@ public: // (to be implemented in sw/filter/xml/txtparai.hxx) virtual void RedlineAdd( - const ::rtl::OUString& rType, /// redline type (insert, del,... ) - const ::rtl::OUString& rId, /// use to identify this redline - const ::rtl::OUString& rAuthor, /// name of the author - const ::rtl::OUString& rComment, /// redline comment + const OUString& rType, /// redline type (insert, del,... ) + const OUString& rId, /// use to identify this redline + const OUString& rAuthor, /// name of the author + const OUString& rComment, /// redline comment const ::com::sun::star::util::DateTime& rDateTime, /// date+time sal_Bool bMergeLastParagraph); /// merge last paras virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor> RedlineCreateText( ::com::sun::star::uno::Reference< /// needed to get the document ::com::sun::star::text::XTextCursor> & rOldCursor, - const ::rtl::OUString& rId); /// ID used to RedlineAdd() call + const OUString& rId); /// ID used to RedlineAdd() call virtual void RedlineSetCursor( - const ::rtl::OUString& rId, /// ID used to RedlineAdd() call + const OUString& rId, /// ID used to RedlineAdd() call sal_Bool bStart, /// start or end Cursor sal_Bool bIsOutsideOfParagraph); /// range is not within <text:p> virtual void RedlineAdjustStartNodeCursor( @@ -697,8 +697,8 @@ public: const ::com::sun::star::uno::Sequence<sal_Int8> & rProtectionKey ); // access to the last open redline ID: - ::rtl::OUString GetOpenRedlineId(); - void SetOpenRedlineId( ::rtl::OUString& rId); + OUString GetOpenRedlineId(); + void SetOpenRedlineId( OUString& rId); void ResetOpenRedlineId(); // #107848# @@ -716,8 +716,8 @@ public: /// pop the list context stack void PopListContext(); - void SetCellParaStyleDefault(::rtl::OUString const& rNewValue); - ::rtl::OUString const& GetCellParaStyleDefault(); + void SetCellParaStyleDefault(OUString const& rNewValue); + OUString const& GetCellParaStyleDefault(); }; #endif diff --git a/xmloff/inc/xmloff/txtimppr.hxx b/xmloff/inc/xmloff/txtimppr.hxx index cd2cc34ddb78..ae58bdd9f55e 100644 --- a/xmloff/inc/xmloff/txtimppr.hxx +++ b/xmloff/inc/xmloff/txtimppr.hxx @@ -52,7 +52,7 @@ protected: virtual bool handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const; public: diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx index d4f71ba96586..8e432e8cf7d7 100644 --- a/xmloff/inc/xmloff/txtparae.hxx +++ b/xmloff/inc/xmloff/txtparae.hxx @@ -80,7 +80,7 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public XMLStyleExport const ::std::auto_ptr< ::xmloff::BoundFrameSets > pBoundFrameSets; XMLTextFieldExport *pFieldExport; - std::vector<rtl::OUString> *pListElements; + std::vector<OUString> *pListElements; XMLTextListAutoStylePool *pListAutoPool; XMLSectionExport *pSectionExport; XMLIndexMarkExport *pIndexMarkExport; diff --git a/xmloff/inc/xmloff/txtstyli.hxx b/xmloff/inc/xmloff/txtstyli.hxx index b3cde20dc460..d645cfc11281 100644 --- a/xmloff/inc/xmloff/txtstyli.hxx +++ b/xmloff/inc/xmloff/txtstyli.hxx @@ -28,20 +28,20 @@ class XMLEventsImportContext; class XMLOFF_DLLPUBLIC XMLTextStyleContext : public XMLPropStyleContext { - ::rtl::OUString sListStyleName; - ::rtl::OUString sCategoryVal; - ::rtl::OUString sDropCapTextStyleName; - ::rtl::OUString sMasterPageName; - ::rtl::OUString sDataStyleName; // for grid columns only - const ::rtl::OUString sIsAutoUpdate; - const ::rtl::OUString sCategory; - const ::rtl::OUString sNumberingStyleName; - const ::rtl::OUString sOutlineLevel; + OUString sListStyleName; + OUString sCategoryVal; + OUString sDropCapTextStyleName; + OUString sMasterPageName; + OUString sDataStyleName; // for grid columns only + const OUString sIsAutoUpdate; + const OUString sCategory; + const OUString sNumberingStyleName; + const OUString sOutlineLevel; public: - const ::rtl::OUString sDropCapCharStyleName; + const OUString sDropCapCharStyleName; private: - const ::rtl::OUString sPageDescName; + const OUString sPageDescName; sal_Int8 nOutlineLevel; @@ -58,15 +58,15 @@ private: protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); XMLTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, @@ -75,22 +75,22 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); sal_Bool IsAutoUpdate() const { return bAutoUpdate; } - const ::rtl::OUString& GetListStyle() const { return sListStyleName; } + const OUString& GetListStyle() const { return sListStyleName; } // XML import: reconstrution of assignment of paragraph style to outline levels (#i69629#) sal_Bool IsListStyleSet() const { return mbListStyleSet; } - const ::rtl::OUString& GetMasterPageName() const { return sMasterPageName; } + const OUString& GetMasterPageName() const { return sMasterPageName; } sal_Bool HasMasterPageName() const { return bHasMasterPageName; } - const ::rtl::OUString& GetDropCapStyleName() const { return sDropCapTextStyleName; } - const ::rtl::OUString& GetDataStyleName() const { return sDataStyleName; } + const OUString& GetDropCapStyleName() const { return sDropCapTextStyleName; } + const OUString& GetDataStyleName() const { return sDataStyleName; } virtual void CreateAndInsert( sal_Bool bOverwrite ); virtual void Finish( sal_Bool bOverwrite ); diff --git a/xmloff/inc/xmloff/unoatrcn.hxx b/xmloff/inc/xmloff/unoatrcn.hxx index 726ea7627456..616d1db4f740 100644 --- a/xmloff/inc/xmloff/unoatrcn.hxx +++ b/xmloff/inc/xmloff/unoatrcn.hxx @@ -40,7 +40,7 @@ class XMLOFF_DLLPUBLIC SvUnoAttributeContainer: private: SvXMLAttrContainerData* mpContainer; - SAL_DLLPRIVATE sal_uInt16 getIndexByName(const ::rtl::OUString& aName ) + SAL_DLLPRIVATE sal_uInt16 getIndexByName(const OUString& aName ) const; public: @@ -57,21 +57,21 @@ public: virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString& aName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& aName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XNameReplace - virtual void SAL_CALL replaceByName(const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL replaceByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XNameContainer - virtual void SAL_CALL insertByName(const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeByName(const ::rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL insertByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL removeByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); friend ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvUnoAttributeContainer_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ) throw( ::com::sun::star::uno::Exception ); }; diff --git a/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx b/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx index 03d30332c2da..e538cbe176e0 100644 --- a/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx +++ b/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx @@ -31,7 +31,7 @@ namespace comphelper { -typedef ::std::map< rtl::OUString, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > IdMap_t; +typedef ::std::map< OUString, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > IdMap_t; class XMLOFF_DLLPUBLIC UnoInterfaceToUniqueIdentifierMapper { @@ -41,30 +41,30 @@ public: /** returns a unique identifier for the given uno object. IF a uno object is registered more than once, the returned identifier is always the same. */ - const rtl::OUString& registerReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ); + const OUString& registerReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ); /** registers the given uno object with the given identifier. @returns false, if the given identifier already exists and is not associated with the given interface */ - bool registerReference( const rtl::OUString& rIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ); + bool registerReference( const OUString& rIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ); /** @returns the identifier for the given uno object. If this uno object is not already registered, an empty string is returned */ - const rtl::OUString& getIdentifier( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ) const; + const OUString& getIdentifier( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ) const; /** @returns the uno object that is registered with the given identifier. If no uno object is registered with the given identifier, an empty reference is returned. */ - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& getReference( const rtl::OUString& rIdentifier ) const; + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& getReference( const OUString& rIdentifier ) const; private: bool findReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface, IdMap_t::const_iterator& rIter ) const; - bool findIdentifier( const rtl::OUString& rIdentifier, IdMap_t::const_iterator& rIter ) const; + bool findIdentifier( const OUString& rIdentifier, IdMap_t::const_iterator& rIter ) const; IdMap_t maEntries; sal_Int32 mnNextId; diff --git a/xmloff/inc/xmloff/xformsexport.hxx b/xmloff/inc/xmloff/xformsexport.hxx index d527d7115468..802180126f1b 100644 --- a/xmloff/inc/xmloff/xformsexport.hxx +++ b/xmloff/inc/xmloff/xformsexport.hxx @@ -20,6 +20,7 @@ #define _XMLOFF_XFORMSEXPORT_HXX #include "xmloff/dllapi.h" +#include <rtl/ustring.hxx> class SvXMLExport; namespace com { namespace sun { namespace star { @@ -29,17 +30,16 @@ namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; struct PropertyValue; } namespace container { class XNameAccess; } } } } -namespace rtl { class OUString; } /** export an XForms model. */ void SAL_DLLPRIVATE exportXForms( SvXMLExport& ); -rtl::OUString SAL_DLLPRIVATE getXFormsBindName( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xBinding ); +OUString SAL_DLLPRIVATE getXFormsBindName( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xBinding ); -rtl::OUString SAL_DLLPRIVATE getXFormsListBindName( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xBinding ); +OUString SAL_DLLPRIVATE getXFormsListBindName( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xBinding ); -rtl::OUString SAL_DLLPRIVATE getXFormsSubmissionName( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xBinding ); +OUString SAL_DLLPRIVATE getXFormsSubmissionName( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xBinding ); /** returns the settings of the given XForms container, to be exported as document specific settings diff --git a/xmloff/inc/xmloff/xformsimport.hxx b/xmloff/inc/xmloff/xformsimport.hxx index f98a3356858c..9be4bc3bdcb6 100644 --- a/xmloff/inc/xmloff/xformsimport.hxx +++ b/xmloff/inc/xmloff/xformsimport.hxx @@ -40,7 +40,7 @@ namespace com { namespace sun { namespace star { XMLOFF_DLLPUBLIC SvXMLImportContext* createXFormsModelContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName ); + const OUString& rLocalName ); /** perform the actual binding of an XForms-binding with the suitable control * @param document which contains the XForms-model(s) @@ -48,7 +48,7 @@ XMLOFF_DLLPUBLIC SvXMLImportContext* createXFormsModelContext( */ void bindXFormsValueBinding( com::sun::star::uno::Reference<com::sun::star::frame::XModel>, - std::pair<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>,rtl::OUString> ); + std::pair<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>,OUString> ); /** perform the actual binding of an XForms-binding as list source with a list control @@ -57,7 +57,7 @@ void bindXFormsValueBinding( */ void bindXFormsListBinding( com::sun::star::uno::Reference<com::sun::star::frame::XModel>, - std::pair<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>,rtl::OUString> ); + std::pair<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>,OUString> ); /** perform the actual binding of an XForms submission with the suitable control * @param document which contains the XForms-model(s) @@ -65,7 +65,7 @@ void bindXFormsListBinding( */ void bindXFormsSubmission( com::sun::star::uno::Reference<com::sun::star::frame::XModel>, - std::pair<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>,rtl::OUString> ); + std::pair<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>,OUString> ); /** applies the given settings to the given XForms container */ diff --git a/xmloff/inc/xmloff/xmlaustp.hxx b/xmloff/inc/xmloff/xmlaustp.hxx index 2482c8026bdf..e08b027ddb0f 100644 --- a/xmloff/inc/xmloff/xmlaustp.hxx +++ b/xmloff/inc/xmloff/xmlaustp.hxx @@ -77,37 +77,37 @@ public: if bAsFamily is sal_False, the family name is used as element name */ // TODO: Remove this ugly method as soon as possible - void AddFamily( sal_Int32 nFamily, const ::rtl::OUString& rStrName, SvXMLExportPropertyMapper* pMapper, ::rtl::OUString aStrPrefix, sal_Bool bAsFamily = sal_True ); - void AddFamily( sal_Int32 nFamily, const ::rtl::OUString& rStrName, + void AddFamily( sal_Int32 nFamily, const OUString& rStrName, SvXMLExportPropertyMapper* pMapper, OUString aStrPrefix, sal_Bool bAsFamily = sal_True ); + void AddFamily( sal_Int32 nFamily, const OUString& rStrName, const UniReference< SvXMLExportPropertyMapper >& rMapper, - const ::rtl::OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); + const OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); void SetFamilyPropSetMapper( sal_Int32 nFamily, const UniReference< SvXMLExportPropertyMapper >& rMapper ); /// Register a name that must not be used as a generated name. - void RegisterName( sal_Int32 nFamily, const ::rtl::OUString& rName ); + void RegisterName( sal_Int32 nFamily, const OUString& rName ); /// retrieve the registered names (names + families) void GetRegisteredNames( com::sun::star::uno::Sequence<sal_Int32>& aFamilies, - com::sun::star::uno::Sequence<rtl::OUString>& aNames ); + com::sun::star::uno::Sequence<OUString>& aNames ); /// register (families + names) void RegisterNames( com::sun::star::uno::Sequence<sal_Int32>& aFamilies, - com::sun::star::uno::Sequence<rtl::OUString>& aNames ); + com::sun::star::uno::Sequence<OUString>& aNames ); /// Add an item set to the pool and return its generated name. - ::rtl::OUString Add( sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties ); - ::rtl::OUString Add( sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties, bool bDontSeek = false ); - sal_Bool Add( ::rtl::OUString& rName, sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ); + OUString Add( sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties ); + OUString Add( sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties, bool bDontSeek = false ); + sal_Bool Add( OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ); /// Add an item set with a pre-defined name (needed for saving sheets separately in Calc). - sal_Bool AddNamed( const ::rtl::OUString& rName, sal_Int32 nFamily, const ::rtl::OUString& rParent, + sal_Bool AddNamed( const OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ); /// Find an item set's name. - ::rtl::OUString Find( sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) const; + OUString Find( sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) const; /** Export all item sets ofs a certain class in the order in that they have been added. */ void exportXML( sal_Int32 nFamily diff --git a/xmloff/inc/xmloff/xmlcnimp.hxx b/xmloff/inc/xmloff/xmlcnimp.hxx index 6eaac83a0d99..1243c2f59b02 100644 --- a/xmloff/inc/xmloff/xmlcnimp.hxx +++ b/xmloff/inc/xmloff/xmlcnimp.hxx @@ -39,33 +39,33 @@ public: int operator ==( const SvXMLAttrContainerData& rCmp ) const; - sal_Bool AddAttr( const ::rtl::OUString& rLName, const rtl::OUString& rValue ); - sal_Bool AddAttr( const ::rtl::OUString& rPrefix, const rtl::OUString& rNamespace, - const ::rtl::OUString& rLName, const rtl::OUString& rValue ); - sal_Bool AddAttr( const ::rtl::OUString& rPrefix, - const ::rtl::OUString& rLName, - const ::rtl::OUString& rValue ); + sal_Bool AddAttr( const OUString& rLName, const OUString& rValue ); + sal_Bool AddAttr( const OUString& rPrefix, const OUString& rNamespace, + const OUString& rLName, const OUString& rValue ); + sal_Bool AddAttr( const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ); size_t GetAttrCount() const; - const rtl::OUString GetAttrNamespace( size_t i ) const; - const rtl::OUString GetAttrPrefix( size_t i ) const; - const rtl::OUString& GetAttrLName( size_t i ) const; - const rtl::OUString& GetAttrValue( size_t i ) const; + const OUString GetAttrNamespace( size_t i ) const; + const OUString GetAttrPrefix( size_t i ) const; + const OUString& GetAttrLName( size_t i ) const; + const OUString& GetAttrValue( size_t i ) const; sal_uInt16 GetFirstNamespaceIndex() const; sal_uInt16 GetNextNamespaceIndex( sal_uInt16 nIdx ) const; - const ::rtl::OUString& GetNamespace( sal_uInt16 i ) const; - const ::rtl::OUString& GetPrefix( sal_uInt16 i ) const; + const OUString& GetNamespace( sal_uInt16 i ) const; + const OUString& GetPrefix( sal_uInt16 i ) const; sal_Bool SetAt( size_t i, - const ::rtl::OUString& rLName, const rtl::OUString& rValue ); + const OUString& rLName, const OUString& rValue ); sal_Bool SetAt( size_t i, - const ::rtl::OUString& rPrefix, const rtl::OUString& rNamespace, - const ::rtl::OUString& rLName, const rtl::OUString& rValue ); + const OUString& rPrefix, const OUString& rNamespace, + const OUString& rLName, const OUString& rValue ); sal_Bool SetAt( size_t i, - const ::rtl::OUString& rPrefix, - const ::rtl::OUString& rLName, - const ::rtl::OUString& rValue ); + const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ); void Remove( size_t i ); }; diff --git a/xmloff/inc/xmloff/xmlerror.hxx b/xmloff/inc/xmloff/xmlerror.hxx index e526f7cd03c8..2400631d3cbb 100644 --- a/xmloff/inc/xmloff/xmlerror.hxx +++ b/xmloff/inc/xmloff/xmlerror.hxx @@ -119,18 +119,18 @@ public: void AddRecord( sal_Int32 nId, /// error ID == error flags + error class + error number const ::com::sun::star::uno::Sequence< - ::rtl::OUString> & rParams, /// parameters for error message - const ::rtl::OUString& rExceptionMessage, /// original exception string + OUString> & rParams, /// parameters for error message + const OUString& rExceptionMessage, /// original exception string sal_Int32 nRow, /// XLocator: file row number sal_Int32 nColumn, /// XLocator: file column number - const ::rtl::OUString& rPublicId, /// XLocator: file public ID - const ::rtl::OUString& rSystemId ); /// XLocator: file system ID + const OUString& rPublicId, /// XLocator: file public ID + const OUString& rSystemId ); /// XLocator: file system ID void AddRecord( sal_Int32 nId, /// error ID == error flags + error class + error number const ::com::sun::star::uno::Sequence< - ::rtl::OUString> & rParams, /// parameters for error message - const ::rtl::OUString& rExceptionMessage, /// original exception string + OUString> & rParams, /// parameters for error message + const OUString& rExceptionMessage, /// original exception string const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator> & rLocator); /// location diff --git a/xmloff/inc/xmloff/xmlevent.hxx b/xmloff/inc/xmloff/xmlevent.hxx index d9ceb372c2dd..a6d0763e3df0 100644 --- a/xmloff/inc/xmloff/xmlevent.hxx +++ b/xmloff/inc/xmloff/xmlevent.hxx @@ -45,15 +45,15 @@ class XMLEventsImportContext; struct XMLEventName { sal_uInt16 m_nPrefix; - ::rtl::OUString m_aName; + OUString m_aName; XMLEventName() : m_nPrefix( 0 ) {} XMLEventName( sal_uInt16 n, const sal_Char *p ) : m_nPrefix( n ), - m_aName( ::rtl::OUString::createFromAscii(p) ) + m_aName( OUString::createFromAscii(p) ) {} - XMLEventName( sal_uInt16 n, const ::rtl::OUString& r ) : + XMLEventName( sal_uInt16 n, const OUString& r ) : m_nPrefix( n ), m_aName( r ) {} @@ -96,7 +96,7 @@ public: virtual void Export( SvXMLExport& rExport, /// the current XML export - const ::rtl::OUString& rEventQName, /// the XML name of the event + const OUString& rEventQName, /// the XML name of the event ::com::sun::star::uno::Sequence< /// the values for the event ::com::sun::star::beans::PropertyValue> & rValues, sal_Bool bUseWhitespace) = 0; /// create whitespace around elements? @@ -129,15 +129,15 @@ public: virtual SvXMLImportContext* CreateContext( SvXMLImport& rImport, /// import context sal_uInt16 nPrefix, /// element: namespace prefix - const ::rtl::OUString& rLocalName, /// element: local name + const OUString& rLocalName, /// element: local name const ::com::sun::star::uno::Reference< /// attribute list ::com::sun::star::xml::sax::XAttributeList> & xAttrList, /// the context for the enclosing <script:events> element XMLEventsImportContext* rEvents, /// the event name (as understood by the API) - const ::rtl::OUString& rApiEventName, + const OUString& rApiEventName, /// the event type name (as registered) - const ::rtl::OUString& rApiLanguage) = 0; + const OUString& rApiLanguage) = 0; }; diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx index cf68b628c3ed..b4f635d522ab 100644 --- a/xmloff/inc/xmloff/xmlexp.hxx +++ b/xmloff/inc/xmloff/xmlexp.hxx @@ -121,10 +121,10 @@ class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6< SvXMLAttributeList *mpAttrList; // a common attribute list ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > mxAttrList; // and an interface of it - ::rtl::OUString msOrigFileName; // the original URL - ::rtl::OUString msGraphicObjectProtocol; - ::rtl::OUString msEmbeddedObjectProtocol; - ::rtl::OUString msFilterName; + OUString msOrigFileName; // the original URL + OUString msGraphicObjectProtocol; + OUString msEmbeddedObjectProtocol; + OUString msFilterName; SvXMLNamespaceMap *mpNamespaceMap; // the namepspace map SvXMLUnitConverter *mpUnitConv; // the unit converter SvXMLNumFmtExport *mpNumExport; @@ -152,7 +152,7 @@ class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6< public: - const ::rtl::OUString msWS; // " " + const OUString msWS; // " " private: @@ -271,13 +271,13 @@ public: SvXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, - const ::rtl::OUString& rFileName, + const OUString& rFileName, sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler); SvXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, - const ::rtl::OUString& rFileName, + const OUString& rFileName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > &, sal_Int16 const eDefaultFieldUnit ); @@ -298,13 +298,13 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // 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); @@ -337,18 +337,18 @@ public: void AddAttributeASCII( sal_uInt16 nPrefix, const sal_Char *pName, const sal_Char *pValue ); void AddAttribute( sal_uInt16 nPrefix, const sal_Char *pName, - const ::rtl::OUString& rValue ); - void AddAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rName, - const ::rtl::OUString& rValue ); + const OUString& rValue ); + void AddAttribute( sal_uInt16 nPrefix, const OUString& rName, + const OUString& rValue ); void AddAttribute( sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, - const ::rtl::OUString& rValue ); + const OUString& rValue ); void AddAttribute( sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, enum ::xmloff::token::XMLTokenEnum eValue ); - void AddAttribute( const ::rtl::OUString& rQName, - const ::rtl::OUString& rValue ); - void AddAttribute( const ::rtl::OUString& rQName, + void AddAttribute( const OUString& rQName, + const OUString& rValue ); + void AddAttribute( const OUString& rQName, enum ::xmloff::token::XMLTokenEnum eValue ); // add several attributes to the common attribute list void AddAttributeList( const ::com::sun::star::uno::Reference< @@ -367,7 +367,7 @@ public: } // Get original ::com::sun::star::util::URL. - const ::rtl::OUString& GetOrigFileName() const { return msOrigFileName; } + const OUString& GetOrigFileName() const { return msOrigFileName; } // Get (const) namespace map. const SvXMLNamespaceMap& GetNamespaceMap() const { return *mpNamespaceMap; } @@ -385,7 +385,7 @@ public: virtual void addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ); virtual void exportDataStyles(); virtual void exportAutoDataStyles(); - virtual rtl::OUString getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) const; + virtual OUString getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) const; sal_Int32 dataStyleForceSystemLanguage(sal_Int32 nFormat) const; virtual void exportAnnotationMeta( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape); @@ -438,17 +438,17 @@ public: /// get the export for image maps XMLImageMapExport& GetImageMapExport(); - ::rtl::OUString AddEmbeddedGraphicObject( - const ::rtl::OUString& rGraphicObjectURL ); + OUString AddEmbeddedGraphicObject( + const OUString& rGraphicObjectURL ); sal_Bool AddEmbeddedGraphicObjectAsBase64( - const ::rtl::OUString& rGraphicObjectURL ); + const OUString& rGraphicObjectURL ); - ::rtl::OUString AddEmbeddedObject( - const ::rtl::OUString& rEmbeddedObjectURL ); + OUString AddEmbeddedObject( + const OUString& rEmbeddedObjectURL ); sal_Bool AddEmbeddedObjectAsBase64( - const ::rtl::OUString& rEmbeddedObjectURL ); + const OUString& rEmbeddedObjectURL ); - ::rtl::OUString EncodeStyleName( const ::rtl::OUString& rName, + OUString EncodeStyleName( const OUString& rName, sal_Bool *pEncoded=0 ) const; // save linked sections? @@ -461,19 +461,19 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rComp ); - rtl::OUString GetRelativeReference(const rtl::OUString& rValue); + OUString GetRelativeReference(const OUString& rValue); // methods for accessing the document handler and handling SAX errors void StartElement(sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, sal_Bool bIgnWSOutside ); - void StartElement(const ::rtl::OUString& rName, + void StartElement(const OUString& rName, sal_Bool bIgnWSOutside ); - void Characters(const ::rtl::OUString& rChars); + void Characters(const OUString& rChars); void EndElement(sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, sal_Bool bIgnWSInside ); - void EndElement(const ::rtl::OUString& rName, + void EndElement(const OUString& rName, sal_Bool bIgnWSInside ); void IgnorableWhitespace(); @@ -486,16 +486,16 @@ public: /// error ID, may contain an error flag sal_Int32 nId, /// string parameters for the error message - const ::com::sun::star::uno::Sequence< ::rtl::OUString> & rMsgParams, + const ::com::sun::star::uno::Sequence< OUString> & rMsgParams, /// original exception message (if applicable) - const ::rtl::OUString& rExceptionMessage, + const OUString& rExceptionMessage, /// error location (if applicable) const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator> & rLocator ); void SetError( sal_Int32 nId, - const ::com::sun::star::uno::Sequence< ::rtl::OUString> & rMsgParams); + const ::com::sun::star::uno::Sequence< OUString> & rMsgParams); /** return current error flags (logical 'or' of all error flags so far) */ sal_uInt16 GetErrorFlags() { return mnErrorFlags; } @@ -522,13 +522,13 @@ public: SvtSaveOptions::ODFDefaultVersion getDefaultVersion() const; /// name of stream in package, e.g., "content.xml" - ::rtl::OUString GetStreamName() const; + OUString GetStreamName() const; // FIXME: this is only for legacy stuff that has not yet been adapted // to implement XMetadatable; this can write duplicate IDs! /// add xml:id and legacy namespace id void SAL_DLLPRIVATE AddAttributeIdLegacy( - sal_uInt16 const nLegacyPrefix, ::rtl::OUString const& rValue); + sal_uInt16 const nLegacyPrefix, OUString const& rValue); /// add xml:id attribute (for RDF metadata) void AddAttributeXmlId(::com::sun::star::uno::Reference< @@ -621,12 +621,12 @@ inline void SvXMLExport::SetGraphicResolver( class XMLOFF_DLLPUBLIC SvXMLElementExport { SvXMLExport& rExport; - ::rtl::OUString aName; + OUString aName; sal_Bool bIgnWS : 1; sal_Bool bDoSomething : 1; SAL_DLLPRIVATE void StartElement( SvXMLExport& rExp, sal_uInt16 nPrefix, - const ::rtl::OUString& rName, + const OUString& rName, sal_Bool bIgnWSOutside ); public: @@ -637,12 +637,12 @@ public: const sal_Char *pName, sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix, - const ::rtl::OUString& rName, + const OUString& rName, sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); - SvXMLElementExport( SvXMLExport& rExp, const ::rtl::OUString& rQName, + SvXMLElementExport( SvXMLExport& rExp, const OUString& rQName, sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); // Thes constructors do nothing if bDoSomething is not set diff --git a/xmloff/inc/xmloff/xmlexppr.hxx b/xmloff/inc/xmloff/xmlexppr.hxx index f116217828c3..db1f043a0d3b 100644 --- a/xmloff/inc/xmloff/xmlexppr.hxx +++ b/xmloff/inc/xmloff/xmlexppr.hxx @@ -49,7 +49,7 @@ class XMLOFF_DLLPUBLIC SvXMLExportPropertyMapper : public UniRefBase protected: UniReference< XMLPropertySetMapper > maPropMapper; - rtl::OUString maStyleName; + OUString maStyleName; /** Filter all properties we don't want to export: Take all properties of the XPropertySet which are also found in the @@ -181,7 +181,7 @@ public: inline const UniReference< XMLPropertySetMapper >& getPropertySetMapper() const { return maPropMapper; } - void SetStyleName( const rtl::OUString& rStyleName ) { maStyleName = rStyleName; } + void SetStyleName( const OUString& rStyleName ) { maStyleName = rStyleName; } }; #endif // _XMLOFF_XMLEXPPR_HXX diff --git a/xmloff/inc/xmloff/xmlictxt.hxx b/xmloff/inc/xmloff/xmlictxt.hxx index 198475ecabfc..37903e4b4f8a 100644 --- a/xmloff/inc/xmloff/xmlictxt.hxx +++ b/xmloff/inc/xmloff/xmlictxt.hxx @@ -39,7 +39,7 @@ class XMLOFF_DLLPUBLIC SvXMLImportContext : public SvRefBase SvXMLImport& mrImport; sal_uInt16 mnPrefix; - ::rtl::OUString maLocalName; + OUString maLocalName; SvXMLNamespaceMap *mpRewindMap; @@ -56,14 +56,14 @@ public: TYPEINFO(); sal_uInt16 GetPrefix() const { return mnPrefix; } - const ::rtl::OUString& GetLocalName() const { return maLocalName; } + const OUString& GetLocalName() const { return maLocalName; } // A contexts constructor does anything that is required if an element // starts. Namespace processing has been done already. // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. SvXMLImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName ); + const OUString& rLName ); // A contexts destructor does anything that is required if an element // ends. By default, nothing is done. @@ -74,7 +74,7 @@ public: // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); // StartElement is called after a context has been constructed and @@ -89,7 +89,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 ); }; SV_DECL_REF( SvXMLImportContext ) diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/xmloff/inc/xmloff/xmlimppr.hxx index eb2a15caa9bc..32d78d4d334c 100644 --- a/xmloff/inc/xmloff/xmlimppr.hxx +++ b/xmloff/inc/xmloff/xmlimppr.hxx @@ -97,7 +97,7 @@ public: virtual bool handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const; @@ -177,7 +177,7 @@ public: ::com::sun::star::beans::XPropertySetInfo> & rPropSetInfo, const UniReference<XMLPropertySetMapper> & rPropMapper, _ContextID_Index_Pair* pSpecialContextIds, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames, + ::com::sun::star::uno::Sequence< OUString >& rNames, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues); }; diff --git a/xmloff/inc/xmloff/xmlmetae.hxx b/xmloff/inc/xmloff/xmlmetae.hxx index 48543c4a75f4..3b99cbfabfdf 100644 --- a/xmloff/inc/xmloff/xmlmetae.hxx +++ b/xmloff/inc/xmloff/xmlmetae.hxx @@ -59,7 +59,7 @@ private: std::vector< ::com::sun::star::beans::StringPair > m_preservedNSs; SAL_DLLPRIVATE void SimpleStringElement( - const ::rtl::OUString& rText, sal_uInt16 nNamespace, + const OUString& rText, sal_uInt16 nNamespace, enum ::xmloff::token::XMLTokenEnum eElementName ); SAL_DLLPRIVATE void SimpleDateTimeElement( const ::com::sun::star::util::DateTime & rDate, sal_uInt16 nNamespace, @@ -78,7 +78,7 @@ public: /// export via XSAXWriter interface, with fallback to _MExport void Export(); - static ::rtl::OUString GetISODateTimeString( + static OUString GetISODateTimeString( const ::com::sun::star::util::DateTime& rDateTime ); // ::com::sun::star::xml::sax::XDocumentHandler: @@ -88,23 +88,23 @@ public: virtual void SAL_CALL endDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL startElement(const ::rtl::OUString & i_rName, + virtual void SAL_CALL startElement(const OUString & i_rName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & i_xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL endElement(const ::rtl::OUString & i_rName) + virtual void SAL_CALL endElement(const OUString & i_rName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL characters(const ::rtl::OUString & i_rChars) + virtual void SAL_CALL characters(const OUString & i_rChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); virtual void SAL_CALL ignorableWhitespace( - const ::rtl::OUString & i_rWhitespaces) + const OUString & i_rWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); virtual void SAL_CALL processingInstruction( - const ::rtl::OUString & i_rTarget, const ::rtl::OUString & i_rData) + const OUString & i_rTarget, const OUString & i_rData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); virtual void SAL_CALL setDocumentLocator( diff --git a/xmloff/inc/xmloff/xmlmetai.hxx b/xmloff/inc/xmloff/xmlmetai.hxx index 5b6790298c29..061bd78e6df0 100644 --- a/xmloff/inc/xmloff/xmlmetai.hxx +++ b/xmloff/inc/xmloff/xmlmetai.hxx @@ -43,14 +43,14 @@ private: public: SvXMLMetaDocumentContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties>& xDocProps); virtual ~SvXMLMetaDocumentContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -60,7 +60,7 @@ public: virtual void EndElement(); public: - static void setBuildId(const ::rtl::OUString & rGenerator, + static void setBuildId(const OUString & rGenerator, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xImportInfo ); }; diff --git a/xmloff/inc/xmloff/xmlmultiimagehelper.hxx b/xmloff/inc/xmloff/xmlmultiimagehelper.hxx index 4628677d1025..cb0a290b1bbd 100644 --- a/xmloff/inc/xmloff/xmlmultiimagehelper.hxx +++ b/xmloff/inc/xmloff/xmlmultiimagehelper.hxx @@ -33,7 +33,7 @@ private: protected: /// helper to get the created xShape instance, needs to be overloaded - virtual rtl::OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const = 0; + virtual OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const = 0; virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const = 0; public: diff --git a/xmloff/inc/xmloff/xmlnume.hxx b/xmloff/inc/xmloff/xmlnume.hxx index 93a7260137dc..78e7cbfdd191 100644 --- a/xmloff/inc/xmloff/xmlnume.hxx +++ b/xmloff/inc/xmloff/xmlnume.hxx @@ -41,11 +41,11 @@ class XMLTextListAutoStylePool; class SvxXMLNumRuleExport { SvXMLExport& rExport; - const ::rtl::OUString sCDATA; - const ::rtl::OUString sWS; - const ::rtl::OUString sNumberingRules; - const ::rtl::OUString sIsPhysical; - const ::rtl::OUString sIsContinuousNumbering; + const OUString sCDATA; + const OUString sWS; + const OUString sNumberingRules; + const OUString sIsPhysical; + const OUString sIsContinuousNumbering; // Boolean indicating, if properties for position-and-space-mode LABEL_ALIGNEMNT // are exported or not. (#i89178#) // These properties have been introduced in ODF 1.2. Thus, its export have @@ -84,7 +84,7 @@ public: XMLTextListAutoStylePool *pPool, sal_Bool bExportChapterNumbering = sal_True ); void exportNumberingRule( - const ::rtl::OUString& rName, sal_Bool bIsHidden, + const OUString& rName, sal_Bool bIsHidden, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > & xNumRule ); }; diff --git a/xmloff/inc/xmloff/xmlnumfe.hxx b/xmloff/inc/xmloff/xmlnumfe.hxx index 112c846fc4b5..20029a6f99b7 100644 --- a/xmloff/inc/xmloff/xmlnumfe.hxx +++ b/xmloff/inc/xmloff/xmlnumfe.hxx @@ -44,41 +44,41 @@ class XMLOFF_DLLPUBLIC SvXMLNumFmtExport { private: SvXMLExport& rExport; - ::rtl::OUString sPrefix; + OUString sPrefix; SvNumberFormatter* pFormatter; - ::rtl::OUStringBuffer sTextContent; + OUStringBuffer sTextContent; SvXMLNumUsedList_Impl* pUsedList; CharClass* pCharClass; LocaleDataWrapper* pLocaleData; - SAL_DLLPRIVATE void AddCalendarAttr_Impl( const ::rtl::OUString& rCalendar ); + SAL_DLLPRIVATE void AddCalendarAttr_Impl( const OUString& rCalendar ); SAL_DLLPRIVATE void AddStyleAttr_Impl( sal_Bool bLong ); SAL_DLLPRIVATE void AddTextualAttr_Impl( sal_Bool bText ); SAL_DLLPRIVATE void AddLanguageAttr_Impl( sal_Int32 nLang ); - SAL_DLLPRIVATE void AddToTextElement_Impl( const ::rtl::OUString& rString ); + SAL_DLLPRIVATE void AddToTextElement_Impl( const OUString& rString ); SAL_DLLPRIVATE void FinishTextElement_Impl(); SAL_DLLPRIVATE void WriteColorElement_Impl( const Color& rColor ); SAL_DLLPRIVATE void WriteNumberElement_Impl( sal_Int32 nDecimals, sal_Int32 nInteger, - const ::rtl::OUString& rDashStr, sal_Bool bVarDecimals, + const OUString& rDashStr, sal_Bool bVarDecimals, sal_Bool bGrouping, sal_Int32 nTrailingThousands, const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries ); SAL_DLLPRIVATE void WriteScientificElement_Impl( sal_Int32 nDecimals, sal_Int32 nInteger, sal_Bool bGrouping, sal_Int32 nExp ); SAL_DLLPRIVATE void WriteFractionElement_Impl( sal_Int32 nInteger, sal_Bool bGrouping, sal_Int32 nNumeratorDigits, sal_Int32 nDenominatorDigits, sal_Int32 nDenominator ); - SAL_DLLPRIVATE void WriteCurrencyElement_Impl( const ::rtl::OUString& rString, - const ::rtl::OUString& rExt ); + SAL_DLLPRIVATE void WriteCurrencyElement_Impl( const OUString& rString, + const OUString& rExt ); SAL_DLLPRIVATE void WriteBooleanElement_Impl(); SAL_DLLPRIVATE void WriteTextContentElement_Impl(); - SAL_DLLPRIVATE void WriteDayElement_Impl( const ::rtl::OUString& rCalendar, sal_Bool bLong ); - SAL_DLLPRIVATE void WriteMonthElement_Impl( const ::rtl::OUString& rCalendar, sal_Bool bLong, sal_Bool bText ); - SAL_DLLPRIVATE void WriteYearElement_Impl( const ::rtl::OUString& rCalendar, sal_Bool bLong ); - SAL_DLLPRIVATE void WriteEraElement_Impl( const ::rtl::OUString& rCalendar, sal_Bool bLong ); - SAL_DLLPRIVATE void WriteDayOfWeekElement_Impl( const ::rtl::OUString& rCalendar, sal_Bool bLong ); - SAL_DLLPRIVATE void WriteWeekElement_Impl( const ::rtl::OUString& rCalendar ); - SAL_DLLPRIVATE void WriteQuarterElement_Impl( const ::rtl::OUString& rCalendar, sal_Bool bLong ); + SAL_DLLPRIVATE void WriteDayElement_Impl( const OUString& rCalendar, sal_Bool bLong ); + SAL_DLLPRIVATE void WriteMonthElement_Impl( const OUString& rCalendar, sal_Bool bLong, sal_Bool bText ); + SAL_DLLPRIVATE void WriteYearElement_Impl( const OUString& rCalendar, sal_Bool bLong ); + SAL_DLLPRIVATE void WriteEraElement_Impl( const OUString& rCalendar, sal_Bool bLong ); + SAL_DLLPRIVATE void WriteDayOfWeekElement_Impl( const OUString& rCalendar, sal_Bool bLong ); + SAL_DLLPRIVATE void WriteWeekElement_Impl( const OUString& rCalendar ); + SAL_DLLPRIVATE void WriteQuarterElement_Impl( const OUString& rCalendar, sal_Bool bLong ); SAL_DLLPRIVATE void WriteHoursElement_Impl( sal_Bool bLong ); SAL_DLLPRIVATE void WriteMinutesElement_Impl( sal_Bool bLong ); SAL_DLLPRIVATE void WriteSecondsElement_Impl( sal_Bool bLong, sal_uInt16 nDecimals ); @@ -87,7 +87,7 @@ private: sal_Int32 nKey, sal_Int32 nPart ); SAL_DLLPRIVATE void WriteRepeatedElement_Impl( sal_Unicode ch ); - SAL_DLLPRIVATE sal_Bool WriteTextWithCurrency_Impl( const ::rtl::OUString& rString, + SAL_DLLPRIVATE sal_Bool WriteTextWithCurrency_Impl( const OUString& rString, const ::com::sun::star::lang::Locale& rLocale ); SAL_DLLPRIVATE void ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt32 nKey, sal_uInt16 nPart, sal_Bool bDefPart ); @@ -101,7 +101,7 @@ public: SvXMLNumFmtExport( SvXMLExport& rExport, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& rSupp, - const rtl::OUString& rPrefix ); + const OUString& rPrefix ); virtual ~SvXMLNumFmtExport(); @@ -112,7 +112,7 @@ public: void SetUsed( sal_uInt32 nKey ); // get the style name that was generated for a key - ::rtl::OUString GetStyleName( sal_uInt32 nKey ); + OUString GetStyleName( sal_uInt32 nKey ); void GetWasUsed(com::sun::star::uno::Sequence<sal_Int32>& rWasUsed); void SetWasUsed(const com::sun::star::uno::Sequence<sal_Int32>& rWasUsed); diff --git a/xmloff/inc/xmloff/xmlnumfi.hxx b/xmloff/inc/xmloff/xmlnumfi.hxx index 71a6a82af454..34bb91cbe9fe 100644 --- a/xmloff/inc/xmloff/xmlnumfi.hxx +++ b/xmloff/inc/xmloff/xmlnumfi.hxx @@ -86,7 +86,7 @@ public: ~SvXMLNumFmtHelper(); SvXMLStyleContext* CreateChildContext( SvXMLImport& rImport, - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles); @@ -95,7 +95,7 @@ public: const SvXMLTokenMap& GetStylesElemTokenMap(); -// sal_uInt32 GetKeyForName( const rtl::OUString& rName ); +// sal_uInt32 GetKeyForName( const OUString& rName ); }; // SvXMLNumFmtDefaults is used in import and export @@ -113,8 +113,8 @@ public: struct MyCondition { - rtl::OUString sCondition; - rtl::OUString sMapName; + OUString sCondition; + OUString sMapName; }; class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext @@ -124,11 +124,11 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext std::vector <MyCondition> aMyConditions; sal_uInt16 nType; sal_Int32 nKey; -// rtl::OUString sFormatName; - rtl::OUString sFormatTitle; -// rtl::OUString sMapName; - rtl::OUString sCalendar; - rtl::OUString sFormatString; +// OUString sFormatName; + OUString sFormatTitle; +// OUString sMapName; + OUString sCalendar; + OUString sFormatString; LanguageType nFormatLang; com::sun::star::lang::Locale aLocale; sal_Bool bAutoOrder; @@ -137,8 +137,8 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext sal_Bool bAutoDec; // set in AddNumber sal_Bool bAutoInt; // set in AddNumber sal_Bool bHasExtraText; - rtl::OUStringBuffer aFormatCode; - rtl::OUStringBuffer aConditions; + OUStringBuffer aFormatCode; + OUStringBuffer aConditions; sal_Bool bHasLongDoW; sal_Bool bHasEra; sal_Bool bHasDateTime; @@ -158,13 +158,13 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext public: SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles ); SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const sal_Int32 nKey, @@ -172,7 +172,7 @@ public: virtual ~SvXMLNumFormatContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void CreateAndInsert(sal_Bool bOverwrite); @@ -190,19 +190,19 @@ public: sal_Bool HasEra() const { return bHasEra; } void SetHasEra(sal_Bool bSet) { bHasEra = bSet; } - void UpdateCalendar( const rtl::OUString& rNewCalendar ); + void UpdateCalendar( const OUString& rNewCalendar ); const LocaleDataWrapper& GetLocaleData() const; - void AddToCode( const rtl::OUString& rString ); + void AddToCode( const OUString& rString ); void AddToCode( sal_Unicode c ); void AddNumber( const SvXMLNumberInfo& rInfo ); - void AddCurrency( const rtl::OUString& rContent, LanguageType nLang ); + void AddCurrency( const OUString& rContent, LanguageType nLang ); void AddNfKeyword( sal_uInt16 nIndex ); sal_Bool ReplaceNfKeyword( sal_uInt16 nOld, sal_uInt16 nNew ); void AddCondition( const sal_Int32 nIndex ); - void AddCondition( const rtl::OUString& rCondition, const rtl::OUString& rApplyName ); + void AddCondition( const OUString& rCondition, const OUString& rApplyName ); void AddColor( sal_uInt32 const nColor ); /// determine whether number format uses the system language diff --git a/xmloff/inc/xmloff/xmlnumi.hxx b/xmloff/inc/xmloff/xmlnumi.hxx index 1061b318507c..ea547379f261 100644 --- a/xmloff/inc/xmloff/xmlnumi.hxx +++ b/xmloff/inc/xmloff/xmlnumi.hxx @@ -31,10 +31,10 @@ class SvxXMLListStyle_Impl; class SvxXMLListStyleContext : public SvXMLStyleContext { - const ::rtl::OUString sIsPhysical; - const ::rtl::OUString sNumberingRules; - const ::rtl::OUString sName; - const ::rtl::OUString sIsContinuousNumbering; + const OUString sIsPhysical; + const OUString sNumberingRules; + const OUString sName; + const OUString sIsContinuousNumbering; ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexReplace > xNumRules; @@ -48,8 +48,8 @@ class SvxXMLListStyleContext : public SvXMLStyleContext protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: @@ -57,7 +57,7 @@ public: SvxXMLListStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_Bool bOutl=sal_False ); @@ -66,7 +66,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/inc/xmloff/xmlprcon.hxx b/xmloff/inc/xmloff/xmlprcon.hxx index 69b49ec56761..f6fb48cee4b6 100644 --- a/xmloff/inc/xmloff/xmlprcon.hxx +++ b/xmloff/inc/xmloff/xmlprcon.hxx @@ -42,7 +42,7 @@ public: SvXMLPropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState > &rProps, @@ -52,14 +52,14 @@ public: virtual ~SvXMLPropertySetContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); // This method is called from this instance implementation of // CreateChildContext if the element matches an entry in the // SvXMLImportItemMapper with the mid flag MID_FLAG_ELEMENT_ITEM_IMPORT virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp ); diff --git a/xmloff/inc/xmloff/xmlprhdl.hxx b/xmloff/inc/xmloff/xmlprhdl.hxx index 91a762615a3f..746e9e39d3e7 100644 --- a/xmloff/inc/xmloff/xmlprhdl.hxx +++ b/xmloff/inc/xmloff/xmlprhdl.hxx @@ -23,9 +23,9 @@ #include "sal/config.h" #include "xmloff/dllapi.h" #include <sal/types.h> +#include <rtl/ustring.hxx> namespace com{ namespace sun{ namespace star{ namespace uno{ class Any; } } } } -namespace rtl{ class OUString; } class SvXMLUnitConverter; struct XMLPropertyState; @@ -48,9 +48,9 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; /// Imports the given value in cas of the given XML-data-type - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0; /// Exports the given value in cas of the given XML-data-type - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0; }; #endif // _XMLOFF_PROPERTYHANDLERBASE_HXX diff --git a/xmloff/inc/xmloff/xmlprmap.hxx b/xmloff/inc/xmloff/xmlprmap.hxx index 8fc4aefe7286..0da806ea6768 100644 --- a/xmloff/inc/xmloff/xmlprmap.hxx +++ b/xmloff/inc/xmloff/xmlprmap.hxx @@ -53,8 +53,8 @@ class XMLPropertyHandler; */ struct XMLPropertySetMapperEntry_Impl { - ::rtl::OUString sXMLAttributeName; - ::rtl::OUString sAPIPropertyName; + OUString sXMLAttributeName; + OUString sAPIPropertyName; sal_uInt16 nXMLNameSpace; sal_Int32 nType; sal_Int16 nContextId; @@ -114,14 +114,14 @@ public: } /** Returns the 'local' XML-name of the entry */ - const ::rtl::OUString& GetEntryXMLName( sal_Int32 nIndex ) const + const OUString& GetEntryXMLName( sal_Int32 nIndex ) const { DBG_ASSERT( (nIndex >= 0) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" ); return aMapEntries[nIndex].sXMLAttributeName; } /** Returns the entry API name */ - const ::rtl::OUString& GetEntryAPIName( sal_Int32 nIndex ) const + const OUString& GetEntryAPIName( sal_Int32 nIndex ) const { DBG_ASSERT( (nIndex >= 0) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" ); return aMapEntries[nIndex].sAPIPropertyName; @@ -144,7 +144,7 @@ public: /** Returns the index of an entry with the given XML-name and namespace If there is no matching entry the method returns -1 */ sal_Int32 GetEntryIndex( sal_uInt16 nNamespace, - const ::rtl::OUString& rStrName, + const OUString& rStrName, sal_uInt32 nPropType, sal_Int32 nStartAt = -1 ) const; @@ -157,17 +157,17 @@ public: /** import/export This methods calls the respective im/export-method of the respective PropertyHandler. */ - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, + virtual sal_Bool exportXML( OUString& rStrExpValue, const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, + virtual sal_Bool importXML( const OUString& rStrImpValue, XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter ) const; /** searches for an entry that matches the given api name, namespace and local name or -1 if nothing found */ sal_Int32 FindEntryIndex( const sal_Char* sApiName, sal_uInt16 nNameSpace, - const ::rtl::OUString& sXMLName ) const; + const OUString& sXMLName ) const; /** searches for an entry that matches the given ContextId or gives -1 if nothing found */ sal_Int32 FindEntryIndex( const sal_Int16 nContextId ) const; diff --git a/xmloff/inc/xmloff/xmlscripti.hxx b/xmloff/inc/xmloff/xmlscripti.hxx index 9c32eb442163..031e33511a91 100644 --- a/xmloff/inc/xmloff/xmlscripti.hxx +++ b/xmloff/inc/xmloff/xmlscripti.hxx @@ -35,14 +35,14 @@ private: public: XMLScriptContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& rDocModel ); virtual ~XMLScriptContext(); // Create child element. virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/xmloff/inc/xmloff/xmlstyle.hxx b/xmloff/inc/xmloff/xmlstyle.hxx index 8296b24799a0..86641f067982 100644 --- a/xmloff/inc/xmloff/xmlstyle.hxx +++ b/xmloff/inc/xmloff/xmlstyle.hxx @@ -60,14 +60,14 @@ enum XMLStyleStylesElemTokens class XMLOFF_DLLPUBLIC SvXMLStyleContext : public SvXMLImportContext { - ::rtl::OUString maName; - ::rtl::OUString maDisplayName; - ::rtl::OUString maAutoName; - ::rtl::OUString maParentName;// Will be moved to XMLPropStyle soon!!!! - ::rtl::OUString maFollow; // Will be moved to XMLPropStyle soon!!!! + OUString maName; + OUString maDisplayName; + OUString maAutoName; + OUString maParentName;// Will be moved to XMLPropStyle soon!!!! + OUString maFollow; // Will be moved to XMLPropStyle soon!!!! sal_Bool mbHidden; - ::rtl::OUString maHelpFile; // Will be removed very soon!!!! + OUString maHelpFile; // Will be removed very soon!!!! sal_uInt32 mnHelpId; // Will be removed very soon!!!! sal_uInt16 mnFamily; @@ -82,18 +82,18 @@ class XMLOFF_DLLPUBLIC SvXMLStyleContext : public SvXMLImportContext protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); void SetFamily( sal_uInt16 nSet ) { mnFamily = nSet; } - void SetAutoName( const ::rtl::OUString& rName ) { maAutoName = rName; } + void SetAutoName( const OUString& rName ) { maAutoName = rName; } public: TYPEINFO(); SvXMLStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_uInt16 nFamily=0, sal_Bool bDefaultStyle = sal_False ); @@ -101,7 +101,7 @@ public: virtual ~SvXMLStyleContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -109,13 +109,13 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - const ::rtl::OUString& GetName() const { return maName; } - const ::rtl::OUString& GetDisplayName() const { return maDisplayName.getLength() ? maDisplayName : maName; } - const ::rtl::OUString& GetAutoName() const { return maAutoName; } - const ::rtl::OUString& GetParentName() const { return maParentName; } - const ::rtl::OUString& GetFollow() const { return maFollow; } + const OUString& GetName() const { return maName; } + const OUString& GetDisplayName() const { return maDisplayName.getLength() ? maDisplayName : maName; } + const OUString& GetAutoName() const { return maAutoName; } + const OUString& GetParentName() const { return maParentName; } + const OUString& GetFollow() const { return maFollow; } - const ::rtl::OUString& GetHelpFile() const { return maHelpFile; } + const OUString& GetHelpFile() const { return maHelpFile; } sal_uInt32 GetHelpId() const { return mnHelpId; } sal_uInt16 GetFamily() const { return mnFamily; } @@ -158,8 +158,8 @@ public: class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext { - const ::rtl::OUString msParaStyleServiceName; - const ::rtl::OUString msTextStyleServiceName; + const OUString msParaStyleServiceName; + const OUString msTextStyleServiceName; SvXMLStylesContext_Impl *mpImpl; SvXMLTokenMap *mpStyleStylesElemTokenMap; @@ -195,18 +195,18 @@ protected: const SvXMLStyleContext *GetStyle( sal_uInt32 i ) const; virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -216,7 +216,7 @@ public: TYPEINFO(); SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_Bool bAutomatic = sal_False ); @@ -225,7 +225,7 @@ public: // Create child element. virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -237,16 +237,16 @@ public: const SvXMLStyleContext *FindStyleChildContext( sal_uInt16 nFamily, - const ::rtl::OUString& rName, + const OUString& rName, sal_Bool bCreateIndex=sal_False ) const; - virtual sal_uInt16 GetFamily( const ::rtl::OUString& rFamily ) const; + virtual sal_uInt16 GetFamily( const OUString& rFamily ) const; virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper( sal_uInt16 nFamily ) const; virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > GetStylesContainer( sal_uInt16 nFamily ) const; - virtual ::rtl::OUString GetServiceName( sal_uInt16 nFamily ) const; + virtual OUString GetServiceName( sal_uInt16 nFamily ) const; virtual ::com::sun::star::uno::Reference < ::com::sun::star::style::XAutoStyleFamily > GetAutoStyles( sal_uInt16 nFamily ) const; diff --git a/xmloff/inc/xmloff/xmltkmap.hxx b/xmloff/inc/xmloff/xmltkmap.hxx index bd10d0f07000..e05885574195 100644 --- a/xmloff/inc/xmloff/xmltkmap.hxx +++ b/xmloff/inc/xmloff/xmltkmap.hxx @@ -45,14 +45,14 @@ class XMLOFF_DLLPUBLIC SvXMLTokenMap SvXMLTokenMap_Impl *pImpl; SAL_DLLPRIVATE SvXMLTokenMapEntry_Impl *_Find( - sal_uInt16 nKind, const ::rtl::OUString& rName ) const; + sal_uInt16 nKind, const OUString& rName ) const; public: SvXMLTokenMap( const SvXMLTokenMapEntry* pMap ); ~SvXMLTokenMap(); - sal_uInt16 Get( sal_uInt16 nPrefix, const ::rtl::OUString& rLName ) const; + sal_uInt16 Get( sal_uInt16 nPrefix, const OUString& rLName ) const; }; #endif // _XMLOFF_XMLTKMAP_HXX diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx index 8ca24b48a4a9..e19043a36850 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -23,9 +23,7 @@ #include "sal/config.h" #include "xmloff/dllapi.h" #include <sal/types.h> - -namespace rtl { class OUString; } - +#include <rtl/ustring.hxx> /** * Handling of tokens in XML: @@ -3191,12 +3189,12 @@ namespace xmloff { namespace token { /// return the OUString representation for eToken - XMLOFF_DLLPUBLIC const ::rtl::OUString& GetXMLToken( + XMLOFF_DLLPUBLIC const OUString& GetXMLToken( enum XMLTokenEnum eToken ); /// compare eToken to the string XMLOFF_DLLPUBLIC sal_Bool IsXMLToken( - const ::rtl::OUString& rString, + const OUString& rString, enum XMLTokenEnum eToken ); // gives all allocated memory for OUString* back diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx index 7e6e33a82256..bc4ddb6b6dbd 100644 --- a/xmloff/inc/xmloff/xmluconv.hxx +++ b/xmloff/inc/xmloff/xmluconv.hxx @@ -28,6 +28,8 @@ #include <limits.h> #include <boost/utility.hpp> +#include <rtl/ustring.hxx> +#include <rtl/ustrbuf.hxx> #include <tools/solar.h> #include <xmloff/xmlement.hxx> #include <xmloff/xmltoken.hxx> @@ -42,11 +44,6 @@ // predeclarations class Time; -namespace rtl -{ -class OUString; -class OUStringBuffer; -} namespace com { namespace sun { namespace star { namespace util { struct DateTime; } @@ -61,14 +58,14 @@ namespace basegfx class XMLOFF_DLLPUBLIC SvXMLTokenEnumerator { private: - const ::rtl::OUString& maTokenString; + const OUString& maTokenString; sal_Int32 mnNextTokenPos; sal_Unicode mcSeperator; public: - SvXMLTokenEnumerator( const ::rtl::OUString& rString, sal_Unicode cSeperator = sal_Unicode(' ') ); + SvXMLTokenEnumerator( const OUString& rString, sal_Unicode cSeperator = sal_Unicode(' ') ); - sal_Bool getNextToken( ::rtl::OUString& rToken ); + sal_Bool getNextToken( OUString& rToken ); }; /** the SvXMLTypeConverter converts values of various types from @@ -118,31 +115,31 @@ public: /** convert string to measure with meCoreMeasureUnit, using optional min and max values*/ bool convertMeasureToCore( sal_Int32& rValue, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nMin = SAL_MIN_INT32, sal_Int32 nMax = SAL_MAX_INT32) const; /** convert measure to string: from meCoreMeasureUnit to meXMLMeasureUnit */ - void convertMeasureToXML( ::rtl::OUStringBuffer& rBuffer, + void convertMeasureToXML( OUStringBuffer& rBuffer, sal_Int32 nMeasure ) const; /** convert string to enum using given enum map, if the enum is not found in the map, this method will return false */ static sal_Bool convertEnum( sal_uInt16& rEnum, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLEnumMapEntry *pMap ); /** convert string to enum using given token map, if the enum is not found in the map, this method will return false */ static sal_Bool convertEnum( sal_uInt16& rEnum, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLEnumStringMapEntry *pMap ); /** convert enum to string using given enum map with an optional default token. If the enum is not found in the map, this method will either use the given default or return false if not default is set */ - static sal_Bool convertEnum( ::rtl::OUStringBuffer& rBuffer, + static sal_Bool convertEnum( OUStringBuffer& rBuffer, unsigned int nValue, const SvXMLEnumMapEntry *pMap, enum ::xmloff::token::XMLTokenEnum eDefault = @@ -150,65 +147,65 @@ public: /** convert double number to string (using ::rtl::math) and DO convert to export MapUnit using meCoreMeasureUnit/meXMLMeasureUnit */ - void convertDouble(::rtl::OUStringBuffer& rBuffer, + void convertDouble(OUStringBuffer& rBuffer, double fNumber, sal_Bool bWriteUnits) const; /** convert string to double number (using ::rtl::math) and DO convert. */ - sal_Bool convertDouble(double& rValue, const ::rtl::OUString& rString, sal_Bool bLookForUnits) const; + sal_Bool convertDouble(double& rValue, const OUString& rString, sal_Bool bLookForUnits) const; /** get the Null Date of the XModel and set it to the UnitConverter */ sal_Bool setNullDate ( const com::sun::star::uno::Reference <com::sun::star::frame::XModel>& xModel); /** convert double to ISO Date Time String */ - void convertDateTime( ::rtl::OUStringBuffer& rBuffer, + void convertDateTime( OUStringBuffer& rBuffer, const double& fDateTime, bool const bAddTimeIf0AM = false); /** convert ISO Date Time String to double */ bool convertDateTime(double& fDateTime, - const ::rtl::OUString& rString); + const OUString& rString); /// these 2 functions use tools Date, so they're not yet moved to sax /** convert double to ISO Date Time String */ - static void convertDateTime( ::rtl::OUStringBuffer& rBuffer, + static void convertDateTime( OUStringBuffer& rBuffer, const double& fDateTime, const com::sun::star::util::Date& aNullDate, sal_Bool bAddTimeIf0AM=sal_False); /** convert ISO Date Time String to double */ static sal_Bool convertDateTime( double& fDateTime, - const ::rtl::OUString& rString, + const OUString& rString, const com::sun::star::util::Date& aNullDate); /** convert string to ::basegfx::B3DVector */ static sal_Bool convertB3DVector( ::basegfx::B3DVector& rVector, - const ::rtl::OUString& rValue ); + const OUString& rValue ); /** convert B3DVector to string */ - static void convertB3DVector( ::rtl::OUStringBuffer &rBuffer, + static void convertB3DVector( OUStringBuffer &rBuffer, const ::basegfx::B3DVector& rVector ); /** convert string to Position3D */ sal_Bool convertPosition3D( com::sun::star::drawing::Position3D& rPosition, - const ::rtl::OUString& rValue ); + const OUString& rValue ); /** convert Position3D to string */ - void convertPosition3D( ::rtl::OUStringBuffer &rBuffer, + void convertPosition3D( OUStringBuffer &rBuffer, const com::sun::star::drawing::Position3D& rVector ); /** convert num-forat and num-letter-sync values to NumberingType */ sal_Bool convertNumFormat( sal_Int16& rType, - const ::rtl::OUString& rNumFormat, - const ::rtl::OUString& rNumLetterSync, + const OUString& rNumFormat, + const OUString& rNumLetterSync, sal_Bool bNumberNone = sal_False ) const; /** convert NumberingType to num-forat and num-letter-sync values */ - void convertNumFormat( ::rtl::OUStringBuffer& rBuffer, + void convertNumFormat( OUStringBuffer& rBuffer, sal_Int16 nType ) const; - void convertNumLetterSync( ::rtl::OUStringBuffer& rBuffer, + void convertNumLetterSync( OUStringBuffer& rBuffer, sal_Int16 nType ) const; static void convertPropertySet(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps, @@ -216,14 +213,14 @@ public: static void convertPropertySet(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& rProperties, const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps); - ::rtl::OUString encodeStyleName( const ::rtl::OUString& rName, + OUString encodeStyleName( const OUString& rName, sal_Bool *pEncoded=0 ) const; /** convert string (hex) to number (sal_uInt32) */ static sal_Bool convertHex( sal_uInt32& nVal, - const ::rtl::OUString& rValue ); + const OUString& rValue ); /** convert number (sal_uInt32) to string (hex) */ - static void convertHex( ::rtl::OUStringBuffer& rBuffer, + static void convertHex( OUStringBuffer& rBuffer, sal_uInt32 nVal ); }; diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx index 4649a7f13f7e..af2bc956e6d2 100644 --- a/xmloff/inc/xmltabi.hxx +++ b/xmloff/inc/xmltabi.hxx @@ -39,14 +39,14 @@ public: TYPEINFO(); SvxXMLTabStopImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ); virtual ~SvxXMLTabStopImportContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx index 1d7595e89e62..95ff607683c2 100644 --- a/xmloff/inc/xmlversion.hxx +++ b/xmloff/inc/xmlversion.hxx @@ -41,7 +41,7 @@ public: XMLVersionListExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& rVersions, - const rtl::OUString &rFileName, + const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > &rHandler ); virtual ~XMLVersionListExport() {} @@ -62,7 +62,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -87,14 +87,14 @@ public: XMLVersionListContext( XMLVersionListImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~XMLVersionListContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -107,14 +107,14 @@ private: XMLVersionListImport& rLocalRef; static sal_Bool ParseISODateTimeString( - const rtl::OUString& rString, + const OUString& rString, com::sun::star::util::DateTime& rDateTime ); public: XMLVersionContext( XMLVersionListImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -130,11 +130,11 @@ public: virtual void SAL_CALL store( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag >& List ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); }; -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL +::com::sun::star::uno::Sequence< OUString > SAL_CALL XMLVersionListPersistence_getSupportedServiceNames() throw(); -::rtl::OUString SAL_CALL XMLVersionPersistence_getImplementationName() +OUString SAL_CALL XMLVersionPersistence_getImplementationName() throw(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx index 0fad212ae246..e171214592e5 100644 --- a/xmloff/source/chart/ColorPropertySet.cxx +++ b/xmloff/source/chart/ColorPropertySet.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star::beans; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::uno::RuntimeException; // ================================================================================ diff --git a/xmloff/source/chart/ColorPropertySet.hxx b/xmloff/source/chart/ColorPropertySet.hxx index 07c9d71b88b4..ad9639d35fd1 100644 --- a/xmloff/source/chart/ColorPropertySet.hxx +++ b/xmloff/source/chart/ColorPropertySet.hxx @@ -43,7 +43,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& aPropertyName, + const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -51,30 +51,30 @@ protected: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& aPropertyName, + const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& aPropertyName, + const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& PropertyName, + const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& PropertyName, + const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, @@ -82,19 +82,19 @@ protected: // ____ XPropertyState ____ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) + const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyToDefault( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( - const ::rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -102,7 +102,7 @@ protected: private: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xInfo; - ::rtl::OUString m_aColorPropName; + OUString m_aColorPropName; sal_Int32 m_nColor; bool m_bIsFillColor; sal_Int32 m_nDefaultColor; diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx index c2ca2f7c1a32..793354ee6d00 100644 --- a/xmloff/source/chart/MultiPropertySetHandler.hxx +++ b/xmloff/source/chart/MultiPropertySetHandler.hxx @@ -46,7 +46,7 @@ public: /** @descr Create a class instance and store the given name. @param rName The name of the property. */ - PropertyWrapperBase (const ::rtl::OUString & rName) + PropertyWrapperBase (const OUString & rName) : msName (rName) {} virtual ~PropertyWrapperBase() @@ -57,7 +57,7 @@ public: */ virtual void SetValue (const ::com::sun::star::uno::Any & rValue) = 0; - const ::rtl::OUString msName; + const OUString msName; }; @@ -71,7 +71,7 @@ template<class T> class PropertyWrapper : public PropertyWrapperBase public: /** @descr Create a wrapper for a property of type T. */ - PropertyWrapper (const ::rtl::OUString & rName, T & rValue) + PropertyWrapper (const OUString & rName, T & rValue) : PropertyWrapperBase (rName), mrValue (rValue) {} @@ -98,7 +98,7 @@ class OUStringComparison { public: /// Compare two strings. Returns true if the first is before the second. - inline bool operator() (const ::rtl::OUString & a, const ::rtl::OUString & b) const + inline bool operator() (const OUString & a, const OUString & b) const { return (a.compareTo (b) < 0); } @@ -141,7 +141,7 @@ public: @param rValue Reference to a variable whose value is set by the call to GetProperties to the property's value. */ - template<class T> void Add (const ::rtl::OUString & sName, T& rValue) + template<class T> void Add (const OUString & sName, T& rValue) { aPropertyList[sName] = new PropertyWrapper<T> (sName, rValue); } @@ -163,7 +163,7 @@ private: @return True if values could be derived. */ inline sal_Bool MultiGet (const ::com::sun::star::uno::Sequence< - ::rtl::OUString> & rNameList); + OUString> & rNameList); /** @descr Try to use the XPropertySet interface to get the property values. @@ -172,13 +172,13 @@ private: @return True if values could be derived. */ inline sal_Bool SingleGet (const ::com::sun::star::uno::Sequence< - ::rtl::OUString> & rNameList); + OUString> & rNameList); /** @descr STL map that maps from property names to polymorphic instances of PropertyWrapper. It uses OUStringComparison for sorting the property names. */ - ::std::map< ::rtl::OUString, PropertyWrapperBase*, OUStringComparison> aPropertyList; + ::std::map< OUString, PropertyWrapperBase*, OUStringComparison> aPropertyList; /// The object from which to get the property values. ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> mxObject; @@ -199,7 +199,7 @@ MultiPropertySetHandler::MultiPropertySetHandler (::com::sun::star::uno::Referen MultiPropertySetHandler::~MultiPropertySetHandler (void) { - ::std::map< ::rtl::OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; + ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; for (I=aPropertyList.begin(); I!=aPropertyList.end(); ++I) delete I->second; } @@ -208,8 +208,8 @@ MultiPropertySetHandler::~MultiPropertySetHandler (void) sal_Bool MultiPropertySetHandler::GetProperties (void) { - ::std::map< ::rtl::OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; - ::com::sun::star::uno::Sequence< ::rtl::OUString> aNameList (aPropertyList.size()); + ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; + ::com::sun::star::uno::Sequence< OUString> aNameList (aPropertyList.size()); int i; for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I) aNameList[i++] = I->second->msName; @@ -223,14 +223,14 @@ sal_Bool MultiPropertySetHandler::GetProperties (void) sal_Bool MultiPropertySetHandler::MultiGet (const ::com::sun::star::uno::Sequence< - ::rtl::OUString> & rNameList) + OUString> & rNameList) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet> xMultiSet ( mxObject, ::com::sun::star::uno::UNO_QUERY); if (xMultiSet.is()) try { - ::std::map< ::rtl::OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; + ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; int i; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> aValueList = xMultiSet->getPropertyValues (rNameList); @@ -251,14 +251,14 @@ sal_Bool MultiPropertySetHandler::MultiGet (const ::com::sun::star::uno::Se sal_Bool MultiPropertySetHandler::SingleGet (const ::com::sun::star::uno::Sequence< - ::rtl::OUString> & rNameList) + OUString> & rNameList) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xSingleSet ( mxObject, ::com::sun::star::uno::UNO_QUERY); if (xSingleSet.is()) try { - ::std::map< ::rtl::OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; + ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; int i; for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I) I->second->SetValue (xSingleSet->getPropertyValue (rNameList[i++])); diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index 0831d3a05944..b6590c072c89 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -202,7 +202,7 @@ void XMLChartExportPropertyMapper::ContextFilter( std::vector< XMLPropertyState >& rProperties, uno::Reference< beans::XPropertySet > rPropSet ) const { - ::rtl::OUString aAutoPropName; + OUString aAutoPropName; sal_Bool bCheckAuto = sal_False; // filter properties @@ -287,12 +287,12 @@ void XMLChartExportPropertyMapper::handleElementItem( { case XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE: { - ::rtl::OUString aURLStr; + OUString aURLStr; rProperty.maValue >>= aURLStr; // export as XLink reference into the package // if embedding is off - ::rtl::OUString sTempURL( mrExport.AddEmbeddedGraphicObject( aURLStr )); + OUString sTempURL( mrExport.AddEmbeddedGraphicObject( aURLStr )); if( !sTempURL.isEmpty() ) { mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sTempURL ); @@ -320,7 +320,7 @@ void XMLChartExportPropertyMapper::handleElementItem( case XML_SCH_CONTEXT_SPECIAL_LABEL_SEPARATOR: { - ::rtl::OUString aSeparator; + OUString aSeparator; rProperty.maValue >>= aSeparator; if( !aSeparator.isEmpty() ) @@ -359,10 +359,10 @@ void XMLChartExportPropertyMapper::handleSpecialItem( { bHandled = sal_True; - rtl::OUString sAttrName = maPropMapper->GetEntryXMLName( rProperty.mnIndex ); + OUString sAttrName = maPropMapper->GetEntryXMLName( rProperty.mnIndex ); sal_uInt16 nNameSpace = maPropMapper->GetEntryNameSpace( rProperty.mnIndex ); - rtl::OUStringBuffer sValueBuffer; - rtl::OUString sValue; + OUStringBuffer sValueBuffer; + OUString sValue; sal_Int32 nValue = 0; sal_Bool bValue = sal_False; @@ -490,7 +490,7 @@ XMLChartImportPropertyMapper::~XMLChartImportPropertyMapper() bool XMLChartImportPropertyMapper::handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const { diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx index 4951ea156f77..5ea101713c01 100644 --- a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx +++ b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx @@ -65,7 +65,7 @@ void SchXMLAutoStylePoolP::exportStyleAttributes( if( ( iter->maValue >>= nNumberFormat ) && ( nNumberFormat != -1 )) { - rtl::OUString sAttrValue = mrSchXMLExport.getDataStyleName( nNumberFormat ); + OUString sAttrValue = mrSchXMLExport.getDataStyleName( nNumberFormat ); if( !sAttrValue.isEmpty() ) { mrSchXMLExport.AddAttribute( diff --git a/xmloff/source/chart/SchXMLAxisContext.hxx b/xmloff/source/chart/SchXMLAxisContext.hxx index 22697c7a758d..b166e97d254b 100644 --- a/xmloff/source/chart/SchXMLAxisContext.hxx +++ b/xmloff/source/chart/SchXMLAxisContext.hxx @@ -28,10 +28,10 @@ class SchXMLAxisContext : public SvXMLImportContext { public: SchXMLAxisContext( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName, + SvXMLImport& rImport, const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > xDiagram, std::vector< SchXMLAxis >& aAxes, - ::rtl::OUString& rCategoriesAddress, + OUString& rCategoriesAddress, bool bAddMissingXAxisForNetCharts, bool bAdaptWrongPercentScaleValues, bool bAdaptXAxisOrientationForOld2DBarCharts, @@ -42,12 +42,12 @@ public: virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); static void CorrectAxisPositions( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xNewDoc, - const ::rtl::OUString& rChartTypeServiceName, - const ::rtl::OUString& rODFVersionOfFile, + const OUString& rChartTypeServiceName, + const OUString& rODFVersionOfFile, bool bAxisPositionAttributeImported ); private: @@ -56,8 +56,8 @@ private: SchXMLAxis m_aCurrentAxis; std::vector< SchXMLAxis >& m_rAxes; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAxisProps; - rtl::OUString m_aAutoStyleName; - rtl::OUString& m_rCategoriesAddress; + OUString m_aAutoStyleName; + OUString& m_rCategoriesAddress; sal_Int32 m_nAxisType;//::com::sun::star::chart::ChartAxisType bool m_bAxisTypeImported; bool m_bDateScaleImported; @@ -67,7 +67,7 @@ private: bool& m_rbAxisPositionAttributeImported; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTitleShape(); - void CreateGrid( ::rtl::OUString sAutoStyleName, bool bIsMajor ); + void CreateGrid( OUString sAutoStyleName, bool bIsMajor ); void CreateAxis(); void SetAxisTitle(); }; diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx index 72fbcf420575..33971e260969 100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx @@ -29,8 +29,6 @@ #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -39,7 +37,7 @@ using namespace ::xmloff::token; SchXMLCalculationSettingsContext::SchXMLCalculationSettingsContext( SvXMLImport& rImport, sal_uInt16 p_nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) : SvXMLImportContext ( rImport, p_nPrefix, rLocalName ) @@ -48,20 +46,20 @@ SchXMLCalculationSettingsContext::SchXMLCalculationSettingsContext( SvXMLImport& const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - const rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + const OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; const sal_uInt16 nPrefix = rMap.GetKeyByAttrName(sAttrName, &aLocalName ); if ( nPrefix == XML_NAMESPACE_TABLE && IsXMLToken( aLocalName, XML_DATE_VALUE ) ) { util::DateTime aNullDate; - const rtl::OUString sValue = xAttrList->getValueByIndex( i ); + const OUString sValue = xAttrList->getValueByIndex( i ); ::sax::Converter::convertDateTime(aNullDate, sValue); m_aNullDate <<= aNullDate; } } } SvXMLImportContext* SchXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) { return new SchXMLCalculationSettingsContext(GetImport(),nPrefix,rLocalName,xAttrList); diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx index 74c7cb1ffbcb..22492eb0e501 100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx @@ -28,12 +28,12 @@ class SchXMLCalculationSettingsContext : public SvXMLImportContext public: SchXMLCalculationSettingsContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 6dbf23c3b654..034a2f6d794a 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -59,7 +59,6 @@ using namespace com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; using com::sun::star::uno::Reference; using namespace ::SchXMLTools; @@ -68,7 +67,7 @@ namespace void lcl_setRoleAtLabeledSequence( const uno::Reference< chart2::data::XLabeledDataSequence > & xLSeq, - const ::rtl::OUString &rRole ) + const OUString &rRole ) { // set role of sequence uno::Reference< chart2::data::XDataSequence > xValues( xLSeq->getValues()); @@ -111,7 +110,7 @@ void lcl_MoveDataToCandleStickSeries( void lcl_setRoleAtFirstSequence( const uno::Reference< chart2::XDataSeries > & xSeries, - const ::rtl::OUString & rRole ) + const OUString & rRole ) { uno::Reference< chart2::data::XDataSource > xSource( xSeries, uno::UNO_QUERY ); if( xSource.is()) @@ -163,12 +162,12 @@ void lcl_removeEmptyChartTypeGroups( const uno::Reference< chart2::XChartDocumen } catch(const uno::Exception& ex) { - rtl::OString aBStr(rtl::OUStringToOString(ex.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(ex.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE( "Exception caught while removing empty chart types: %s", aBStr.getStr()); } } -uno::Sequence< sal_Int32 > lcl_getNumberSequenceFromString( const ::rtl::OUString& rStr, bool bAddOneToEachOldIndex ) +uno::Sequence< sal_Int32 > lcl_getNumberSequenceFromString( const OUString& rStr, bool bAddOneToEachOldIndex ) { const sal_Unicode aSpace( ' ' ); @@ -224,7 +223,7 @@ uno::Sequence< sal_Int32 > lcl_getNumberSequenceFromString( const ::rtl::OUStrin // ---------------------------------------- SchXMLChartContext::SchXMLChartContext( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName ) : + SvXMLImport& rImport, const OUString& rLocalName ) : SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ), mrImportHelper( rImpHelper ), m_bHasRangeAtPlotArea( false ), @@ -254,15 +253,15 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut // this flag is necessarry for pie charts in the core sal_Bool bSetSwitchData = sal_False; - ::rtl::OUString sAutoStyleName; - ::rtl::OUString aOldChartTypeName; + OUString sAutoStyleName; + OUString aOldChartTypeName; bool bHasAddin = false; for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; + OUString aValue = xAttrList->getValueByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName )) @@ -273,7 +272,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut case XML_TOK_CHART_CLASS: { - rtl::OUString sClassName; + OUString sClassName; sal_uInt16 nClassPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( aValue, &sClassName ); @@ -335,7 +334,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut { OSL_FAIL( "need a charttype to create a diagram" ); //set a fallback value: - ::rtl::OUString aChartClass_Bar( GetXMLToken(XML_BAR ) ); + OUString aChartClass_Bar( GetXMLToken(XML_BAR ) ); aOldChartTypeName = SchXMLTools::GetChartTypeByClassName( aChartClass_Bar, true /* bUseOldNames */ ); maChartTypeServiceName = SchXMLTools::GetChartTypeByClassName( aChartClass_Bar, false /* bUseOldNames */ ); } @@ -355,9 +354,9 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut { try { - xDocProp->getPropertyValue( ::rtl::OUString( "BaseDiagram" )) >>= aOldChartTypeName; + xDocProp->getPropertyValue( OUString( "BaseDiagram" )) >>= aOldChartTypeName; maChartTypeServiceName = SchXMLTools::GetNewChartTypeName( aOldChartTypeName ); - xDocProp->setPropertyValue( rtl::OUString( "RefreshAddInAllowed" ) , uno::makeAny( sal_False) ); + xDocProp->setPropertyValue( OUString( "RefreshAddInAllowed" ) , uno::makeAny( sal_False) ); } catch(const uno::Exception&) { @@ -389,11 +388,11 @@ struct NewDonutSeries { ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > m_xSeries; - ::rtl::OUString msStyleName; + OUString msStyleName; sal_Int32 mnAttachedAxis; - ::std::vector< ::rtl::OUString > m_aSeriesStyles; - ::std::vector< ::rtl::OUString > m_aPointStyles; + ::std::vector< OUString > m_aSeriesStyles; + ::std::vector< OUString > m_aPointStyles; NewDonutSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, sal_Int32 nPointCount ) @@ -404,14 +403,14 @@ struct NewDonutSeries m_aSeriesStyles.resize(nPointCount); } - void setSeriesStyleNameToPoint( const ::rtl::OUString& rStyleName, sal_Int32 nPointIndex ) + void setSeriesStyleNameToPoint( const OUString& rStyleName, sal_Int32 nPointIndex ) { DBG_ASSERT(nPointIndex < static_cast<sal_Int32>(m_aSeriesStyles.size()),"donut point <-> series count mismatch"); if( nPointIndex < static_cast<sal_Int32>(m_aSeriesStyles.size()) ) m_aSeriesStyles[nPointIndex]=rStyleName; } - void setPointStyleNameToPoint( const ::rtl::OUString& rStyleName, sal_Int32 nPointIndex ) + void setPointStyleNameToPoint( const OUString& rStyleName, sal_Int32 nPointIndex ) { DBG_ASSERT(nPointIndex < static_cast<sal_Int32>(m_aPointStyles.size()),"donut point <-> series count mismatch"); if( nPointIndex < static_cast<sal_Int32>(m_aPointStyles.size()) ) @@ -427,8 +426,8 @@ struct NewDonutSeries aRet.push_back( aSeriesStyle ); sal_Int32 nPointIndex=0; - ::std::vector< ::rtl::OUString >::iterator aPointIt( m_aPointStyles.begin() ); - ::std::vector< ::rtl::OUString >::iterator aPointEnd( m_aPointStyles.end() ); + ::std::vector< OUString >::iterator aPointIt( m_aPointStyles.begin() ); + ::std::vector< OUString >::iterator aPointEnd( m_aPointStyles.end() ); while( aPointIt != aPointEnd ) { DataRowPointStyle aPointStyle( DataRowPointStyle::DATA_POINT @@ -569,7 +568,7 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle } bool lcl_SpecialHandlingForDonutChartNeeded( - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, const SvXMLImport & rImport ) { bool bResult = false; @@ -585,12 +584,12 @@ bool lcl_SpecialHandlingForDonutChartNeeded( static void lcl_ApplyDataFromRectangularRangeToDiagram( const uno::Reference< chart2::XChartDocument >& xNewDoc - , const rtl::OUString& rRectangularRange + , const OUString& rRectangularRange , ::com::sun::star::chart::ChartDataRowSource eDataRowSource , bool bRowHasLabels, bool bColHasLabels , bool bSwitchOnLabelsAndCategoriesForOwnData - , const rtl::OUString& sColTrans - , const rtl::OUString& sRowTrans ) + , const OUString& sColTrans + , const OUString& sRowTrans ) { if( !xNewDoc.is() ) return; @@ -613,15 +612,15 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( uno::Sequence< beans::PropertyValue > aArgs( 3 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString( "CellRangeRepresentation" ), + OUString( "CellRangeRepresentation" ), -1, uno::makeAny( rRectangularRange ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - ::rtl::OUString( "DataRowSource" ), + OUString( "DataRowSource" ), -1, uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - ::rtl::OUString( "FirstCellAsLabel" ), + OUString( "FirstCellAsLabel" ), -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ); @@ -629,7 +628,7 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( { aArgs.realloc( aArgs.getLength() + 1 ); aArgs[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 1 ] = beans::PropertyValue( - ::rtl::OUString( "SequenceMapping" ), + OUString( "SequenceMapping" ), -1, uno::makeAny( !sColTrans.isEmpty() ? lcl_getNumberSequenceFromString( sColTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() ) : lcl_getNumberSequenceFromString( sRowTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() ) ), @@ -638,24 +637,24 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( //work around wrong writer ranges ( see Issue 58464 ) { - rtl::OUString aChartOleObjectName; + OUString aChartOleObjectName; uno::Reference< frame::XModel > xModel(xNewDoc, uno::UNO_QUERY ); if( xModel.is() ) { comphelper::MediaDescriptor aMediaDescriptor( xModel->getArgs() ); comphelper::MediaDescriptor::const_iterator aIt( - aMediaDescriptor.find( rtl::OUString( "HierarchicalDocumentName" ))); + aMediaDescriptor.find( OUString( "HierarchicalDocumentName" ))); if( aIt != aMediaDescriptor.end() ) { - aChartOleObjectName = (*aIt).second.get< ::rtl::OUString >(); + aChartOleObjectName = (*aIt).second.get< OUString >(); } } if( !aChartOleObjectName.isEmpty() ) { aArgs.realloc( aArgs.getLength() + 1 ); aArgs[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 1 ] = beans::PropertyValue( - ::rtl::OUString( "ChartOleObjectName" ), + OUString( "ChartOleObjectName" ), -1, uno::makeAny( aChartOleObjectName ), beans::PropertyState_DIRECT_VALUE ); } @@ -667,11 +666,11 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( aArgs.realloc( aArgs.getLength() + 2 ); aArgs[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 2 ] = beans::PropertyValue( - ::rtl::OUString( "HasCategories" ), + OUString( "HasCategories" ), -1, uno::makeAny( bHasCateories ), beans::PropertyState_DIRECT_VALUE ); aArgs[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 1 ] = beans::PropertyValue( - ::rtl::OUString("UseCategoriesAsX"), + OUString("UseCategoriesAsX"), -1, uno::makeAny( sal_False ),//categories in ODF files are not to be used as x values (independent from what is offered in our ui) beans::PropertyState_DIRECT_VALUE ); @@ -695,7 +694,7 @@ void SchXMLChartContext::EndElement() { uno::Any aAny; aAny <<= maMainTitle; - xTitleProp->setPropertyValue( rtl::OUString( "String" ), aAny ); + xTitleProp->setPropertyValue( OUString( "String" ), aAny ); } catch(const beans::UnknownPropertyException&) { @@ -712,7 +711,7 @@ void SchXMLChartContext::EndElement() { uno::Any aAny; aAny <<= maSubTitle; - xTitleProp->setPropertyValue( rtl::OUString( "String" ), aAny ); + xTitleProp->setPropertyValue( OUString( "String" ), aAny ); } catch(const beans::UnknownPropertyException&) { @@ -731,13 +730,13 @@ void SchXMLChartContext::EndElement() if( xDiaProp.is()) { if( maSeriesDefaultsAndStyles.maStackedDefault.hasValue()) - xDiaProp->setPropertyValue(::rtl::OUString("Stacked"),maSeriesDefaultsAndStyles.maStackedDefault); + xDiaProp->setPropertyValue(OUString("Stacked"),maSeriesDefaultsAndStyles.maStackedDefault); if( maSeriesDefaultsAndStyles.maPercentDefault.hasValue()) - xDiaProp->setPropertyValue(::rtl::OUString("Percent"),maSeriesDefaultsAndStyles.maPercentDefault); + xDiaProp->setPropertyValue(OUString("Percent"),maSeriesDefaultsAndStyles.maPercentDefault); if( maSeriesDefaultsAndStyles.maDeepDefault.hasValue()) - xDiaProp->setPropertyValue(::rtl::OUString("Deep"),maSeriesDefaultsAndStyles.maDeepDefault); + xDiaProp->setPropertyValue(OUString("Deep"),maSeriesDefaultsAndStyles.maDeepDefault); if( maSeriesDefaultsAndStyles.maStackedBarsConnectedDefault.hasValue()) - xDiaProp->setPropertyValue(::rtl::OUString("StackedBarsConnected"),maSeriesDefaultsAndStyles.maStackedBarsConnectedDefault); + xDiaProp->setPropertyValue(OUString("StackedBarsConnected"),maSeriesDefaultsAndStyles.maStackedBarsConnectedDefault); } //the OOo 2.0 implementation and older has a bug with donuts @@ -808,7 +807,7 @@ void SchXMLChartContext::EndElement() try { if( bOlderThan2_3 && xDiaProp.is() )//for older charts the hidden cells were removed by calc on the fly - xDiaProp->setPropertyValue(::rtl::OUString("IncludeHiddenCells"),uno::makeAny(false)); + xDiaProp->setPropertyValue(OUString("IncludeHiddenCells"),uno::makeAny(false)); // note: mbRowHasLabels means the first row contains labels, that means we have "column-descriptions", // (analogously mbColHasLabels means we have "row-descriptions") @@ -874,7 +873,7 @@ void SchXMLChartContext::EndElement() // set autostyles for series and data points const SvXMLStylesContext* pStylesCtxt = mrImportHelper.GetAutoStylesContext(); const SvXMLStyleContext* pStyle = NULL; - ::rtl::OUString sCurrStyleName; + OUString sCurrStyleName; if( pStylesCtxt ) { @@ -906,7 +905,7 @@ void SchXMLChartContext::EndElement() } if( xProp.is()) - xProp->setPropertyValue( rtl::OUString( "RefreshAddInAllowed" ) , uno::makeAny( sal_True) ); + xProp->setPropertyValue( OUString( "RefreshAddInAllowed" ) , uno::makeAny( sal_True) ); } void SchXMLChartContext::MergeSeriesForStockChart() @@ -934,7 +933,7 @@ void SchXMLChartContext::MergeSeriesForStockChart() { xDSContainer.set( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xCTProp( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW ); - xCTProp->getPropertyValue( ::rtl::OUString( "Japanese" )) >>= bHasJapaneseCandlestick; + xCTProp->getPropertyValue( OUString( "Japanese" )) >>= bHasJapaneseCandlestick; break; } } @@ -989,7 +988,7 @@ void SchXMLChartContext::MergeSeriesForStockChart() SvXMLImportContext* SchXMLChartContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { static const sal_Bool bTrue = sal_True; @@ -1019,7 +1018,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext( { if( xProp.is()) { - xProp->setPropertyValue( rtl::OUString( "HasMainTitle" ), aTrueBool ); + xProp->setPropertyValue( OUString( "HasMainTitle" ), aTrueBool ); } uno::Reference< drawing::XShape > xTitleShape( xDoc->getTitle(), uno::UNO_QUERY ); pContext = new SchXMLTitleContext( mrImportHelper, GetImport(), @@ -1032,7 +1031,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext( { if( xProp.is()) { - xProp->setPropertyValue( rtl::OUString( "HasSubTitle" ), aTrueBool ); + xProp->setPropertyValue( OUString( "HasSubTitle" ), aTrueBool ); } uno::Reference< drawing::XShape > xTitleShape( xDoc->getSubTitle(), uno::UNO_QUERY ); pContext = new SchXMLTitleContext( mrImportHelper, GetImport(), @@ -1140,8 +1139,8 @@ void SchXMLChartContext::InitChart( // ---------------------------------------- SchXMLTitleContext::SchXMLTitleContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, - rtl::OUString& rTitle, + const OUString& rLocalName, + OUString& rTitle, uno::Reference< drawing::XShape >& xTitleShape ) : SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ), mrImportHelper( rImpHelper ), @@ -1163,9 +1162,9 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; + OUString aValue = xAttrList->getValueByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_SVG ) @@ -1214,7 +1213,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut SvXMLImportContext* SchXMLTitleContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx index 2a6258cd734a..91057b84f16a 100644 --- a/xmloff/source/chart/SchXMLChartContext.hxx +++ b/xmloff/source/chart/SchXMLChartContext.hxx @@ -79,7 +79,7 @@ class SchXMLChartContext : public SvXMLImportContext { public: SchXMLChartContext( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName ); + SvXMLImport& rImport, const OUString& rLocalName ); virtual ~SchXMLChartContext(); virtual void StartElement( const com::sun::star::uno::Reference< @@ -87,7 +87,7 @@ public: virtual void EndElement(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); @@ -95,9 +95,9 @@ private: SchXMLTable maTable; SchXMLImportHelper& mrImportHelper; - ::rtl::OUString maMainTitle, maSubTitle; + OUString maMainTitle, maSubTitle; com::sun::star::awt::Point maMainTitlePos, maSubTitlePos, maLegendPos; - ::rtl::OUString m_aXLinkHRefAttributeToIndicateDataProvider; + OUString m_aXLinkHRefAttributeToIndicateDataProvider; bool m_bHasRangeAtPlotArea; bool m_bHasTableElement; sal_Bool mbAllRangeAddressesAvailable; @@ -107,16 +107,16 @@ private: bool mbIsStockChart; com::sun::star::uno::Sequence< com::sun::star::chart::ChartSeriesAddress > maSeriesAddresses; - ::rtl::OUString msCategoriesAddress; - ::rtl::OUString msChartAddress; + OUString msCategoriesAddress; + OUString msChartAddress; SeriesDefaultsAndStyles maSeriesDefaultsAndStyles; tSchXMLLSequencesPerIndex maLSequencesPerIndex; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxDrawPage; - ::rtl::OUString msColTrans; - ::rtl::OUString msRowTrans; - ::rtl::OUString maChartTypeServiceName; + OUString msColTrans; + OUString msRowTrans; + OUString maChartTypeServiceName; ::com::sun::star::awt::Size maChartSize; @@ -126,7 +126,7 @@ private: @param bSetWitchData Indicates whether the data set takes it's data series from rows or from columns. */ - void InitChart (const ::rtl::OUString & rChartTypeServiceName, + void InitChart (const OUString & rChartTypeServiceName, sal_Bool bSetSwitchData); void MergeSeriesForStockChart(); @@ -138,14 +138,14 @@ class SchXMLTitleContext : public SvXMLImportContext { private: SchXMLImportHelper& mrImportHelper; - rtl::OUString& mrTitle; + OUString& mrTitle; com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxTitleShape; - rtl::OUString msAutoStyleName; + OUString msAutoStyleName; public: SchXMLTitleContext( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName, - rtl::OUString& rTitle, + SvXMLImport& rImport, const OUString& rLocalName, + OUString& rTitle, com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xTitleShape ); virtual ~SchXMLTitleContext(); @@ -153,7 +153,7 @@ public: com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); }; diff --git a/xmloff/source/chart/SchXMLEnumConverter.cxx b/xmloff/source/chart/SchXMLEnumConverter.cxx index c3ddabd3af83..9350f8676267 100644 --- a/xmloff/source/chart/SchXMLEnumConverter.cxx +++ b/xmloff/source/chart/SchXMLEnumConverter.cxx @@ -26,7 +26,6 @@ // header for rtl::Static #include <rtl/instance.hxx> -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star; diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 11cac872a45c..ee01a6ad3e18 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -109,9 +109,6 @@ using namespace com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringToOString; using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -161,9 +158,9 @@ public: UniReference< XMLPropertySetMapper > GetPropertySetMapper() const; - void SetChartRangeAddress( const ::rtl::OUString& rAddress ) + void SetChartRangeAddress( const OUString& rAddress ) { msChartAddress = rAddress; } - void SetTableNumberList( const ::rtl::OUString& rList ) + void SetTableNumberList( const OUString& rList ) { msTableNumberList = rList; } void InitRangeSegmentationProperties( @@ -177,7 +174,7 @@ public: /** first parseDocument: collect autostyles and store names in this queue second parseDocument: export content and use names from this queue */ - ::std::queue< ::rtl::OUString > maAutoStyleNameQueue; + ::std::queue< OUString > maAutoStyleNameQueue; void CollectAutoStyle( const std::vector< XMLPropertyState >& aStates ); void AddAutoStyleAttribute( @@ -251,7 +248,7 @@ public: /// fills the member msString with the appropriate String (i.e. "A3") void getCellAddress( sal_Int32 nCol, sal_Int32 nRow ); /// exports a string as a paragraph element - void exportText( const ::rtl::OUString& rText, bool bConvertTabsLFs = false ); + void exportText( const OUString& rText, bool bConvertTabsLFs = false ); void exportErrorBarRanges(); private: @@ -264,24 +261,24 @@ public: UniReference< XMLPropertySetMapper > mxPropertySetMapper; UniReference< XMLChartExportPropertyMapper > mxExpPropMapper; - rtl::OUString msTableName; - rtl::OUStringBuffer msStringBuffer; - rtl::OUString msString; + OUString msTableName; + OUStringBuffer msStringBuffer; + OUString msString; // members filled by InitRangeSegmentationProperties (retrieved from DataProvider) sal_Bool mbHasSeriesLabels; sal_Bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false sal_Bool mbRowSourceColumns; - rtl::OUString msChartAddress; - rtl::OUString msTableNumberList; + OUString msChartAddress; + OUString msTableNumberList; ::com::sun::star::uno::Sequence< sal_Int32 > maSequenceMapping; - rtl::OUString msCLSID; + OUString msCLSID; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxAdditionalShapes; tDataSequenceCont m_aDataSequencesToExport; - rtl::OUString maCategoriesRange; + OUString maCategoriesRange; }; namespace @@ -488,7 +485,7 @@ bool lcl_isSeriesAttachedToFirstAxis( return bResult; } -OUString lcl_ConvertRange( const ::rtl::OUString & rRange, const Reference< chart2::XChartDocument > & xDoc ) +OUString lcl_ConvertRange( const OUString & rRange, const Reference< chart2::XChartDocument > & xDoc ) { OUString aResult = rRange; if( !xDoc.is() ) @@ -593,10 +590,10 @@ sal_Int32 lcl_getMaxSequenceLength( return nResult; } -uno::Sequence< rtl::OUString > lcl_DataSequenceToStringSequence( +uno::Sequence< OUString > lcl_DataSequenceToStringSequence( const uno::Reference< chart2::data::XDataSequence >& xDataSequence ) { - uno::Sequence< rtl::OUString > aResult; + uno::Sequence< OUString > aResult; if(!xDataSequence.is()) return aResult; @@ -662,7 +659,7 @@ uno::Sequence< rtl::OUString > lcl_DataSequenceToStringSequence( { //no double value is countained //is there any text? - uno::Sequence< rtl::OUString > aStrings( lcl_DataSequenceToStringSequence( xSeq ) ); + uno::Sequence< OUString > aStrings( lcl_DataSequenceToStringSequence( xSeq ) ); sal_Int32 nTextCount = aStrings.getLength(); for( sal_Int32 j = 0; j < nTextCount; ++j ) { @@ -977,7 +974,7 @@ void lcl_exportNumberFormat( const OUString& rPropertyName, const Reference< bea catch( const uno::Exception & rEx ) { #ifdef DBG_UTIL - rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE( "chart:exporting error bar ranges: %s", aBStr.getStr()); #else (void)rEx; // avoid warning @@ -988,7 +985,7 @@ void lcl_exportNumberFormat( const OUString& rPropertyName, const Reference< bea return aResult; } -bool lcl_exportDomainForThisSequence( const Reference< chart2::data::XDataSequence > xValues, rtl::OUString& rFirstRangeForThisDomainIndex, SvXMLExport& rExport ) +bool lcl_exportDomainForThisSequence( const Reference< chart2::data::XDataSequence > xValues, OUString& rFirstRangeForThisDomainIndex, SvXMLExport& rExport ) { bool bDomainExported = false; if( xValues.is()) @@ -1078,7 +1075,7 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl( mbHasSeriesLabels( sal_False ), mbHasCategoryLabels( sal_False ), mbRowSourceColumns( sal_True ), - msCLSID( rtl::OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName())) + msCLSID( OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName())) { msTableName = OUString( "local-table" ); @@ -1104,13 +1101,13 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl( XML_STYLE_FAMILY_TEXT_PARAGRAPH, GetXMLToken( XML_PARAGRAPH ), mxExpPropMapper.get(), - rtl::OUString( 'P' )); + OUString( 'P' )); // register text family also for shapes mrAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_TEXT, GetXMLToken( XML_TEXT ), mxExpPropMapper.get(), - rtl::OUString( 'T' )); + OUString( 'T' )); } SchXMLExportHelper_Impl::~SchXMLExportHelper_Impl() @@ -1129,7 +1126,7 @@ void SchXMLExportHelper_Impl::exportChart( Reference< chart::XChartDocument > rC DBG_ASSERT( maAutoStyleNameQueue.empty(), "There are still remaining autostyle names in the queue" ); } -static ::rtl::OUString lcl_GetStringFromNumberSequence( const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bRemoveOneFromEachIndex /*should be true if having categories*/ ) +static OUString lcl_GetStringFromNumberSequence( const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bRemoveOneFromEachIndex /*should be true if having categories*/ ) { const sal_Int32* pArray = rSequenceMapping.getConstArray(); const sal_Int32 nSize = rSequenceMapping.getLength(); @@ -1230,7 +1227,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& { SvXMLElementExport aSet( mrExport, XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, sal_True, sal_True ); { - ::rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDateTime(sBuffer, aNullDate); mrExport.AddAttribute( XML_NAMESPACE_TABLE,XML_DATE_VALUE,sBuffer.makeStringAndClear()); SvXMLElementExport aNull( mrExport, XML_NAMESPACE_TABLE, XML_NULL_DATE, sal_True, sal_True ); @@ -1300,7 +1297,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& enum XMLTokenEnum eTransToken = ::xmloff::token::XML_ROW_MAPPING; if( mbRowSourceColumns ) eTransToken = ::xmloff::token::XML_COLUMN_MAPPING; - ::rtl::OUString aSequenceMappingStr( lcl_GetStringFromNumberSequence( + OUString aSequenceMappingStr( lcl_GetStringFromNumberSequence( maSequenceMapping, mbHasCategoryLabels && !xNewDoc->hasInternalDataProvider() ) ); mrExport.AddAttribute( XML_NAMESPACE_CHART, @@ -1458,7 +1455,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& { awt::Size aSize( xLegendShape->getSize() ); addSize( aSize, true ); - rtl::OUStringBuffer aAspectRatioString; + OUStringBuffer aAspectRatioString; ::sax::Converter::convertDouble( aAspectRatioString, double(aSize.Width)/double(aSize.Height)); @@ -1988,7 +1985,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( catch( const uno::Exception & rEx ) { #ifdef DBG_UTIL - rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE("chart:TableNumberList property caught: %s", aBStr.getStr()); #else (void)rEx; // avoid warning @@ -2024,7 +2021,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( catch( const uno::Exception & rEx ) { #ifdef DBG_UTIL - rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE( "chart:exportPlotAreaException caught: %s", aBStr.getStr()); #else (void)rEx; // avoid warning @@ -2609,7 +2606,7 @@ namespace Reference< chart2::data::XTextualDataSequence > xTextualDataSequence( xDataSequence, uno::UNO_QUERY ); if( xTextualDataSequence.is() ) { - uno::Sequence< rtl::OUString > aStrings( xTextualDataSequence->getTextualData() ); + uno::Sequence< OUString > aStrings( xTextualDataSequence->getTextualData() ); sal_Int32 nCount = aStrings.getLength(); for( sal_Int32 i = 0; i < nCount; ++i ) { @@ -3083,7 +3080,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const Reference<beans::XPropertySe { Any aAny; - aAny = xSeriesProp->getPropertyValue( bYError ? rtl::OUString("ErrorBarY") : rtl::OUString("ErrorBarX") ); + aAny = xSeriesProp->getPropertyValue( bYError ? OUString("ErrorBarY") : OUString("ErrorBarX") ); aAny >>= xErrorBarProp; if ( xErrorBarProp.is() ) @@ -3121,7 +3118,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const Reference<beans::XPropertySe { if ( nCurrentVersion > SvtSaveOptions::ODFVER_012 ) { - rtl::OUString aRole, aRange; + OUString aRole, aRange; Reference< beans::XPropertySet > xSeqProp( *aIt, uno::UNO_QUERY_THROW ); xSeqProp->getPropertyValue("Role") >>= aRole; @@ -3739,7 +3736,7 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference< { Reference< chart2::data::XDataSource > xDataSource( lcl_pressUsedDataIntoRectangularFormat( xChartDoc, mbHasCategoryLabels )); Sequence< beans::PropertyValue > aArgs( xDataProvider->detectArguments( xDataSource )); - ::rtl::OUString sCellRange, sBrokenRange; + OUString sCellRange, sBrokenRange; bool bBrokenRangeAvailable = false; for( sal_Int32 i=0; i<aArgs.getLength(); ++i ) { diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index 234d43bb4a7c..6f758c880339 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -53,9 +53,6 @@ using namespace com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringToOString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -682,7 +679,7 @@ void SAL_CALL SchXMLImport::setTargetDocument( const uno::Reference< lang::XComp catch( const uno::Exception & rEx ) { #ifdef DBG_UTIL - rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE("SchXMLChartContext::StartElement(): Exception caught: %s", aBStr.getStr()); #else (void)rEx; // avoid warning for pro build diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx index 3a86f43de05e..ba44bf3184ff 100644 --- a/xmloff/source/chart/SchXMLLegendContext.cxx +++ b/xmloff/source/chart/SchXMLLegendContext.cxx @@ -33,7 +33,6 @@ using namespace ::xmloff::token; using namespace com::sun::star; -using rtl::OUString; using com::sun::star::uno::Reference; //---------------------------------------- @@ -84,7 +83,7 @@ struct theLegendAttributeTokenMap : public rtl::Static< LegendAttributeTokenMap, //---------------------------------------- -SchXMLLegendContext::SchXMLLegendContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const rtl::OUString& rLocalName ) : +SchXMLLegendContext::SchXMLLegendContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName ) : SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ), mrImportHelper( rImpHelper ) { @@ -131,14 +130,14 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu chart::ChartLegendExpansion nLegendExpansion = chart::ChartLegendExpansion_HIGH; bool bHasExpansion=false; - rtl::OUString sAutoStyleName; + OUString sAutoStyleName; uno::Any aAny; for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; + OUString aValue = xAttrList->getValueByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName )) diff --git a/xmloff/source/chart/SchXMLLegendContext.hxx b/xmloff/source/chart/SchXMLLegendContext.hxx index 88ab218f811c..980af704bc82 100644 --- a/xmloff/source/chart/SchXMLLegendContext.hxx +++ b/xmloff/source/chart/SchXMLLegendContext.hxx @@ -26,7 +26,7 @@ class SchXMLLegendContext : public SvXMLImportContext { public: - SchXMLLegendContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const rtl::OUString& rLocalName ); + SchXMLLegendContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName ); virtual ~SchXMLLegendContext(); virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx index 9195e6644b2c..f74095ee732e 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.cxx +++ b/xmloff/source/chart/SchXMLParagraphContext.cxx @@ -25,7 +25,6 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> -using ::rtl::OUString; using namespace com::sun::star; using namespace ::xmloff::token; @@ -53,8 +52,8 @@ void SchXMLParagraphContext::StartElement( const uno::Reference< xml::sax::XAttr for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if (IsXMLToken(aLocalName, XML_ID)) diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx index ba246ee75a11..8c2b922f60b4 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.hxx +++ b/xmloff/source/chart/SchXMLParagraphContext.hxx @@ -30,25 +30,25 @@ namespace com { namespace sun { namespace star { namespace xml { namespace sax { class SchXMLParagraphContext : public SvXMLImportContext { private: - ::rtl::OUString& mrText; - ::rtl::OUString* mpId; - ::rtl::OUStringBuffer maBuffer; + OUString& mrText; + OUString* mpId; + OUStringBuffer maBuffer; public: SchXMLParagraphContext( SvXMLImport& rImport, - const ::rtl::OUString& rLocalName, - ::rtl::OUString& rText, - ::rtl::OUString * pOutId = 0 ); + const OUString& rLocalName, + OUString& rText, + OUString * pOutId = 0 ); virtual ~SchXMLParagraphContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual void Characters( const rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif // _SCH_XMLPARAGRAPHCONTEXT_HXX_ diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index a6ca2b526c5b..8fef27b02dbc 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -64,7 +64,6 @@ using namespace com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; using com::sun::star::uno::Reference; namespace @@ -78,7 +77,7 @@ struct lcl_AxisHasCategories : public ::std::unary_function< SchXMLAxis, bool > } }; -OUString lcl_ConvertRange( const ::rtl::OUString & rRange, const uno::Reference< chart2::XChartDocument > & xDoc ) +OUString lcl_ConvertRange( const OUString & rRange, const uno::Reference< chart2::XChartDocument > & xDoc ) { OUString aResult = rRange; if(!xDoc.is()) @@ -108,7 +107,7 @@ void SchXML3DSceneAttributesHelper::getCameraDefaultFromDiagram( const uno::Refe if( xProp.is() ) { drawing::CameraGeometry aCamGeo; - xProp->getPropertyValue( ::rtl::OUString( "D3DCameraGeometry" )) >>= aCamGeo; + xProp->getPropertyValue( OUString( "D3DCameraGeometry" )) >>= aCamGeo; maVRP.setX( aCamGeo.vrp.PositionX ); maVRP.setY( aCamGeo.vrp.PositionY ); maVRP.setZ( aCamGeo.vrp.PositionZ ); @@ -123,7 +122,7 @@ void SchXML3DSceneAttributesHelper::getCameraDefaultFromDiagram( const uno::Refe catch( const uno::Exception & rEx ) { #ifdef DBG_UTIL - rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE( "Exception caught for property NumberOfLines: %s", aBStr.getStr()); #else (void)rEx; // avoid warning for pro build @@ -137,17 +136,17 @@ SchXML3DSceneAttributesHelper::~SchXML3DSceneAttributesHelper() SchXMLPlotAreaContext::SchXMLPlotAreaContext( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName, - const rtl::OUString& rXLinkHRefAttributeToIndicateDataProvider, - ::rtl::OUString& rCategoriesAddress, - ::rtl::OUString& rChartAddress, + SvXMLImport& rImport, const OUString& rLocalName, + const OUString& rXLinkHRefAttributeToIndicateDataProvider, + OUString& rCategoriesAddress, + OUString& rChartAddress, bool& rbHasRangeAtPlotArea, sal_Bool & rAllRangeAddressesAvailable, sal_Bool & rColHasLabels, sal_Bool & rRowHasLabels, chart::ChartDataRowSource & rDataRowSource, SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles, - const ::rtl::OUString& aChartTypeServiceName, + const OUString& aChartTypeServiceName, tSchXMLLSequencesPerIndex & rLSequencesPerIndex, const awt::Size & rChartSize ) : SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ), @@ -199,36 +198,36 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext( try { xProp->setPropertyValue( - rtl::OUString( "HasXAxis" ), aFalseBool ); + OUString( "HasXAxis" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasXAxisGrid" ), aFalseBool ); + OUString( "HasXAxisGrid" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasXAxisDescription" ), aFalseBool ); + OUString( "HasXAxisDescription" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasSecondaryXAxis" ), aFalseBool ); + OUString( "HasSecondaryXAxis" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasSecondaryXAxisDescription" ), aFalseBool ); + OUString( "HasSecondaryXAxisDescription" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasYAxis" ), aFalseBool ); + OUString( "HasYAxis" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasYAxisGrid" ), aFalseBool ); + OUString( "HasYAxisGrid" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasYAxisDescription" ), aFalseBool ); + OUString( "HasYAxisDescription" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasSecondaryYAxis" ), aFalseBool ); + OUString( "HasSecondaryYAxis" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasSecondaryYAxisDescription" ), aFalseBool ); + OUString( "HasSecondaryYAxisDescription" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasZAxis" ), aFalseBool ); + OUString( "HasZAxis" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasZAxisDescription" ), aFalseBool ); + OUString( "HasZAxisDescription" ), aFalseBool ); uno::Any aAny; chart::ChartDataRowSource eSource = chart::ChartDataRowSource_COLUMNS; aAny <<= eSource; - xProp->setPropertyValue( rtl::OUString( "DataRowSource" ), aAny ); + xProp->setPropertyValue( OUString( "DataRowSource" ), aAny ); } catch( const beans::UnknownPropertyException & ) { @@ -249,9 +248,9 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; + OUString aValue = xAttrList->getValueByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName )) @@ -306,12 +305,12 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri uno::Any aAny; aAny <<= (sal_Bool)(mrColHasLabels); xDocProp->setPropertyValue( - ::rtl::OUString( "DataSourceLabelsInFirstColumn" ), + OUString( "DataSourceLabelsInFirstColumn" ), aAny ); aAny <<= (sal_Bool)(mrRowHasLabels); xDocProp->setPropertyValue( - ::rtl::OUString( "DataSourceLabelsInFirstRow" ), + OUString( "DataSourceLabelsInFirstRow" ), aAny ); } catch( const beans::UnknownPropertyException & ) @@ -341,13 +340,13 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri pPropStyleContext->FillPropertySet( xProp ); // get the data row source that was set without having data - xProp->getPropertyValue( ::rtl::OUString( "DataRowSource" )) + xProp->getPropertyValue( OUString( "DataRowSource" )) >>= mrDataRowSource; //lines on/off //this old property is not supported fully anymore with the new chart, so we need to get the information a little bit different from similar properties mrSeriesDefaultsAndStyles.maLinesOnProperty = SchXMLTools::getPropertyFromContext( - ::rtl::OUString("Lines"), pPropStyleContext, pStylesCtxt ); + OUString("Lines"), pPropStyleContext, pStylesCtxt ); //handle automatic position and size m_aOuterPositioning.readAutomaticPositioningProperties( pPropStyleContext, pStylesCtxt ); @@ -356,12 +355,12 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri if( SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan3_0( GetImport().GetModel() ) ) { bool bIs3d = false; - if( xProp.is() && ( xProp->getPropertyValue(::rtl::OUString("Dim3D")) >>= bIs3d ) && + if( xProp.is() && ( xProp->getPropertyValue(OUString("Dim3D")) >>= bIs3d ) && bIs3d ) { if( maChartTypeServiceName == "com.sun.star.chart2.PieChartType" || maChartTypeServiceName == "com.sun.star.chart2.DonutChartType" ) { - ::rtl::OUString aPropName( ::rtl::OUString("StartingAngle") ); + OUString aPropName( OUString("StartingAngle") ); uno::Any aAStartingAngle( SchXMLTools::getPropertyFromContext( aPropName, pPropStyleContext, pStylesCtxt ) ); if( !aAStartingAngle.hasValue() ) xProp->setPropertyValue( aPropName, uno::makeAny(sal_Int32(0)) ) ; @@ -378,28 +377,28 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri { try { - mrSeriesDefaultsAndStyles.maSymbolTypeDefault = xProp->getPropertyValue(::rtl::OUString("SymbolType")); - mrSeriesDefaultsAndStyles.maDataCaptionDefault = xProp->getPropertyValue(::rtl::OUString("DataCaption")); + mrSeriesDefaultsAndStyles.maSymbolTypeDefault = xProp->getPropertyValue(OUString("SymbolType")); + mrSeriesDefaultsAndStyles.maDataCaptionDefault = xProp->getPropertyValue(OUString("DataCaption")); - mrSeriesDefaultsAndStyles.maMeanValueDefault = xProp->getPropertyValue(::rtl::OUString("MeanValue")); - mrSeriesDefaultsAndStyles.maRegressionCurvesDefault = xProp->getPropertyValue(::rtl::OUString("RegressionCurves")); + mrSeriesDefaultsAndStyles.maMeanValueDefault = xProp->getPropertyValue(OUString("MeanValue")); + mrSeriesDefaultsAndStyles.maRegressionCurvesDefault = xProp->getPropertyValue(OUString("RegressionCurves")); bool bStacked = false; - mrSeriesDefaultsAndStyles.maStackedDefault = xProp->getPropertyValue(::rtl::OUString("Stacked")); + mrSeriesDefaultsAndStyles.maStackedDefault = xProp->getPropertyValue(OUString("Stacked")); mrSeriesDefaultsAndStyles.maStackedDefault >>= bStacked; - mrSeriesDefaultsAndStyles.maPercentDefault = xProp->getPropertyValue(::rtl::OUString("Percent")); + mrSeriesDefaultsAndStyles.maPercentDefault = xProp->getPropertyValue(OUString("Percent")); mrSeriesDefaultsAndStyles.maPercentDefault >>= mbPercentStacked; - mrSeriesDefaultsAndStyles.maStackedBarsConnectedDefault = xProp->getPropertyValue(::rtl::OUString("StackedBarsConnected")); + mrSeriesDefaultsAndStyles.maStackedBarsConnectedDefault = xProp->getPropertyValue(OUString("StackedBarsConnected")); // deep - uno::Any aDeepProperty( xProp->getPropertyValue(::rtl::OUString("Deep"))); + uno::Any aDeepProperty( xProp->getPropertyValue(OUString("Deep"))); // #124488# old versions store a 3d area and 3D line deep chart with Deep==false => workaround for this if( ! (bStacked || mbPercentStacked )) { if( SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan2_3( GetImport().GetModel() ) ) { bool bIs3d = false; - if( ( xProp->getPropertyValue(::rtl::OUString("Dim3D")) >>= bIs3d ) && + if( ( xProp->getPropertyValue(OUString("Dim3D")) >>= bIs3d ) && bIs3d ) { if( maChartTypeServiceName == "com.sun.star.chart2.AreaChartType" || maChartTypeServiceName == "com.sun.star.chart2.LineChartType" ) @@ -411,13 +410,13 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri } mrSeriesDefaultsAndStyles.maDeepDefault = aDeepProperty; - xProp->getPropertyValue(::rtl::OUString("NumberOfLines")) >>= mnNumOfLinesProp; - xProp->getPropertyValue(::rtl::OUString("Volume")) >>= mbStockHasVolume; + xProp->getPropertyValue(OUString("NumberOfLines")) >>= mnNumOfLinesProp; + xProp->getPropertyValue(OUString("Volume")) >>= mbStockHasVolume; } catch( const uno::Exception & rEx ) { #ifdef DBG_UTIL - rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE("PlotAreaContext:EndElement(): Exception caught: %s", aBStr.getStr()); #else (void)rEx; // avoid warning for pro build @@ -442,13 +441,13 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri // data yet. mxNewDoc->createInternalDataProvider( false /* bCloneExistingData */ ); if( xProp.is() && mrDataRowSource!=chart::ChartDataRowSource_COLUMNS ) - xProp->setPropertyValue( rtl::OUString( "DataRowSource" ), uno::makeAny(mrDataRowSource) ); + xProp->setPropertyValue( OUString( "DataRowSource" ), uno::makeAny(mrDataRowSource) ); } } SvXMLImportContext* SchXMLPlotAreaContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { SvXMLImportContext* pContext = 0; @@ -570,7 +569,7 @@ void SchXMLPlotAreaContext::EndElement() if( xDiaProp.is()) { sal_Bool bIsThreeDim = sal_False; - uno::Any aAny = xDiaProp->getPropertyValue( ::rtl::OUString( "Dim3D" )); + uno::Any aAny = xDiaProp->getPropertyValue( OUString( "Dim3D" )); aAny >>= bIsThreeDim; // set 3d scene attributes @@ -585,13 +584,13 @@ void SchXMLPlotAreaContext::EndElement() { try { - xDiaProp->setPropertyValue( ::rtl::OUString( "NumberOfLines" ), + xDiaProp->setPropertyValue( OUString( "NumberOfLines" ), uno::makeAny( mnNumOfLinesProp )); } catch( const uno::Exception & rEx ) { #ifdef DBG_UTIL - rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE( "Exception caught for property NumberOfLines: %s", aBStr.getStr()); #else (void)rEx; // avoid warning for pro build @@ -605,13 +604,13 @@ void SchXMLPlotAreaContext::EndElement() { try { - xDiaProp->setPropertyValue( ::rtl::OUString( "Volume" ), + xDiaProp->setPropertyValue( OUString( "Volume" ), uno::makeAny( true )); } catch( const uno::Exception & rEx ) { #ifdef DBG_UTIL - rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE("Exception caught for property Volume: %s", aBStr.getStr()); #else (void)rEx; // avoid warning for pro build @@ -644,7 +643,7 @@ void SchXMLPlotAreaContext::EndElement() // ======================================== -SchXMLDataPointContext::SchXMLDataPointContext( SvXMLImport& rImport, const rtl::OUString& rLocalName, +SchXMLDataPointContext::SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName, ::std::list< DataRowPointStyle >& rStyleList, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, @@ -665,13 +664,13 @@ SchXMLDataPointContext::~SchXMLDataPointContext() void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; - ::rtl::OUString sAutoStyleName; + OUString sAutoStyleName; sal_Int32 nRepeat = 1; for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_CHART ) @@ -734,7 +733,7 @@ awt::Rectangle SchXMLPositonAttributesHelper::getRectangle() const return awt::Rectangle( m_aPosition.X, m_aPosition.Y, m_aSize.Width, m_aSize.Height ); } -bool SchXMLPositonAttributesHelper::readPositioningAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +bool SchXMLPositonAttributesHelper::readPositioningAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { //returns true if the attribute was proccessed bool bReturn = true; @@ -781,9 +780,9 @@ void SchXMLPositonAttributesHelper::readAutomaticPositioningProperties( XMLPropS { //handle automatic position and size SchXMLTools::getPropertyFromContext( - ::rtl::OUString("AutomaticSize"), pPropStyleContext, pStylesCtxt ) >>= m_bAutoSize; + OUString("AutomaticSize"), pPropStyleContext, pStylesCtxt ) >>= m_bAutoSize; SchXMLTools::getPropertyFromContext( - ::rtl::OUString("AutomaticPosition"), pPropStyleContext, pStylesCtxt ) >>= m_bAutoPosition; + OUString("AutomaticPosition"), pPropStyleContext, pStylesCtxt ) >>= m_bAutoPosition; } } @@ -792,7 +791,7 @@ void SchXMLPositonAttributesHelper::readAutomaticPositioningProperties( XMLPropS SchXMLCoordinateRegionContext::SchXMLCoordinateRegionContext( SvXMLImport& rImport , sal_uInt16 nPrefix - , const rtl::OUString& rLocalName + , const OUString& rLocalName , SchXMLPositonAttributesHelper& rPositioning ) : SvXMLImportContext( rImport, nPrefix, rLocalName ) , m_rPositioning( rPositioning ) @@ -810,9 +809,9 @@ void SchXMLCoordinateRegionContext::StartElement( const uno::Reference< xml::sax for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; + OUString aValue = xAttrList->getValueByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); m_rPositioning.readPositioningAttribute( nPrefix, aLocalName, aValue ); } @@ -824,7 +823,7 @@ SchXMLWallFloorContext::SchXMLWallFloorContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, uno::Reference< chart::XDiagram >& xDiagram, ContextType eContextType ) : SvXMLImportContext( rImport, nPrefix, rLocalName ), @@ -843,12 +842,12 @@ void SchXMLWallFloorContext::StartElement( const uno::Reference< xml::sax::XAttr if( mxWallFloorSupplier.is()) { sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; - rtl::OUString sAutoStyleName; + OUString sAutoStyleName; for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_CHART && @@ -887,7 +886,7 @@ SchXMLStockContext::SchXMLStockContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, uno::Reference< chart::XDiagram >& xDiagram, ContextType eContextType ) : SvXMLImportContext( rImport, nPrefix, rLocalName ), @@ -906,12 +905,12 @@ void SchXMLStockContext::StartElement( const uno::Reference< xml::sax::XAttribut if( mxStockPropProvider.is()) { sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; - rtl::OUString sAutoStyleName; + OUString sAutoStyleName; for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_CHART && @@ -957,7 +956,7 @@ void SchXMLStockContext::StartElement( const uno::Reference< xml::sax::XAttribut static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocument > &xDoc, const uno::Reference< beans::XPropertySet > &xBarProp, - const rtl::OUString &aXMLRange, + const OUString &aXMLRange, bool bPositiveValue, bool bYError, tSchXMLLSequencesPerIndex& rSequences) { @@ -967,7 +966,7 @@ static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocume assert( xDataSink.is() && xDataSource.is() && xDataProvider.is() ); - rtl::OUString aRange(lcl_ConvertRange(aXMLRange,xDoc)); + OUString aRange(lcl_ConvertRange(aXMLRange,xDoc)); uno::Reference< chart2::data::XDataSequence > xNewSequence( xDataProvider->createDataSequenceByRangeRepresentation( aRange )); @@ -976,7 +975,7 @@ static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocume { SchXMLTools::setXMLRangePropertyAtDataSequence(xNewSequence,aXMLRange); - rtl::OUStringBuffer aRoleBuffer("error-bars-"); + OUStringBuffer aRoleBuffer("error-bars-"); if( bYError ) aRoleBuffer.append( sal_Unicode( 'y' )); else @@ -989,7 +988,7 @@ static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocume else aRoleBuffer = aRoleBuffer.appendAscii( "negative" ); - rtl::OUString aRole = aRoleBuffer.makeStringAndClear(); + OUString aRole = aRoleBuffer.makeStringAndClear(); Reference< beans::XPropertySet > xSeqProp( xNewSequence, uno::UNO_QUERY ); @@ -1019,8 +1018,8 @@ SchXMLStatisticsObjectContext::SchXMLStatisticsObjectContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, - const rtl::OUString &rSeriesStyleName, + const OUString& rLocalName, + const OUString &rSeriesStyleName, ::std::list< DataRowPointStyle >& rStyleList, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, @@ -1159,15 +1158,15 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; - ::rtl::OUString sAutoStyleName; - rtl::OUString aPosRange; - rtl::OUString aNegRange; + OUString sAutoStyleName; + OUString aPosRange; + OUString aNegRange; bool bYError = true; /// Default errorbar, to be backward compatible with older files! for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_CHART ) @@ -1246,7 +1245,7 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax SvXMLImportContext* SchXMLStatisticsObjectContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { SvXMLImportContext* pContext = 0; @@ -1271,7 +1270,7 @@ SchXMLEquationContext::SchXMLEquationContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, const awt::Size & rChartSize, @@ -1302,9 +1301,9 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; + OUString aValue = xAttrList->getValueByIndex( i ); sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName )) @@ -1337,7 +1336,7 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri uno::Reference< lang::XMultiServiceFactory > xFact( comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); if( xFact.is()) xEqProp.set( xFact->createInstance( - ::rtl::OUString( "com.sun.star.chart2.RegressionEquation" )), uno::UNO_QUERY ); + OUString( "com.sun.star.chart2.RegressionEquation" )), uno::UNO_QUERY ); if( xEqProp.is()) { if( !sAutoStyleName.isEmpty() ) diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx index 3f4d1337b7e1..cf945c142567 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx @@ -64,7 +64,7 @@ public: SchXMLPositonAttributesHelper( SvXMLImport& rImporter ); ~SchXMLPositonAttributesHelper(); - bool readPositioningAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + bool readPositioningAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); void readAutomaticPositioningProperties( XMLPropStyleContext* pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ); bool hasPosSize() const; @@ -95,17 +95,17 @@ class SchXMLPlotAreaContext : public SvXMLImportContext { public: SchXMLPlotAreaContext( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName, - const rtl::OUString& rXLinkHRefAttributeToIndicateDataProvider, - ::rtl::OUString& rCategoriesAddress, - ::rtl::OUString& rChartAddress, + SvXMLImport& rImport, const OUString& rLocalName, + const OUString& rXLinkHRefAttributeToIndicateDataProvider, + OUString& rCategoriesAddress, + OUString& rChartAddress, bool& bHasRangeAtPlotArea, sal_Bool & rAllRangeAddressesAvailable, sal_Bool & rColHasLabels, sal_Bool & rRowHasLabels, ::com::sun::star::chart::ChartDataRowSource & rDataRowSource, SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles, - const ::rtl::OUString& aChartTypeServiceName, + const OUString& aChartTypeServiceName, tSchXMLLSequencesPerIndex & rLSequencesPerIndex, const ::com::sun::star::awt::Size & rChartSize ); virtual ~SchXMLPlotAreaContext(); @@ -113,7 +113,7 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); @@ -122,7 +122,7 @@ private: ::com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > mxDiagram; ::com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > mxNewDoc; ::std::vector< SchXMLAxis > maAxes; - rtl::OUString& mrCategoriesAddress; + OUString& mrCategoriesAddress; SeriesDefaultsAndStyles& mrSeriesDefaultsAndStyles; sal_Int32 mnNumOfLinesProp; sal_Bool mbStockHasVolume; @@ -134,14 +134,14 @@ private: SchXMLPositonAttributesHelper m_aInnerPositioning;//excluding axes and axes titles bool mbPercentStacked; bool m_bAxisPositionAttributeImported; - ::rtl::OUString msAutoStyleName; - const ::rtl::OUString& m_rXLinkHRefAttributeToIndicateDataProvider; - ::rtl::OUString& mrChartAddress; + OUString msAutoStyleName; + const OUString& m_rXLinkHRefAttributeToIndicateDataProvider; + OUString& mrChartAddress; bool& m_rbHasRangeAtPlotArea; sal_Bool & mrColHasLabels; sal_Bool & mrRowHasLabels; ::com::sun::star::chart::ChartDataRowSource & mrDataRowSource; - ::rtl::OUString maChartTypeServiceName; + OUString maChartTypeServiceName; tSchXMLLSequencesPerIndex & mrLSequencesPerIndex; @@ -161,7 +161,7 @@ private: bool mbSymbolSizeForSeriesIsMissingInFile; public: - SchXMLDataPointContext( SvXMLImport& rImport, const rtl::OUString& rLocalName, + SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName, ::std::list< DataRowPointStyle >& rStyleList, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, sal_Int32& rIndex, @@ -179,7 +179,7 @@ public: SchXMLCoordinateRegionContext( SvXMLImport& rImport , sal_uInt16 nPrefix - , const rtl::OUString& rLocalName + , const OUString& rLocalName , SchXMLPositonAttributesHelper& rPositioning ); virtual ~SchXMLCoordinateRegionContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); @@ -208,7 +208,7 @@ public: SchXMLWallFloorContext( SchXMLImportHelper& rImportHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram >& xDiagram, ContextType eContextType ); virtual ~SchXMLWallFloorContext(); @@ -236,7 +236,7 @@ public: SchXMLStockContext( SchXMLImportHelper& rImportHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram >& xDiagram, ContextType eContextType ); virtual ~SchXMLStockContext(); @@ -259,8 +259,8 @@ public: SchXMLImportHelper& rImportHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, - const rtl::OUString &rSeriesStyleName, + const OUString& rLocalName, + const OUString &rSeriesStyleName, ::std::list< DataRowPointStyle >& rStyleList, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, @@ -273,7 +273,7 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); private: @@ -283,7 +283,7 @@ private: ::com::sun::star::chart2::XDataSeries > m_xSeries; ContextType meContextType; ::com::sun::star::awt::Size maChartSize; - rtl::OUString maSeriesStyleName; + OUString maSeriesStyleName; tSchXMLLSequencesPerIndex& mrLSequencesPerIndex; }; @@ -296,7 +296,7 @@ public: SchXMLImportHelper& rImportHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, const ::com::sun::star::awt::Size & rChartSize, diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 5f4bf115a088..527bbd51c436 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -57,8 +57,6 @@ using namespace ::xmloff::token; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ================================================================================ @@ -73,7 +71,7 @@ private: public: SchXMLDomain2Context( SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, ::std::vector< OUString > & rAddresses ); virtual ~SchXMLDomain2Context(); virtual void StartElement( const Reference< xml::sax::XAttributeList >& xAttrList ); @@ -82,8 +80,8 @@ public: SchXMLDomain2Context::SchXMLDomain2Context( SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, - ::std::vector< ::rtl::OUString > & rAddresses ) : + const OUString& rLocalName, + ::std::vector< OUString > & rAddresses ) : SvXMLImportContext( rImport, nPrefix, rLocalName ), mrAddresses( rAddresses ) { @@ -99,8 +97,8 @@ void SchXMLDomain2Context::StartElement( const uno::Reference< xml::sax::XAttrib for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_TABLE && @@ -145,7 +143,7 @@ void lcl_setAutomaticSymbolSize( const uno::Reference< beans::XPropertySet >& xS aSymbolSize.Width = aSymbolSize.Height; } } - xSeriesOrPointProp->setPropertyValue(::rtl::OUString("SymbolSize"),uno::makeAny( aSymbolSize )); + xSeriesOrPointProp->setPropertyValue(OUString("SymbolSize"),uno::makeAny( aSymbolSize )); } void lcl_setSymbolSizeIfNeeded( const uno::Reference< beans::XPropertySet >& xSeriesOrPointProp, const SvXMLImport& rImport ) @@ -154,14 +152,14 @@ void lcl_setSymbolSizeIfNeeded( const uno::Reference< beans::XPropertySet >& xSe return; sal_Int32 nSymbolType = chart::ChartSymbolType::NONE; - if( xSeriesOrPointProp.is() && ( xSeriesOrPointProp->getPropertyValue(::rtl::OUString("SymbolType")) >>= nSymbolType) ) + if( xSeriesOrPointProp.is() && ( xSeriesOrPointProp->getPropertyValue(OUString("SymbolType")) >>= nSymbolType) ) { if(chart::ChartSymbolType::NONE!=nSymbolType) { if( chart::ChartSymbolType::BITMAPURL==nSymbolType ) { //set special size for graphics to indicate to use the bitmap size itself - xSeriesOrPointProp->setPropertyValue(::rtl::OUString("SymbolSize"),uno::makeAny( awt::Size(-1,-1) )); + xSeriesOrPointProp->setPropertyValue(OUString("SymbolSize"),uno::makeAny( awt::Size(-1,-1) )); } else { @@ -174,7 +172,7 @@ void lcl_setSymbolSizeIfNeeded( const uno::Reference< beans::XPropertySet >& xSe void lcl_resetSymbolSizeForPointsIfNecessary( const uno::Reference< beans::XPropertySet >& xPointProp, const SvXMLImport& rImport , const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ) { - uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( ::rtl::OUString("SymbolSize"), pPropStyleContext, pStylesCtxt ) ); + uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( OUString("SymbolSize"), pPropStyleContext, pStylesCtxt ) ); if( !aASymbolSize.hasValue() ) lcl_setSymbolSizeIfNeeded( xPointProp, rImport ); } @@ -187,8 +185,8 @@ void lcl_insertErrorBarLSequencesToMap( Reference< chart2::data::XDataSource > xErrorBarSource; const OUString aPropName( bYError - ? ::rtl::OUString( "ErrorBarY" ) - : ::rtl::OUString( "ErrorBarX" )); + ? OUString( "ErrorBarY" ) + : OUString( "ErrorBarX" )); if( ( xSeriesProp->getPropertyValue( aPropName ) >>= xErrorBarSource ) && xErrorBarSource.is() ) { @@ -204,8 +202,8 @@ void lcl_insertErrorBarLSequencesToMap( } } -Reference< chart2::data::XLabeledDataSequence2 > lcl_createAndAddSequenceToSeries( const rtl::OUString& rRole - , const rtl::OUString& rRange +Reference< chart2::data::XLabeledDataSequence2 > lcl_createAndAddSequenceToSeries( const OUString& rRole + , const OUString& rRange , const Reference< chart2::XChartDocument >& xChartDoc , const Reference< chart2::XDataSeries >& xSeries ) { @@ -245,7 +243,7 @@ Reference< chart2::data::XLabeledDataSequence2 > lcl_createAndAddSequenceToSerie SchXMLSeries2Context::SchXMLSeries2Context( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName, + SvXMLImport& rImport, const OUString& rLocalName, const Reference< chart2::XChartDocument > & xNewDoc, std::vector< SchXMLAxis >& rAxes, ::std::list< DataRowPointStyle >& rStyleList, @@ -299,9 +297,9 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; + OUString aValue = xAttrList->getValueByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName )) @@ -392,7 +390,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib // set default color for range-line to black (before applying styles) Reference< beans::XPropertySet > xSeriesProp( m_xSeries, uno::UNO_QUERY ); if( xSeriesProp.is()) - xSeriesProp->setPropertyValue( ::rtl::OUString("Color"), + xSeriesProp->setPropertyValue( OUString("Color"), uno::makeAny( sal_Int32( 0x000000 ))); // black } else if ( maSeriesChartTypeName == "com.sun.star.chart2.PieChartType" ) @@ -400,7 +398,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib //@todo: this property should be saved Reference< beans::XPropertySet > xSeriesProp( m_xSeries, uno::UNO_QUERY ); if( xSeriesProp.is()) - xSeriesProp->setPropertyValue( ::rtl::OUString("VaryColorsByPoint"), + xSeriesProp->setPropertyValue( OUString("VaryColorsByPoint"), uno::makeAny( true )); } @@ -448,10 +446,10 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib catch( const uno::Exception & ex ) { (void)ex; // avoid warning for pro build - OSL_FAIL( ::rtl::OUStringToOString( - ::rtl::OUString( "Exception caught. Type: " ) + - ::rtl::OUString::createFromAscii( typeid( ex ).name()) + - ::rtl::OUString( ", Message: " ) + + OSL_FAIL( OUStringToOString( + OUString( "Exception caught. Type: " ) + + OUString::createFromAscii( typeid( ex ).name()) + + OUString( ", Message: " ) + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } @@ -468,7 +466,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib const XMLPropStyleContext* pPropStyleContext = dynamic_cast< const XMLPropStyleContext * >( pStyle ); - uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( ::rtl::OUString("SymbolSize") + uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( OUString("SymbolSize") , pPropStyleContext, pStylesCtxt ) ); mbSymbolSizeIsMissingInFile = !aASymbolSize.hasValue(); } @@ -481,12 +479,12 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib struct DomainInfo { - DomainInfo( const rtl::OUString& rRole, const rtl::OUString& rRange, sal_Int32 nIndex ) + DomainInfo( const OUString& rRole, const OUString& rRange, sal_Int32 nIndex ) : aRole(rRole), aRange(rRange), nIndexForLocalData(nIndex) {} - rtl::OUString aRole; - rtl::OUString aRange; + OUString aRole; + OUString aRange; sal_Int32 nIndexForLocalData; }; @@ -623,7 +621,7 @@ void SchXMLSeries2Context::EndElement() SvXMLImportContext* SchXMLSeries2Context::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; @@ -728,27 +726,27 @@ void SchXMLSeries2Context::setDefaultsToSeries( SeriesDefaultsAndStyles& rSeries continue; if( rSeriesDefaultsAndStyles.maSymbolTypeDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("SymbolType"),rSeriesDefaultsAndStyles.maSymbolTypeDefault); + xSeries->setPropertyValue(OUString("SymbolType"),rSeriesDefaultsAndStyles.maSymbolTypeDefault); if( rSeriesDefaultsAndStyles.maDataCaptionDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("DataCaption"),rSeriesDefaultsAndStyles.maDataCaptionDefault); + xSeries->setPropertyValue(OUString("DataCaption"),rSeriesDefaultsAndStyles.maDataCaptionDefault); if( rSeriesDefaultsAndStyles.maErrorIndicatorDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("ErrorIndicator"),rSeriesDefaultsAndStyles.maErrorIndicatorDefault); + xSeries->setPropertyValue(OUString("ErrorIndicator"),rSeriesDefaultsAndStyles.maErrorIndicatorDefault); if( rSeriesDefaultsAndStyles.maErrorCategoryDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("ErrorCategory"),rSeriesDefaultsAndStyles.maErrorCategoryDefault); + xSeries->setPropertyValue(OUString("ErrorCategory"),rSeriesDefaultsAndStyles.maErrorCategoryDefault); if( rSeriesDefaultsAndStyles.maConstantErrorLowDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("ConstantErrorLow"),rSeriesDefaultsAndStyles.maConstantErrorLowDefault); + xSeries->setPropertyValue(OUString("ConstantErrorLow"),rSeriesDefaultsAndStyles.maConstantErrorLowDefault); if( rSeriesDefaultsAndStyles.maConstantErrorHighDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("ConstantErrorHigh"),rSeriesDefaultsAndStyles.maConstantErrorHighDefault); + xSeries->setPropertyValue(OUString("ConstantErrorHigh"),rSeriesDefaultsAndStyles.maConstantErrorHighDefault); if( rSeriesDefaultsAndStyles.maPercentageErrorDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("PercentageError"),rSeriesDefaultsAndStyles.maPercentageErrorDefault); + xSeries->setPropertyValue(OUString("PercentageError"),rSeriesDefaultsAndStyles.maPercentageErrorDefault); if( rSeriesDefaultsAndStyles.maErrorMarginDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("ErrorMargin"),rSeriesDefaultsAndStyles.maErrorMarginDefault); + xSeries->setPropertyValue(OUString("ErrorMargin"),rSeriesDefaultsAndStyles.maErrorMarginDefault); if( rSeriesDefaultsAndStyles.maMeanValueDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("MeanValue"),rSeriesDefaultsAndStyles.maMeanValueDefault); + xSeries->setPropertyValue(OUString("MeanValue"),rSeriesDefaultsAndStyles.maMeanValueDefault); if( rSeriesDefaultsAndStyles.maRegressionCurvesDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("RegressionCurves"),rSeriesDefaultsAndStyles.maRegressionCurvesDefault); + xSeries->setPropertyValue(OUString("RegressionCurves"),rSeriesDefaultsAndStyles.maRegressionCurvesDefault); } catch( uno::Exception & ) { @@ -761,7 +759,7 @@ void SchXMLSeries2Context::setDefaultsToSeries( SeriesDefaultsAndStyles& rSeries void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles , const SvXMLStylesContext* pStylesCtxt , const SvXMLStyleContext*& rpStyle - , ::rtl::OUString& rCurrStyleName + , OUString& rCurrStyleName , SchXMLImportHelper& rImportHelper , const SvXMLImport& rImport , bool bIsStockChart @@ -782,7 +780,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe if( iStyle->mnAttachedAxis != 1 ) { - xSeriesProp->setPropertyValue( rtl::OUString( "Axis" ) + xSeriesProp->setPropertyValue( OUString( "Axis" ) , uno::makeAny(chart::ChartAxisAssign::SECONDARY_Y) ); } @@ -807,7 +805,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe // this property) bool bHasErrorBarRangesFromData = false; { - const ::rtl::OUString aErrorBarStylePropName( "ErrorBarStyle"); + const OUString aErrorBarStylePropName( "ErrorBarStyle"); uno::Any aErrorBarStyle( SchXMLTools::getPropertyFromContext( aErrorBarStylePropName, pPropStyleContext, pStylesCtxt )); if( aErrorBarStyle.hasValue()) @@ -854,7 +852,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles , const SvXMLStylesContext* pStylesCtxt , const SvXMLStyleContext*& rpStyle - , ::rtl::OUString& rCurrStyleName ) + , OUString& rCurrStyleName ) { ::std::list< DataRowPointStyle >::iterator iStyle; @@ -946,7 +944,7 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles , const SvXMLStylesContext* pStylesCtxt , const SvXMLStyleContext*& rpStyle - , ::rtl::OUString& rCurrStyleName + , OUString& rCurrStyleName , SchXMLImportHelper& rImportHelper , const SvXMLImport& rImport , bool bIsStockChart, bool bIsDonutChart, bool bSwitchOffLinesForScatter ) @@ -1006,7 +1004,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri { //need to set this explicitly here for old files as the new api does not support this property fully anymore if( bSwitchOffLinesForScatter ) - xPointProp->setPropertyValue(::rtl::OUString("Lines"),uno::makeAny(sal_False)); + xPointProp->setPropertyValue(OUString("Lines"),uno::makeAny(sal_False)); } catch( const uno::Exception & ) { @@ -1057,7 +1055,7 @@ void SchXMLSeries2Context::switchSeriesLinesOff( ::std::list< DataRowPointStyle if( !xSeries.is() ) continue; - xSeries->setPropertyValue(::rtl::OUString("Lines"),uno::makeAny(sal_False)); + xSeries->setPropertyValue(OUString("Lines"),uno::makeAny(sal_False)); } catch( uno::Exception & ) { diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx index 3ff16788f405..44819bb9a38b 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.hxx +++ b/xmloff/source/chart/SchXMLSeries2Context.hxx @@ -57,12 +57,12 @@ private: SchXMLAxis* mpAttachedAxis; sal_Int32 mnAttachedAxis; - ::rtl::OUString msAutoStyleName; - ::std::vector< ::rtl::OUString > maDomainAddresses; - ::rtl::OUString maGlobalChartTypeName; - ::rtl::OUString maSeriesChartTypeName; - ::rtl::OUString m_aSeriesRange; - ::rtl::OUString m_aSeriesLabelRange; + OUString msAutoStyleName; + ::std::vector< OUString > maDomainAddresses; + OUString maGlobalChartTypeName; + OUString maSeriesChartTypeName; + OUString m_aSeriesRange; + OUString m_aSeriesLabelRange; bool m_bHasDomainContext; tSchXMLLSequencesPerIndex & mrLSequencesPerIndex; tSchXMLLSequencesPerIndex maPostponedSequences; @@ -72,7 +72,7 @@ private: public: SchXMLSeries2Context( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName, + SvXMLImport& rImport, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xNewDoc, std::vector< SchXMLAxis >& rAxes, @@ -80,7 +80,7 @@ public: sal_Int32 nSeriesIndex, sal_Bool bStockHasVolume, GlobalSeriesImportInfo& rGlobalSeriesImportInfo, - const ::rtl::OUString & aGlobalChartTypeName, + const OUString & aGlobalChartTypeName, tSchXMLLSequencesPerIndex & rLSequencesPerIndex, bool& rGlobalChartTypeUsedBySeries, const ::com::sun::star::awt::Size & rChartSize ); @@ -89,7 +89,7 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); @@ -101,7 +101,7 @@ public: static void setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles , const SvXMLStylesContext* pStylesCtxt , const SvXMLStyleContext*& rpStyle - , ::rtl::OUString& rCurrStyleName + , OUString& rCurrStyleName , SchXMLImportHelper& rImportHelper , const SvXMLImport& rImport , bool bIsStockChart @@ -110,12 +110,12 @@ public: static void setStylesToStatisticsObjects( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles , const SvXMLStylesContext* pStylesCtxt , const SvXMLStyleContext*& rpStyle - , rtl::OUString &rCurrStyleName ); + , OUString &rCurrStyleName ); static void setStylesToDataPoints( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles , const SvXMLStylesContext* pStylesCtxt , const SvXMLStyleContext*& rpStyle - , ::rtl::OUString& rCurrStyleName + , OUString& rCurrStyleName , SchXMLImportHelper& rImportHelper , const SvXMLImport& rImport , bool bIsStockChart, bool bIsDonutChart, bool bSwitchOffLinesForScatter ); diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index d2a804369c2a..2c2ca93babee 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -54,7 +54,6 @@ using namespace com::sun::star; using namespace ::xmloff::token; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; namespace { @@ -62,7 +61,7 @@ namespace const char aLabelPrefix[] = "label "; const char aCategoriesRange[] = "categories"; -typedef ::std::multimap< ::rtl::OUString, ::rtl::OUString > +typedef ::std::multimap< OUString, OUString > lcl_tOriginalRangeToInternalRangeMap; struct lcl_ApplyCellToData : public ::std::unary_function< SchXMLCell, void > @@ -194,8 +193,8 @@ bool lcl_mapContainsRange( } bool lcl_tableOfRangeMatches( - const ::rtl::OUString & rRange, - const ::rtl::OUString & rTableName ) + const OUString & rRange, + const OUString & rTableName ) { // both strings are non-empty and the table name is part of the range return ( !rRange.isEmpty() && @@ -221,7 +220,7 @@ template< typename T > SchXMLTableContext::SchXMLTableContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLName, + const OUString& rLName, SchXMLTable& aTable ) : SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLName ), mrImportHelper( rImpHelper ), @@ -241,7 +240,7 @@ SchXMLTableContext::~SchXMLTableContext() SvXMLImportContext *SchXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; @@ -285,8 +284,8 @@ void SchXMLTableContext::StartElement( const uno::Reference< xml::sax::XAttribut for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if ( nPrefix == XML_NAMESPACE_TABLE ) { @@ -423,7 +422,7 @@ void SchXMLTableContext::setColumnPermutation( const uno::Sequence< sal_Int32 > SchXMLTableColumnsContext::SchXMLTableColumnsContext( SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ) : SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ), mrTable( aTable ) @@ -436,7 +435,7 @@ SchXMLTableColumnsContext::~SchXMLTableColumnsContext() SvXMLImportContext* SchXMLTableColumnsContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; @@ -458,7 +457,7 @@ SvXMLImportContext* SchXMLTableColumnsContext::CreateChildContext( SchXMLTableColumnContext::SchXMLTableColumnContext( SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ) : SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ), mrTable( aTable ) @@ -474,21 +473,21 @@ void SchXMLTableColumnContext::StartElement( const uno::Reference< xml::sax::XAt for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_TABLE && IsXMLToken( aLocalName, XML_NUMBER_COLUMNS_REPEATED ) ) { - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString aValue = xAttrList->getValueByIndex( i ); if( !aValue.isEmpty()) nRepeated = aValue.toInt32(); } else if( nPrefix == XML_NAMESPACE_TABLE && IsXMLToken( aLocalName, XML_VISIBILITY ) ) { - rtl::OUString aVisibility = xAttrList->getValueByIndex( i ); + OUString aVisibility = xAttrList->getValueByIndex( i ); bHidden = aVisibility.equals( GetXMLToken( XML_COLLAPSE ) ); } } @@ -525,7 +524,7 @@ SchXMLTableColumnContext::~SchXMLTableColumnContext() SchXMLTableRowsContext::SchXMLTableRowsContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ) : SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ), mrImportHelper( rImpHelper ), @@ -539,7 +538,7 @@ SchXMLTableRowsContext::~SchXMLTableRowsContext() SvXMLImportContext* SchXMLTableRowsContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; @@ -564,7 +563,7 @@ SvXMLImportContext* SchXMLTableRowsContext::CreateChildContext( SchXMLTableRowContext::SchXMLTableRowContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ) : SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ), mrImportHelper( rImpHelper ), @@ -585,7 +584,7 @@ SchXMLTableRowContext::~SchXMLTableRowContext() SvXMLImportContext* SchXMLTableRowContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; @@ -615,19 +614,19 @@ class SchXMLRangeSomewhereContext : public SvXMLImportContext //-> use description at an empty group element for now private: - ::rtl::OUString& mrRangeString; - ::rtl::OUStringBuffer maRangeStringBuffer; + OUString& mrRangeString; + OUStringBuffer maRangeStringBuffer; public: SchXMLRangeSomewhereContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - ::rtl::OUString& rRangeString ); + const OUString& rLocalName, + OUString& rRangeString ); virtual ~SchXMLRangeSomewhereContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); }; @@ -646,7 +645,7 @@ public: SchXMLTableCellContext::SchXMLTableCellContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ) : SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ), mrImportHelper( rImpHelper ), @@ -661,15 +660,15 @@ SchXMLTableCellContext::~SchXMLTableCellContext() void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; - rtl::OUString aValue; - rtl::OUString aLocalName; - rtl::OUString aCellContent; + OUString aValue; + OUString aLocalName; + OUString aCellContent; SchXMLCellType eValueType = SCH_CELL_TYPE_UNKNOWN; const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetCellAttrTokenMap(); for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName )) @@ -711,7 +710,7 @@ void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttr SvXMLImportContext* SchXMLTableCellContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; @@ -1024,7 +1023,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( if( xDataSource.is() ) { bool bHasUnhiddenColumns = false; - rtl::OUString aRange; + OUString aRange; uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > aSequences( xDataSource->getDataSequences() ); for( sal_Int32 nN=0; nN< aSequences.getLength(); ++nN ) { @@ -1069,7 +1068,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( { //first detect which collumns are really used std::map< sal_Int32, bool > aUsageMap; - rtl::OUString aRange; + OUString aRange; Sequence< Reference< chart2::data::XLabeledDataSequence > > aUsedSequences( xDataSource->getDataSequences() ); for( sal_Int32 nN=0; nN< aUsedSequences.getLength(); ++nN ) { diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx index d983fc03a4e0..1d06dd50c613 100644 --- a/xmloff/source/chart/SchXMLTableContext.hxx +++ b/xmloff/source/chart/SchXMLTableContext.hxx @@ -51,13 +51,13 @@ private: public: SchXMLTableContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ); virtual ~SchXMLTableContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, 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(); @@ -71,8 +71,8 @@ public: class SchXMLTableHelper { private: - static void GetCellAddress( const rtl::OUString& rStr, sal_Int32& rCol, sal_Int32& rRow ); - static sal_Bool GetCellRangeAddress( const rtl::OUString& rStr, SchNumericCellRangeAddress& rResult ); + static void GetCellAddress( const OUString& rStr, sal_Int32& rCol, sal_Int32& rRow ); + static sal_Bool GetCellRangeAddress( const OUString& rStr, SchNumericCellRangeAddress& rResult ); static void PutTableContentIntoSequence( const SchXMLTable& rTable, SchNumericCellRangeAddress& rAddress, @@ -112,13 +112,13 @@ private: public: SchXMLTableColumnsContext( SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ); virtual ~SchXMLTableColumnsContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); }; @@ -131,7 +131,7 @@ private: public: SchXMLTableColumnContext( SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ); virtual ~SchXMLTableColumnContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); @@ -150,13 +150,13 @@ private: public: SchXMLTableRowsContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ); virtual ~SchXMLTableRowsContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); }; @@ -171,13 +171,13 @@ private: public: SchXMLTableRowContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ); virtual ~SchXMLTableRowContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); }; @@ -190,20 +190,20 @@ class SchXMLTableCellContext : public SvXMLImportContext private: SchXMLImportHelper& mrImportHelper; SchXMLTable& mrTable; - rtl::OUString maCellContent; - rtl::OUString maRangeId; + OUString maCellContent; + OUString maRangeId; sal_Bool mbReadText; public: SchXMLTableCellContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ); virtual ~SchXMLTableCellContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, 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(); diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx index f9d17e03d81a..fbf15a2481ec 100644 --- a/xmloff/source/chart/SchXMLTextListContext.cxx +++ b/xmloff/source/chart/SchXMLTextListContext.cxx @@ -26,7 +26,6 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using namespace com::sun::star; @@ -43,11 +42,11 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); private: - ::rtl::OUString& m_rText; + OUString& m_rText; }; SchXMLListItemContext::SchXMLListItemContext( diff --git a/xmloff/source/chart/SchXMLTextListContext.hxx b/xmloff/source/chart/SchXMLTextListContext.hxx index 283685f56735..27089c000040 100644 --- a/xmloff/source/chart/SchXMLTextListContext.hxx +++ b/xmloff/source/chart/SchXMLTextListContext.hxx @@ -31,20 +31,20 @@ class SchXMLTextListContext : public SvXMLImportContext { public: SchXMLTextListContext( SvXMLImport& rImport, - const ::rtl::OUString& rLocalName, - ::com::sun::star::uno::Sequence< ::rtl::OUString>& rTextList ); + const OUString& rLocalName, + ::com::sun::star::uno::Sequence< OUString>& rTextList ); virtual ~SchXMLTextListContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); private: - ::com::sun::star::uno::Sequence< ::rtl::OUString>& m_rTextList; - std::vector< ::rtl::OUString> m_aTextVector; + ::com::sun::star::uno::Sequence< OUString>& m_rTextList; + std::vector< OUString> m_aTextVector; }; #endif // _SCH_XMLTEXTLISTCONTEXT_HXX_ diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 9d95a61fa60c..482f4f525bb3 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -57,17 +57,15 @@ using namespace com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; namespace { -rtl::OUString lcl_getGeneratorFromModel( const uno::Reference< frame::XModel >& xChartModel ) +OUString lcl_getGeneratorFromModel( const uno::Reference< frame::XModel >& xChartModel ) { - ::rtl::OUString aGenerator; + OUString aGenerator; uno::Reference< document::XDocumentPropertiesSupplier> xChartDocumentPropertiesSupplier( xChartModel, uno::UNO_QUERY ); if( xChartDocumentPropertiesSupplier.is() ) { @@ -79,9 +77,9 @@ rtl::OUString lcl_getGeneratorFromModel( const uno::Reference< frame::XModel >& return aGenerator; } -rtl::OUString lcl_getGeneratorFromModelOrItsParent( const uno::Reference< frame::XModel >& xChartModel ) +OUString lcl_getGeneratorFromModelOrItsParent( const uno::Reference< frame::XModel >& xChartModel ) { - ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); + OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); if( aGenerator.isEmpty() ) //try to get the missing info from the parent document { uno::Reference< container::XChild > xChild( xChartModel, uno::UNO_QUERY ); @@ -91,7 +89,7 @@ rtl::OUString lcl_getGeneratorFromModelOrItsParent( const uno::Reference< frame: return aGenerator; } -sal_Int32 lcl_getBuildIDFromGenerator( const ::rtl::OUString& rGenerator ) +sal_Int32 lcl_getBuildIDFromGenerator( const OUString& rGenerator ) { //returns -1 if nothing found sal_Int32 nBuildId = -1; @@ -105,7 +103,7 @@ sal_Int32 lcl_getBuildIDFromGenerator( const ::rtl::OUString& rGenerator ) return nBuildId; } -OUString lcl_ConvertRange( const ::rtl::OUString & rRange, const Reference< chart2::data::XDataProvider >& xDataProvider ) +OUString lcl_ConvertRange( const OUString & rRange, const Reference< chart2::data::XDataProvider >& xDataProvider ) { OUString aResult = rRange; Reference< chart2::data::XRangeXMLConversion > xRangeConversion( xDataProvider, uno::UNO_QUERY ); @@ -161,42 +159,42 @@ SchXMLChartTypeEnum GetChartTypeEnum( const OUString& rClassName ) return SchXMLChartTypeEnum(nEnumVal); } -typedef ::comphelper::MakeMap< ::rtl::OUString, ::rtl::OUString > tMakeStringStringMap; +typedef ::comphelper::MakeMap< OUString, OUString > tMakeStringStringMap; //static const tMakeStringStringMap& lcl_getChartTypeNameMap() { //shape property -- chart model object property static tMakeStringStringMap g_aChartTypeNameMap = tMakeStringStringMap - ( ::rtl::OUString( "com.sun.star.chart.LineDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.LineChartType" ) ) + ( OUString( "com.sun.star.chart.LineDiagram" ) + , OUString( "com.sun.star.chart2.LineChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.AreaDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.AreaChartType" ) ) + ( OUString( "com.sun.star.chart.AreaDiagram" ) + , OUString( "com.sun.star.chart2.AreaChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.BarDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.ColumnChartType" ) ) + ( OUString( "com.sun.star.chart.BarDiagram" ) + , OUString( "com.sun.star.chart2.ColumnChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.PieDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.PieChartType" ) ) + ( OUString( "com.sun.star.chart.PieDiagram" ) + , OUString( "com.sun.star.chart2.PieChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.DonutDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.DonutChartType" ) ) + ( OUString( "com.sun.star.chart.DonutDiagram" ) + , OUString( "com.sun.star.chart2.DonutChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.XYDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.ScatterChartType" ) ) + ( OUString( "com.sun.star.chart.XYDiagram" ) + , OUString( "com.sun.star.chart2.ScatterChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.NetDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.NetChartType" ) ) + ( OUString( "com.sun.star.chart.NetDiagram" ) + , OUString( "com.sun.star.chart2.NetChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.FilledNetDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.FilledNetChartType" ) ) + ( OUString( "com.sun.star.chart.FilledNetDiagram" ) + , OUString( "com.sun.star.chart2.FilledNetChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.StockDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.CandleStickChartType" ) ) + ( OUString( "com.sun.star.chart.StockDiagram" ) + , OUString( "com.sun.star.chart2.CandleStickChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.BubbleDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.BubbleChartType" ) ) + ( OUString( "com.sun.star.chart.BubbleDiagram" ) + , OUString( "com.sun.star.chart2.BubbleChartType" ) ) ; return g_aChartTypeNameMap; @@ -482,8 +480,8 @@ void CreateCategories( catch( const lang::IllegalArgumentException & ex ) { (void)ex; // avoid warning for pro build - OSL_FAIL( ::rtl::OUStringToOString( - ::rtl::OUString( "IllegalArgumentException caught, Message: " ) + + OSL_FAIL( OUStringToOString( + OUString( "IllegalArgumentException caught, Message: " ) + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } aData.Categories.set( xLabeledSeq ); @@ -509,7 +507,7 @@ void CreateCategories( } -uno::Any getPropertyFromContext( const rtl::OUString& rPropertyName, const XMLPropStyleContext* pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ) +uno::Any getPropertyFromContext( const OUString& rPropertyName, const XMLPropStyleContext* pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ) { uno::Any aRet; if( !pPropStyleContext || !pStylesCtxt ) @@ -586,7 +584,7 @@ void exportText( SvXMLExport& rExport, const OUString& rText, bool bConvertTabsL } } -void exportRangeToSomewhere( SvXMLExport& rExport, const ::rtl::OUString& rValue ) +void exportRangeToSomewhere( SvXMLExport& rExport, const OUString& rValue ) { //with issue #i366# and CWS chart20 ranges for error bars were introduced //to keep them during copy paste from calc to impress for example it @@ -658,8 +656,8 @@ void setXMLRangePropertyAtDataSequence( catch( const uno::Exception & ex ) { (void)ex; // avoid warning for pro build - OSL_FAIL( ::rtl::OUStringToOString( - ::rtl::OUString( "Exception caught, Message: " ) + + OSL_FAIL( OUStringToOString( + OUString( "Exception caught, Message: " ) + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } } @@ -688,8 +686,8 @@ bool getXMLRangePropertyFromDataSequence( catch( const uno::Exception & ex ) { (void)ex; // avoid warning for pro build - OSL_FAIL( ::rtl::OUStringToOString( - ::rtl::OUString( "Exception caught, Message: " ) + + OSL_FAIL( OUStringToOString( + OUString( "Exception caught, Message: " ) + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } } @@ -760,7 +758,7 @@ bool switchBackToDataProviderFromParent( const Reference< chart2::XChartDocument void setBuildIDAtImportInfo( uno::Reference< frame::XModel > xModel, Reference< beans::XPropertySet > xImportInfo ) { - ::rtl::OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xModel) ); + OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xModel) ); if( !aGenerator.isEmpty() ) SvXMLMetaDocumentContext::setBuildId( aGenerator, xImportInfo ); } @@ -770,7 +768,7 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan3_3( const uno::Reference< frame: bool bResult = isDocumentGeneratedWithOpenOfficeOlderThan3_0( xChartModel ); if( !bResult ) { - ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); + OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); if( aGenerator.indexOf( "OpenOffice.org_project/3" ) != -1 ) { if( aGenerator.indexOf( "OpenOffice.org_project/300m" ) != -1 ) @@ -793,7 +791,7 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan3_0( const uno::Reference< frame: bool bResult = isDocumentGeneratedWithOpenOfficeOlderThan2_3( xChartModel ); if( !bResult ) { - ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); + OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); if( aGenerator.indexOf( "OpenOffice.org_project/680m" ) != -1 ) bResult= true; } @@ -817,7 +815,7 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_4( const uno::Reference< frame: bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame::XModel >& xChartModel ) { bool bResult = false; - ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); + OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); //if there is a meta stream at the chart object it was not written with an older OpenOffice version < 2.3 if( aGenerator.isEmpty() ) { @@ -845,7 +843,7 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame: bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel) { bool bResult = false; - ::rtl::OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) ); + OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) ); if( ( aGenerator.indexOf( "OpenOffice.org 1" ) == 0 ) || ( aGenerator.indexOf( "StarOffice 6" ) == 0 ) || ( aGenerator.indexOf( "StarOffice 7" ) == 0 ) diff --git a/xmloff/source/chart/SchXMLTools.hxx b/xmloff/source/chart/SchXMLTools.hxx index 5273f23a4c24..e50d7f523fe2 100644 --- a/xmloff/source/chart/SchXMLTools.hxx +++ b/xmloff/source/chart/SchXMLTools.hxx @@ -67,37 +67,37 @@ namespace SchXMLTools XML_CHART_CLASS_UNKNOWN }; - SchXMLChartTypeEnum GetChartTypeEnum( const ::rtl::OUString& rClassName ); + SchXMLChartTypeEnum GetChartTypeEnum( const OUString& rClassName ); - ::rtl::OUString GetChartTypeByClassName( - const ::rtl::OUString & rClassName, bool bUseOldNames ); + OUString GetChartTypeByClassName( + const OUString & rClassName, bool bUseOldNames ); ::xmloff::token::XMLTokenEnum getTokenByChartType( - const ::rtl::OUString & rChartTypeService, bool bUseOldNames ); + const OUString & rChartTypeService, bool bUseOldNames ); - ::rtl::OUString GetNewChartTypeName( const ::rtl::OUString & rOldChartTypeName ); + OUString GetNewChartTypeName( const OUString & rOldChartTypeName ); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence2 > GetNewLabeledDataSequence(); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > CreateDataSequence( - const ::rtl::OUString& rRange, + const OUString& rRange, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc ); void CreateCategories( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > & xDataProvider, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xNewDoc, - const ::rtl::OUString & rRangeAddress, + const OUString & rRangeAddress, sal_Int32 nCooSysIndex, sal_Int32 nDimensionIndex, tSchXMLLSequencesPerIndex * pLSequencesPerIndex = 0 ); - ::com::sun::star::uno::Any getPropertyFromContext( const ::rtl::OUString& rPropertyName, const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ); + ::com::sun::star::uno::Any getPropertyFromContext( const OUString& rPropertyName, const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ); - void exportText( SvXMLExport& rExport, const ::rtl::OUString& rText, bool bConvertTabsLFs ); + void exportText( SvXMLExport& rExport, const OUString& rText, bool bConvertTabsLFs ); - void exportRangeToSomewhere( SvXMLExport& rExport, const ::rtl::OUString& rValue ); + void exportRangeToSomewhere( SvXMLExport& rExport, const OUString& rValue ); /** returns the properties of the equation of the first regression curve that is no mean-value line @@ -113,7 +113,7 @@ namespace SchXMLTools void setXMLRangePropertyAtDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xDataSequence, - const ::rtl::OUString & rXMLRange ); + const OUString & rXMLRange ); /** checks if the data sequence has the property "CachedXMLRange" (true for internal data sequences), and if so retrieves this property and applies @@ -127,7 +127,7 @@ namespace SchXMLTools bool getXMLRangePropertyFromDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xDataSequence, - ::rtl::OUString & rOutXMLRange, + OUString & rOutXMLRange, bool bClearProp = false ); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > getDataProviderFromParent( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc ); diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx index df4986d9ba1c..89e62cfc8184 100644 --- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx +++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx @@ -31,8 +31,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace com::sun::star; @@ -87,7 +85,7 @@ sal_Bool XMLAxisPositionPropertyHdl::exportXML( OUString& rStrExpValue, { sal_Bool bResult = sal_False; - rtl::OUStringBuffer sValueBuffer; + OUStringBuffer sValueBuffer; if( m_bCrossingValue ) { if(rStrExpValue.isEmpty()) diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx index 3449bbf41cc2..01601fc00a85 100644 --- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx +++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx @@ -27,8 +27,8 @@ public: XMLAxisPositionPropertyHdl( bool bCrossingValue ); virtual ~XMLAxisPositionPropertyHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; private: bool m_bCrossingValue; diff --git a/xmloff/source/chart/XMLChartPropertyContext.cxx b/xmloff/source/chart/XMLChartPropertyContext.cxx index 832cd96c2df5..a1290e557289 100644 --- a/xmloff/source/chart/XMLChartPropertyContext.cxx +++ b/xmloff/source/chart/XMLChartPropertyContext.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star; XMLChartPropertyContext::XMLChartPropertyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState >& rProps, @@ -44,7 +44,7 @@ XMLChartPropertyContext::~XMLChartPropertyContext() SvXMLImportContext* XMLChartPropertyContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp ) diff --git a/xmloff/source/chart/XMLChartPropertyContext.hxx b/xmloff/source/chart/XMLChartPropertyContext.hxx index 42d33607ebf0..ab1f07938fb7 100644 --- a/xmloff/source/chart/XMLChartPropertyContext.hxx +++ b/xmloff/source/chart/XMLChartPropertyContext.hxx @@ -27,7 +27,7 @@ public: TYPEINFO(); XMLChartPropertyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_uInt32 nFamily, @@ -38,7 +38,7 @@ public: using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, ::std::vector< XMLPropertyState > &rProperties, diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx index 4af474b75ee6..f836d8c1b2f4 100644 --- a/xmloff/source/chart/XMLChartStyleContext.cxx +++ b/xmloff/source/chart/XMLChartStyleContext.cxx @@ -41,8 +41,8 @@ TYPEINIT1( XMLChartStyleContext, XMLPropStyleContext ); void XMLChartStyleContext::SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ) + const OUString& rLocalName, + const OUString& rValue ) { if( IsXMLToken( rLocalName, XML_DATA_STYLE_NAME ) ) { @@ -63,7 +63,7 @@ void XMLChartStyleContext::SetAttribute( // CTOR XMLChartStyleContext::XMLChartStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily ) : @@ -78,7 +78,7 @@ XMLChartStyleContext::~XMLChartStyleContext() namespace { - void lcl_NumberFormatStyleToProperty( const ::rtl::OUString& rStyleName, const ::rtl::OUString& rPropertyName, + void lcl_NumberFormatStyleToProperty( const OUString& rStyleName, const OUString& rPropertyName, const SvXMLStylesContext& rStylesContext, const uno::Reference< beans::XPropertySet >& rPropSet ) { @@ -116,7 +116,7 @@ void XMLChartStyleContext::FillPropertySet( SvXMLImportContext *XMLChartStyleContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { SvXMLImportContext* pContext = NULL; diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx index 8f6149f91fea..3eee9e4e1e96 100644 --- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx +++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/uno/Any.hxx> -using ::rtl::OUString; using namespace com::sun::star; XMLErrorBarStylePropertyHdl::XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ) diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx index 9aa21a51816d..6cc4dfe70cf7 100644 --- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx +++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx @@ -27,7 +27,7 @@ public: XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ); virtual ~XMLErrorBarStylePropertyHdl(); - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLERRORBARSTYLEPROPERTYHDL_HXX_ diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx index 43667465daf6..d3f64b356965 100644 --- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx +++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star; XMLErrorIndicatorPropertyHdl::~XMLErrorIndicatorPropertyHdl() {} -sal_Bool XMLErrorIndicatorPropertyHdl::importXML( const ::rtl::OUString& rStrImpValue, +sal_Bool XMLErrorIndicatorPropertyHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { bool bValue(false); @@ -78,10 +78,10 @@ sal_Bool XMLErrorIndicatorPropertyHdl::importXML( const ::rtl::OUString& rStrImp return sal_True; } -sal_Bool XMLErrorIndicatorPropertyHdl::exportXML( ::rtl::OUString& rStrExpValue, +sal_Bool XMLErrorIndicatorPropertyHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; chart::ChartErrorIndicatorType eType; rValue >>= eType; diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx index 8421428e34e7..3b8ebcab1e2f 100644 --- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx +++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx @@ -31,8 +31,8 @@ public: {} virtual ~XMLErrorIndicatorPropertyHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLERRORINDICATORPROPERTYHDL_HXX_ diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx index e34870028629..f19c68b57895 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; XMLLabelSeparatorContext::XMLLabelSeparatorContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ) : XMLElementPropertyContext( @@ -49,7 +49,7 @@ void XMLLabelSeparatorContext::StartElement( const uno::Reference< xml::sax::XAt } SvXMLImportContext* XMLLabelSeparatorContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/ ) { SvXMLImportContext* pContext = NULL; diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.hxx b/xmloff/source/chart/XMLLabelSeparatorContext.hxx index 5b9942d5f964..e2baa0f80e15 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.hxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.hxx @@ -27,7 +27,7 @@ public: TYPEINFO(); XMLLabelSeparatorContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ); virtual ~XMLLabelSeparatorContext(); @@ -35,12 +35,12 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); private: - ::rtl::OUString m_aSeparator; + OUString m_aSeparator; }; #endif // _XMLOFF_SYMBOLIMAGECONTEXT_HXX_ diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx index 9b0f06ce95f2..d57534fb2f95 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.cxx +++ b/xmloff/source/chart/XMLSymbolImageContext.cxx @@ -50,7 +50,7 @@ static SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] = XMLSymbolImageContext::XMLSymbolImageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ) : XMLElementPropertyContext( @@ -64,16 +64,16 @@ XMLSymbolImageContext::~XMLSymbolImageContext() void XMLSymbolImageContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { SvXMLTokenMap aTokenMap( aSymbolImageAttrTokenMap ); - ::rtl::OUString aLocalName; + OUString aLocalName; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - const ::rtl::OUString& rAttrName = xAttrList->getNameByIndex( i ); + const OUString& rAttrName = xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName ); - const ::rtl::OUString& rValue = xAttrList->getValueByIndex( i ); + const OUString& rValue = xAttrList->getValueByIndex( i ); switch( aTokenMap.Get( nPrefix, aLocalName ) ) { @@ -91,7 +91,7 @@ void XMLSymbolImageContext::StartElement( const uno::Reference< xml::sax::XAttri } SvXMLImportContext* XMLSymbolImageContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { SvXMLImportContext* pContext = NULL; @@ -117,7 +117,7 @@ SvXMLImportContext* XMLSymbolImageContext::CreateChildContext( void XMLSymbolImageContext::EndElement() { - ::rtl::OUString sResolvedURL; + OUString sResolvedURL; if( !msURL.isEmpty() ) { diff --git a/xmloff/source/chart/XMLSymbolImageContext.hxx b/xmloff/source/chart/XMLSymbolImageContext.hxx index d3add4cc933f..215f6a641352 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.hxx +++ b/xmloff/source/chart/XMLSymbolImageContext.hxx @@ -31,7 +31,7 @@ public: TYPEINFO(); XMLSymbolImageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ); virtual ~XMLSymbolImageContext(); @@ -39,12 +39,12 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); private: - ::rtl::OUString msURL; + OUString msURL; ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; }; diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx index 5abdd61c6724..ac537488b4db 100644 --- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx +++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx @@ -23,8 +23,6 @@ #include <rtl/ustrbuf.hxx> using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace { diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx index 2f46b6cb2060..f7b4c9cdb6ef 100644 --- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx +++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx @@ -27,8 +27,8 @@ public: XMLSymbolTypePropertyHdl( bool bIsNamedSymbol ); virtual ~XMLSymbolTypePropertyHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; private: bool m_bIsNamedSymbol; diff --git a/xmloff/source/chart/XMLTextOrientationHdl.cxx b/xmloff/source/chart/XMLTextOrientationHdl.cxx index 191d199e5670..b206f45e6406 100644 --- a/xmloff/source/chart/XMLTextOrientationHdl.cxx +++ b/xmloff/source/chart/XMLTextOrientationHdl.cxx @@ -29,7 +29,7 @@ XMLTextOrientationHdl::~XMLTextOrientationHdl() } sal_Bool XMLTextOrientationHdl::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { @@ -50,7 +50,7 @@ sal_Bool XMLTextOrientationHdl::importXML( } sal_Bool XMLTextOrientationHdl::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { diff --git a/xmloff/source/chart/XMLTextOrientationHdl.hxx b/xmloff/source/chart/XMLTextOrientationHdl.hxx index 514e71baba78..8c50a0757aea 100644 --- a/xmloff/source/chart/XMLTextOrientationHdl.hxx +++ b/xmloff/source/chart/XMLTextOrientationHdl.hxx @@ -27,10 +27,10 @@ private: public: virtual ~XMLTextOrientationHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx index 37eb7e2d4819..8f5f9e245b34 100644 --- a/xmloff/source/chart/contexts.cxx +++ b/xmloff/source/chart/contexts.cxx @@ -42,17 +42,17 @@ public: SchXMLBodyContext_Impl( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName ); + const OUString& rLName ); virtual ~SchXMLBodyContext_Impl(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ); }; SchXMLBodyContext_Impl::SchXMLBodyContext_Impl( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& rLName ) : + sal_uInt16 nPrfx, const OUString& rLName ) : SvXMLImportContext( rImport, nPrfx, rLName ), mrImportHelper( rImpHelper ) { @@ -64,7 +64,7 @@ SchXMLBodyContext_Impl::~SchXMLBodyContext_Impl() SvXMLImportContext *SchXMLBodyContext_Impl::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & ) { return new SchXMLBodyContext( mrImportHelper, GetImport(), nPrefix, @@ -76,7 +76,7 @@ SvXMLImportContext *SchXMLBodyContext_Impl::CreateChildContext( SchXMLDocContext::SchXMLDocContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLName ) : + const OUString& rLName ) : SvXMLImportContext( rImport, nPrefix, rLName ), mrImportHelper( rImpHelper ) { @@ -95,7 +95,7 @@ TYPEINIT1( SchXMLDocContext, SvXMLImportContext ); SvXMLImportContext* SchXMLDocContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { SvXMLImportContext* pContext = 0; @@ -140,7 +140,7 @@ SvXMLImportContext* SchXMLDocContext::CreateChildContext( SchXMLFlatDocContext_Impl::SchXMLFlatDocContext_Impl( SchXMLImportHelper& i_rImpHelper, SchXMLImport& i_rImport, - sal_uInt16 i_nPrefix, const ::rtl::OUString & i_rLName, + sal_uInt16 i_nPrefix, const OUString & i_rLName, const uno::Reference<document::XDocumentProperties>& i_xDocProps) : SvXMLImportContext(i_rImport, i_nPrefix, i_rLName), SchXMLDocContext(i_rImpHelper, i_rImport, i_nPrefix, i_rLName), @@ -153,7 +153,7 @@ SchXMLFlatDocContext_Impl::~SchXMLFlatDocContext_Impl() { } SvXMLImportContext *SchXMLFlatDocContext_Impl::CreateChildContext( - sal_uInt16 i_nPrefix, const ::rtl::OUString& i_rLocalName, + sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) { // behave like meta base class iff we encounter office:meta @@ -173,7 +173,7 @@ SvXMLImportContext *SchXMLFlatDocContext_Impl::CreateChildContext( SchXMLBodyContext::SchXMLBodyContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLName ) : + const OUString& rLName ) : SvXMLImportContext( rImport, nPrefix, rLName ), mrImportHelper( rImpHelper ) { @@ -191,7 +191,7 @@ void SchXMLBodyContext::EndElement() SvXMLImportContext* SchXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { SvXMLImportContext* pContext = 0; diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx index 186c98f3838c..4a7b830a8740 100644 --- a/xmloff/source/chart/contexts.hxx +++ b/xmloff/source/chart/contexts.hxx @@ -48,14 +48,14 @@ public: SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLName ); + const OUString& rLName ); virtual ~SchXMLDocContext(); TYPEINFO(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); }; @@ -69,13 +69,13 @@ public: SchXMLFlatDocContext_Impl( SchXMLImportHelper& i_rImpHelper, SchXMLImport& i_rImport, - sal_uInt16 i_nPrefix, const ::rtl::OUString & i_rLName, + sal_uInt16 i_nPrefix, const OUString & i_rLName, const com::sun::star::uno::Reference<com::sun::star::document::XDocumentProperties>& i_xDocProps); virtual ~SchXMLFlatDocContext_Impl(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 i_nPrefix, const ::rtl::OUString& i_rLocalName, + sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& i_xAttrList); }; @@ -91,13 +91,13 @@ public: SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLName ); + const OUString& rLName ); virtual ~SchXMLBodyContext(); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); }; diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx index 17728ed4adc1..92efcae36400 100644 --- a/xmloff/source/chart/transporttypes.hxx +++ b/xmloff/source/chart/transporttypes.hxx @@ -35,11 +35,11 @@ enum SchXMLCellType struct SchXMLCell { - rtl::OUString aString; - ::com::sun::star::uno::Sequence< rtl::OUString > aComplexString; + OUString aString; + ::com::sun::star::uno::Sequence< OUString > aComplexString; double fValue; SchXMLCellType eType; - rtl::OUString aRangeId; + OUString aRangeId; SchXMLCell(): fValue( 0.0 ), eType( SCH_CELL_TYPE_UNKNOWN ) {} @@ -58,7 +58,7 @@ struct SchXMLTable bool bHasHeaderRow; bool bHasHeaderColumn; - ::rtl::OUString aTableNameOfFile; /// the table name read at the table:table element + OUString aTableNameOfFile; /// the table name read at the table:table element ::std::vector< sal_Int32 > aHiddenColumns; @@ -122,8 +122,8 @@ struct SchXMLAxis { enum SchXMLAxisDimension eDimension; sal_Int8 nAxisIndex;//0->primary axis; 1->secondary axis - rtl::OUString aName; - rtl::OUString aTitle; + OUString aName; + OUString aTitle; bool bHasCategories; SchXMLAxis() : eDimension( SCH_XML_AXIS_UNDEF ), nAxisIndex( 0 ), bHasCategories( false ) {} @@ -144,10 +144,10 @@ struct GlobalSeriesImportInfo sal_Int32 nCurrentDataIndex; - ::rtl::OUString aFirstFirstDomainAddress; + OUString aFirstFirstDomainAddress; sal_Int32 nFirstFirstDomainIndex; - ::rtl::OUString aFirstSecondDomainAddress; + OUString aFirstSecondDomainAddress; sal_Int32 nFirstSecondDomainIndex; }; @@ -175,8 +175,8 @@ struct DataRowPointStyle ::com::sun::star::beans::XPropertySet > m_xEquationProperties; sal_Int32 m_nPointIndex; sal_Int32 m_nPointRepeat; - ::rtl::OUString msStyleName; - ::rtl::OUString msSeriesStyleNameForDonuts; + OUString msStyleName; + OUString msSeriesStyleNameForDonuts; sal_Int32 mnAttachedAxis; bool mbSymbolSizeForSeriesIsMissingInFile; @@ -185,7 +185,7 @@ struct DataRowPointStyle ::com::sun::star::chart2::XDataSeries >& xSeries , sal_Int32 nPointIndex , sal_Int32 nPointRepeat - , ::rtl::OUString sStyleName + , OUString sStyleName , sal_Int32 nAttachedAxis = 0 ) : meType( eType ), m_xSeries( xSeries ), @@ -198,7 +198,7 @@ struct DataRowPointStyle {} }; -typedef ::std::multimap< ::rtl::OUString, ::com::sun::star::uno::Reference< +typedef ::std::multimap< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > > tSchXMLRangeSequenceMap; #endif // SCH_XML_TRANSPORTTYPES_HXX_ diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index 6379a13c4284..f963983e6041 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -129,7 +129,7 @@ protected: com::sun::star::uno::Any& mrAny; XMLConfigBaseContext* mpBaseContext; public: - XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, com::sun::star::uno::Any& rAny, XMLConfigBaseContext* pBaseContext); virtual ~XMLConfigBaseContext(); @@ -141,27 +141,27 @@ public: class XMLConfigItemContext : public SvXMLImportContext { - rtl::OUString msType; - rtl::OUString msValue; + OUString msType; + OUString msValue; uno::Sequence<sal_Int8> maDecoded; com::sun::star::uno::Any& mrAny; - const rtl::OUString mrItemName; + const OUString mrItemName; XMLConfigBaseContext* mpBaseContext; public: - XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Any& rAny, - const rtl::OUString& rItemName, + const OUString& rItemName, XMLConfigBaseContext* pBaseContext); virtual ~XMLConfigItemContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); @@ -173,7 +173,7 @@ public: class XMLConfigItemSetContext : public XMLConfigBaseContext { public: - XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Any& rAny, @@ -181,7 +181,7 @@ public: virtual ~XMLConfigItemSetContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -193,7 +193,7 @@ public: class XMLConfigItemMapNamedContext : public XMLConfigBaseContext { public: - XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Any& rAny, @@ -201,7 +201,7 @@ public: virtual ~XMLConfigItemMapNamedContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -213,20 +213,20 @@ public: class XMLConfigItemMapIndexedContext : public XMLConfigBaseContext { private: - rtl::OUString maConfigItemName; + OUString maConfigItemName; public: XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Any& rAny, - const rtl::OUString& rConfigItemName, + const OUString& rConfigItemName, XMLConfigBaseContext* pBaseContext); virtual ~XMLConfigItemMapIndexedContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -236,21 +236,21 @@ public: //============================================================================= SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, sal_uInt16 p_nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, beans::PropertyValue& rProp, XMLConfigBaseContext* pBaseContext) { SvXMLImportContext *pContext = 0; - rProp.Name = rtl::OUString(); + rProp.Name = OUString(); sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_CONFIG) { @@ -283,7 +283,7 @@ namespace { struct SettingsGroup { - ::rtl::OUString sGroupName; + OUString sGroupName; uno::Any aSettings; SettingsGroup() @@ -292,7 +292,7 @@ namespace { } - SettingsGroup( const ::rtl::OUString& _rGroupName, const uno::Any& _rSettings ) + SettingsGroup( const OUString& _rGroupName, const uno::Any& _rSettings ) :sGroupName( _rGroupName ) ,aSettings( _rSettings ) { @@ -309,7 +309,7 @@ struct XMLDocumentSettingsContext_Data //============================================================================= -XMLDocumentSettingsContext::XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, +XMLDocumentSettingsContext::XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) : SvXMLImportContext( rImport, nPrfx, rLName ) , m_pData( new XMLDocumentSettingsContext_Data ) @@ -322,21 +322,21 @@ XMLDocumentSettingsContext::~XMLDocumentSettingsContext() } SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( sal_uInt16 p_nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; - rtl::OUString sName; + OUString sName; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_CONFIG) { @@ -349,7 +349,7 @@ SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( sal_uInt16 p { if (IsXMLToken(rLocalName, XML_CONFIG_ITEM_SET)) { - ::rtl::OUString aLocalConfigName; + OUString aLocalConfigName; sal_uInt16 nConfigPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sName, &aLocalConfigName ); @@ -422,11 +422,11 @@ void XMLDocumentSettingsContext::EndElement() while ( ( i >= 0 ) && nFound < 2 ) { - rtl::OUString sProp( aSeqConfigProps[i].Name ); + OUString sProp( aSeqConfigProps[i].Name ); if ( sProp.compareToAscii("PrinterName") == 0 ) { - rtl::OUString sEmpty; + OUString sEmpty; aSeqConfigProps[i].Value = uno::makeAny( sEmpty ); nFound++; } @@ -458,7 +458,7 @@ void XMLDocumentSettingsContext::EndElement() //============================================================================= XMLConfigBaseContext::XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, com::sun::star::uno::Any& rTempAny, + const OUString& rLName, com::sun::star::uno::Any& rTempAny, XMLConfigBaseContext* pTempBaseContext) : SvXMLImportContext( rImport, nPrfx, rLName ), maProps( rImport.GetComponentContext() ), @@ -475,7 +475,7 @@ XMLConfigBaseContext::~XMLConfigBaseContext() //============================================================================= XMLConfigItemSetContext::XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>&, com::sun::star::uno::Any& rAny, @@ -490,7 +490,7 @@ XMLConfigItemSetContext::~XMLConfigItemSetContext() } SvXMLImportContext *XMLConfigItemSetContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -506,11 +506,11 @@ void XMLConfigItemSetContext::EndElement() //============================================================================= -XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, +XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Any& rTempAny, - const rtl::OUString& rTempItemName, + const OUString& rTempItemName, XMLConfigBaseContext* pTempBaseContext) : SvXMLImportContext(rImport, nPrfx, rLName), mrAny(rTempAny), @@ -520,11 +520,11 @@ XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrf sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_CONFIG) { @@ -539,7 +539,7 @@ XMLConfigItemContext::~XMLConfigItemContext() } SvXMLImportContext *XMLConfigItemContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& ) { @@ -547,19 +547,19 @@ SvXMLImportContext *XMLConfigItemContext::CreateChildContext( sal_uInt16 nPrefix return pContext; } -void XMLConfigItemContext::Characters( const ::rtl::OUString& rChars ) +void XMLConfigItemContext::Characters( const OUString& rChars ) { if (IsXMLToken(msType, XML_BASE64BINARY)) { - rtl::OUString sTrimmedChars( rChars.trim() ); + OUString sTrimmedChars( rChars.trim() ); if( !sTrimmedChars.isEmpty() ) { - rtl::OUString sChars; + OUString sChars; if( !msValue.isEmpty() ) { sChars = msValue; sChars += sTrimmedChars; - msValue = rtl::OUString(); + msValue = OUString(); } else { @@ -658,7 +658,7 @@ void XMLConfigItemContext::ManipulateConfigItem() { if( mrItemName == "PrinterIndependentLayout" ) { - rtl::OUString sValue; + OUString sValue; mrAny >>= sValue; sal_Int16 nTmp = document::PrinterIndependentLayout::HIGH_RESOLUTION; @@ -683,7 +683,7 @@ void XMLConfigItemContext::ManipulateConfigItem() uno::Reference< uno::XComponentContext > xContext( GetImport().GetComponentContext() ); uno::Reference< util::XStringSubstitution > xStringSubsitution( util::PathSubstitution::create(xContext) ); - rtl::OUString aURL; + OUString aURL; mrAny >>= aURL; aURL = xStringSubsitution->substituteVariables( aURL, sal_False ); mrAny <<= aURL; @@ -697,7 +697,7 @@ void XMLConfigItemContext::ManipulateConfigItem() //============================================================================= -XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, +XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>&, com::sun::star::uno::Any& rAny, @@ -711,7 +711,7 @@ XMLConfigItemMapNamedContext::~XMLConfigItemMapNamedContext() } SvXMLImportContext *XMLConfigItemMapNamedContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -733,11 +733,11 @@ void XMLConfigItemMapNamedContext::EndElement() //============================================================================= XMLConfigItemMapIndexedContext::XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>&, com::sun::star::uno::Any& rAny, - const ::rtl::OUString& rConfigItemName, + const OUString& rConfigItemName, XMLConfigBaseContext* pBaseContext) : XMLConfigBaseContext(rImport, nPrfx, rLName, rAny, pBaseContext), maConfigItemName( rConfigItemName ) @@ -749,7 +749,7 @@ XMLConfigItemMapIndexedContext::~XMLConfigItemMapIndexedContext() } SvXMLImportContext *XMLConfigItemMapIndexedContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -789,11 +789,11 @@ void XMLConfigItemMapIndexedContext::EndElement() beans::PropertyValue *pForChar = aProps.getArray(); i18n::ForbiddenCharacters aForbid; lang::Locale aLocale; - const rtl::OUString sLanguage ( "Language" ); - const rtl::OUString sCountry ( "Country" ); - const rtl::OUString sVariant ( "Variant" ); - const rtl::OUString sBeginLine ( "BeginLine" ); - const rtl::OUString sEndLine ( "EndLine" ); + const OUString sLanguage ( "Language" ); + const OUString sCountry ( "Country" ); + const OUString sVariant ( "Variant" ); + const OUString sBeginLine ( "BeginLine" ); + const OUString sEndLine ( "EndLine" ); sal_Bool bHaveLanguage = sal_False, bHaveCountry = sal_False, bHaveVariant = sal_False, bHaveBegin = sal_False, bHaveEnd = sal_False; @@ -857,16 +857,16 @@ void XMLConfigItemMapIndexedContext::EndElement() formula::SymbolDescriptor *pDescriptor = aSymbolList.getArray(); - const rtl::OUString sName ( "Name" ); - const rtl::OUString sExportName ( "ExportName" ); - const rtl::OUString sFontName ( "FontName" ); - const rtl::OUString sSymbolSet ( "SymbolSet" ); - const rtl::OUString sCharacter ( "Character" ); - const rtl::OUString sCharSet ( "CharSet" ); - const rtl::OUString sFamily ( "Family" ); - const rtl::OUString sPitch ( "Pitch" ); - const rtl::OUString sWeight ( "Weight" ); - const rtl::OUString sItalic ( "Italic" ); + const OUString sName ( "Name" ); + const OUString sExportName ( "ExportName" ); + const OUString sFontName ( "FontName" ); + const OUString sSymbolSet ( "SymbolSet" ); + const OUString sCharacter ( "Character" ); + const OUString sCharSet ( "CharSet" ); + const OUString sFamily ( "Family" ); + const OUString sPitch ( "Pitch" ); + const OUString sWeight ( "Weight" ); + const OUString sItalic ( "Italic" ); sal_Int16 nNumFullEntries = 0; for ( sal_Int32 i = 0; i < nCount; i++ ) diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx index c35b9763ad0d..8d02dd45972d 100644 --- a/xmloff/source/core/DomBuilderContext.cxx +++ b/xmloff/source/core/DomBuilderContext.cxx @@ -54,7 +54,6 @@ using com::sun::star::xml::dom::XNode; using com::sun::star::xml::dom::XElement; using com::sun::star::xml::sax::XAttributeList; using com::sun::star::xml::dom::NodeType_ELEMENT_NODE; -using rtl::OUString; // helper functions; implemented below diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx index 1266815f8342..7e87c621aba2 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -54,8 +54,6 @@ using std::vector; using namespace com::sun::star::xml::dom; -using rtl::OUString; -using rtl::OUStringBuffer; class DomVisitor diff --git a/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx index edebc2bda0a7..43355a5925b4 100644 --- a/xmloff/source/core/PropertySetMerger.cxx +++ b/xmloff/source/core/PropertySetMerger.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include "PropertySetMerger.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx index 2b278b242ac0..eb7936047b09 100644 --- a/xmloff/source/core/RDFaExportHelper.cxx +++ b/xmloff/source/core/RDFaExportHelper.cxx @@ -57,18 +57,18 @@ using namespace ::com::sun::star; namespace xmloff { -static ::rtl::OUString +static OUString makeCURIE(SvXMLExport * i_pExport, uno::Reference<rdf::XURI> const & i_xURI) { OSL_ENSURE(i_xURI.is(), "makeCURIE: null URI"); if (!i_xURI.is()) throw uno::RuntimeException(); - const ::rtl::OUString Namespace( i_xURI->getNamespace() ); + const OUString Namespace( i_xURI->getNamespace() ); OSL_ENSURE(!Namespace.isEmpty(), "makeCURIE: no namespace"); if (Namespace.isEmpty()) throw uno::RuntimeException(); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append( i_pExport->EnsureNamespace(Namespace) ); buf.append( static_cast<sal_Unicode>(':') ); // N.B.: empty LocalName is valid! @@ -80,12 +80,12 @@ makeCURIE(SvXMLExport * i_pExport, // #i112473# SvXMLExport::GetRelativeReference() not right for RDF on SaveAs // because the URIs in the repository are not rewritten on SaveAs, the // URI of the loaded document has to be used, not the URI of the target doc. -static ::rtl::OUString -getRelativeReference(SvXMLExport const& rExport, ::rtl::OUString const& rURI) +static OUString +getRelativeReference(SvXMLExport const& rExport, OUString const& rURI) { uno::Reference< rdf::XURI > const xModelURI( rExport.GetModel(), uno::UNO_QUERY_THROW ); - ::rtl::OUString const baseURI( xModelURI->getStringValue() ); + OUString const baseURI( xModelURI->getStringValue() ); uno::Reference<uno::XComponentContext> xContext( comphelper::getProcessComponentContext() ); uno::Reference<uri::XUriReferenceFactory> const xUriFactory = @@ -98,7 +98,7 @@ getRelativeReference(SvXMLExport const& rExport, ::rtl::OUString const& rURI) uno::Reference< uri::XUriReference > const xRelativeURI( xUriFactory->makeRelative(xBaseURI, xAbsoluteURI, true, true, false), uno::UNO_SET_THROW ); - ::rtl::OUString const relativeURI(xRelativeURI->getUriReference()); + OUString const relativeURI(xRelativeURI->getUriReference()); return relativeURI; } @@ -116,13 +116,13 @@ RDFaExportHelper::RDFaExportHelper(SvXMLExport & i_rExport) m_xRepository.set(xRS->getRDFRepository(), uno::UNO_QUERY_THROW); } -::rtl::OUString +OUString RDFaExportHelper::LookupBlankNode( uno::Reference<rdf::XBlankNode> const & i_xBlankNode) { OSL_ENSURE(i_xBlankNode.is(), "null BlankNode?"); if (!i_xBlankNode.is()) throw uno::RuntimeException(); - ::rtl::OUString & rEntry( + OUString & rEntry( m_BlankNodeMap[ i_xBlankNode->getStringValue() ] ); if (rEntry.isEmpty()) { @@ -160,9 +160,9 @@ RDFaExportHelper::AddRDFa( } static const sal_Unicode s_OpenBracket ('['); static const sal_Unicode s_CloseBracket(']'); - const ::rtl::OUString about( xSubjectURI.is() + const OUString about( xSubjectURI.is() ? getRelativeReference(m_rExport, xSubjectURI->getStringValue()) - : ::rtl::OUStringBuffer().append(s_OpenBracket).append( + : OUStringBuffer().append(s_OpenBracket).append( LookupBlankNode(xSubjectBNode)).append(s_CloseBracket) .makeStringAndClear() ); @@ -172,7 +172,7 @@ RDFaExportHelper::AddRDFa( const uno::Reference<rdf::XURI> xDatatype(xContent->getDatatype()); if (xDatatype.is()) { - const ::rtl::OUString datatype( + const OUString datatype( makeCURIE(&m_rExport, xDatatype) ); m_rExport.AddAttribute(XML_NAMESPACE_XHTML, token::XML_DATATYPE, datatype); @@ -183,7 +183,7 @@ RDFaExportHelper::AddRDFa( xContent->getValue()); } - ::rtl::OUStringBuffer property; + OUStringBuffer property; ::comphelper::intersperse( ::boost::make_transform_iterator( ::comphelper::stl_begin(rStatements), @@ -195,7 +195,7 @@ RDFaExportHelper::AddRDFa( ::boost::bind(&makeCURIE, &m_rExport, ::boost::bind(&rdf::Statement::Predicate, _1))), ::comphelper::OUStringBufferAppender(property), - ::rtl::OUString(" ")); + OUString(" ")); m_rExport.AddAttribute(XML_NAMESPACE_XHTML, token::XML_PROPERTY, property.makeStringAndClear()); diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx index 5ae9760fa116..e37789435fea 100644 --- a/xmloff/source/core/RDFaImportHelper.cxx +++ b/xmloff/source/core/RDFaImportHelper.cxx @@ -58,7 +58,7 @@ class SAL_DLLPRIVATE RDFaReader const SvXMLImport & GetImport() const { return m_rImport; } //FIXME: this is an ugly hack to workaround buggy SvXMLImport::GetAbsolute - ::rtl::OUString GetAbsoluteReference(::rtl::OUString const & i_rURI) const + OUString GetAbsoluteReference(OUString const & i_rURI) const { if (i_rURI.isEmpty() || i_rURI[0] == '#') { @@ -76,13 +76,13 @@ public: { } // returns URI or blank node! - ::rtl::OUString ReadCURIE(::rtl::OUString const & i_rCURIE) const; + OUString ReadCURIE(OUString const & i_rCURIE) const; - std::vector< ::rtl::OUString > - ReadCURIEs(::rtl::OUString const & i_rCURIEs) const; + std::vector< OUString > + ReadCURIEs(OUString const & i_rCURIEs) const; - ::rtl::OUString - ReadURIOrSafeCURIE( ::rtl::OUString const & i_rURIOrSafeCURIE) const; + OUString + ReadURIOrSafeCURIE( OUString const & i_rURIOrSafeCURIE) const; }; /** helper to insert RDFa statements into the RDF repository */ @@ -91,7 +91,7 @@ class SAL_DLLPRIVATE RDFaInserter const uno::Reference<uno::XComponentContext> m_xContext; uno::Reference< rdf::XDocumentRepository > m_xRepository; - typedef ::std::map< ::rtl::OUString, uno::Reference< rdf::XBlankNode > > + typedef ::std::map< OUString, uno::Reference< rdf::XBlankNode > > BlankNodeMap_t; BlankNodeMap_t m_BlankNodeMap; @@ -104,13 +104,13 @@ public: {} uno::Reference< rdf::XBlankNode > - LookupBlankNode(::rtl::OUString const & i_rNodeId ); + LookupBlankNode(OUString const & i_rNodeId ); uno::Reference< rdf::XURI > - MakeURI( ::rtl::OUString const & i_rURI) const; + MakeURI( OUString const & i_rURI) const; uno::Reference< rdf::XResource> - MakeResource( ::rtl::OUString const & i_rResource); + MakeResource( OUString const & i_rResource); void InsertRDFaEntry(struct RDFaEntry const & i_rEntry); }; @@ -118,16 +118,16 @@ public: /** store parsed RDFa attributes */ struct SAL_DLLPRIVATE ParsedRDFaAttributes { - ::rtl::OUString m_About; - ::std::vector< ::rtl::OUString > m_Properties; - ::rtl::OUString m_Content; - ::rtl::OUString m_Datatype; + OUString m_About; + ::std::vector< OUString > m_Properties; + OUString m_Content; + OUString m_Datatype; ParsedRDFaAttributes( - ::rtl::OUString const & i_rAbout, - ::std::vector< ::rtl::OUString > const & i_rProperties, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype) + OUString const & i_rAbout, + ::std::vector< OUString > const & i_rProperties, + OUString const & i_rContent, + OUString const & i_rDatatype) : m_About(i_rAbout) , m_Properties(i_rProperties) , m_Content(i_rContent) @@ -157,7 +157,7 @@ static inline bool isWS(const sal_Unicode i_Char) || (' ' == i_Char); } -static ::rtl::OUString splitAtWS(::rtl::OUString & io_rString) +static OUString splitAtWS(OUString & io_rString) { const sal_Int32 len( io_rString.getLength() ); sal_Int32 idxstt(0); @@ -166,21 +166,21 @@ static ::rtl::OUString splitAtWS(::rtl::OUString & io_rString) sal_Int32 idxend(idxstt); while ((idxend < len) && (!isWS(io_rString[idxend]))) ++idxend; // the CURIE - const ::rtl::OUString ret(io_rString.copy(idxstt, idxend - idxstt)); + const OUString ret(io_rString.copy(idxstt, idxend - idxstt)); io_rString = io_rString.copy(idxend); // rest return ret; } -::rtl::OUString -RDFaReader::ReadCURIE(::rtl::OUString const & i_rCURIE) const +OUString +RDFaReader::ReadCURIE(OUString const & i_rCURIE) const { // the RDFa spec says that a prefix is required (it may be empty: ":foo") const sal_Int32 idx( i_rCURIE.indexOf(':') ); if (idx >= 0) { - ::rtl::OUString Prefix; - ::rtl::OUString LocalName; - ::rtl::OUString Namespace; + OUString Prefix; + OUString LocalName; + OUString Namespace; sal_uInt16 nKey( GetImport().GetNamespaceMap()._GetKeyByAttrName( i_rCURIE, &Prefix, &LocalName, &Namespace) ); if ( Prefix == "_" ) @@ -196,30 +196,30 @@ RDFaReader::ReadCURIE(::rtl::OUString const & i_rCURIE) const (XML_NAMESPACE_XMLNS != nKey)) { // N.B.: empty LocalName is valid! - const ::rtl::OUString URI(Namespace + LocalName); + const OUString URI(Namespace + LocalName); return GetAbsoluteReference(URI); } else { OSL_TRACE( "ReadCURIE: invalid CURIE: invalid prefix" ); - return ::rtl::OUString(); + return OUString(); } } } OSL_TRACE( "ReadCURIE: invalid CURIE: no prefix" ); - return ::rtl::OUString(); + return OUString(); } -::std::vector< ::rtl::OUString > -RDFaReader::ReadCURIEs(::rtl::OUString const & i_rCURIEs) const +::std::vector< OUString > +RDFaReader::ReadCURIEs(OUString const & i_rCURIEs) const { - std::vector< ::rtl::OUString > vec; - ::rtl::OUString CURIEs(i_rCURIEs); + std::vector< OUString > vec; + OUString CURIEs(i_rCURIEs); do { - ::rtl::OUString curie( splitAtWS(CURIEs) ); + OUString curie( splitAtWS(CURIEs) ); if (!curie.isEmpty()) { - const ::rtl::OUString uri(ReadCURIE(curie)); + const OUString uri(ReadCURIE(curie)); if (!uri.isEmpty()) { vec.push_back(uri); @@ -234,8 +234,8 @@ RDFaReader::ReadCURIEs(::rtl::OUString const & i_rCURIEs) const return vec; } -::rtl::OUString -RDFaReader::ReadURIOrSafeCURIE(::rtl::OUString const & i_rURIOrSafeCURIE) const +OUString +RDFaReader::ReadURIOrSafeCURIE(OUString const & i_rURIOrSafeCURIE) const { const sal_Int32 len(i_rURIOrSafeCURIE.getLength()); if (len && (i_rURIOrSafeCURIE[0] == '[')) @@ -247,7 +247,7 @@ RDFaReader::ReadURIOrSafeCURIE(::rtl::OUString const & i_rURIOrSafeCURIE) const else { OSL_TRACE( "ReadURIOrSafeCURIE: invalid SafeCURIE" ); - return ::rtl::OUString(); + return OUString(); } } else @@ -255,7 +255,7 @@ RDFaReader::ReadURIOrSafeCURIE(::rtl::OUString const & i_rURIOrSafeCURIE) const if (i_rURIOrSafeCURIE.matchAsciiL("_:", 2)) // blank node { OSL_TRACE( "ReadURIOrSafeCURIE: invalid URI: scheme is _" ); - return ::rtl::OUString(); + return OUString(); } else { @@ -267,7 +267,7 @@ RDFaReader::ReadURIOrSafeCURIE(::rtl::OUString const & i_rURIOrSafeCURIE) const //////////////////////////////////////////////////////////////////////////// uno::Reference< rdf::XBlankNode > -RDFaInserter::LookupBlankNode(::rtl::OUString const & i_rNodeId ) +RDFaInserter::LookupBlankNode(OUString const & i_rNodeId ) { uno::Reference< rdf::XBlankNode > & rEntry( m_BlankNodeMap[ i_rNodeId ] ); if (!rEntry.is()) @@ -278,7 +278,7 @@ RDFaInserter::LookupBlankNode(::rtl::OUString const & i_rNodeId ) } uno::Reference< rdf::XURI > -RDFaInserter::MakeURI( ::rtl::OUString const & i_rURI) const +RDFaInserter::MakeURI( OUString const & i_rURI) const { if (i_rURI.matchAsciiL("_:", 2)) // blank node { @@ -300,14 +300,14 @@ RDFaInserter::MakeURI( ::rtl::OUString const & i_rURI) const } uno::Reference< rdf::XResource> -RDFaInserter::MakeResource( ::rtl::OUString const & i_rResource) +RDFaInserter::MakeResource( OUString const & i_rResource) { if (i_rResource.matchAsciiL("_:", 2)) // blank node { // we cannot use the blank node label as-is: it must be distinct // from labels in other graphs, so create fresh ones per XML stream // N.B.: content.xml and styles.xml are distinct graphs - ::rtl::OUString name( i_rResource.copy(2) ); + OUString name( i_rResource.copy(2) ); const uno::Reference< rdf::XBlankNode > xBNode( LookupBlankNode(name) ); OSL_ENSURE(xBNode.is(), "no blank node?"); return uno::Reference<rdf::XResource>( xBNode, uno::UNO_QUERY); @@ -405,10 +405,10 @@ RDFaImportHelper::~RDFaImportHelper() ::boost::shared_ptr<ParsedRDFaAttributes> RDFaImportHelper::ParseRDFa( - ::rtl::OUString const & i_rAbout, - ::rtl::OUString const & i_rProperty, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype) + OUString const & i_rAbout, + OUString const & i_rProperty, + OUString const & i_rContent, + OUString const & i_rDatatype) { if (i_rProperty.isEmpty()) { @@ -417,18 +417,18 @@ RDFaImportHelper::ParseRDFa( } // must parse CURIEs here: need namespace declaration context RDFaReader reader(GetImport()); - const ::rtl::OUString about( reader.ReadURIOrSafeCURIE(i_rAbout) ); + const OUString about( reader.ReadURIOrSafeCURIE(i_rAbout) ); if (about.isEmpty()) { return ::boost::shared_ptr<ParsedRDFaAttributes>(); } - const ::std::vector< ::rtl::OUString > properties( + const ::std::vector< OUString > properties( reader.ReadCURIEs(i_rProperty) ); if (!properties.size()) { return ::boost::shared_ptr<ParsedRDFaAttributes>(); } - const ::rtl::OUString datatype( !i_rDatatype.isEmpty() + const OUString datatype( !i_rDatatype.isEmpty() ? reader.ReadCURIE(i_rDatatype) - : ::rtl::OUString() ); + : OUString() ); return ::boost::shared_ptr<ParsedRDFaAttributes>( new ParsedRDFaAttributes(about, properties, i_rContent, datatype)); } @@ -454,10 +454,10 @@ RDFaImportHelper::AddRDFa( void RDFaImportHelper::ParseAndAddRDFa( uno::Reference<rdf::XMetadatable> const & i_xObject, - ::rtl::OUString const & i_rAbout, - ::rtl::OUString const & i_rProperty, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype) + OUString const & i_rAbout, + OUString const & i_rProperty, + OUString const & i_rContent, + OUString const & i_rDatatype) { ::boost::shared_ptr<ParsedRDFaAttributes> pAttributes( ParseRDFa(i_rAbout, i_rProperty, i_rContent, i_rDatatype) ); diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx index a1de3f713322..b8d2a571c442 100644 --- a/xmloff/source/core/SettingsExportHelper.cxx +++ b/xmloff/source/core/SettingsExportHelper.cxx @@ -62,7 +62,7 @@ XMLSettingsExportHelper::~XMLSettingsExportHelper() } void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny, - const rtl::OUString& rName) const + const OUString& rName) const { uno::Any aAny( rAny ); ManipulateSetting( aAny, rName ); @@ -122,7 +122,7 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny, break; case uno::TypeClass_STRING: { - rtl::OUString sString; + OUString sString; aAny >>= sString; exportString(sString, rName); } @@ -180,13 +180,13 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny, } } -void XMLSettingsExportHelper::exportBool(const sal_Bool bValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportBool(const sal_Bool bValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_BOOLEAN ); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUString sValue; + OUString sValue; if (bValue) sValue = GetXMLToken(XML_TRUE); else @@ -195,7 +195,7 @@ void XMLSettingsExportHelper::exportBool(const sal_Bool bValue, const rtl::OUStr m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const OUString& rName) const { (void) nValue; (void) rName; OSL_ENSURE(false, "XMLSettingsExportHelper::exportByte(): #i114162#:\n" @@ -203,54 +203,54 @@ void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const rtl::OUStr "so storing them is disabled!\n" "Use a different type instead (e.g. \"short\")."); } -void XMLSettingsExportHelper::exportShort(const sal_Int16 nValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportShort(const sal_Int16 nValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_SHORT ); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, sal_Int32(nValue)); m_rContext.Characters( sBuffer.makeStringAndClear() ); m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportInt(const sal_Int32 nValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportInt(const sal_Int32 nValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_INT ); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nValue); m_rContext.Characters( sBuffer.makeStringAndClear() ); m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportLong(const sal_Int64 nValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportLong(const sal_Int64 nValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_LONG ); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUString sValue(rtl::OUString::valueOf(nValue)); + OUString sValue(OUString::valueOf(nValue)); m_rContext.Characters( sValue ); m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportDouble(const double fValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportDouble(const double fValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_DOUBLE ); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDouble(sBuffer, fValue); m_rContext.Characters( sBuffer.makeStringAndClear() ); m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportString(const rtl::OUString& sValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportString(const OUString& sValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); @@ -261,12 +261,12 @@ void XMLSettingsExportHelper::exportString(const rtl::OUString& sValue, const rt m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportDateTime(const util::DateTime& aValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportDateTime(const util::DateTime& aValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_DATETIME ); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDateTime(sBuffer, aValue); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); m_rContext.Characters( sBuffer.makeStringAndClear() ); @@ -275,7 +275,7 @@ void XMLSettingsExportHelper::exportDateTime(const util::DateTime& aValue, const void XMLSettingsExportHelper::exportSequencePropertyValue( const uno::Sequence<beans::PropertyValue>& aProps, - const rtl::OUString& rName) const + const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); sal_Int32 nLength(aProps.getLength()); @@ -290,20 +290,20 @@ void XMLSettingsExportHelper::exportSequencePropertyValue( } void XMLSettingsExportHelper::exportSymbolDescriptors( const uno::Sequence < formula::SymbolDescriptor > &rProps, - const rtl::OUString rName) const + const OUString rName) const { uno::Reference< container::XIndexContainer > xBox = document::IndexedPropertyValues::create(m_rContext.GetComponentContext()); - const rtl::OUString sName ( "Name" ); - const rtl::OUString sExportName ( "ExportName" ); - const rtl::OUString sSymbolSet ( "SymbolSet" ); - const rtl::OUString sCharacter ( "Character" ); - const rtl::OUString sFontName ( "FontName" ); - const rtl::OUString sCharSet ( "CharSet" ); - const rtl::OUString sFamily ( "Family" ); - const rtl::OUString sPitch ( "Pitch" ); - const rtl::OUString sWeight ( "Weight" ); - const rtl::OUString sItalic ( "Italic" ); + const OUString sName ( "Name" ); + const OUString sExportName ( "ExportName" ); + const OUString sSymbolSet ( "SymbolSet" ); + const OUString sCharacter ( "Character" ); + const OUString sFontName ( "FontName" ); + const OUString sCharSet ( "CharSet" ); + const OUString sFamily ( "Family" ); + const OUString sPitch ( "Pitch" ); + const OUString sWeight ( "Weight" ); + const OUString sItalic ( "Italic" ); sal_Int32 nCount = rProps.getLength(); const formula::SymbolDescriptor *pDescriptor = rProps.getConstArray(); @@ -342,7 +342,7 @@ void XMLSettingsExportHelper::exportSymbolDescriptors( } void XMLSettingsExportHelper::exportbase64Binary( const uno::Sequence<sal_Int8>& aProps, - const rtl::OUString& rName) const + const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); sal_Int32 nLength(aProps.getLength()); @@ -351,7 +351,7 @@ void XMLSettingsExportHelper::exportbase64Binary( m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); if(nLength) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::encodeBase64(sBuffer, aProps); m_rContext.Characters( sBuffer.makeStringAndClear() ); } @@ -359,7 +359,7 @@ void XMLSettingsExportHelper::exportbase64Binary( } void XMLSettingsExportHelper::exportMapEntry(const uno::Any& rAny, - const rtl::OUString& rName, + const OUString& rName, const sal_Bool bNameAccess) const { DBG_ASSERT((bNameAccess && !rName.isEmpty()) || !bNameAccess, "no name"); @@ -379,7 +379,7 @@ void XMLSettingsExportHelper::exportMapEntry(const uno::Any& rAny, void XMLSettingsExportHelper::exportNameAccess( const uno::Reference<container::XNameAccess>& aNamed, - const rtl::OUString& rName) const + const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); DBG_ASSERT(aNamed->getElementType().equals(getCppuType( (uno::Sequence<beans::PropertyValue> *)0 ) ), @@ -388,7 +388,7 @@ void XMLSettingsExportHelper::exportNameAccess( { m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.StartElement( XML_CONFIG_ITEM_MAP_NAMED, sal_True ); - uno::Sequence< rtl::OUString > aNames(aNamed->getElementNames()); + uno::Sequence< OUString > aNames(aNamed->getElementNames()); for (sal_Int32 i = 0; i < aNames.getLength(); i++) exportMapEntry(aNamed->getByName(aNames[i]), aNames[i], sal_True); m_rContext.EndElement( sal_True ); @@ -397,12 +397,12 @@ void XMLSettingsExportHelper::exportNameAccess( void XMLSettingsExportHelper::exportIndexAccess( const uno::Reference<container::XIndexAccess> aIndexed, - const rtl::OUString rName) const + const OUString rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); DBG_ASSERT(aIndexed->getElementType().equals(getCppuType( (uno::Sequence<beans::PropertyValue> *)0 ) ), "wrong IndexAccess" ); - rtl::OUString sEmpty; + OUString sEmpty; if(aIndexed->hasElements()) { m_rContext.AddAttribute( XML_NAME, rName ); @@ -418,7 +418,7 @@ void XMLSettingsExportHelper::exportIndexAccess( void XMLSettingsExportHelper::exportForbiddenCharacters( const uno::Any &rAny, - const rtl::OUString rName) const + const OUString rName) const { uno::Reference<i18n::XForbiddenCharacters> xForbChars; uno::Reference<linguistic2::XSupportedLocales> xLocales; @@ -437,11 +437,11 @@ void XMLSettingsExportHelper::exportForbiddenCharacters( const sal_Int32 nCount = aLocales.getLength(); - const rtl::OUString sLanguage ( "Language" ); - const rtl::OUString sCountry ( "Country" ); - const rtl::OUString sVariant ( "Variant" ); - const rtl::OUString sBeginLine ( "BeginLine" ); - const rtl::OUString sEndLine ( "EndLine" ); + const OUString sLanguage ( "Language" ); + const OUString sCountry ( "Country" ); + const OUString sVariant ( "Variant" ); + const OUString sBeginLine ( "BeginLine" ); + const OUString sEndLine ( "EndLine" ); sal_Int32 nPos = 0; for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++, pLocales++ ) @@ -474,7 +474,7 @@ void XMLSettingsExportHelper::exportForbiddenCharacters( void XMLSettingsExportHelper::exportAllSettings( const uno::Sequence<beans::PropertyValue>& aProps, - const rtl::OUString& rName) const + const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); exportSequencePropertyValue(aProps, rName); @@ -485,7 +485,7 @@ void XMLSettingsExportHelper::exportAllSettings( * from their XML settings representation. This is your chance to do * so! */ -void XMLSettingsExportHelper::ManipulateSetting( uno::Any& rAny, const rtl::OUString& rName ) const +void XMLSettingsExportHelper::ManipulateSetting( uno::Any& rAny, const OUString& rName ) const { if( rName == msPrinterIndependentLayout ) { @@ -493,11 +493,11 @@ void XMLSettingsExportHelper::ManipulateSetting( uno::Any& rAny, const rtl::OUSt if( rAny >>= nTmp ) { if( nTmp == document::PrinterIndependentLayout::LOW_RESOLUTION ) - rAny <<= rtl::OUString("low-resolution"); + rAny <<= OUString("low-resolution"); else if( nTmp == document::PrinterIndependentLayout::DISABLED ) - rAny <<= rtl::OUString("disabled"); + rAny <<= OUString("disabled"); else if( nTmp == document::PrinterIndependentLayout::HIGH_RESOLUTION ) - rAny <<= rtl::OUString("high-resolution"); + rAny <<= OUString("high-resolution"); } } else if( (rName == msColorTableURL) || (rName == msLineEndTableURL) || (rName == msHatchTableURL) || @@ -518,7 +518,7 @@ void XMLSettingsExportHelper::ManipulateSetting( uno::Any& rAny, const rtl::OUSt if( mxStringSubsitution.is() ) { - ::rtl::OUString aURL; + OUString aURL; rAny >>= aURL; aURL = mxStringSubsitution->reSubstituteVariables( aURL ); rAny <<= aURL; diff --git a/xmloff/source/core/SvXMLAttr.cxx b/xmloff/source/core/SvXMLAttr.cxx index 2a42dff11760..4ce1a12d99fd 100644 --- a/xmloff/source/core/SvXMLAttr.cxx +++ b/xmloff/source/core/SvXMLAttr.cxx @@ -31,8 +31,8 @@ #include <limits.h> //USHRT_MAX #include "SvXMLAttr.hxx" -SvXMLAttr::SvXMLAttr( const rtl::OUString& rLName, - const rtl::OUString& rValue ) : +SvXMLAttr::SvXMLAttr( const OUString& rLName, + const OUString& rValue ) : aPrefixPos(USHRT_MAX), aLName(rLName), aValue(rValue) @@ -40,8 +40,8 @@ SvXMLAttr::SvXMLAttr( const rtl::OUString& rLName, } SvXMLAttr::SvXMLAttr( const sal_uInt16 nPos, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) : + const OUString& rLName, + const OUString& rValue ) : aPrefixPos(nPos), aLName(rLName), aValue(rValue) @@ -60,12 +60,12 @@ sal_uInt16 SvXMLAttr::getPrefixPos() const return aPrefixPos; } -const rtl::OUString& SvXMLAttr::getLName() const +const OUString& SvXMLAttr::getLName() const { return aLName; } -const rtl::OUString& SvXMLAttr::getValue() const { +const OUString& SvXMLAttr::getValue() const { return aValue; } diff --git a/xmloff/source/core/SvXMLAttr.hxx b/xmloff/source/core/SvXMLAttr.hxx index 6ac9cd954ceb..82f8e95151ef 100644 --- a/xmloff/source/core/SvXMLAttr.hxx +++ b/xmloff/source/core/SvXMLAttr.hxx @@ -31,26 +31,26 @@ #ifndef _XMLOFF_SVXMLATTR_HXX #define _XMLOFF_SVXMLATTR_HXX -#include <rtl/ustring.hxx> //rtl::OUString +#include <rtl/ustring.hxx> //OUString class SvXMLAttr { private: sal_uInt16 aPrefixPos; - rtl::OUString aLName; - rtl::OUString aValue; + OUString aLName; + OUString aValue; public: // Assuming OUString is well behaved, the default copy constructor and // assignment operator are fine. - SvXMLAttr( const rtl::OUString& rLName, - const rtl::OUString& rValue ); + SvXMLAttr( const OUString& rLName, + const OUString& rValue ); SvXMLAttr( const sal_uInt16 nPos, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); + const OUString& rLName, + const OUString& rValue ); bool operator== (const SvXMLAttr &rCmp) const; sal_uInt16 getPrefixPos() const; - const rtl::OUString& getLName() const; - const rtl::OUString& getValue() const; + const OUString& getLName() const; + const OUString& getValue() const; }; #endif /* _XMLOFF_SVXMLATTR_HXX */ diff --git a/xmloff/source/core/SvXMLAttrCollection.cxx b/xmloff/source/core/SvXMLAttrCollection.cxx index 748ed5dff3a2..2c3bbf2da966 100644 --- a/xmloff/source/core/SvXMLAttrCollection.cxx +++ b/xmloff/source/core/SvXMLAttrCollection.cxx @@ -37,26 +37,26 @@ bool SvXMLAttrCollection::operator ==( const SvXMLAttrCollection& rCmp ) const (rCmp.aAttrs == aAttrs); } -sal_Bool SvXMLAttrCollection::AddAttr( const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrCollection::AddAttr( const OUString& rLName, + const OUString& rValue ) { aAttrs.push_back( SvXMLAttr(rLName, rValue) ); return sal_True; } -sal_Bool SvXMLAttrCollection::AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrCollection::AddAttr( const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ) { sal_uInt16 nPos = aNamespaceMap.Add( rPrefix, rNamespace ); aAttrs.push_back( SvXMLAttr(nPos, rLName, rValue) ); return sal_True; } -sal_Bool SvXMLAttrCollection::AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrCollection::AddAttr( const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ) { sal_uInt16 nPos = aNamespaceMap.GetIndexByPrefix( rPrefix ); if( USHRT_MAX == nPos ) @@ -66,8 +66,8 @@ sal_Bool SvXMLAttrCollection::AddAttr( const rtl::OUString& rPrefix, } sal_Bool SvXMLAttrCollection::SetAt( size_t i, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rLName, + const OUString& rValue ) { if( i >= GetAttrCount() ) return sal_False; @@ -76,10 +76,10 @@ sal_Bool SvXMLAttrCollection::SetAt( size_t i, } sal_Bool SvXMLAttrCollection::SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ) { if( i >= GetAttrCount() ) return sal_False; @@ -93,9 +93,9 @@ sal_Bool SvXMLAttrCollection::SetAt( size_t i, } sal_Bool SvXMLAttrCollection::SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ) { if( i >= GetAttrCount() ) return sal_False; @@ -125,21 +125,21 @@ size_t SvXMLAttrCollection::GetAttrCount() const return aAttrs.size(); } -const rtl::OUString& SvXMLAttrCollection::GetAttrLName(size_t i) const +const OUString& SvXMLAttrCollection::GetAttrLName(size_t i) const { OSL_ENSURE( i < aAttrs.size(), "SvXMLAttrContainerData::GetLName: illegal index" ); return aAttrs[i].getLName(); } -const rtl::OUString& SvXMLAttrCollection::GetAttrValue(size_t i) const +const OUString& SvXMLAttrCollection::GetAttrValue(size_t i) const { OSL_ENSURE( i < aAttrs.size(), "SvXMLAttrContainerData::GetValue: illegal index" ); return aAttrs[i].getValue(); } -const rtl::OUString SvXMLAttrCollection::GetAttrNamespace( size_t i ) const +const OUString SvXMLAttrCollection::GetAttrNamespace( size_t i ) const { - rtl::OUString sRet; + OUString sRet; sal_uInt16 nPos = GetPrefixPos( i ); //Does this point to a valid namespace entry? if( USHRT_MAX != nPos ) @@ -147,9 +147,9 @@ const rtl::OUString SvXMLAttrCollection::GetAttrNamespace( size_t i ) const return sRet; } -const rtl::OUString SvXMLAttrCollection::GetAttrPrefix( size_t i ) const +const OUString SvXMLAttrCollection::GetAttrPrefix( size_t i ) const { - rtl::OUString sRet; + OUString sRet; sal_uInt16 nPos = GetPrefixPos( i ); //Does this point to a valid namespace entry? if( USHRT_MAX != nPos ) @@ -157,12 +157,12 @@ const rtl::OUString SvXMLAttrCollection::GetAttrPrefix( size_t i ) const return sRet; } -const rtl::OUString& SvXMLAttrCollection::GetNamespace( sal_uInt16 i ) const +const OUString& SvXMLAttrCollection::GetNamespace( sal_uInt16 i ) const { return aNamespaceMap.GetNameByIndex( i ); } -const rtl::OUString& SvXMLAttrCollection::GetPrefix( sal_uInt16 i ) const +const OUString& SvXMLAttrCollection::GetPrefix( sal_uInt16 i ) const { return aNamespaceMap.GetPrefixByIndex( i ); } diff --git a/xmloff/source/core/SvXMLAttrCollection.hxx b/xmloff/source/core/SvXMLAttrCollection.hxx index 96fb88a5ace2..852ca4eba9e2 100644 --- a/xmloff/source/core/SvXMLAttrCollection.hxx +++ b/xmloff/source/core/SvXMLAttrCollection.hxx @@ -34,7 +34,7 @@ #include "SvXMLAttr.hxx" #include <xmloff/nmspmap.hxx> //SvXMLNamespaceMap -#include <rtl/ustring.hxx> //rtl::OUString +#include <rtl/ustring.hxx> //OUString #include <sal/types.h> //sal_uInt16 and sal_Bool #include <vector> @@ -45,38 +45,38 @@ public: std::vector<SvXMLAttr> aAttrs; bool operator==(const SvXMLAttrCollection &rCmp) const; - sal_Bool AddAttr( const rtl::OUString& rLName, - const rtl::OUString& rValue ); - sal_Bool AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); - sal_Bool AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); + sal_Bool AddAttr( const OUString& rLName, + const OUString& rValue ); + sal_Bool AddAttr( const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ); + sal_Bool AddAttr( const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ); sal_Bool SetAt( size_t i, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); + const OUString& rLName, + const OUString& rValue ); sal_Bool SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); + const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ); sal_Bool SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); + const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ); void Remove( size_t i ); size_t GetAttrCount() const; - const rtl::OUString& GetAttrLName(size_t i) const; - const rtl::OUString& GetAttrValue(size_t i) const; - const rtl::OUString GetAttrNamespace( size_t i ) const; - const rtl::OUString GetAttrPrefix( size_t i ) const; - const rtl::OUString& GetNamespace( sal_uInt16 i ) const; - const rtl::OUString& GetPrefix( sal_uInt16 i ) const; + const OUString& GetAttrLName(size_t i) const; + const OUString& GetAttrValue(size_t i) const; + const OUString GetAttrNamespace( size_t i ) const; + const OUString GetAttrPrefix( size_t i ) const; + const OUString& GetNamespace( sal_uInt16 i ) const; + const OUString& GetPrefix( sal_uInt16 i ) const; sal_uInt16 GetFirstNamespaceIndex() const; sal_uInt16 GetNextNamespaceIndex( sal_uInt16 nIdx ) const; diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx index b402f985e6c9..45e20ce0087d 100644 --- a/xmloff/source/core/XMLBase64Export.cxx +++ b/xmloff/source/core/XMLBase64Export.cxx @@ -30,8 +30,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #define INPUT_BUFFER_SIZE 54 #define OUTPUT_BUFFER_SIZE 72 diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx index cfca4e01b290..22a6f464b6b9 100644 --- a/xmloff/source/core/XMLBase64ImportContext.cxx +++ b/xmloff/source/core/XMLBase64ImportContext.cxx @@ -25,8 +25,6 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/XMLBase64ImportContext.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -56,7 +54,7 @@ void XMLBase64ImportContext::EndElement() xOut->closeOutput(); } -void XMLBase64ImportContext::Characters( const ::rtl::OUString& rChars ) +void XMLBase64ImportContext::Characters( const OUString& rChars ) { OUString sTrimmedChars( rChars. trim() ); if( !sTrimmedChars.isEmpty() ) diff --git a/xmloff/source/core/XMLBasicExportFilter.cxx b/xmloff/source/core/XMLBasicExportFilter.cxx index cb226621f586..abc408cc4e55 100644 --- a/xmloff/source/core/XMLBasicExportFilter.cxx +++ b/xmloff/source/core/XMLBasicExportFilter.cxx @@ -58,7 +58,7 @@ void XMLBasicExportFilter::endDocument() // ----------------------------------------------------------------------------- -void XMLBasicExportFilter::startElement( const ::rtl::OUString& aName, +void XMLBasicExportFilter::startElement( const OUString& aName, const Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, RuntimeException) { @@ -68,7 +68,7 @@ void XMLBasicExportFilter::startElement( const ::rtl::OUString& aName, // ----------------------------------------------------------------------------- -void XMLBasicExportFilter::endElement( const ::rtl::OUString& aName ) +void XMLBasicExportFilter::endElement( const OUString& aName ) throw (xml::sax::SAXException, RuntimeException) { if ( m_xHandler.is() ) @@ -77,7 +77,7 @@ void XMLBasicExportFilter::endElement( const ::rtl::OUString& aName ) // ----------------------------------------------------------------------------- -void XMLBasicExportFilter::characters( const ::rtl::OUString& aChars ) +void XMLBasicExportFilter::characters( const OUString& aChars ) throw (xml::sax::SAXException, RuntimeException) { if ( m_xHandler.is() ) @@ -86,7 +86,7 @@ void XMLBasicExportFilter::characters( const ::rtl::OUString& aChars ) // ----------------------------------------------------------------------------- -void XMLBasicExportFilter::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) +void XMLBasicExportFilter::ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, RuntimeException) { if ( m_xHandler.is() ) @@ -95,8 +95,8 @@ void XMLBasicExportFilter::ignorableWhitespace( const ::rtl::OUString& aWhitespa // ----------------------------------------------------------------------------- -void XMLBasicExportFilter::processingInstruction( const ::rtl::OUString& aTarget, - const ::rtl::OUString& aData ) +void XMLBasicExportFilter::processingInstruction( const OUString& aTarget, + const OUString& aData ) throw (xml::sax::SAXException, RuntimeException) { if ( m_xHandler.is() ) diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx index f49a9f29ad48..fa8cdffc28dc 100644 --- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx @@ -19,7 +19,6 @@ #include "xmloff/XMLEmbeddedObjectExportFilter.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index fa5a264ebf78..b00df847f95f 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -32,8 +32,6 @@ #include "xmloff/XMLFilterServiceNames.h" #include "XMLEmbeddedObjectImportContext.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; @@ -76,21 +74,21 @@ public: TYPEINFO(); XMLEmbeddedObjectImportContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rHandler ); virtual ~XMLEmbeddedObjectImportContext_Impl(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, 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 ); }; TYPEINIT1( XMLEmbeddedObjectImportContext_Impl, SvXMLImportContext ); @@ -219,7 +217,7 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext( }; for (int k=0; aTmp[k]; k++) { - ::rtl::OUString sTmpString = ::rtl::OUString::createFromAscii(aTmp[k]); + OUString sTmpString = OUString::createFromAscii(aTmp[k]); if( sMime.matchAsciiL( aTmp[k], sTmpString.getLength() ) ) { sClass = sMime.copy( sTmpString.getLength() ); @@ -325,7 +323,7 @@ void XMLEmbeddedObjectImportContext::EndElement() } } -void XMLEmbeddedObjectImportContext::Characters( const ::rtl::OUString& rChars ) +void XMLEmbeddedObjectImportContext::Characters( const OUString& rChars ) { if( xHandler.is() ) xHandler->characters( rChars ); diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx index 6ae6031cfaee..c625ae5792a9 100644 --- a/xmloff/source/core/attrlist.cxx +++ b/xmloff/source/core/attrlist.cxx @@ -26,7 +26,6 @@ #include <xmloff/attrlist.hxx> -using ::rtl::OUString; using namespace ::osl; using namespace ::com::sun::star; @@ -197,7 +196,7 @@ void SvXMLAttributeList::AppendAttributeList( const uno::Reference< ::com::sun:: } void SvXMLAttributeList::SetValueByIndex( sal_Int16 i, - const ::rtl::OUString& rValue ) + const OUString& rValue ) { if( static_cast< SvXMLAttributeList_Impl::size_type >( i ) < m_pImpl->vecAttribute.size() ) diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 689b314885d3..1b7e60196768 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -33,7 +33,6 @@ using namespace com::sun::star; -using ::rtl::OUString; #define SERVICE( className ) \ extern OUString SAL_CALL className##_getImplementationName() throw(); \ diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx index c61a986f4b8b..7f4d69eb5bab 100644 --- a/xmloff/source/core/i18nmap.cxx +++ b/xmloff/source/core/i18nmap.cxx @@ -21,8 +21,8 @@ #include <tools/debug.hxx> #include "xmloff/i18nmap.hxx" -bool SvI18NMap::Add( sal_uInt16 nKind, const rtl::OUString& rName, - const rtl::OUString& rNewName ) +bool SvI18NMap::Add( sal_uInt16 nKind, const OUString& rName, + const OUString& rNewName ) { SvI18NMapEntry_Key aKey(nKind, rName); bool bIsNewInsertion = m_aMap.insert(SvI18NMap_Impl::value_type(aKey, rNewName)).second; @@ -30,7 +30,7 @@ bool SvI18NMap::Add( sal_uInt16 nKind, const rtl::OUString& rName, return bIsNewInsertion; } -const rtl::OUString& SvI18NMap::Get( sal_uInt16 nKind, const rtl::OUString& rName ) const +const OUString& SvI18NMap::Get( sal_uInt16 nKind, const OUString& rName ) const { SvI18NMapEntry_Key aKey(nKind, rName); SvI18NMap_Impl::const_iterator aI = m_aMap.find(aKey); diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index ebf268c26dd7..03e5e13edd08 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -29,8 +29,6 @@ #include "xmloff/xmlnmspe.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; /* The basic idea of this class is that we have two two ways to search our @@ -179,7 +177,7 @@ OUString SvXMLNamespaceMap::GetAttrNameByKey( sal_uInt16 nKey ) const if (aIter != aNameMap.end()) { sAttrName.append( sXMLNS ); - const ::rtl::OUString & prefix( (*aIter).second->sPrefix ); + const OUString & prefix( (*aIter).second->sPrefix ); if (!prefix.isEmpty()) // not default namespace { sAttrName.append( sal_Unicode(':') ); @@ -444,7 +442,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName( const OUString& rAttrName, return _GetKeyByAttrName ( rAttrName, pPrefix, pLocalName, pNamespace ); } -sal_Bool SvXMLNamespaceMap::NormalizeURI( ::rtl::OUString& rName ) +sal_Bool SvXMLNamespaceMap::NormalizeURI( OUString& rName ) { // try OASIS + W3 URI normalization sal_Bool bSuccess = NormalizeOasisURN( rName ); @@ -453,7 +451,7 @@ sal_Bool SvXMLNamespaceMap::NormalizeURI( ::rtl::OUString& rName ) return bSuccess; } -sal_Bool SvXMLNamespaceMap::NormalizeW3URI( ::rtl::OUString& rName ) +sal_Bool SvXMLNamespaceMap::NormalizeW3URI( OUString& rName ) { // check if URI matches: // http://www.w3.org/[0-9]*/[:letter:]* @@ -477,7 +475,7 @@ sal_Bool SvXMLNamespaceMap::NormalizeW3URI( ::rtl::OUString& rName ) return bSuccess; } -sal_Bool SvXMLNamespaceMap::NormalizeOasisURN( ::rtl::OUString& rName ) +sal_Bool SvXMLNamespaceMap::NormalizeOasisURN( OUString& rName ) { // #i38644# // we exported the wrong namespace for smil, so we correct this here on load diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index 8cbebdd55778..cc51124ead99 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -27,8 +27,6 @@ #include "xmloff/unoatrcn.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx index 4b1d1336b8c0..87e54d711e21 100644 --- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx +++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx @@ -23,7 +23,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; -using ::rtl::OUString; namespace comphelper { diff --git a/xmloff/source/core/xmlcnimp.cxx b/xmloff/source/core/xmlcnimp.cxx index 2cb1deb0a8be..ca467fba0a29 100644 --- a/xmloff/source/core/xmlcnimp.cxx +++ b/xmloff/source/core/xmlcnimp.cxx @@ -41,47 +41,47 @@ int SvXMLAttrContainerData::operator ==( const SvXMLAttrContainerData& rCmp ) co return ( *(rCmp.pimpl) == *(pimpl) ); } -sal_Bool SvXMLAttrContainerData::AddAttr( const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rLName, + const OUString& rValue ) { return pimpl->AddAttr(rLName, rValue); } -sal_Bool SvXMLAttrContainerData::AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ) { return pimpl->AddAttr(rPrefix, rNamespace, rLName, rValue); } -sal_Bool SvXMLAttrContainerData::AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ) { return pimpl->AddAttr(rPrefix, rLName, rValue); } sal_Bool SvXMLAttrContainerData::SetAt( size_t i, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rLName, + const OUString& rValue ) { return pimpl->SetAt(i, rLName, rValue); } sal_Bool SvXMLAttrContainerData::SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ) { return pimpl->SetAt(i, rPrefix, rNamespace, rLName, rValue); } sal_Bool SvXMLAttrContainerData::SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ) { return pimpl->SetAt(i, rPrefix, rLName, rValue); } @@ -96,32 +96,32 @@ size_t SvXMLAttrContainerData::GetAttrCount() const return pimpl->GetAttrCount(); } -const rtl::OUString& SvXMLAttrContainerData::GetAttrLName(size_t i) const +const OUString& SvXMLAttrContainerData::GetAttrLName(size_t i) const { return pimpl->GetAttrLName(i); } -const rtl::OUString& SvXMLAttrContainerData::GetAttrValue(size_t i) const +const OUString& SvXMLAttrContainerData::GetAttrValue(size_t i) const { return pimpl->GetAttrValue(i); } -const rtl::OUString SvXMLAttrContainerData::GetAttrNamespace( size_t i ) const +const OUString SvXMLAttrContainerData::GetAttrNamespace( size_t i ) const { return pimpl->GetAttrNamespace(i); } -const rtl::OUString SvXMLAttrContainerData::GetAttrPrefix( size_t i ) const +const OUString SvXMLAttrContainerData::GetAttrPrefix( size_t i ) const { return pimpl->GetAttrPrefix(i); } -const rtl::OUString& SvXMLAttrContainerData::GetNamespace( sal_uInt16 i ) const +const OUString& SvXMLAttrContainerData::GetNamespace( sal_uInt16 i ) const { return pimpl->GetNamespace(i); } -const rtl::OUString& SvXMLAttrContainerData::GetPrefix( sal_uInt16 i ) const +const OUString& SvXMLAttrContainerData::GetPrefix( sal_uInt16 i ) const { return pimpl->GetPrefix(i); } diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx index 76463aa2fa84..c9fd6bd25e23 100644 --- a/xmloff/source/core/xmlerror.cxx +++ b/xmloff/source/core/xmlerror.cxx @@ -31,8 +31,6 @@ -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -181,7 +179,7 @@ void XMLErrors::AddRecord( } // convert to byte string and signal the error - rtl::OString aError(rtl::OUStringToOString(sMessage.makeStringAndClear(), + OString aError(OUStringToOString(sMessage.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)); OSL_FAIL( aError.getStr() ); #endif diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index c82a6809ff3d..82ba7252f4d7 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -88,7 +88,6 @@ #include <comphelper/xmltools.hxx> -using ::rtl::OUString; using namespace ::osl; using namespace ::com::sun::star; @@ -155,7 +154,7 @@ public: } virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, - const ::rtl::OUString& i_rValue ); + const OUString& i_rValue ); virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, enum ::xmloff::token::XMLTokenEnum i_eValue ); @@ -163,16 +162,16 @@ public: const sal_Bool i_bIgnoreWhitespace ); virtual void EndElement( const sal_Bool i_bIgnoreWhitespace ); - virtual void Characters( const ::rtl::OUString& i_rCharacters ); + virtual void Characters( const OUString& i_rCharacters ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > GetComponentContext() const; private: SvXMLExport& m_rExport; - ::std::stack< ::rtl::OUString > m_aElements; + ::std::stack< OUString > m_aElements; }; -void SettingsExportFacade::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const ::rtl::OUString& i_rValue ) +void SettingsExportFacade::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue ) { m_rExport.AddAttribute( XML_NAMESPACE_CONFIG, i_eName, i_rValue ); } @@ -184,19 +183,19 @@ void SettingsExportFacade::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eN void SettingsExportFacade::StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const sal_Bool i_bIgnoreWhitespace ) { - const ::rtl::OUString sElementName( m_rExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_CONFIG, GetXMLToken( i_eName ) ) ); + const OUString sElementName( m_rExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_CONFIG, GetXMLToken( i_eName ) ) ); m_rExport.StartElement( sElementName, i_bIgnoreWhitespace ); m_aElements.push( sElementName ); } void SettingsExportFacade::EndElement( const sal_Bool i_bIgnoreWhitespace ) { - const ::rtl::OUString sElementName( m_aElements.top() ); + const OUString sElementName( m_aElements.top() ); m_rExport.EndElement( sElementName, i_bIgnoreWhitespace ); m_aElements.pop(); } -void SettingsExportFacade::Characters( const ::rtl::OUString& i_rCharacters ) +void SettingsExportFacade::Characters( const OUString& i_rCharacters ) { m_rExport.GetDocHandler()->characters( i_rCharacters ); } @@ -251,8 +250,8 @@ public: ::comphelper::UnoInterfaceToUniqueIdentifierMapper maInterfaceToIdentifierMapper; uno::Reference< uri::XUriReferenceFactory > mxUriReferenceFactory; - rtl::OUString msPackageURI; - rtl::OUString msPackageURIScheme; + OUString msPackageURI; + OUString msPackageURIScheme; // Written OpenDocument file format doesn't fit to the created text document (#i69627#) sal_Bool mbOutlineStyleAsNormalListStyle; sal_Bool mbSaveBackwardCompatibleODF; @@ -262,10 +261,10 @@ public: SvtSaveOptions maSaveOptions; /// relative path of stream in package, e.g. "someobject/content.xml" - ::rtl::OUString mStreamPath; + OUString mStreamPath; /// name of stream in package, e.g., "content.xml" - ::rtl::OUString mStreamName; + OUString mStreamName; /// stack of backed up namespace maps /// long: depth at which namespace map has been backed up into the stack @@ -278,7 +277,7 @@ public: sal_Bool mbExportTextNumberElement; sal_Bool mbNullDateInitialized; - void SetSchemeOf( const ::rtl::OUString& rOrigFileName ) + void SetSchemeOf( const OUString& rOrigFileName ) { sal_Int32 nSep = rOrigFileName.indexOf(':'); if( nSep != -1 ) @@ -775,7 +774,7 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen mpImpl->mStreamName = sName; // Note: may be empty (XSLT) // Written OpenDocument file format doesn't fit to the created text document (#i69627#) - const ::rtl::OUString sOutlineStyleAsNormalListStyle( + const OUString sOutlineStyleAsNormalListStyle( "OutlineStyleAsNormalListStyle" ); if( xPropertySetInfo->hasPropertyByName( sOutlineStyleAsNormalListStyle ) ) { @@ -787,7 +786,7 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen if( xPropertySetInfo->hasPropertyByName( sTargetStorage ) ) mxExportInfo->getPropertyValue( sTargetStorage ) >>= mpImpl->mxTargetStorage; - const ::rtl::OUString sExportTextNumberElement( + const OUString sExportTextNumberElement( "ExportTextNumberElement" ); if( xPropertySetInfo->hasPropertyByName( sExportTextNumberElement ) ) { @@ -841,12 +840,12 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue if (GetModel().is()) { // print a trace message with the URL - rtl::OString aUrl(rtl::OUStringToOString(GetModel()->getURL(), + OString aUrl(OUStringToOString(GetModel()->getURL(), RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_CONTEXT_TRACE1( aLogContext, "%s", aUrl.getStr() ); // we also want a trace message with the document class - rtl::OString aClass(rtl::OUStringToOString(GetXMLToken(meClass), + OString aClass(OUStringToOString(GetXMLToken(meClass), RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_CONTEXT_TRACE1( aLogContext, "class=\"%s\"", aClass.getStr() ); @@ -875,13 +874,13 @@ void SAL_CALL SvXMLExport::cancel() throw(uno::RuntimeException) SetError(XMLERROR_CANCEL|XMLERROR_FLAG_SEVERE, aEmptySeq); } -::rtl::OUString SAL_CALL SvXMLExport::getName( ) +OUString SAL_CALL SvXMLExport::getName( ) throw (::com::sun::star::uno::RuntimeException) { return msFilterName; } -void SAL_CALL SvXMLExport::setName( const ::rtl::OUString& ) +void SAL_CALL SvXMLExport::setName( const OUString& ) throw (::com::sun::star::uno::RuntimeException) { // do nothing, because it is not possible to set the FilterName @@ -913,11 +912,11 @@ uno::Sequence< OUString > SAL_CALL SvXMLExport::getSupportedServiceNames( ) /////////////////////////////////////////////////////////////////////// -::rtl::OUString -SvXMLExport::EnsureNamespace(::rtl::OUString const & i_rNamespace, - ::rtl::OUString const & i_rPreferredPrefix) +OUString +SvXMLExport::EnsureNamespace(OUString const & i_rNamespace, + OUString const & i_rPreferredPrefix) { - ::rtl::OUString sPrefix; + OUString sPrefix; sal_uInt16 nKey( _GetNamespaceMap().GetKeyByName( i_rNamespace ) ); if( XML_NAMESPACE_UNKNOWN == nKey ) { @@ -926,7 +925,7 @@ SvXMLExport::EnsureNamespace(::rtl::OUString const & i_rNamespace, sPrefix = i_rPreferredPrefix; nKey = _GetNamespaceMap().GetKeyByPrefix( sPrefix ); sal_Int32 n( 0 ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; while( nKey != USHRT_MAX ) { buf.append( i_rPreferredPrefix ); @@ -1006,15 +1005,15 @@ void SvXMLExport::AddAttribute( sal_uInt16 nPrefixKey, GetXMLToken(eValue) ); } -void SvXMLExport::AddAttribute( const ::rtl::OUString& rQName, - const ::rtl::OUString& rValue ) +void SvXMLExport::AddAttribute( const OUString& rQName, + const OUString& rValue ) { mpAttrList->AddAttribute( rQName, rValue ); } -void SvXMLExport::AddAttribute( const ::rtl::OUString& rQName, +void SvXMLExport::AddAttribute( const OUString& rQName, enum ::xmloff::token::XMLTokenEnum eValue ) { mpAttrList->AddAttribute( @@ -1222,7 +1221,7 @@ void SvXMLExport::addChaffWhenEncryptedStorage() if (xEncr.is() && xEncr->hasEncryptionData() && mxExtHandler.is()) { - mxExtHandler->comment(rtl::OStringToOUString(comphelper::xml::makeXMLChaff(), RTL_TEXTENCODING_ASCII_US)); + mxExtHandler->comment(OStringToOUString(comphelper::xml::makeXMLChaff(), RTL_TEXTENCODING_ASCII_US)); } } @@ -1266,7 +1265,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) ::comphelper::PropertyMapEntry aInfoMap[] = { { "Class", sizeof("Class")-1, 0, - &::getCppuType((::rtl::OUString*)0), + &::getCppuType((OUString*)0), PropertyAttribute::MAYBEVOID, 0}, { NULL, 0, 0, NULL, 0, 0 } }; @@ -1481,8 +1480,8 @@ void SvXMLExport::_ExportScripts() // export Basic macros (only for FlatXML) if ( mnExportFlags & EXPORT_EMBEDDED ) { - ::rtl::OUString aValue( GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_OOO ) ); - aValue += ::rtl::OUString( ":Basic" ); + OUString aValue( GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_OOO ) ); + aValue += OUString( ":Basic" ); AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, aValue ); SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_SCRIPT, sal_True, sal_True ); @@ -1492,7 +1491,7 @@ void SvXMLExport::_ExportScripts() { Reference< beans::XPropertySet > xPSet( mxModel, UNO_QUERY ); if ( xPSet.is() ) - xPSet->getPropertyValue( ::rtl::OUString( "BasicLibraries" ) ); + xPSet->getPropertyValue( OUString( "BasicLibraries" ) ); } Reference < XDocumentHandler > xHdl( new XMLBasicExportFilter( mxHandler ) ); @@ -2201,7 +2200,7 @@ void SvXMLExport::StartElement(const OUString& rName, ++mpImpl->mDepth; // increment nesting depth counter } -void SvXMLExport::Characters(const ::rtl::OUString& rChars) +void SvXMLExport::Characters(const OUString& rChars) { if ((mnErrorFlags & ERROR_DO_NOTHING) != ERROR_DO_NOTHING) { @@ -2361,14 +2360,14 @@ SvtSaveOptions::ODFDefaultVersion SvXMLExport::getDefaultVersion() const return SvtSaveOptions::ODFVER_012; } -::rtl::OUString SvXMLExport::GetStreamName() const +OUString SvXMLExport::GetStreamName() const { return mpImpl->mStreamName; } void SvXMLExport::AddAttributeIdLegacy( - sal_uInt16 const nLegacyPrefix, ::rtl::OUString const& rValue) + sal_uInt16 const nLegacyPrefix, OUString const& rValue) { switch (getDefaultVersion()) { case SvtSaveOptions::ODFVER_011: // fall thru @@ -2399,7 +2398,7 @@ SvXMLExport::AddAttributeXmlId(uno::Reference<uno::XInterface> const & i_xIfc) const beans::StringPair mdref( xMeta->getMetadataReference() ); if ( !mdref.Second.isEmpty() ) { - const ::rtl::OUString streamName( GetStreamName() ); + const OUString streamName( GetStreamName() ); if ( !streamName.isEmpty() ) { if ( streamName.equals(mdref.First) ) diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx index fd1e3b8e8867..f748d04fbbca 100644 --- a/xmloff/source/core/xmlictxt.cxx +++ b/xmloff/source/core/xmlictxt.cxx @@ -28,8 +28,6 @@ #include <xmloff/xmlictxt.hxx> #include <tools/debug.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 07c1f4c8298b..b9de04c615c7 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -62,8 +62,6 @@ using ::com::sun::star::beans::XPropertySetInfo; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::osl; using namespace ::com::sun::star; @@ -269,9 +267,9 @@ public: INetURLObject aDocBase; /// name of stream in package, e.g., "content.xml" - ::rtl::OUString mStreamName; + OUString mStreamName; - ::rtl::OUString aODFVersion; + OUString aODFVersion; // Boolean, indicating that position attributes // of shapes are given in horizontal left-to-right layout. This is the case @@ -689,7 +687,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName, #ifdef TIMELOG // If we do profiling, we want a trace message for the first element // in order to identify the stream. - rtl::OString aString(rtl::OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); + OString aString(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_TRACE_AUTHOR1( "xmloff", "unknown", "SvXMLImport::StartElement( \"%s\", ... )", aString.getStr() ); @@ -1160,7 +1158,7 @@ const Reference< container::XNameContainer > & SvXMLImport::GetDashHelper() return mxDashHelper; } -sal_Bool SvXMLImport::IsPackageURL( const ::rtl::OUString& rURL ) const +sal_Bool SvXMLImport::IsPackageURL( const OUString& rURL ) const { // if, and only if, only parts are imported, then we're in a package @@ -1206,16 +1204,16 @@ sal_Bool SvXMLImport::IsPackageURL( const ::rtl::OUString& rURL ) const return sal_True; } -::rtl::OUString SvXMLImport::ResolveGraphicObjectURL( const ::rtl::OUString& rURL, +OUString SvXMLImport::ResolveGraphicObjectURL( const OUString& rURL, sal_Bool bLoadOnDemand ) { - ::rtl::OUString sRet; + OUString sRet; if( IsPackageURL( rURL ) ) { if( !bLoadOnDemand && mxGraphicResolver.is() ) { - ::rtl::OUString aTmp( msPackageProtocol ); + OUString aTmp( msPackageProtocol ); aTmp += rURL; sRet = mxGraphicResolver->resolveGraphicObjectURL( aTmp ); } @@ -1244,7 +1242,7 @@ Reference< XOutputStream > SvXMLImport::GetStreamForGraphicObjectURLFromBase64() return xOStm; } -::rtl::OUString SvXMLImport::ResolveGraphicObjectURLFromBase64( +OUString SvXMLImport::ResolveGraphicObjectURLFromBase64( const Reference < XOutputStream >& rOut ) { OUString sURL; @@ -1255,11 +1253,11 @@ Reference< XOutputStream > SvXMLImport::GetStreamForGraphicObjectURLFromBase64() return sURL; } -::rtl::OUString SvXMLImport::ResolveEmbeddedObjectURL( - const ::rtl::OUString& rURL, - const ::rtl::OUString& rClassId ) +OUString SvXMLImport::ResolveEmbeddedObjectURL( + const OUString& rURL, + const OUString& rClassId ) { - ::rtl::OUString sRet; + OUString sRet; if( IsPackageURL( rURL ) ) { @@ -1304,9 +1302,9 @@ Reference < XOutputStream > return xOLEStream; } -::rtl::OUString SvXMLImport::ResolveEmbeddedObjectURLFromBase64() +OUString SvXMLImport::ResolveEmbeddedObjectURLFromBase64() { - ::rtl::OUString sRet; + OUString sRet; if( mxEmbeddedResolver.is() ) { @@ -1373,7 +1371,7 @@ void SvXMLImport::SetConfigurationSettings(const com::sun::star::uno::Sequence<c { } -void SvXMLImport::SetDocumentSpecificSettings(const ::rtl::OUString& _rSettingsGroupName, const uno::Sequence<beans::PropertyValue>& _rSettings) +void SvXMLImport::SetDocumentSpecificSettings(const OUString& _rSettingsGroupName, const uno::Sequence<beans::PropertyValue>& _rSettings) { (void)_rSettingsGroupName; (void)_rSettings; @@ -1489,7 +1487,7 @@ void SvXMLImport::SetAutoStyles( SvXMLStylesContext *pAutoStyles ) if (pAutoStyles && mxNumberStyles.is() && (mnImportFlags & IMPORT_CONTENT) ) { uno::Reference<xml::sax::XAttributeList> xAttrList; - uno::Sequence< ::rtl::OUString > aNames = mxNumberStyles->getElementNames(); + uno::Sequence< OUString > aNames = mxNumberStyles->getElementNames(); sal_uInt32 nCount(aNames.getLength()); if (nCount) { @@ -1566,7 +1564,7 @@ OUString SvXMLImport::GetAbsoluteReference(const OUString& rValue) const return rValue; } -sal_Bool SvXMLImport::IsODFVersionConsistent( const ::rtl::OUString& aODFVersion ) +sal_Bool SvXMLImport::IsODFVersionConsistent( const OUString& aODFVersion ) { // the check returns sal_False only if the storage version could be retrieved sal_Bool bResult = sal_True; @@ -1582,7 +1580,7 @@ sal_Bool SvXMLImport::IsODFVersionConsistent( const ::rtl::OUString& aODFVersion uno::Reference< beans::XPropertySet > xStorProps( xStor, uno::UNO_QUERY_THROW ); // the check should be done only for OASIS format - ::rtl::OUString aMediaType; + OUString aMediaType; xStorProps->getPropertyValue( "MediaType" ) >>= aMediaType; if ( ::comphelper::OStorageHelper::GetXStorageFormat( xStor ) >= SOFFICE_FILEFORMAT_8 ) { @@ -1597,7 +1595,7 @@ sal_Bool SvXMLImport::IsODFVersionConsistent( const ::rtl::OUString& aODFVersion // check only if not in Repair mode if ( !bRepairPackage ) { - ::rtl::OUString aStorVersion; + OUString aStorVersion; xStorProps->getPropertyValue( "Version" ) >>= aStorVersion; @@ -1773,17 +1771,17 @@ SvXMLImport::GetComponentContext() const return mpImpl->mxComponentContext; } -::rtl::OUString SvXMLImport::GetBaseURL() const +OUString SvXMLImport::GetBaseURL() const { return mpImpl->aBaseURL.GetMainURL( INetURLObject::NO_DECODE ); } -::rtl::OUString SvXMLImport::GetDocumentBase() const +OUString SvXMLImport::GetDocumentBase() const { return mpImpl->aDocBase.GetMainURL( INetURLObject::NO_DECODE ); } -::rtl::OUString SvXMLImport::GetStreamName() const +OUString SvXMLImport::GetStreamName() const { return mpImpl->mStreamName; } @@ -1847,14 +1845,14 @@ bool SvXMLImport::isGraphicLoadOnDemandSupported() const return mbIsGraphicLoadOnDemandSupported; } -::rtl::OUString SvXMLImport::GetODFVersion() const +OUString SvXMLImport::GetODFVersion() const { return mpImpl->aODFVersion; } // xml:id for RDF metadata void SvXMLImport::SetXmlId(uno::Reference<uno::XInterface> const & i_xIfc, - ::rtl::OUString const & i_rXmlId) + OUString const & i_rXmlId) { if (!i_rXmlId.isEmpty()) { try { @@ -1888,10 +1886,10 @@ SvXMLImport::GetRDFaImportHelper() void SvXMLImport::AddRDFa(uno::Reference<rdf::XMetadatable> i_xObject, - ::rtl::OUString const & i_rAbout, - ::rtl::OUString const & i_rProperty, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype) + OUString const & i_rAbout, + OUString const & i_rProperty, + OUString const & i_rContent, + OUString const & i_rDatatype) { // N.B.: we only get called if i_xObject had xhtml:about attribute // (an empty attribute value is valid) diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx b/xmloff/source/core/xmlmultiimagehelper.cxx index e060de15c2d3..b1ad7bb1ae19 100644 --- a/xmloff/source/core/xmlmultiimagehelper.cxx +++ b/xmloff/source/core/xmlmultiimagehelper.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; namespace { - sal_uInt32 getQualityIndex(const rtl::OUString& rString) + sal_uInt32 getQualityIndex(const OUString& rString) { sal_uInt32 nRetval(0); @@ -100,7 +100,7 @@ void multiImageImportHelper::solveMultipleImages() for(a = 0; a < maImplContextVector.size(); a++) { - const rtl::OUString aStreamURL(getGraphicURLFromImportContext(**maImplContextVector[a])); + const OUString aStreamURL(getGraphicURLFromImportContext(**maImplContextVector[a])); const sal_uInt32 nNewQuality(getQualityIndex(aStreamURL)); if(nNewQuality > nBestQuality) diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx index d88c287ab4ba..1087017ca1ae 100644 --- a/xmloff/source/core/xmltkmap.cxx +++ b/xmloff/source/core/xmltkmap.cxx @@ -24,7 +24,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; class SvXMLTokenMapEntry_Impl { diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index b195b94c41ad..da73b1606aef 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -22,7 +22,6 @@ #include <tools/debug.hxx> #include <rtl/ustring.hxx> -using ::rtl::OUString; namespace xmloff { namespace token { @@ -33,7 +32,7 @@ namespace xmloff { namespace token { { sal_Int32 nLength; const sal_Char* pChar; - ::rtl::OUString* pOUString; + OUString* pOUString; #if OSL_DEBUG_LEVEL > 0 XMLTokenEnum eToken; #endif diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 604c0cd6d90b..056a5c8306e4 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -53,8 +53,6 @@ using namespace com::sun::star::style; using namespace ::com::sun::star::i18n; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; const sal_Int8 XML_MAXDIGITSCOUNT_TIME = 11; const sal_Int8 XML_MAXDIGITSCOUNT_DATETIME = 6; @@ -274,7 +272,7 @@ void SvXMLUnitConverter::convertDouble(OUStringBuffer& rBuffer, /** convert string to double number (using ::rtl::math) */ sal_Bool SvXMLUnitConverter::convertDouble(double& rValue, - const ::rtl::OUString& rString, sal_Bool bLookForUnits) const + const OUString& rString, sal_Bool bLookForUnits) const { if(bLookForUnits) { @@ -297,13 +295,13 @@ sal_Bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference <c if (xNumberFormatsSupplier.is()) { const com::sun::star::uno::Reference <com::sun::star::beans::XPropertySet> xPropertySet = xNumberFormatsSupplier->getNumberFormatSettings(); - return xPropertySet.is() && (xPropertySet->getPropertyValue(rtl::OUString(XML_NULLDATE)) >>= m_pImpl->m_aNullDate); + return xPropertySet.is() && (xPropertySet->getPropertyValue(OUString(XML_NULLDATE)) >>= m_pImpl->m_aNullDate); } return sal_False; } /** convert double to ISO Date Time String */ -void SvXMLUnitConverter::convertDateTime(::rtl::OUStringBuffer& rBuffer, +void SvXMLUnitConverter::convertDateTime(OUStringBuffer& rBuffer, const double& fDateTime, bool const bAddTimeIf0AM) { convertDateTime(rBuffer, fDateTime, m_pImpl->m_aNullDate, bAddTimeIf0AM); @@ -311,7 +309,7 @@ void SvXMLUnitConverter::convertDateTime(::rtl::OUStringBuffer& rBuffer, /** convert ISO Date Time String to double */ bool SvXMLUnitConverter::convertDateTime(double& fDateTime, - const ::rtl::OUString& rString) + const OUString& rString) { return convertDateTime(fDateTime, rString, m_pImpl->m_aNullDate); } diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx index ba70abd924c5..6f9c520e0211 100644 --- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx +++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx @@ -180,7 +180,7 @@ static const TokenTable pTokenTableArray[] = { "NotFound", EAS_NotFound } }; -EnhancedCustomShapeTokenEnum EASGet( const rtl::OUString& rShapeType ) +EnhancedCustomShapeTokenEnum EASGet( const OUString& rShapeType ) { if ( !pHashMap ) { // init hash map @@ -208,12 +208,12 @@ EnhancedCustomShapeTokenEnum EASGet( const rtl::OUString& rShapeType ) return eRetValue; } -rtl::OUString EASGet( const EnhancedCustomShapeTokenEnum eToken ) +OUString EASGet( const EnhancedCustomShapeTokenEnum eToken ) { sal_uInt32 i = eToken >= EAS_Last ? (sal_uInt32)EAS_NotFound : (sal_uInt32)eToken; - return rtl::OUString::createFromAscii( pTokenTableArray[ i ].pS ); + return OUString::createFromAscii( pTokenTableArray[ i ].pS ); } } diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index f66dcd655e31..761b07005b47 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -27,8 +27,6 @@ #include "XMLShapePropertySetContext.hxx" #include <xmloff/XMLGraphicsDefaultStyle.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 5f63f6e9a534..efa3b48c18ab 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -45,8 +45,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::XPropertySetInfo; using ::com::sun::star::container::XIndexContainer; @@ -102,26 +100,26 @@ class XMLImageMapObjectContext : public SvXMLImportContext protected: - const ::rtl::OUString sBoundary; - const ::rtl::OUString sCenter; - const ::rtl::OUString sTitle; - const ::rtl::OUString sDescription; - const ::rtl::OUString sImageMap; - const ::rtl::OUString sIsActive; - const ::rtl::OUString sName; - const ::rtl::OUString sPolygon; - const ::rtl::OUString sRadius; - const ::rtl::OUString sTarget; - const ::rtl::OUString sURL; + const OUString sBoundary; + const OUString sCenter; + const OUString sTitle; + const OUString sDescription; + const OUString sImageMap; + const OUString sIsActive; + const OUString sName; + const OUString sPolygon; + const OUString sRadius; + const OUString sTarget; + const OUString sURL; Reference<XIndexContainer> xImageMap; /// the image map Reference<XPropertySet> xMapEntry; /// one map-entry (one area) - ::rtl::OUString sUrl; - ::rtl::OUString sTargt; - ::rtl::OUStringBuffer sDescriptionBuffer; - ::rtl::OUStringBuffer sTitleBuffer; - ::rtl::OUString sNam; + OUString sUrl; + OUString sTargt; + OUStringBuffer sDescriptionBuffer; + OUStringBuffer sTitleBuffer; + OUString sNam; sal_Bool bIsActive; sal_Bool bValid; @@ -132,7 +130,7 @@ public: XMLImageMapObjectContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> xMap, const sal_Char* pServiceName); @@ -145,7 +143,7 @@ public: SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); @@ -153,7 +151,7 @@ protected: virtual void ProcessAttribute( enum XMLImageMapToken eToken, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void Prepare( ::com::sun::star::uno::Reference< @@ -326,7 +324,7 @@ public: XMLImageMapRectangleContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> xMap); @@ -335,7 +333,7 @@ public: protected: virtual void ProcessAttribute( enum XMLImageMapToken eToken, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void Prepare( ::com::sun::star::uno::Reference< @@ -424,8 +422,8 @@ void XMLImageMapRectangleContext::Prepare( class XMLImageMapPolygonContext : public XMLImageMapObjectContext { - ::rtl::OUString sViewBoxString; - ::rtl::OUString sPointsString; + OUString sViewBoxString; + OUString sPointsString; sal_Bool bViewBoxOK; sal_Bool bPointsOK; @@ -436,7 +434,7 @@ public: XMLImageMapPolygonContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> xMap); @@ -445,7 +443,7 @@ public: protected: virtual void ProcessAttribute( enum XMLImageMapToken eToken, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void Prepare( ::com::sun::star::uno::Reference< @@ -537,7 +535,7 @@ public: XMLImageMapCircleContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> xMap); @@ -546,7 +544,7 @@ public: protected: virtual void ProcessAttribute( enum XMLImageMapToken eToken, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void Prepare( ::com::sun::star::uno::Reference< diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx index 80efd4a1c955..c6e40115597a 100644 --- a/xmloff/source/draw/XMLImageMapExport.cxx +++ b/xmloff/source/draw/XMLImageMapExport.cxx @@ -44,8 +44,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Sequence; diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index b748383a158f..26dd94a1063d 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -31,7 +31,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; struct SdXMLDataStyleNumber { @@ -500,26 +499,26 @@ public: SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ); virtual ~SdXMLNumberFormatMemberImportContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, 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 ); }; TYPEINIT1( SdXMLNumberFormatMemberImportContext, SvXMLImportContext ); -SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ) +SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ) : SvXMLImportContext(rImport, nPrfx, rLocalName), mpParent( pParent ), maNumberStyle( rLocalName ), @@ -561,7 +560,7 @@ SdXMLNumberFormatMemberImportContext::~SdXMLNumberFormatMemberImportContext() } SvXMLImportContext *SdXMLNumberFormatMemberImportContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) { return mpSlaveContext->CreateChildContext( nPrefix, rLocalName, xAttrList ); @@ -580,7 +579,7 @@ void SdXMLNumberFormatMemberImportContext::EndElement() mpParent->add( maNumberStyle, mbLong, mbTextual, mbDecimal02, maText ); } -void SdXMLNumberFormatMemberImportContext::Characters( const ::rtl::OUString& rChars ) +void SdXMLNumberFormatMemberImportContext::Characters( const OUString& rChars ) { mpSlaveContext->Characters( rChars ); maText += rChars; @@ -589,7 +588,7 @@ void SdXMLNumberFormatMemberImportContext::Characters( const ::rtl::OUString& rC TYPEINIT1( SdXMLNumberFormatImportContext, SvXMLImportContext ); -SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles) +SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles) : SvXMLNumFormatContext(rImport, nPrfx, rLocalName, pNewData, nNewType, xAttrList, rStyles), mbAutomatic( sal_False ), mnIndex(0), @@ -723,7 +722,7 @@ void SdXMLNumberFormatImportContext::EndElement() } } -SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { return new SdXMLNumberFormatMemberImportContext( GetImport(), nPrefix, rLocalName, xAttrList, this, SvXMLNumFormatContext::CreateChildContext( nPrefix, rLocalName, xAttrList ) ); } diff --git a/xmloff/source/draw/XMLNumberStylesExport.hxx b/xmloff/source/draw/XMLNumberStylesExport.hxx index f91d0d3c7b5a..e087873b14e4 100644 --- a/xmloff/source/draw/XMLNumberStylesExport.hxx +++ b/xmloff/source/draw/XMLNumberStylesExport.hxx @@ -37,8 +37,8 @@ public: static sal_Int32 getDateStyleCount() { return SdXMLDateFormatCount; } static sal_Int32 getTimeStyleCount() { return SdXMLTimeFormatCount; } - static rtl::OUString getTimeStyleName(const sal_Int32 nTimeFormat ); - static rtl::OUString getDateStyleName(const sal_Int32 nDateFormat ); + static OUString getTimeStyleName(const sal_Int32 nTimeFormat ); + static OUString getDateStyleName(const sal_Int32 nDateFormat ); }; #endif // _XMLOFF_NUMBERSTYLESEXPORT_HXX diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx index a03e74c950d2..a8c1b340555c 100644 --- a/xmloff/source/draw/XMLReplacementImageContext.cxx +++ b/xmloff/source/draw/XMLReplacementImageContext.cxx @@ -26,7 +26,6 @@ #include <xmloff/XMLBase64ImportContext.hxx> #include "XMLReplacementImageContext.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::makeAny; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx index ae013324ab1b..22aacdf9cfdf 100644 --- a/xmloff/source/draw/XMLShapePropertySetContext.cxx +++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx @@ -26,8 +26,6 @@ #include "sdpropls.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index ca735da1a56d..d144656e7a34 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -34,8 +34,6 @@ #include "sdpropls.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -65,7 +63,7 @@ XMLShapeStyleContext::~XMLShapeStyleContext() { } -void XMLShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void XMLShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, const OUString& rValue ) { if (m_sControlDataStyleName.isEmpty() && (::xmloff::token::GetXMLToken(::xmloff::token::XML_DATA_STYLE_NAME) == rLocalName)) { diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index 8d6efb698e28..f3ba9647105e 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -67,8 +67,6 @@ #include "animations.hxx" #include <xmloff/animationexport.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; @@ -1053,7 +1051,7 @@ void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >& if( 0 == ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE ) ) { // issue 146582 - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; ::sax::Converter::convertDuration(buf, fTemp / (24*60*60)); mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_ITERATE_INTERVAL, buf.makeStringAndClear()); diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 0f237bbc6a79..67e4f44a1cc6 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -67,8 +67,6 @@ #include "animations.hxx" #include "animationimport.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; @@ -630,7 +628,7 @@ TYPEINIT1( AnimationNodeContext, SvXMLImportContext ); AnimationNodeContext::AnimationNodeContext( const Reference< XAnimationNode >& xParentNode, - SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, + SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, AnimationsImportHelperImpl* pHelper /* = NULL */ ) : SvXMLImportContext(rImport, nPrfx, rLocalName), @@ -1245,7 +1243,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< : } } -SvXMLImportContext * AnimationNodeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext * AnimationNodeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { if( mxNode.is()) diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index e14541f2481e..90cc84697499 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -36,8 +36,6 @@ #include <xmloff/shapeexport.hxx> #include "anim.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 53269439fae3..f6964886d45e 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -37,8 +37,6 @@ #include "anim.hxx" #include "animimp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; @@ -662,7 +660,7 @@ void XMLAnimationsEffectContext::EndElement() TYPEINIT1( XMLAnimationsContext, SvXMLImportContext ); -XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, +XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& ) : SvXMLImportContext(rImport, nPrfx, rLocalName) { @@ -674,7 +672,7 @@ XMLAnimationsContext::~XMLAnimationsContext() delete mpImpl; } -SvXMLImportContext * XMLAnimationsContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext * XMLAnimationsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { return new XMLAnimationsEffectContext( GetImport(), nPrefix, rLocalName, xAttrList, mpImpl ); diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx index 63081f3c1be0..3d1417af3ca7 100644 --- a/xmloff/source/draw/descriptionimp.cxx +++ b/xmloff/source/draw/descriptionimp.cxx @@ -27,8 +27,6 @@ #include "descriptionimp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; @@ -75,7 +73,7 @@ void SdXMLDescriptionContext::EndElement() // This method is called for all characters that are contained in the // current element. The default is to ignore them. -void SdXMLDescriptionContext::Characters( const ::rtl::OUString& rChars ) +void SdXMLDescriptionContext::Characters( const OUString& rChars ) { msText += rChars; } diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx index cab44cf6eaf3..5b77fa96b9c0 100644 --- a/xmloff/source/draw/descriptionimp.hxx +++ b/xmloff/source/draw/descriptionimp.hxx @@ -30,13 +30,13 @@ class SdXMLDescriptionContext : public SvXMLImportContext { private: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; - ::rtl::OUString msText; + OUString msText; public: TYPEINFO(); SdXMLDescriptionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rxShape ); virtual ~SdXMLDescriptionContext(); @@ -45,7 +45,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_EVENTIMP_HXX diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index fb711d8a1fef..ba288e63b02b 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -38,8 +38,6 @@ #include "eventimp.hxx" #include "anim.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; @@ -265,7 +263,7 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, cons } else { - const rtl::OUString &rTmp = + const OUString &rTmp = rImp.GetAbsoluteReference(sValue); INetURLObject::translateToInternal( rTmp, msBookmark, INetURLObject::DECODE_UNAMBIGUOUS, @@ -509,7 +507,7 @@ SdXMLEventsContext::~SdXMLEventsContext() { } -SvXMLImportContext * SdXMLEventsContext::CreateChildContext( sal_uInt16 nPrfx, const ::rtl::OUString& rLocalName, +SvXMLImportContext * SdXMLEventsContext::CreateChildContext( sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { return new SdXMLEventContext( GetImport(), nPrfx, rLocalName, xAttrList, mxShape ); diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx index 6663767cfc3d..8704d9978fcf 100644 --- a/xmloff/source/draw/eventimp.hxx +++ b/xmloff/source/draw/eventimp.hxx @@ -36,12 +36,12 @@ public: SdXMLEventsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rxShape ); virtual ~SdXMLEventsContext(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx index e7b0de74e955..2069915cb39e 100644 --- a/xmloff/source/draw/layerexp.cxx +++ b/xmloff/source/draw/layerexp.cxx @@ -28,8 +28,6 @@ #include <xmloff/nmspmap.hxx> #include "layerexp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Reference; using namespace ::cppu; diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index 8404552cb551..dd5731775231 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -31,8 +31,6 @@ #include <xmloff/nmspmap.hxx> #include "layerimp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #include "XMLStringBufferImportContext.hxx" @@ -55,14 +53,14 @@ public: SdXMLLayerContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XNameAccess >& xLayerManager ); virtual ~SdXMLLayerContext(); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const Reference< XAttributeList >& xAttrList ); + virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ); virtual void EndElement(); private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxLayerManager; - ::rtl::OUString msName; - ::rtl::OUStringBuffer sDescriptionBuffer; - ::rtl::OUStringBuffer sTitleBuffer; + OUString msName; + OUStringBuffer sDescriptionBuffer; + OUStringBuffer sTitleBuffer; }; SdXMLLayerContext::SdXMLLayerContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XNameAccess >& xLayerManager ) @@ -91,7 +89,7 @@ SdXMLLayerContext::~SdXMLLayerContext() { } -SvXMLImportContext * SdXMLLayerContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const Reference< XAttributeList >& ) +SvXMLImportContext * SdXMLLayerContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& ) { if( (XML_NAMESPACE_SVG == nPrefix) && IsXMLToken(rLocalName, XML_TITLE) ) { @@ -145,7 +143,7 @@ void SdXMLLayerContext::EndElement() TYPEINIT1( SdXMLLayerSetContext, SvXMLImportContext ); -SdXMLLayerSetContext::SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, +SdXMLLayerSetContext::SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>&) : SvXMLImportContext(rImport, nPrfx, rLocalName) { @@ -159,7 +157,7 @@ SdXMLLayerSetContext::~SdXMLLayerSetContext() { } -SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { return new SdXMLLayerContext( GetImport(), nPrefix, rLocalName, xAttrList, mxLayerManager ); diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx index 09464a995deb..c6754e179c04 100644 --- a/xmloff/source/draw/layerimp.hxx +++ b/xmloff/source/draw/layerimp.hxx @@ -36,11 +36,11 @@ public: SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~SdXMLLayerSetContext(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/draw/numithdl.cxx b/xmloff/source/draw/numithdl.cxx index c381e69be389..96043fa6be7e 100644 --- a/xmloff/source/draw/numithdl.cxx +++ b/xmloff/source/draw/numithdl.cxx @@ -41,12 +41,12 @@ bool XMLNumRulePropHdl::equals( const uno::Any& r1, const uno::Any& r2 ) const return mxNumRuleCompare.is() && mxNumRuleCompare->compare( r1, r2 ) == 0; } -sal_Bool XMLNumRulePropHdl::importXML( const ::rtl::OUString& /*rStrImpValue*/, ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const +sal_Bool XMLNumRulePropHdl::importXML( const OUString& /*rStrImpValue*/, ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { return sal_False; } -sal_Bool XMLNumRulePropHdl::exportXML( ::rtl::OUString& /*rStrExpValue*/, const ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const +sal_Bool XMLNumRulePropHdl::exportXML( OUString& /*rStrExpValue*/, const ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { return sal_False; } diff --git a/xmloff/source/draw/numithdl.hxx b/xmloff/source/draw/numithdl.hxx index a9f40177452d..2acaa39bad78 100644 --- a/xmloff/source/draw/numithdl.hxx +++ b/xmloff/source/draw/numithdl.hxx @@ -37,8 +37,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; /// NumRules will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_NUMRULE_HXX diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx index 3d6dc4a59d83..51394da2e074 100644 --- a/xmloff/source/draw/propimp0.cxx +++ b/xmloff/source/draw/propimp0.cxx @@ -28,8 +28,6 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/xmlimp.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; @@ -247,13 +245,13 @@ XMLDateTimeFormatHdl::~XMLDateTimeFormatHdl() { } -sal_Bool XMLDateTimeFormatHdl::importXML( const rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const +sal_Bool XMLDateTimeFormatHdl::importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const { rValue <<= rStrImpValue; return true; } -sal_Bool XMLDateTimeFormatHdl::exportXML( rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const +sal_Bool XMLDateTimeFormatHdl::exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_Int32 nNumberFormat = 0; if( mpExport && (rValue >>= nNumberFormat) ) diff --git a/xmloff/source/draw/propimp0.hxx b/xmloff/source/draw/propimp0.hxx index 4ba946d66e83..0324a7e41a69 100644 --- a/xmloff/source/draw/propimp0.hxx +++ b/xmloff/source/draw/propimp0.hxx @@ -29,8 +29,8 @@ class XMLDurationPropertyHdl : public XMLPropertyHandler { public: virtual ~XMLDurationPropertyHdl(); - virtual sal_Bool importXML( const rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class SvXMLImport; @@ -41,16 +41,16 @@ private: public: XMLOpacityPropertyHdl( SvXMLImport* pImport ); virtual ~XMLOpacityPropertyHdl(); - virtual sal_Bool importXML( const rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLTextAnimationStepPropertyHdl : public XMLPropertyHandler { public: virtual ~XMLTextAnimationStepPropertyHdl(); - virtual sal_Bool importXML( const rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class SvXMLExport; @@ -62,8 +62,8 @@ private: public: XMLDateTimeFormatHdl( SvXMLExport* pExport ); virtual ~XMLDateTimeFormatHdl(); - virtual sal_Bool importXML( const rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 273517bccb0a..9fa89b35f7d7 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -68,8 +68,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -740,11 +738,11 @@ class XMLCaptionEscapeRelative : public XMLPropertyHandler { public: virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; @@ -782,11 +780,11 @@ public: XMLMoveSizeProtectHdl( sal_Int32 nType ) : mnType( nType ) {} virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; private: @@ -825,8 +823,8 @@ class XMLSdHeaderFooterVisibilityTypeHdl : public XMLPropertyHandler public: virtual ~XMLSdHeaderFooterVisibilityTypeHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; XMLSdHeaderFooterVisibilityTypeHdl::~XMLSdHeaderFooterVisibilityTypeHdl() @@ -834,7 +832,7 @@ XMLSdHeaderFooterVisibilityTypeHdl::~XMLSdHeaderFooterVisibilityTypeHdl() } sal_Bool XMLSdHeaderFooterVisibilityTypeHdl::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const { diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index c49200f3ff79..77bfe0053df7 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -254,9 +254,9 @@ private: SvxXMLNumRuleExport maNumRuleExp; sal_Bool mbIsInAutoStyles; - const rtl::OUString msCDATA; - const rtl::OUString msTrue; - const rtl::OUString msFalse; + const OUString msCDATA; + const OUString msTrue; + const OUString msFalse; protected: virtual void ContextFilter( @@ -291,9 +291,9 @@ class XMLPageExportPropertyMapper : public SvXMLExportPropertyMapper private: SvXMLExport& mrExport; - const rtl::OUString msCDATA; - const rtl::OUString msTrue; - const rtl::OUString msFalse; + const OUString msCDATA; + const OUString msTrue; + const OUString msFalse; protected: virtual void ContextFilter( diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 78563fb77cd7..6e86da36ed2f 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -76,8 +76,6 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1877,7 +1875,7 @@ void SdXMLExport::_ExportContent() OUString aBookmarkName( aBookmarkURL.copy( nIndex+1 ) ); aBookmarkURL = GetRelativeReference( aFileName ); - aBookmarkURL += rtl::OUString(static_cast<sal_Unicode>('#')); + aBookmarkURL += OUString(static_cast<sal_Unicode>('#')); aBookmarkURL += aBookmarkName; } diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index ccc34b204bea..506981d978f0 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -69,14 +69,14 @@ DECLARE_STL_STDKEY_SET( sal_Int32, SdXMLFormatMap ); struct HeaderFooterPageSettingsImpl { - rtl::OUString maStrHeaderDeclName; - rtl::OUString maStrFooterDeclName; - rtl::OUString maStrDateTimeDeclName; + OUString maStrHeaderDeclName; + OUString maStrFooterDeclName; + OUString maStrDateTimeDeclName; }; struct DateTimeDeclImpl { - rtl::OUString maStrText; + OUString maStrText; sal_Bool mbFixed; sal_Int32 mnFormat; }; @@ -101,17 +101,17 @@ class SdXMLExport : public SvXMLExport ImpXMLEXPPageMasterInfo* mpHandoutPageMaster; ImpXMLAutoLayoutInfoList* mpAutoLayoutInfoList; - com::sun::star::uno::Sequence< ::rtl::OUString > maDrawPagesAutoLayoutNames; + com::sun::star::uno::Sequence< OUString > maDrawPagesAutoLayoutNames; - ::std::vector< ::rtl::OUString > maDrawPagesStyleNames; - ::std::vector< ::rtl::OUString > maDrawNotesPagesStyleNames; - ::std::vector< ::rtl::OUString > maMasterPagesStyleNames; - ::rtl::OUString maHandoutMasterStyleName; + ::std::vector< OUString > maDrawPagesStyleNames; + ::std::vector< OUString > maDrawNotesPagesStyleNames; + ::std::vector< OUString > maMasterPagesStyleNames; + OUString maHandoutMasterStyleName; ::std::vector< HeaderFooterPageSettingsImpl > maDrawPagesHeaderFooterSettings; ::std::vector< HeaderFooterPageSettingsImpl > maDrawNotesPagesHeaderFooterSettings; - ::std::vector< ::rtl::OUString > maHeaderDeclsVector; - ::std::vector< ::rtl::OUString > maFooterDeclsVector; + ::std::vector< OUString > maHeaderDeclsVector; + ::std::vector< OUString > maFooterDeclsVector; ::std::vector< DateTimeDeclImpl > maDateTimeDeclsVector; HeaderFooterPageSettingsImpl maHandoutPageHeaderFooterSettings; @@ -127,12 +127,12 @@ class SdXMLExport : public SvXMLExport sal_Bool mbFamilyGraphicUsed; sal_Bool mbFamilyPresentationUsed; - const rtl::OUString msZIndex; - const rtl::OUString msEmptyPres; - const rtl::OUString msModel; - const rtl::OUString msStartShape; - const rtl::OUString msEndShape; - const rtl::OUString msPageLayoutNames; + const OUString msZIndex; + const OUString msEmptyPres; + const OUString msModel; + const OUString msStartShape; + const OUString msEndShape; + const OUString msPageLayoutNames; virtual void _ExportStyles(sal_Bool bUsed); virtual void _ExportAutoStyles(); @@ -148,14 +148,14 @@ class SdXMLExport : public SvXMLExport void ImpWritePageMasterInfos(); void ImpPrepAutoLayoutInfos(); HeaderFooterPageSettingsImpl ImpPrepDrawPageHeaderFooterDecls( const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xDrawPage ); - ImpXMLEXPPageMasterInfo* ImpGetPageMasterInfoByName(const rtl::OUString& rName); + ImpXMLEXPPageMasterInfo* ImpGetPageMasterInfoByName(const OUString& rName); void ImpPrepDrawPageInfos(); void ImpPrepMasterPageInfos(); void ImpWritePresentationStyles(); - ::rtl::OUString ImpCreatePresPageStyleName( com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> xDrawPage, bool bExportBackground = true ); + OUString ImpCreatePresPageStyleName( com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> xDrawPage, bool bExportBackground = true ); - sal_Bool ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, rtl::OUString& rName); + sal_Bool ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, OUString& rName); void ImpWriteAutoLayoutInfos(); void ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectangle& rRect); void ImpWriteHeaderFooterDecls(); @@ -167,7 +167,7 @@ class SdXMLExport : public SvXMLExport // #82003# helper function for recursive object count sal_uInt32 ImpRecursiveObjectCount( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xShapes); - rtl::OUString getNavigationOrder( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage ); + OUString getNavigationOrder( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage ); void collectAnnotationAutoStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage ); void exportAnnotations( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage ); @@ -204,10 +204,10 @@ public: virtual void addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ); virtual void exportDataStyles(); virtual void exportAutoDataStyles(); - virtual rtl::OUString getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) const; + virtual OUString getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) const; // XServiceInfo ( : SvXMLExport ) - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); }; #endif // _SDXMLEXP_HXX diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 741a6852e961..afa0ea68d27d 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -48,8 +48,6 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -434,7 +432,7 @@ void SAL_CALL SdXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen if( xInfoSetInfo->hasPropertyByName( msPreview ) ) xInfoSet->getPropertyValue( msPreview ) >>= mbPreview; - ::rtl::OUString const sOrganizerMode( + OUString const sOrganizerMode( "OrganizerMode"); if (xInfoSetInfo->hasPropertyByName(sOrganizerMode)) { @@ -1011,19 +1009,19 @@ OUString SAL_CALL SdXMLImport::getImplementationName() throw( uno::RuntimeExcept } } -void SdXMLImport::AddHeaderDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText ) +void SdXMLImport::AddHeaderDecl( const OUString& rName, const OUString& rText ) { if( !rName.isEmpty() && !rText.isEmpty() ) maHeaderDeclsMap[rName] = rText; } -void SdXMLImport::AddFooterDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText ) +void SdXMLImport::AddFooterDecl( const OUString& rName, const OUString& rText ) { if( !rName.isEmpty() && !rText.isEmpty() ) maFooterDeclsMap[rName] = rText; } -void SdXMLImport::AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText, sal_Bool bFixed, const ::rtl::OUString& rDateTimeFormat ) +void SdXMLImport::AddDateTimeDecl( const OUString& rName, const OUString& rText, sal_Bool bFixed, const OUString& rDateTimeFormat ) { if( !rName.isEmpty() && (!rText.isEmpty() || !bFixed) ) { @@ -1035,9 +1033,9 @@ void SdXMLImport::AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OU } } -::rtl::OUString SdXMLImport::GetHeaderDecl( const ::rtl::OUString& rName ) const +OUString SdXMLImport::GetHeaderDecl( const OUString& rName ) const { - ::rtl::OUString aRet; + OUString aRet; HeaderFooterDeclMap::const_iterator aIter( maHeaderDeclsMap.find( rName ) ); if( aIter != maHeaderDeclsMap.end() ) aRet = (*aIter).second; @@ -1045,9 +1043,9 @@ void SdXMLImport::AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OU return aRet; } -::rtl::OUString SdXMLImport::GetFooterDecl( const ::rtl::OUString& rName ) const +OUString SdXMLImport::GetFooterDecl( const OUString& rName ) const { - ::rtl::OUString aRet; + OUString aRet; HeaderFooterDeclMap::const_iterator aIter( maFooterDeclsMap.find( rName ) ); if( aIter != maFooterDeclsMap.end() ) aRet = (*aIter).second; @@ -1055,7 +1053,7 @@ void SdXMLImport::AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OU return aRet; } -::rtl::OUString SdXMLImport::GetDateTimeDecl( const ::rtl::OUString& rName, sal_Bool& rbFixed, ::rtl::OUString& rDateTimeFormat ) +OUString SdXMLImport::GetDateTimeDecl( const OUString& rName, sal_Bool& rbFixed, OUString& rDateTimeFormat ) { DateTimeDeclContextImpl aDecl; diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 43ba353e17b3..1a50eb9fc799 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -166,14 +166,14 @@ class SdXMLMasterStylesContext; struct DateTimeDeclContextImpl { - rtl::OUString maStrText; + OUString maStrText; sal_Bool mbFixed; - rtl::OUString maStrDateTimeFormat; + OUString maStrDateTimeFormat; DateTimeDeclContextImpl() : mbFixed(sal_True) {} }; -DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, HeaderFooterDeclMap ); +DECLARE_STL_USTRINGACCESS_MAP( OUString, HeaderFooterDeclMap ); DECLARE_STL_USTRINGACCESS_MAP( DateTimeDeclContextImpl, DateTimeDeclMap ); ////////////////////////////////////////////////////////////////////////////// @@ -211,8 +211,8 @@ class SdXMLImport: public SvXMLImport DrawPageIdMap maDrawPageIds; - ::rtl::OUString msPageLayouts; - ::rtl::OUString msPreview; + OUString msPageLayouts; + OUString msPreview; HeaderFooterDeclMap maHeaderDeclsMap; HeaderFooterDeclMap maFooterDeclsMap; @@ -222,7 +222,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); @@ -244,18 +244,18 @@ public: // namespace office // NB: in contrast to other CreateFooContexts, this particular one handles // the root element (i.e. office:document-meta) - SvXMLImportContext* CreateMetaContext(const rtl::OUString& rLocalName, + SvXMLImportContext* CreateMetaContext(const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); - SvXMLImportContext* CreateScriptContext( const ::rtl::OUString& rLocalName ); - SvXMLImportContext* CreateBodyContext(const rtl::OUString& rLocalName, + SvXMLImportContext* CreateScriptContext( const OUString& rLocalName ); + SvXMLImportContext* CreateBodyContext(const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); - SvXMLStylesContext* CreateStylesContext(const rtl::OUString& rLocalName, + SvXMLStylesContext* CreateStylesContext(const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); - SvXMLStylesContext* CreateAutoStylesContext(const rtl::OUString& rLocalName, + SvXMLStylesContext* CreateAutoStylesContext(const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); - SvXMLImportContext* CreateMasterStylesContext(const rtl::OUString& rLocalName, + SvXMLImportContext* CreateMasterStylesContext(const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); - SvXMLImportContext *CreateFontDeclsContext(const ::rtl::OUString& rLocalName, + SvXMLImportContext *CreateFontDeclsContext(const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); // Styles and AutoStyles contexts @@ -300,15 +300,15 @@ public: sal_Bool IsPreview() const { return mbPreview; } // XServiceInfo ( : SvXMLExport ) - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - void AddHeaderDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText ); - void AddFooterDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText ); - void AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText, sal_Bool bFixed, const ::rtl::OUString& rDateTimeFormat ); + void AddHeaderDecl( const OUString& rName, const OUString& rText ); + void AddFooterDecl( const OUString& rName, const OUString& rText ); + void AddDateTimeDecl( const OUString& rName, const OUString& rText, sal_Bool bFixed, const OUString& rDateTimeFormat ); - ::rtl::OUString GetHeaderDecl( const ::rtl::OUString& rName ) const; - ::rtl::OUString GetFooterDecl( const ::rtl::OUString& rName ) const; - ::rtl::OUString GetDateTimeDecl( const ::rtl::OUString& rName, sal_Bool& rbFixed, ::rtl::OUString& rDateTimeFormat ); + OUString GetHeaderDecl( const OUString& rName ) const; + OUString GetFooterDecl( const OUString& rName ) const; + OUString GetDateTimeDecl( const OUString& rName, sal_Bool& rbFixed, OUString& rDateTimeFormat ); virtual void NotifyEmbeddedFontRead() SAL_OVERRIDE; }; diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index db38c9d649c3..51f0427ea1bb 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -155,10 +155,10 @@ uno::Reference< drawing::XShape > XMLShapeExport::checkForCustomShapeReplacement { uno::Sequence< uno::Any > aArgument( 1 ); uno::Sequence< beans::PropertyValue > aPropValues( 2 ); - aPropValues[ 0 ].Name = rtl::OUString( "CustomShape" ); + aPropValues[ 0 ].Name = OUString( "CustomShape" ); aPropValues[ 0 ].Value <<= xShape; sal_Bool bForceGroupWithText = sal_True; - aPropValues[ 1 ].Name = rtl::OUString( "ForceGroupWithText" ); + aPropValues[ 1 ].Name = OUString( "ForceGroupWithText" ); aPropValues[ 1 ].Value <<= bForceGroupWithText; aArgument[ 0 ] <<= aPropValues; uno::Reference< uno::XInterface > xInterface( xFactory->createInstanceWithArguments( aEngine, aArgument ) ); @@ -321,7 +321,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap uno::Reference< beans::XPropertySet > xControlModel(xControl->getControl(), uno::UNO_QUERY); DBG_ASSERT(xControlModel.is(), "XMLShapeExport::collectShapeAutoStyles: no control model on the control shape!"); - ::rtl::OUString sNumberStyle = mrExport.GetFormExport()->getControlNumberStyle(xControlModel); + OUString sNumberStyle = mrExport.GetFormExport()->getControlNumberStyle(xControlModel); if (!sNumberStyle.isEmpty()) { sal_Int32 nIndex = GetPropertySetMapper()->getPropertySetMapper()->FindEntryIndex(CTF_SD_CONTROL_SHAPE_DATA_STYLE); @@ -383,7 +383,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap // * defaults for style properties are not written, but we need to write the "left", // because we need to distiguish this "left" from the case where not align attribute // is present which means "void" - static const ::rtl::OUString s_sParaAdjustPropertyName( "ParaAdjust" ); + static const OUString s_sParaAdjustPropertyName( "ParaAdjust" ); if ( xPropSetInfo->hasPropertyByName( s_sParaAdjustPropertyName ) && ( beans::PropertyState_DEFAULT_VALUE == xPropState->getPropertyState( s_sParaAdjustPropertyName ) ) ) @@ -1077,14 +1077,14 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x if(xPropSet.is()) { - rtl::OUString sCLSID; + OUString sCLSID; if(xPropSet->getPropertyValue(OUString("CLSID")) >>= sCLSID) { if (sCLSID.equals(mrExport.GetChartExport()->getChartCLSID())) { eShapeType = XmlShapeTypeDrawChartShape; } - else if (sCLSID.equals(rtl::OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName()))) + else if (sCLSID.equals(OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName()))) { eShapeType = XmlShapeTypeDrawSheetShape; } @@ -1127,7 +1127,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x if(xPropSet.is()) try { - rtl::OUString sCLSID; + OUString sCLSID; if(xPropSet->getPropertyValue(OUString("CLSID")) >>= sCLSID) { if( sCLSID.equals(OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName())) ) diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index 4f00fe33305a..58cb26e03d1a 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -53,8 +53,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/tuple/b2dtuple.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -226,7 +224,7 @@ void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTR ////////////////////////////////////////////////////////////////////////////// -sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< beans::XPropertySet >& xPropSet, const rtl::OUString& rClass ) +sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< beans::XPropertySet >& xPropSet, const OUString& rClass ) { sal_Bool bIsEmpty = sal_False; @@ -1143,12 +1141,12 @@ void XMLShapeExport::ImpExportGraphicObjectShape( xPropSet->getPropertyValue( OUString("GraphicURL")) >>= sImageURL; OUString aResolveURL( sImageURL ); - const rtl::OUString sPackageURL( "vnd.sun.star.Package:" ); + const OUString sPackageURL( "vnd.sun.star.Package:" ); // sj: trying to preserve the filename if ( aStreamURL.match( sPackageURL, 0 ) ) { - rtl::OUString sRequestedName( aStreamURL.copy( sPackageURL.getLength(), aStreamURL.getLength() - sPackageURL.getLength() ) ); + OUString sRequestedName( aStreamURL.copy( sPackageURL.getLength(), aStreamURL.getLength() - sPackageURL.getLength() ) ); sal_Int32 nLastIndex = sRequestedName.lastIndexOf( '/' ) + 1; if ( ( nLastIndex > 0 ) && ( nLastIndex < sRequestedName.getLength() ) ) sRequestedName = sRequestedName.copy( nLastIndex, sRequestedName.getLength() - nLastIndex ); @@ -1717,9 +1715,9 @@ void XMLShapeExport::ImpExportOLE2Shape( // this is an alien object ( currently MSOLE is the only supported type of such objects ) // in case it is not an OASIS format the object should be asked to store replacement image if possible - ::rtl::OUString sURLRequest( sURL ); + OUString sURLRequest( sURL ); if ( ( mrExport.getExportFlags() & EXPORT_OASIS ) == 0 ) - sURLRequest += ::rtl::OUString( "?oasis=false" ); + sURLRequest += OUString( "?oasis=false" ); mrExport.AddEmbeddedObjectAsBase64( sURLRequest ); } } @@ -1987,7 +1985,7 @@ void XMLShapeExport::ImpExportPluginShape( static void lcl_CopyStream( uno::Reference<io::XInputStream> const& xInStream, uno::Reference<embed::XStorage> const& xTarget, - ::rtl::OUString const& rPath) + OUString const& rPath) { ::comphelper::LifecycleProxy proxy; uno::Reference<io::XStream> const xStream( @@ -1999,19 +1997,19 @@ static void lcl_CopyStream( { SAL_WARN("xmloff", "no output stream"); throw uno::Exception( - ::rtl::OUString("no output stream"),0); + OUString("no output stream"),0); } uno::Reference< beans::XPropertySet > const xStreamProps(xStream, uno::UNO_QUERY); if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage xStreamProps->setPropertyValue( - ::rtl::OUString("MediaType"), - uno::makeAny(::rtl::OUString( + OUString("MediaType"), + uno::makeAny(OUString( //FIXME how to detect real media type? //but currently xmloff has this one hardcoded anyway... "application/vnd.sun.star.media"))); xStreamProps->setPropertyValue( // turn off compression - ::rtl::OUString("Compressed"), + OUString("Compressed"), uno::makeAny(sal_False)); } ::comphelper::OStorageHelper::CopyInputToOutput(xInStream, xOutStream); @@ -2021,10 +2019,10 @@ static void lcl_CopyStream( static char const s_PkgScheme[] = "vnd.sun.star.Package:"; -static ::rtl::OUString +static OUString lcl_StoreMediaAndGetURL(SvXMLExport & rExport, uno::Reference<beans::XPropertySet> const& xPropSet, - ::rtl::OUString const& rURL) + OUString const& rURL) { if (0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( rURL.getStr(), rURL.getLength(), @@ -2036,16 +2034,16 @@ lcl_StoreMediaAndGetURL(SvXMLExport & rExport, rExport.GetTargetStorage(), uno::UNO_QUERY_THROW); uno::Reference<io::XInputStream> xInStream; xPropSet->getPropertyValue( - ::rtl::OUString("PrivateStream")) + OUString("PrivateStream")) >>= xInStream; if (!xInStream.is()) { SAL_WARN("xmloff", "no input stream"); - return ::rtl::OUString(); + return OUString(); } - ::rtl::OUString const urlPath( + OUString const urlPath( rURL.copy(SAL_N_ELEMENTS(s_PkgScheme)-1)); lcl_CopyStream(xInStream, xTarget, rURL); @@ -2057,7 +2055,7 @@ lcl_StoreMediaAndGetURL(SvXMLExport & rExport, SAL_INFO("xmloff", "exception while storing embedded media: '" << e.Message << "'"); } - return ::rtl::OUString(); + return OUString(); } else { diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx index 9b5df3529e06..2cd8574b8754 100644 --- a/xmloff/source/draw/shapeexport3.cxx +++ b/xmloff/source/draw/shapeexport3.cxx @@ -41,8 +41,6 @@ #include "xmloff/xmlnmspe.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 7e21572c7d83..fb411104985a 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -43,8 +43,6 @@ #include <map> #include <vector> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::com::sun::star; @@ -993,7 +991,7 @@ void XMLShapeImportHelper::shapeWithZIndexAdded( com::sun::star::uno::Reference< void XMLShapeImportHelper::addShapeConnection( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rConnectorShape, sal_Bool bStart, - const rtl::OUString& rDestShapeId, + const OUString& rDestShapeId, sal_Int32 nDestGlueId ) { ConnectionHint aHint; diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index 9d30a46b82ba..2bed18d85f32 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -33,8 +33,6 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/tools/unotools.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; @@ -150,7 +148,7 @@ void Imp_PutNumberCharWithSpace(OUString& rStr, sal_Int32 nValue) const sal_Int32 aLen(rStr.getLength()); if(aLen) if(Imp_IsOnNumberChar(rStr, aLen - 1, false) && nValue >= 0) - rStr += rtl::OUString(static_cast<sal_Unicode>(' ')); + rStr += OUString(static_cast<sal_Unicode>(' ')); Imp_PutNumberChar(rStr, nValue); } @@ -1348,12 +1346,12 @@ SdXMLImExPointsElement::SdXMLImExPointsElement(drawing::PointSequence* pPoints, // X and comma Imp_PutNumberChar(aNewString, nX); - aNewString += rtl::OUString(static_cast<sal_Unicode>(',')); + aNewString += OUString(static_cast<sal_Unicode>(',')); // Y and space (not for last) Imp_PutNumberChar(aNewString, nY); if(a + 1 != nCnt) - aNewString += rtl::OUString(static_cast<sal_Unicode>(' ')); + aNewString += OUString(static_cast<sal_Unicode>(' ')); // next point pArray++; @@ -1817,7 +1815,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('t')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('t')); + aNewString += OUString(static_cast<sal_Unicode>('t')); Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY); @@ -1827,7 +1825,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('T')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('T')); + aNewString += OUString(static_cast<sal_Unicode>('T')); Imp_PutNumberCharWithSpace(aNewString, nX); Imp_PutNumberCharWithSpace(aNewString, nY); @@ -1847,7 +1845,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('q')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('q')); + aNewString += OUString(static_cast<sal_Unicode>('q')); Imp_PutNumberCharWithSpace(aNewString, nX1 - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY1 - mnLastY); @@ -1859,7 +1857,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('Q')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('Q')); + aNewString += OUString(static_cast<sal_Unicode>('Q')); Imp_PutNumberCharWithSpace(aNewString, nX1); Imp_PutNumberCharWithSpace(aNewString, nY1); @@ -1906,7 +1904,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('s')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('s')); + aNewString += OUString(static_cast<sal_Unicode>('s')); Imp_PutNumberCharWithSpace(aNewString, nX2 - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY2 - mnLastY); @@ -1918,7 +1916,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('S')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('S')); + aNewString += OUString(static_cast<sal_Unicode>('S')); Imp_PutNumberCharWithSpace(aNewString, nX2); Imp_PutNumberCharWithSpace(aNewString, nY2); @@ -1940,7 +1938,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('c')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('c')); + aNewString += OUString(static_cast<sal_Unicode>('c')); Imp_PutNumberCharWithSpace(aNewString, nX1 - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY1 - mnLastY); @@ -1954,7 +1952,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('C')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('C')); + aNewString += OUString(static_cast<sal_Unicode>('C')); Imp_PutNumberCharWithSpace(aNewString, nX1); Imp_PutNumberCharWithSpace(aNewString, nY1); @@ -1996,7 +1994,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('v')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('v')); + aNewString += OUString(static_cast<sal_Unicode>('v')); Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY); @@ -2005,7 +2003,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('V')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('V')); + aNewString += OUString(static_cast<sal_Unicode>('V')); Imp_PutNumberCharWithSpace(aNewString, nY); @@ -2017,7 +2015,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('h')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('h')); + aNewString += OUString(static_cast<sal_Unicode>('h')); Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX); @@ -2026,7 +2024,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('H')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('H')); + aNewString += OUString(static_cast<sal_Unicode>('H')); Imp_PutNumberCharWithSpace(aNewString, nX); @@ -2038,7 +2036,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('l')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('l')); + aNewString += OUString(static_cast<sal_Unicode>('l')); Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY); @@ -2048,7 +2046,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('L')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('L')); + aNewString += OUString(static_cast<sal_Unicode>('L')); Imp_PutNumberCharWithSpace(aNewString, nX); Imp_PutNumberCharWithSpace(aNewString, nY); @@ -2062,7 +2060,7 @@ void SdXMLImExSvgDElement::AddPolygon( // write as start point if(mbRelative) { - aNewString += rtl::OUString(static_cast<sal_Unicode>('m')); + aNewString += OUString(static_cast<sal_Unicode>('m')); Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY); @@ -2071,7 +2069,7 @@ void SdXMLImExSvgDElement::AddPolygon( } else { - aNewString += rtl::OUString(static_cast<sal_Unicode>('M')); + aNewString += OUString(static_cast<sal_Unicode>('M')); Imp_PutNumberCharWithSpace(aNewString, nX); Imp_PutNumberCharWithSpace(aNewString, nY); @@ -2099,9 +2097,9 @@ void SdXMLImExSvgDElement::AddPolygon( if(bClosed) { if(mbRelative) - aNewString += rtl::OUString(static_cast<sal_Unicode>('z')); + aNewString += OUString(static_cast<sal_Unicode>('z')); else - aNewString += rtl::OUString(static_cast<sal_Unicode>('Z')); + aNewString += OUString(static_cast<sal_Unicode>('Z')); // update current point - we're back at the start if( bDidWriteStart ) diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 2da5687532b0..da119f19dd6c 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -32,8 +32,6 @@ #include <com/sun/star/drawing/PolyPolygonShape3D.hpp> #include <com/sun/star/drawing/DoubleSequence.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx index e35b14c7cebd..42dcde876762 100644 --- a/xmloff/source/draw/ximp3dobject.hxx +++ b/xmloff/source/draw/ximp3dobject.hxx @@ -46,7 +46,7 @@ public: SdXML3DObjectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -70,7 +70,7 @@ public: TYPEINFO(); SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -94,7 +94,7 @@ public: TYPEINFO(); SdXML3DSphereObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -109,14 +109,14 @@ public: class SdXML3DPolygonBasedShapeContext : public SdXML3DObjectContext { - rtl::OUString maPoints; - rtl::OUString maViewBox; + OUString maPoints; + OUString maViewBox; public: TYPEINFO(); SdXML3DPolygonBasedShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -135,7 +135,7 @@ public: TYPEINFO(); SdXML3DLatheObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -154,7 +154,7 @@ public: TYPEINFO(); SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 4bfaa552f691..6eac43a8cc4e 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -30,8 +30,6 @@ #include "eventimp.hxx" #include "descriptionimp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -42,7 +40,7 @@ using namespace ::xmloff::token; SdXML3DLightContext::SdXML3DLightContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName), maDiffuseColor(0x00000000), @@ -243,7 +241,7 @@ SdXML3DSceneAttributesHelper::~SdXML3DSceneAttributesHelper() } /** creates a 3d ligth context and adds it to the internal list for later processing */ -SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uInt16 nPrfx, const rtl::OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList) +SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList) { SvXMLImportContext* pContext = new SdXML3DLightContext(mrImport, nPrfx, rLName, xAttrList); @@ -258,7 +256,7 @@ SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uIn } /** this should be called for each scene attribute */ -void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DR3D == nPrefix ) { diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index d1a32bfd21b0..8eea3ac00d27 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -49,7 +49,7 @@ public: SdXML3DSceneShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -59,7 +59,7 @@ public: virtual void EndElement(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& GetLocalShapesContext() const diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index dc4f534836ef..4f0ac3300fe9 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -37,8 +37,6 @@ #include "PropertySetMerger.hxx" #include "animationimport.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx index a4a8fd542087..2e6b3b8d6337 100644 --- a/xmloff/source/draw/ximpbody.hxx +++ b/xmloff/source/draw/ximpbody.hxx @@ -30,21 +30,21 @@ class SdXMLDrawPageContext : public SdXMLGenericPageContext { - rtl::OUString maName; - rtl::OUString maMasterPageName; - rtl::OUString maStyleName; - rtl::OUString maHREF; + OUString maName; + OUString maMasterPageName; + OUString maStyleName; + OUString maHREF; bool mbHadSMILNodes; public: SdXMLDrawPageContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); virtual ~SdXMLDrawPageContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -59,11 +59,11 @@ class SdXMLBodyContext : public SvXMLImportContext SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } public: - SdXMLBodyContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName ); + SdXMLBodyContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName ); virtual ~SdXMLBodyContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 1a280ef14347..5dd0f00ef5e9 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -55,7 +55,7 @@ TYPEINIT1( XMLEnhancedCustomShapeContext, SvXMLImportContext ); XMLEnhancedCustomShapeContext::XMLEnhancedCustomShapeContext( SvXMLImport& rImport, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ) : SvXMLImportContext( rImport, nPrefix, rLocalName ), mrUnitConverter( rImport.GetMM100UnitConverter() ), @@ -73,7 +73,7 @@ const SvXMLEnumMapEntry aXML_GluePointEnumMap[] = { XML_TOKEN_INVALID, 0 } }; void GetBool( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { bool bAttrBool; if (::sax::Converter::convertBool( bAttrBool, rValue )) @@ -86,7 +86,7 @@ void GetBool( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetInt32( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int32 nAttrNumber; if (::sax::Converter::convertNumber( nAttrNumber, rValue )) @@ -99,7 +99,7 @@ void GetInt32( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetDouble( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { double fAttrDouble; if (::sax::Converter::convertDouble( fAttrDouble, rValue )) @@ -112,7 +112,7 @@ void GetDouble( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetDistance( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { double fAttrDouble; sal_Int16 const eSrcUnit( ::sax::Converter::GetUnitFromString( @@ -128,7 +128,7 @@ void GetDistance( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetString( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { beans::PropertyValue aProp; aProp.Name = EASGet( eDestProp ); @@ -137,7 +137,7 @@ void GetString( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetEnum( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, const SvXMLEnumMapEntry& rMap ) { sal_uInt16 eKind; @@ -152,7 +152,7 @@ void GetEnum( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int16 const eSrcUnit = ::sax::Converter::GetUnitFromString( rValue, util::MeasureUnit::MM_100TH); @@ -172,7 +172,7 @@ void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& r } void GetB3DVector( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { ::basegfx::B3DVector aB3DVector; if ( SvXMLUnitConverter::convertB3DVector( aB3DVector, rValue ) ) @@ -185,7 +185,7 @@ void GetB3DVector( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -sal_Bool GetEquationName( const rtl::OUString& rEquation, const sal_Int32 nStart, rtl::OUString& rEquationName ) +sal_Bool GetEquationName( const OUString& rEquation, const sal_Int32 nStart, OUString& rEquationName ) { sal_Int32 nIndex = nStart; while( nIndex < rEquation.getLength() ) @@ -208,7 +208,7 @@ sal_Bool GetEquationName( const rtl::OUString& rEquation, const sal_Int32 nStart return bValid; } -sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32& nIndex, const rtl::OUString& rParaString ) +sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32& nIndex, const OUString& rParaString ) { if ( nIndex >= rParaString.getLength() ) return sal_False; @@ -228,7 +228,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter { nIndex++; bNumberRequired = sal_False; - rtl::OUString aEquationName; + OUString aEquationName; bValid = GetEquationName( rParaString, nIndex, aEquationName ); if ( bValid ) { @@ -397,7 +397,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter bValid = sal_False; if ( bValid ) { - rtl::OUString aNumber( rParaString.copy( nStartIndex, nIndex - nStartIndex ) ); + OUString aNumber( rParaString.copy( nStartIndex, nIndex - nStartIndex ) ); if ( bE || bDot ) { double fAttrDouble; @@ -426,7 +426,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter } void GetPosition3D( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:extrusion-viewpoint - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, SvXMLUnitConverter& rUnitConverter ) { drawing::Position3D aPosition3D; @@ -440,14 +440,14 @@ void GetPosition3D( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetDoubleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:glue-point-leaving-directions - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< double > vDirection; sal_Int32 nIndex = 0; do { double fAttrDouble; - rtl::OUString aToken( rValue.getToken( 0, ',', nIndex ) ); + OUString aToken( rValue.getToken( 0, ',', nIndex ) ); if (!::sax::Converter::convertDouble( fAttrDouble, aToken )) break; else @@ -473,14 +473,14 @@ void GetDoubleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDe } void GetSizeSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< sal_Int32 > vNum; sal_Int32 nIndex = 0; do { sal_Int32 n; - rtl::OUString aToken( rValue.getToken( 0, ' ', nIndex ) ); + OUString aToken( rValue.getToken( 0, ' ', nIndex ) ); if (!::sax::Converter::convertNumber( n, aToken )) break; else @@ -510,7 +510,7 @@ void GetSizeSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest } void GetEnhancedParameter( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:handle-position - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int32 nIndex = 0; com::sun::star::drawing::EnhancedCustomShapeParameter aParameter; @@ -524,7 +524,7 @@ void GetEnhancedParameter( std::vector< com::sun::star::beans::PropertyValue >& } void GetEnhancedParameterPair( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:handle-position - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int32 nIndex = 0; com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameterPair; @@ -539,7 +539,7 @@ void GetEnhancedParameterPair( std::vector< com::sun::star::beans::PropertyValue } sal_Int32 GetEnhancedParameterPairSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:glue-points - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > vParameter; com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameter; @@ -569,7 +569,7 @@ sal_Int32 GetEnhancedParameterPairSequence( std::vector< com::sun::star::beans:: } void GetEnhancedRectangleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:text-areas - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< com::sun::star::drawing::EnhancedCustomShapeTextFrame > vTextFrame; com::sun::star::drawing::EnhancedCustomShapeTextFrame aParameter; @@ -601,7 +601,7 @@ void GetEnhancedRectangleSequence( std::vector< com::sun::star::beans::PropertyV } void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:enhanced-path - const rtl::OUString& rValue ) + const OUString& rValue ) { std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > vCoordinates; std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment > vSegments; @@ -855,7 +855,7 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest } void GetAdjustmentValues( std::vector< com::sun::star::beans::PropertyValue >& rDest, // draw:adjustments - const rtl::OUString& rValue ) + const OUString& rValue ) { std::vector< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > vAdjustmentValue; com::sun::star::drawing::EnhancedCustomShapeParameter aParameter; @@ -900,8 +900,8 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax sal_Int32 nAttrNumber; for( sal_Int16 nAttr = 0; nAttr < nLength; nAttr++ ) { - rtl::OUString aLocalName; - const rtl::OUString& rValue = xAttrList->getValueByIndex( nAttr ); + OUString aLocalName; + const OUString& rValue = xAttrList->getValueByIndex( nAttr ); /* sven fixme, this must be checked! sal_uInt16 nPrefix = */ GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( nAttr ), &aLocalName ); switch( EASGet( aLocalName ) ) @@ -959,7 +959,7 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax ::sax::Converter::GetUnitFromString( rValue, util::MeasureUnit::MM_100TH)); - rtl::OUStringBuffer aUnitStr; + OUStringBuffer aUnitStr; double fFactor = ::sax::Converter::GetConversionFactor( aUnitStr, util::MeasureUnit::MM_100TH, eSrcUnit); if ( ( fFactor != 1.0 ) && ( fFactor != 0.0 ) ) @@ -1153,7 +1153,7 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec, const std::vector< beans::PropertyValues >& rElement, - const rtl::OUString& rElementName ) + const OUString& rElementName ) { if ( !rElement.empty() ) { @@ -1173,15 +1173,15 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property } void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec, - const std::vector< rtl::OUString >& rElement, - const rtl::OUString& rElementName ) + const std::vector< OUString >& rElement, + const OUString& rElementName ) { if ( !rElement.empty() ) { - uno::Sequence< rtl::OUString > aPropSeq( rElement.size() ); - std::vector< rtl::OUString >::const_iterator aIter = rElement.begin(); - std::vector< rtl::OUString >::const_iterator aEnd = rElement.end(); - rtl::OUString* pValues = aPropSeq.getArray(); + uno::Sequence< OUString > aPropSeq( rElement.size() ); + std::vector< OUString >::const_iterator aIter = rElement.begin(); + std::vector< OUString >::const_iterator aEnd = rElement.end(); + OUString* pValues = aPropSeq.getArray(); while ( aIter != aEnd ) *pValues++ = *aIter++; @@ -1195,7 +1195,7 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec, const std::vector< com::sun::star::beans::PropertyValue >& rElement, - const rtl::OUString& rElementName ) + const OUString& rElementName ) { if ( !rElement.empty() ) { @@ -1214,15 +1214,15 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property } } -typedef boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash, OUStringEqFunc> EquationHashMap; +typedef boost::unordered_map< OUString, sal_Int32, OUStringHash, OUStringEqFunc> EquationHashMap; /* if rPara.Type is from type EnhancedCustomShapeParameterType::EQUATION, the name of the equation - will be converted from rtl::OUString to index */ + will be converted from OUString to index */ void CheckAndResolveEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rPara, EquationHashMap* pH ) { if ( rPara.Type == com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION ) { - rtl::OUString aEquationName; + OUString aEquationName; if ( rPara.Value >>= aEquationName ) { sal_Int32 nIndex = 0; @@ -1241,8 +1241,8 @@ void XMLEnhancedCustomShapeContext::EndElement() { // creating hash map containing the name and index of each equation EquationHashMap* pH = new EquationHashMap; - std::vector< rtl::OUString >::iterator aEquationNameIter = maEquationNames.begin(); - std::vector< rtl::OUString >::iterator aEquationNameEnd = maEquationNames.end(); + std::vector< OUString >::iterator aEquationNameIter = maEquationNames.begin(); + std::vector< OUString >::iterator aEquationNameEnd = maEquationNames.end(); while( aEquationNameIter != aEquationNameEnd ) { (*pH)[ *aEquationNameIter ] = (sal_Int32)( aEquationNameIter - maEquationNames.begin() ); @@ -1250,8 +1250,8 @@ void XMLEnhancedCustomShapeContext::EndElement() } // resolve equation - std::vector< rtl::OUString >::iterator aEquationIter = maEquations.begin(); - std::vector< rtl::OUString >::iterator aEquationEnd = maEquations.end(); + std::vector< OUString >::iterator aEquationIter = maEquations.begin(); + std::vector< OUString >::iterator aEquationEnd = maEquations.end(); while( aEquationIter != aEquationEnd ) { sal_Int32 nIndexOf = 0; @@ -1260,16 +1260,16 @@ void XMLEnhancedCustomShapeContext::EndElement() nIndexOf = aEquationIter->indexOf( '?', nIndexOf ); if ( nIndexOf != -1 ) { - rtl::OUString aEquationName; + OUString aEquationName; if ( GetEquationName( *aEquationIter, nIndexOf + 1, aEquationName ) ) { // copying first characters inclusive '?' - rtl::OUString aNew( aEquationIter->copy( 0, nIndexOf + 1 ) ); + OUString aNew( aEquationIter->copy( 0, nIndexOf + 1 ) ); sal_Int32 nIndex = 0; EquationHashMap::iterator aHashIter( pH->find( aEquationName ) ); if ( aHashIter != pH->end() ) nIndex = (*aHashIter).second; - aNew += rtl::OUString::valueOf( nIndex ); + aNew += OUString::valueOf( nIndex ); aNew += aEquationIter->copy( nIndexOf + aEquationName.getLength() + 1 ); *aEquationIter = aNew; } @@ -1368,7 +1368,7 @@ void XMLEnhancedCustomShapeContext::EndElement() SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maHandles, EASGet( EAS_Handles ) ); } -SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix,const rtl::OUString& rLocalName, +SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix,const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList> & xAttrList ) { EnhancedCustomShapeTokenEnum aTokenEnum = EASGet( rLocalName ); @@ -1377,12 +1377,12 @@ SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt1 sal_Int16 nLength = xAttrList->getLength(); if ( nLength ) { - rtl::OUString aFormula; - rtl::OUString aFormulaName; + OUString aFormula; + OUString aFormulaName; for( sal_Int16 nAttr = 0; nAttr < nLength; nAttr++ ) { - rtl::OUString aLocalName; - const rtl::OUString& rValue = xAttrList->getValueByIndex( nAttr ); + OUString aLocalName; + const OUString& rValue = xAttrList->getValueByIndex( nAttr ); /* fixme sven, this needs to be chekced! sal_uInt16 nPrefix = */ GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( nAttr ), &aLocalName ); switch( EASGet( aLocalName ) ) @@ -1410,8 +1410,8 @@ SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt1 const sal_Int16 nLength = xAttrList->getLength(); for( sal_Int16 nAttr = 0; nAttr < nLength; nAttr++ ) { - rtl::OUString aLocalName; - const rtl::OUString& rValue = xAttrList->getValueByIndex( nAttr ); + OUString aLocalName; + const OUString& rValue = xAttrList->getValueByIndex( nAttr ); /* fixme sven, this needs to be chekced! sal_uInt16 nPrefix = */ GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( nAttr ), &aLocalName ); switch( EASGet( aLocalName ) ) { diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx index 1c0e4f28cfdd..008ba4a08da7 100644 --- a/xmloff/source/draw/ximpcustomshape.hxx +++ b/xmloff/source/draw/ximpcustomshape.hxx @@ -46,20 +46,20 @@ class XMLEnhancedCustomShapeContext : public SvXMLImportContext std::vector< com::sun::star::beans::PropertyValue > maPath; std::vector< com::sun::star::beans::PropertyValue > maTextPath; std::vector< com::sun::star::beans::PropertyValues > maHandles; - std::vector< rtl::OUString > maEquations; - std::vector< rtl::OUString > maEquationNames; + std::vector< OUString > maEquations; + std::vector< OUString > maEquationNames; public: TYPEINFO(); XMLEnhancedCustomShapeContext( SvXMLImport& rImport, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ); + const OUString& rLocalName, std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx index 513b39d27728..8747bdadb58c 100644 --- a/xmloff/source/draw/ximpgrp.cxx +++ b/xmloff/source/draw/ximpgrp.cxx @@ -24,8 +24,6 @@ #include "eventimp.hxx" #include "descriptionimp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx index bfae703b22e5..b24414e91cb6 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -42,14 +42,14 @@ protected: public: TYPEINFO(); - SdXMLGroupShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, + SdXMLGroupShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); virtual ~SdXMLGroupShapeContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, 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(); diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx index c277a907d353..92f99c004c28 100644 --- a/xmloff/source/draw/ximplink.cxx +++ b/xmloff/source/draw/ximplink.cxx @@ -21,8 +21,6 @@ #include "ximplink.hxx" #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx index 3b60b21b2c04..d2d33779787e 100644 --- a/xmloff/source/draw/ximplink.hxx +++ b/xmloff/source/draw/ximplink.hxx @@ -37,18 +37,18 @@ class SdXMLShapeLinkContext : public SvXMLShapeContext { // the parent shape group this link is placed in com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxParent; - rtl::OUString msHyperlink; + OUString msHyperlink; public: TYPEINFO(); - SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, + SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); virtual ~SdXMLShapeLinkContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, 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(); diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx index b92a14fcf37d..52f90ad8f02e 100644 --- a/xmloff/source/draw/ximpnote.cxx +++ b/xmloff/source/draw/ximpnote.cxx @@ -20,8 +20,6 @@ #include "ximpnote.hxx" #include <com/sun/star/presentation/XPresentationPage.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx index 1f013726357e..89ec7e3163b5 100644 --- a/xmloff/source/draw/ximpnote.hxx +++ b/xmloff/source/draw/ximpnote.hxx @@ -31,17 +31,17 @@ class SdXMLNotesContext : public SdXMLGenericPageContext { private: - rtl::OUString msPageMasterName; + OUString msPageMasterName; public: SdXMLNotesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); virtual ~SdXMLNotesContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); }; diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 576b543d6fdf..3a9c5ab0db0d 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -38,8 +38,6 @@ #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/xmluconv.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -63,7 +61,7 @@ class DrawAnnotationContext : public SvXMLImportContext public: DrawAnnotationContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,const Reference< xml::sax::XAttributeList>& xAttrList, const Reference< XAnnotationAccess >& xAnnotationAccess ); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); private: @@ -360,7 +358,7 @@ void SdXMLGenericPageContext::EndElement() SetNavigationOrder(); } -void SdXMLGenericPageContext::SetStyle( rtl::OUString& rStyleName ) +void SdXMLGenericPageContext::SetStyle( OUString& rStyleName ) { // set PageProperties? if(!rStyleName.isEmpty()) diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx index 486846f55855..cb5b01a63035 100644 --- a/xmloff/source/draw/ximppage.hxx +++ b/xmloff/source/draw/ximppage.hxx @@ -38,17 +38,17 @@ class SdXMLGenericPageContext : public SvXMLImportContext ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotationAccess > mxAnnotationAccess; protected: - rtl::OUString maPageLayoutName; - rtl::OUString maUseHeaderDeclName; - rtl::OUString maUseFooterDeclName; - rtl::OUString maUseDateTimeDeclName; - rtl::OUString msNavOrder; + OUString maPageLayoutName; + OUString maUseHeaderDeclName; + OUString maUseFooterDeclName; + OUString maUseDateTimeDeclName; + OUString msNavOrder; void SetLocalShapesContext(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rNew) { mxShapes = rNew; } /** sets the page style on this page */ - void SetStyle( rtl::OUString& rStyleName ); + void SetStyle( OUString& rStyleName ); /** sets the presentation layout at this page. It is used for drawing pages and for the handout master */ void SetLayout(); @@ -60,21 +60,21 @@ protected: SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } /** sets the properties from a page master style with the given name on this contexts page */ - void SetPageMaster( rtl::OUString& rsPageMasterName ); + void SetPageMaster( OUString& rsPageMasterName ); void SetNavigationOrder(); public: TYPEINFO(); - SdXMLGenericPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, + SdXMLGenericPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); virtual ~SdXMLGenericPageContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index c38f45faf326..f853c3ddc895 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -77,8 +77,6 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/text/XTextDocument.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -117,7 +115,7 @@ SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[] = //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -static bool ImpIsEmptyURL( const ::rtl::OUString& rURL ) +static bool ImpIsEmptyURL( const OUString& rURL ) { if( rURL.isEmpty() ) return true; @@ -364,7 +362,7 @@ void SdXMLShapeContext::EndElement() { uno::Reference< beans::XPropertySet > xProp( mxShape, uno::UNO_QUERY ); - rtl::OUString sLink( "Hyperlink" ); + OUString sLink( "Hyperlink" ); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName( sLink ) ) xProp->setPropertyValue( sLink, uno::Any( msHyperlink ) ); Reference< XEventsSupplier > xEventsSupplier( mxShape, UNO_QUERY_THROW ); @@ -443,10 +441,10 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape) { uno::Reference< beans::XPropertySet > xSet( xShape, uno::UNO_QUERY_THROW ); if( !mbVisible ) - xSet->setPropertyValue( rtl::OUString( "Visible" ), uno::Any( sal_False ) ); + xSet->setPropertyValue( OUString( "Visible" ), uno::Any( sal_False ) ); if( !mbPrintable ) - xSet->setPropertyValue( rtl::OUString( "Printable" ), uno::Any( sal_False ) ); + xSet->setPropertyValue( OUString( "Printable" ), uno::Any( sal_False ) ); } catch(const Exception&) { @@ -511,7 +509,7 @@ void SdXMLShapeContext::AddShape(const char* pServiceName ) } catch(const uno::Exception& e) { - uno::Sequence<rtl::OUString> aSeq( 1 ); + uno::Sequence<OUString> aSeq( 1 ); aSeq[0] = OUString::createFromAscii(pServiceName); GetImport().SetError( XMLERROR_FLAG_ERROR | XMLERROR_API, aSeq, e.Message, NULL ); @@ -782,7 +780,7 @@ void SdXMLShapeContext::SetThumbnail() } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { bool bHaveXmlId( false ); if( (XML_NAMESPACE_DRAW == nPrefix) || (XML_NAMESPACE_DRAW_EXT == nPrefix) ) @@ -945,7 +943,7 @@ SdXMLRectShapeContext::~SdXMLRectShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLRectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLRectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -1023,7 +1021,7 @@ SdXMLLineShapeContext::~SdXMLLineShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLLineShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLLineShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_SVG == nPrefix ) { @@ -1152,7 +1150,7 @@ SdXMLEllipseShapeContext::~SdXMLEllipseShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_SVG == nPrefix ) { @@ -1274,7 +1272,7 @@ SdXMLPolygonShapeContext::SdXMLPolygonShapeContext( ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_SVG == nPrefix ) { @@ -1373,7 +1371,7 @@ SdXMLPathShapeContext::~SdXMLPathShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLPathShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLPathShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_SVG == nPrefix ) { @@ -1507,7 +1505,7 @@ SdXMLTextBoxShapeContext::~SdXMLTextBoxShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -1681,7 +1679,7 @@ SdXMLControlShapeContext::~SdXMLControlShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLControlShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLControlShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -1761,7 +1759,7 @@ SdXMLConnectorShapeContext::~SdXMLConnectorShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -1994,7 +1992,7 @@ SdXMLMeasureShapeContext::~SdXMLMeasureShapeContext() } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLMeasureShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLMeasureShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -2114,7 +2112,7 @@ SdXMLPageShapeContext::~SdXMLPageShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLPageShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLPageShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -2267,7 +2265,7 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -2313,7 +2311,7 @@ SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext( ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_XLINK == nPrefix ) { @@ -2438,7 +2436,7 @@ void SdXMLGraphicObjectShapeContext::EndElement() ////////////////////////////////////////////////////////////////////////////// SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext* pContext = NULL; @@ -2567,13 +2565,13 @@ void SdXMLChartShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -void SdXMLChartShapeContext::Characters( const ::rtl::OUString& rChars ) +void SdXMLChartShapeContext::Characters( const OUString& rChars ) { if( mpChartContext ) mpChartContext->Characters( rChars ); } -SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { if( mpChartContext ) @@ -2587,7 +2585,7 @@ SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPre TYPEINIT1( SdXMLObjectShapeContext, SdXMLShapeContext ); SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape) @@ -2731,7 +2729,7 @@ void SdXMLObjectShapeContext::EndElement() } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -2755,7 +2753,7 @@ void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl: } SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { // #100592# @@ -2804,7 +2802,7 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext( TYPEINIT1( SdXMLAppletShapeContext, SdXMLShapeContext ); SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape) @@ -2833,7 +2831,7 @@ void SdXMLAppletShapeContext::StartElement( const ::com::sun::star::uno::Referen } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLAppletShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLAppletShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -2912,7 +2910,7 @@ void SdXMLAppletShapeContext::EndElement() xProps->setPropertyValue( OUString( "AppletCode" ), aAny ); } - aAny <<= ::rtl::OUString( GetImport().GetDocumentBase() ); + aAny <<= OUString( GetImport().GetDocumentBase() ); xProps->setPropertyValue( OUString( "AppletDocBase" ), aAny ); SetThumbnail(); @@ -2921,7 +2919,7 @@ void SdXMLAppletShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) ) { @@ -2969,7 +2967,7 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_n TYPEINIT1( SdXMLPluginShapeContext, SdXMLShapeContext ); SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape) : @@ -3049,12 +3047,12 @@ void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Referen } } -static ::rtl::OUString -lcl_GetMediaReference(SvXMLImport const& rImport, ::rtl::OUString const& rURL) +static OUString +lcl_GetMediaReference(SvXMLImport const& rImport, OUString const& rURL) { if (rImport.IsPackageURL(rURL)) { - return ::rtl::OUString( "vnd.sun.star.Package:") + rURL; + return OUString( "vnd.sun.star.Package:") + rURL; } else { @@ -3063,7 +3061,7 @@ lcl_GetMediaReference(SvXMLImport const& rImport, ::rtl::OUString const& rURL) } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLPluginShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLPluginShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -3096,7 +3094,7 @@ void SdXMLPluginShapeContext::EndElement() if ( maSize.Width && maSize.Height ) { - const rtl::OUString sVisibleArea( "VisibleArea" ); + const OUString sVisibleArea( "VisibleArea" ); uno::Reference< beans::XPropertySetInfo > aXPropSetInfo( xProps->getPropertySetInfo() ); if ( !aXPropSetInfo.is() || aXPropSetInfo->hasPropertyByName( sVisibleArea ) ) { @@ -3197,7 +3195,7 @@ void SdXMLPluginShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) ) { @@ -3245,7 +3243,7 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_n TYPEINIT1( SdXMLFloatingFrameShapeContext, SdXMLShapeContext ); SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape) @@ -3294,7 +3292,7 @@ void SdXMLFloatingFrameShapeContext::StartElement( const ::com::sun::star::uno:: } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLFloatingFrameShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLFloatingFrameShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -3342,7 +3340,7 @@ void SdXMLFloatingFrameShapeContext::EndElement() TYPEINIT1( SdXMLFrameShapeContext, SdXMLShapeContext ); SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape) @@ -3400,9 +3398,9 @@ void SdXMLFrameShapeContext::removeGraphicFromImportContext(const SvXMLImportCon } } -rtl::OUString SdXMLFrameShapeContext::getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const +OUString SdXMLFrameShapeContext::getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const { - rtl::OUString aRetval; + OUString aRetval; const SdXMLGraphicObjectShapeContext* pSdXMLGraphicObjectShapeContext = dynamic_cast< const SdXMLGraphicObjectShapeContext* >(&rContext); if(pSdXMLGraphicObjectShapeContext) @@ -3591,7 +3589,7 @@ void SdXMLFrameShapeContext::EndElement() } void SdXMLFrameShapeContext::processAttribute( sal_uInt16, - const ::rtl::OUString&, const ::rtl::OUString& ) + const OUString&, const OUString& ) { // ignore } @@ -3618,7 +3616,7 @@ SdXMLCustomShapeContext::~SdXMLCustomShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLCustomShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLCustomShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -3682,7 +3680,7 @@ void SdXMLCustomShapeContext::EndElement() { if ( !maCustomShapeGeometry.empty() ) { - const rtl::OUString sCustomShapeGeometry ( "CustomShapeGeometry" ); + const OUString sCustomShapeGeometry ( "CustomShapeGeometry" ); // converting the vector to a sequence uno::Sequence< beans::PropertyValue > aSeq( maCustomShapeGeometry.size() ); @@ -3715,7 +3713,7 @@ void SdXMLCustomShapeContext::EndElement() Reference< drawing::XEnhancedCustomShapeDefaulter > xDefaulter( mxShape, UNO_QUERY ); if( xDefaulter.is() ) { - rtl::OUString aEmptyType; + OUString aEmptyType; xDefaulter->createCustomShapeDefaults( aEmptyType ); } } @@ -3727,7 +3725,7 @@ void SdXMLCustomShapeContext::EndElement() ////////////////////////////////////////////////////////////////////////////// SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext* pContext = NULL; @@ -3753,7 +3751,7 @@ SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext( TYPEINIT1( SdXMLTableShapeContext, SdXMLShapeContext ); -SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) +SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, sal_False ) { memset( &maTemplateStylesUsed, 0, sizeof( maTemplateStylesUsed ) ); @@ -3865,7 +3863,7 @@ void SdXMLTableShapeContext::EndElement() } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLTableShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLTableShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( nPrefix == XML_NAMESPACE_TABLE ) { @@ -3893,7 +3891,7 @@ void SdXMLTableShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl:: SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -SvXMLImportContext* SdXMLTableShapeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContext* SdXMLTableShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { if( mxTableImportContext.Is() && (nPrefix == XML_NAMESPACE_TABLE) ) return mxTableImportContext->CreateChildContext(nPrefix, rLocalName, xAttrList); diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 56c428c55188..951fe905c426 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -50,11 +50,11 @@ protected: com::sun::star::uno::Reference< com::sun::star::container::XIdentifierContainer > mxGluePoints; com::sun::star::uno::Reference< com::sun::star::document::XActionLockable > mxLockable; - rtl::OUString maDrawStyleName; - rtl::OUString maTextStyleName; - rtl::OUString maPresentationClass; - rtl::OUString maShapeName; - rtl::OUString maThumbnailURL; + OUString maDrawStyleName; + OUString maTextStyleName; + OUString maPresentationClass; + OUString maShapeName; + OUString maThumbnailURL; /// whether to restore list context (#91964#) bool mbListContextPushed; @@ -65,12 +65,12 @@ protected: bool mbClearDefaultAttributes; sal_Bool mbIsUserTransformed; sal_Int32 mnZOrder; - rtl::OUString maShapeId; - rtl::OUString maLayerName; + OUString maShapeId; + OUString maLayerName; // #i68101# - rtl::OUString maShapeTitle; - rtl::OUString maShapeDescription; + OUString maShapeTitle; + OUString maShapeDescription; SdXMLImExTransform2D mnTransform; com::sun::star::awt::Size maSize; @@ -100,7 +100,7 @@ public: SdXMLShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -109,11 +109,11 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -127,7 +127,7 @@ public: TYPEINFO(); SdXMLRectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -135,7 +135,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -152,7 +152,7 @@ public: TYPEINFO(); SdXMLLineShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -160,7 +160,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -180,7 +180,7 @@ public: TYPEINFO(); SdXMLEllipseShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -188,7 +188,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -196,22 +196,22 @@ public: class SdXMLPolygonShapeContext : public SdXMLShapeContext { - rtl::OUString maPoints; - rtl::OUString maViewBox; + OUString maPoints; + OUString maViewBox; sal_Bool mbClosed; public: TYPEINFO(); SdXMLPolygonShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bClosed, sal_Bool bTemporaryShape); virtual ~SdXMLPolygonShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -219,14 +219,14 @@ public: class SdXMLPathShapeContext : public SdXMLShapeContext { - rtl::OUString maD; - rtl::OUString maViewBox; + OUString maD; + OUString maViewBox; public: TYPEINFO(); SdXMLPathShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -234,7 +234,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -248,7 +248,7 @@ public: TYPEINFO(); SdXMLTextBoxShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -256,7 +256,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -265,13 +265,13 @@ public: class SdXMLControlShapeContext : public SdXMLShapeContext { private: - rtl::OUString maFormId; + OUString maFormId; public: TYPEINFO(); SdXMLControlShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -279,7 +279,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -293,9 +293,9 @@ private: sal_uInt16 mnType; - rtl::OUString maStartShapeId; + OUString maStartShapeId; sal_Int32 mnStartGlueId; - rtl::OUString maEndShapeId; + OUString maEndShapeId; sal_Int32 mnEndGlueId; sal_Int32 mnDelta1; @@ -308,7 +308,7 @@ public: TYPEINFO(); SdXMLConnectorShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -316,7 +316,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -332,7 +332,7 @@ public: TYPEINFO(); SdXMLMeasureShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -341,7 +341,7 @@ public: virtual void EndElement(); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -355,7 +355,7 @@ public: TYPEINFO(); SdXMLPageShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -363,7 +363,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -379,7 +379,7 @@ public: TYPEINFO(); SdXMLCaptionShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -387,7 +387,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -396,14 +396,14 @@ public: class SdXMLGraphicObjectShapeContext : public SdXMLShapeContext { private: - ::rtl::OUString maURL; + OUString maURL; ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; public: TYPEINFO(); SdXMLGraphicObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -411,11 +411,11 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -429,7 +429,7 @@ public: TYPEINFO(); SdXMLChartShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -437,8 +437,8 @@ public: 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 SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual void Characters( const OUString& rChars ); + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; @@ -448,8 +448,8 @@ public: class SdXMLObjectShapeContext : public SdXMLShapeContext { private: - rtl::OUString maCLSID; - rtl::OUString maHref; + OUString maCLSID; + OUString maHref; // #100592# ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; @@ -458,7 +458,7 @@ public: TYPEINFO(); SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -468,11 +468,11 @@ public: virtual void EndElement(); // #100592# - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -481,9 +481,9 @@ public: class SdXMLAppletShapeContext : public SdXMLShapeContext { private: - rtl::OUString maAppletName; - rtl::OUString maAppletCode; - rtl::OUString maHref; + OUString maAppletName; + OUString maAppletCode; + OUString maHref; sal_Bool mbIsScript; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; @@ -492,7 +492,7 @@ public: TYPEINFO(); SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -501,11 +501,11 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -514,8 +514,8 @@ public: class SdXMLPluginShapeContext : public SdXMLShapeContext { private: - rtl::OUString maMimeType; - rtl::OUString maHref; + OUString maMimeType; + OUString maHref; bool mbMedia; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; @@ -524,7 +524,7 @@ public: TYPEINFO(); SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -533,11 +533,11 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -546,14 +546,14 @@ public: class SdXMLFloatingFrameShapeContext : public SdXMLShapeContext { private: - rtl::OUString maFrameName; - rtl::OUString maHref; + OUString maFrameName; + OUString maHref; public: TYPEINFO(); SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -563,7 +563,7 @@ public: virtual void EndElement(); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -578,26 +578,26 @@ private: protected: /// helper to get the created xShape instance, needs to be overloaded - virtual rtl::OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const; + virtual OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const; virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const; public: TYPEINFO(); SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); virtual ~SdXMLFrameShapeContext(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, 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 processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; class SdXMLCustomShapeContext : public SdXMLShapeContext @@ -605,8 +605,8 @@ class SdXMLCustomShapeContext : public SdXMLShapeContext protected : - rtl::OUString maCustomShapeEngine; - rtl::OUString maCustomShapeData; + OUString maCustomShapeEngine; + OUString maCustomShapeData; std::vector< com::sun::star::beans::PropertyValue > maCustomShapeGeometry; @@ -614,7 +614,7 @@ public: TYPEINFO(); - SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, + SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -623,11 +623,11 @@ public: virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -639,7 +639,7 @@ public: TYPEINFO(); SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ); virtual ~SdXMLTableShapeContext(); @@ -647,14 +647,14 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); private: SvXMLImportContextRef mxTableImportContext; - rtl::OUString msTemplateStyleName; + OUString msTemplateStyleName; sal_Bool maTemplateStylesUsed[6]; }; diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx index fe6ebd919781..d80c71d43ecb 100644 --- a/xmloff/source/draw/ximpshow.cxx +++ b/xmloff/source/draw/ximpshow.cxx @@ -34,8 +34,6 @@ #include <xmloff/xmluconv.hxx> #include "ximpshow.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx index 116bb8eebb2b..a6190f0c6de8 100644 --- a/xmloff/source/draw/ximpshow.hxx +++ b/xmloff/source/draw/ximpshow.hxx @@ -37,11 +37,11 @@ public: SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~SdXMLShowsContext(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 61c1a48cd461..db902df9a80a 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -45,8 +45,6 @@ #include "XMLNumberStylesImport.hxx" #include "xmloff/xmlerror.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -62,7 +60,7 @@ public: TYPEINFO(); SdXMLDrawingPagePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProps, @@ -72,7 +70,7 @@ public: using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp); @@ -143,7 +141,7 @@ public: SdXMLDrawingPageStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily = XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID); @@ -151,7 +149,7 @@ public: SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void Finish( sal_Bool bOverwrite ); @@ -1270,8 +1268,8 @@ void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) co try { uno::Reference< container::XNameAccess > xMasterPageStyles( rStyleFamilies->getByName(rMaster.GetDisplayName()), UNO_QUERY_THROW ); - rtl::OUString sPrefix(rMaster.GetDisplayName()); - sPrefix += rtl::OUString(static_cast<sal_Unicode>('-')); + OUString sPrefix(rMaster.GetDisplayName()); + sPrefix += OUString(static_cast<sal_Unicode>('-')); ImpSetGraphicStyles(xMasterPageStyles, XML_STYLE_FAMILY_SD_PRESENTATION_ID, sPrefix); } catch (const uno::Exception&) @@ -1291,7 +1289,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles() const const OUString sGraphicStyleName(OUString("graphics")); uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sGraphicStyleName), uno::UNO_QUERY_THROW ); - ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, rtl::OUString()); + ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, OUString()); } catch( uno::Exception& ) { @@ -1306,7 +1304,7 @@ void SdXMLStylesContext::ImpSetCellStyles() const const OUString sCellStyleName(OUString("cell")); uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sCellStyleName), uno::UNO_QUERY_THROW ); - ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_TABLE_CELL, rtl::OUString()); + ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_TABLE_CELL, OUString()); } catch( uno::Exception& ) { @@ -1317,7 +1315,7 @@ void SdXMLStylesContext::ImpSetCellStyles() const ////////////////////////////////////////////////////////////////////////////// // help function used by ImpSetGraphicStyles() and ImpSetMasterPageStyles() // -void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAccess >& xPageStyles, sal_uInt16 nFamily, const rtl::OUString& rPrefix) const +void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAccess >& xPageStyles, sal_uInt16 nFamily, const OUString& rPrefix) const { sal_Int32 nPrefLen(rPrefix.getLength()); @@ -1449,7 +1447,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAc if(xStyle.is()) { // set parent style name - ::rtl::OUString sParentStyleDisplayName( const_cast< SvXMLImport& >( GetImport() ).GetStyleDisplayName( pStyle->GetFamily(), pStyle->GetParentName() ) ); + OUString sParentStyleDisplayName( const_cast< SvXMLImport& >( GetImport() ).GetStyleDisplayName( pStyle->GetFamily(), pStyle->GetParentName() ) ); if( nPrefLen ) { sal_Int32 nStylePrefLen = sParentStyleDisplayName.lastIndexOf( sal_Unicode('-') ) + 1; @@ -1498,7 +1496,7 @@ TYPEINIT1( SdXMLMasterStylesContext, SvXMLImportContext ); SdXMLMasterStylesContext::SdXMLMasterStylesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName) + const OUString& rLName) : SvXMLImportContext( rImport, nPrfx, rLName) { } @@ -1512,7 +1510,7 @@ SdXMLMasterStylesContext::~SdXMLMasterStylesContext() SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList) { SvXMLImportContext* pContext = 0; @@ -1586,7 +1584,7 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext( /////////////////////////////////////////////////////////////////////// SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) : SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList ) { @@ -1640,7 +1638,7 @@ void SdXMLHeaderFooterDeclContext::EndElement() } } -void SdXMLHeaderFooterDeclContext::Characters( const ::rtl::OUString& rChars ) +void SdXMLHeaderFooterDeclContext::Characters( const OUString& rChars ) { maStrText += rChars; } diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index 05e13038ded7..3b572bfc5223 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -52,7 +52,7 @@ public: SdXMLPageMasterStyleContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPageMasterStyleContext(); @@ -70,7 +70,7 @@ public: class SdXMLPageMasterContext: public SvXMLStyleContext { - rtl::OUString msName; + OUString msName; SdXMLPageMasterStyleContext*mpPageMasterStyle; const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); } @@ -82,15 +82,15 @@ public: SdXMLPageMasterContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPageMasterContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); - const rtl::OUString& GetName() const { return msName; } + const OUString& GetName() const { return msName; } const SdXMLPageMasterStyleContext* GetPageMasterStyle() const { return mpPageMasterStyle; } }; @@ -99,10 +99,10 @@ public: class SdXMLMasterPageContext: public SdXMLGenericPageContext { - rtl::OUString msPageMasterName; - rtl::OUString msName; - rtl::OUString msDisplayName; - rtl::OUString msStyleName; + OUString msPageMasterName; + OUString msName; + OUString msDisplayName; + OUString msStyleName; public: TYPEINFO(); @@ -110,20 +110,20 @@ public: SdXMLMasterPageContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); virtual ~SdXMLMasterPageContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - const rtl::OUString& GetPageMasterName() const { return msPageMasterName; } - const rtl::OUString& GetEncodedName() const { return msName; } - const rtl::OUString& GetDisplayName() const { return msDisplayName; } + const OUString& GetPageMasterName() const { return msPageMasterName; } + const OUString& GetEncodedName() const { return msName; } + const OUString& GetDisplayName() const { return msDisplayName; } }; typedef ::std::vector< SdXMLMasterPageContext* > ImpMasterPageList; @@ -133,7 +133,7 @@ typedef ::std::vector< SdXMLMasterPageContext* > ImpMasterPageList; class SdXMLPresentationPlaceholderContext: public SvXMLImportContext { - rtl::OUString msName; + OUString msName; sal_Int32 mnX; sal_Int32 mnY; sal_Int32 mnWidth; @@ -146,11 +146,11 @@ public: SdXMLPresentationPlaceholderContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPresentationPlaceholderContext(); - const rtl::OUString& GetName() const { return msName; } + const OUString& GetName() const { return msName; } sal_Int32 GetX() const { return mnX; } sal_Int32 GetY() const { return mnY; } sal_Int32 GetWidth() const { return mnWidth; } @@ -163,7 +163,7 @@ typedef ::std::vector< SdXMLPresentationPlaceholderContext* > ImpPlaceholderList class SdXMLPresentationPageLayoutContext: public SvXMLStyleContext { - rtl::OUString msName; + OUString msName; ImpPlaceholderList maList; sal_uInt16 mnTypeId; @@ -176,12 +176,12 @@ public: SdXMLPresentationPageLayoutContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPresentationPageLayoutContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); @@ -204,23 +204,23 @@ class SdXMLStylesContext : public SvXMLStylesContext void ImpSetGraphicStyles() const; void ImpSetCellStyles() const; void ImpSetGraphicStyles( com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xPageStyles, - sal_uInt16 nFamily, const rtl::OUString& rPrefix) const; + sal_uInt16 nFamily, const OUString& rPrefix) const; protected: virtual SvXMLStyleContext* CreateStyleChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: @@ -229,12 +229,12 @@ public: SdXMLStylesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_Bool bIsAutoStyle); virtual ~SdXMLStylesContext(); - virtual sal_uInt16 GetFamily( const rtl::OUString& rFamily ) const; + virtual sal_uInt16 GetFamily( const OUString& rFamily ) const; virtual void EndElement(); virtual UniReference< SvXMLImportPropertyMapper > GetImportPropertyMapper(sal_uInt16 nFamily) const; @@ -259,12 +259,12 @@ public: SdXMLMasterStylesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName); + const OUString& rLName); virtual ~SdXMLMasterStylesContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); const ImpMasterPageList& GetMasterPageList() const { return maMasterPageList; } @@ -277,17 +277,17 @@ class SdXMLHeaderFooterDeclContext : public SvXMLStyleContext { public: SdXMLHeaderFooterDeclContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual sal_Bool IsTransient() const; virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); private: - ::rtl::OUString maStrName; - ::rtl::OUString maStrText; - ::rtl::OUString maStrDateTimeFormat; + OUString maStrName; + OUString maStrText; + OUString maStrDateTimeFormat; sal_Bool mbFixed; }; diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx index 8d74287dd640..37a965967046 100644 --- a/xmloff/source/forms/attriblistmerge.cxx +++ b/xmloff/source/forms/attriblistmerge.cxx @@ -60,7 +60,7 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OAttribListMerger::seekToName(const ::rtl::OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) + sal_Bool OAttribListMerger::seekToName(const OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) { for ( ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin(); aLookupSublist != m_aLists.end(); @@ -91,37 +91,37 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAttribListMerger::getNameByIndex( sal_Int16 i ) throw(RuntimeException) + OUString SAL_CALL OAttribListMerger::getNameByIndex( sal_Int16 i ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; sal_Int16 nLocalIndex; if (!seekToIndex(i, xSubList, nLocalIndex)) - return ::rtl::OUString(); + return OUString(); return xSubList->getNameByIndex(nLocalIndex); } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAttribListMerger::getTypeByIndex( sal_Int16 i ) throw(RuntimeException) + OUString SAL_CALL OAttribListMerger::getTypeByIndex( sal_Int16 i ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; sal_Int16 nLocalIndex; if (!seekToIndex(i, xSubList, nLocalIndex)) - return ::rtl::OUString(); + return OUString(); return xSubList->getTypeByIndex(nLocalIndex); } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAttribListMerger::getTypeByName( const ::rtl::OUString& _rName ) throw(RuntimeException) + OUString SAL_CALL OAttribListMerger::getTypeByName( const OUString& _rName ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; sal_Int16 nLocalIndex; if (!seekToName(_rName, xSubList, nLocalIndex)) - return ::rtl::OUString(); + return OUString(); // though we're in getTypeByName here, we reroute this to the getTypeByIndex of the sub list, // assuming that this is faster @@ -129,25 +129,25 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAttribListMerger::getValueByIndex( sal_Int16 i ) throw(RuntimeException) + OUString SAL_CALL OAttribListMerger::getValueByIndex( sal_Int16 i ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; sal_Int16 nLocalIndex; if (!seekToIndex(i, xSubList, nLocalIndex)) - return ::rtl::OUString(); + return OUString(); return xSubList->getValueByIndex(nLocalIndex); } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAttribListMerger::getValueByName( const ::rtl::OUString& _rName ) throw(RuntimeException) + OUString SAL_CALL OAttribListMerger::getValueByName( const OUString& _rName ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; sal_Int16 nLocalIndex; if (!seekToName(_rName, xSubList, nLocalIndex)) - return ::rtl::OUString(); + return OUString(); // though we're in getValueByName here, we reroute this to the getValueByIndex of the sub list, // assuming that this is faster diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx index 8b80bf2638fd..8cdd67642e24 100644 --- a/xmloff/source/forms/attriblistmerge.hxx +++ b/xmloff/source/forms/attriblistmerge.hxx @@ -57,15 +57,15 @@ namespace xmloff // XAttributeList virtual sal_Int16 SAL_CALL getLength( ) 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); protected: sal_Bool seekToIndex(sal_Int16 _nGlobalIndex, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); - sal_Bool seekToName(const ::rtl::OUString& _rName, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); + sal_Bool seekToName(const OUString& _rName, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); }; diff --git a/xmloff/source/forms/callbacks.hxx b/xmloff/source/forms/callbacks.hxx index 77ad6ccfeed1..311846b11131 100644 --- a/xmloff/source/forms/callbacks.hxx +++ b/xmloff/source/forms/callbacks.hxx @@ -48,7 +48,7 @@ namespace xmloff virtual void exportCollectionElements( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxCollection) = 0; - virtual ::rtl::OUString getObjectStyleName( + virtual OUString getObjectStyleName( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) = 0; protected: diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx index 15b96431a2be..d89f2eb23bc6 100644 --- a/xmloff/source/forms/controlpropertyhdl.cxx +++ b/xmloff/source/forms/controlpropertyhdl.cxx @@ -143,9 +143,9 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OControlTextEmphasisHandler::exportXML( ::rtl::OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OControlTextEmphasisHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { - ::rtl::OUStringBuffer aReturn; + OUStringBuffer aReturn; sal_Bool bSuccess = sal_False; sal_Int16 nFontEmphasis = sal_Int16(); if (_rValue >>= nFontEmphasis) @@ -170,7 +170,7 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OControlTextEmphasisHandler::importXML( const ::rtl::OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OControlTextEmphasisHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { sal_Bool bSuccess = sal_True; sal_uInt16 nEmphasis = awt::FontEmphasisMark::NONE; @@ -178,7 +178,7 @@ namespace xmloff sal_Bool bBelow = sal_False; sal_Bool bHasPos = sal_False, bHasType = sal_False; - ::rtl::OUString sToken; + OUString sToken; SvXMLTokenEnumerator aTokenEnum(_rStrImpValue); while (aTokenEnum.getNextToken(sToken)) { @@ -228,9 +228,9 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OControlBorderHandler::importXML( const ::rtl::OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OControlBorderHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { - ::rtl::OUString sToken; + OUString sToken; SvXMLTokenEnumerator aTokens(_rStrImpValue); sal_uInt16 nStyle = 1; @@ -266,11 +266,11 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OControlBorderHandler::exportXML( ::rtl::OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OControlBorderHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { sal_Bool bSuccess = sal_False; - ::rtl::OUStringBuffer aOut; + OUStringBuffer aOut; switch ( m_eFacet ) { case STYLE: @@ -311,7 +311,7 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OFontWidthHandler::importXML( const ::rtl::OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OFontWidthHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { sal_Int32 nWidth = 0; bool const bSuccess = ::sax::Converter::convertMeasure( @@ -323,10 +323,10 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OFontWidthHandler::exportXML( ::rtl::OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OFontWidthHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { sal_Int16 nWidth = 0; - ::rtl::OUStringBuffer aResult; + OUStringBuffer aResult; if (_rValue >>= nWidth) { ::sax::Converter::convertMeasure(aResult, nWidth, @@ -346,7 +346,7 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool ORotationAngleHandler::importXML( const ::rtl::OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool ORotationAngleHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { double fValue; bool const bSucces = @@ -361,14 +361,14 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool ORotationAngleHandler::exportXML( ::rtl::OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool ORotationAngleHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { float fAngle = 0; sal_Bool bSuccess = (_rValue >>= fAngle); if (bSuccess) { - rtl::OUStringBuffer sValue; + OUStringBuffer sValue; ::sax::Converter::convertDouble(sValue, ((double)fAngle) / 10); _rStrExpValue = sValue.makeStringAndClear(); } diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 768c76a02158..bc53c1e213bb 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -173,13 +173,13 @@ namespace xmloff return; } - ::rtl::OUString sServiceName = xPersistence->getServiceName(); + OUString sServiceName = xPersistence->getServiceName(); // we don't want to write the old service name directly: it's a name used for compatibility reasons, but // as we start some kind of new file format here (with this xml export), we don't care about // compatibility ... // So we translate the old persistence service name into new ones, if possible - ::rtl::OUString sToWriteServiceName = sServiceName; + OUString sToWriteServiceName = sServiceName; #define CHECK_N_TRANSLATE( name ) \ else if (sServiceName.equals(SERVICE_PERSISTENT_COMPONENT_##name)) \ sToWriteServiceName = SERVICE_##name @@ -247,7 +247,7 @@ namespace xmloff //===================================================================== //--------------------------------------------------------------------- OControlExport::OControlExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxControl, - const ::rtl::OUString& _rControlId, const ::rtl::OUString& _rReferringControls, + const OUString& _rControlId, const OUString& _rReferringControls, const Sequence< ScriptEventDescriptor >& _rEvents) :OElementExport(_rContext, _rxControl, _rEvents) ,m_sControlId(_rControlId) @@ -358,14 +358,14 @@ namespace xmloff const XMLPropertyMapEntry* pCharAttributeProperties = XMLTextPropertySetMapper::getPropertyMapForType( TEXT_PROP_MAP_TEXT ); while ( pCharAttributeProperties->msApiName ) { - exportedProperty( ::rtl::OUString::createFromAscii( pCharAttributeProperties->msApiName ) ); + exportedProperty( OUString::createFromAscii( pCharAttributeProperties->msApiName ) ); ++pCharAttributeProperties; } const XMLPropertyMapEntry* pParaAttributeProperties = XMLTextPropertySetMapper::getPropertyMapForType( TEXT_PROP_MAP_SHAPE_PARA ); while ( pParaAttributeProperties->msApiName ) { - exportedProperty( ::rtl::OUString::createFromAscii( pParaAttributeProperties->msApiName ) ); + exportedProperty( OUString::createFromAscii( pParaAttributeProperties->msApiName ) ); ++pParaAttributeProperties; } @@ -421,7 +421,7 @@ namespace xmloff break; case COMBOBOX: { // a combox box description has sub elements: the items - DBG_CHECK_PROPERTY( PROPERTY_STRING_ITEM_LIST, Sequence< ::rtl::OUString > ); + DBG_CHECK_PROPERTY( PROPERTY_STRING_ITEM_LIST, Sequence< OUString > ); // don't export the list entries if the are not provided by the user, but obtained implicitly // from other sources @@ -429,10 +429,10 @@ namespace xmloff if ( controlHasUserSuppliedListEntries() ) { // get the item list - Sequence< ::rtl::OUString > aListItems; + Sequence< OUString > aListItems; m_xProps->getPropertyValue(PROPERTY_STRING_ITEM_LIST) >>= aListItems; // loop through it and write the sub elements - const ::rtl::OUString* pListItems = aListItems.getConstArray(); + const OUString* pListItems = aListItems.getConstArray(); for (sal_Int32 i=0; i<aListItems.getLength(); ++i, ++pListItems) { m_rContext.getGlobalContext().ClearAttrList(); @@ -494,7 +494,7 @@ namespace xmloff continue; } - ::rtl::OUString attributeValue; + OUString attributeValue; if ( propDescription->propertyGroup == NO_GROUP ) { // that's a property which has a direct mapping to an attribute @@ -571,7 +571,7 @@ namespace xmloff CCA_LABEL, CCA_TITLE }; // the names of all properties which are expected to be of type string - static ::rtl::OUString aStringPropertyNames[] = + static OUString aStringPropertyNames[] = { OUString(PROPERTY_LABEL), OUString(PROPERTY_TITLE) }; @@ -746,7 +746,7 @@ namespace xmloff // However, if the model has a property "PersistenceMaxTextLength", then we prefer this // determine the name of the property to export - ::rtl::OUString sTextLenPropertyName( PROPERTY_MAXTEXTLENGTH ); + OUString sTextLenPropertyName( PROPERTY_MAXTEXTLENGTH ); if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_PERSISTENCE_MAXTEXTLENGTH ) ) sTextLenPropertyName = PROPERTY_PERSISTENCE_MAXTEXTLENGTH; @@ -823,7 +823,7 @@ namespace xmloff // don't export the current-value if this value originates from a data binding // #i26944# if ( controlHasActiveDataBinding() ) - exportedProperty( ::rtl::OUString::createFromAscii( pCurrentValuePropertyName ) ); + exportedProperty( OUString::createFromAscii( pCurrentValuePropertyName ) ); else exportGenericPropertyAttribute( nCurrentValueAttributeNamespaceKey, @@ -1078,7 +1078,7 @@ namespace xmloff if ( SCA_STEP_SIZE & m_nIncludeSpecial ) { - ::rtl::OUString sPropertyName; + OUString sPropertyName; if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_LINE_INCREMENT ) ) sPropertyName = PROPERTY_LINE_INCREMENT; else if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_SPIN_INCREMENT ) ) @@ -1152,7 +1152,7 @@ namespace xmloff aDuration.Seconds = aTime.GetSec(); aDuration.MilliSeconds = nRepeatDelay % 1000; - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; ::sax::Converter::convertDuration(buf, aDuration); AddAttribute(OAttributeMetaData::getSpecialAttributeNamespace( SCA_REPEAT_DELAY ) ,OAttributeMetaData::getSpecialAttributeName( SCA_REPEAT_DELAY ) @@ -1177,7 +1177,7 @@ namespace xmloff m_xProps->getPropertyValue(PROPERTY_ECHO_CHAR) >>= nValue; if (nValue) { - ::rtl::OUString sCharacter(reinterpret_cast<const sal_Unicode*>(&nValue), 1); + OUString sCharacter(reinterpret_cast<const sal_Unicode*>(&nValue), 1); AddAttribute( OAttributeMetaData::getSpecialAttributeNamespace(SCA_ECHO_CHAR), OAttributeMetaData::getSpecialAttributeName(SCA_ECHO_CHAR), @@ -1276,13 +1276,13 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OControlExport::getScalarListSourceValue() const + OUString OControlExport::getScalarListSourceValue() const { - ::rtl::OUString sListSource; + OUString sListSource; Any aListSource = m_xProps->getPropertyValue( PROPERTY_LISTSOURCE ); if ( !( aListSource >>= sListSource ) ) { - Sequence< ::rtl::OUString > aListSourceSequence; + Sequence< OUString > aListSourceSequence; aListSource >>= aListSourceSequence; if ( aListSourceSequence.getLength() ) sListSource = aListSourceSequence[ 0 ]; @@ -1296,7 +1296,7 @@ namespace xmloff // DA_LIST_SOURCE needs some special handling DBG_CHECK_PROPERTY_NO_TYPE( PROPERTY_LISTSOURCE ); - ::rtl::OUString sListSource = getScalarListSourceValue(); + OUString sListSource = getScalarListSourceValue(); if ( !sListSource.isEmpty() ) { // the ListSource property needs to be exported as attribute, and it is not empty AddAttribute( @@ -1309,7 +1309,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OControlExport::getSequenceInt16PropertyAsSet(const ::rtl::OUString& _rPropertyName, Int16Set& _rOut) + void OControlExport::getSequenceInt16PropertyAsSet(const OUString& _rPropertyName, Int16Set& _rOut) { Sequence< sal_Int16 > aValueSequence; DBG_CHECK_PROPERTY(_rPropertyName, Sequence< sal_Int16 >); @@ -1324,11 +1324,11 @@ namespace xmloff void OControlExport::exportListSourceAsElements() { // the string lists - Sequence< ::rtl::OUString > aItems, aValues; - DBG_CHECK_PROPERTY( PROPERTY_STRING_ITEM_LIST, Sequence< ::rtl::OUString > ); + Sequence< OUString > aItems, aValues; + DBG_CHECK_PROPERTY( PROPERTY_STRING_ITEM_LIST, Sequence< OUString > ); m_xProps->getPropertyValue(PROPERTY_STRING_ITEM_LIST) >>= aItems; - DBG_CHECK_PROPERTY( PROPERTY_LISTSOURCE, Sequence< ::rtl::OUString > ); + DBG_CHECK_PROPERTY( PROPERTY_LISTSOURCE, Sequence< OUString > ); if ( 0 == ( m_nIncludeDatabase & DA_LIST_SOURCE ) ) m_xProps->getPropertyValue(PROPERTY_LISTSOURCE) >>= aValues; // if we exported the list source as attribute, we do not repeat it as sub elements @@ -1339,14 +1339,14 @@ namespace xmloff getSequenceInt16PropertyAsSet(PROPERTY_DEFAULT_SELECT_SEQ, aDefaultSelection); // the string for "true" - ::rtl::OUString sTrue; - ::rtl::OUStringBuffer sBuffer; + OUString sTrue; + OUStringBuffer sBuffer; ::sax::Converter::convertBool(sBuffer, true); sTrue = sBuffer.makeStringAndClear(); // loop through both lists ('til the maximum of both lengths) - const ::rtl::OUString* pItems = aItems.getConstArray(); - const ::rtl::OUString* pValues = aValues.getConstArray(); + const OUString* pItems = aItems.getConstArray(); + const OUString* pValues = aValues.getConstArray(); sal_Int32 nItems = aItems.getLength(); sal_Int32 nValues = aValues.getLength(); @@ -1842,7 +1842,7 @@ namespace xmloff { sal_Int16 nLinkageType = aHelper.isCellIntegerBinding( xBinding ) ? 1 : 0; - ::rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; m_rContext.getGlobalContext().GetMM100UnitConverter().convertEnum( sBuffer, (sal_uInt16)nLinkageType, @@ -1867,19 +1867,19 @@ namespace xmloff //--------------------------------------------------------------------- void OControlExport::exportXFormsBindAttributes() { - rtl::OUString sBindName = getXFormsBindName( m_xProps ); + OUString sBindName = getXFormsBindName( m_xProps ); AddAttribute( XML_NAMESPACE_XFORMS, XML_BIND, sBindName ); } //--------------------------------------------------------------------- void OControlExport::exportXFormsListAttributes() { - rtl::OUString sBindName = getXFormsListBindName( m_xProps ); + OUString sBindName = getXFormsListBindName( m_xProps ); AddAttribute( XML_NAMESPACE_FORM, XML_XFORMS_LIST_SOURCE, sBindName ); } //--------------------------------------------------------------------- void OControlExport::exportXFormsSubmissionAttributes() { - rtl::OUString sSubmission = getXFormsSubmissionName( m_xProps ); + OUString sSubmission = getXFormsSubmissionName( m_xProps ); AddAttribute( XML_NAMESPACE_FORM, XML_XFORMS_SUBMISSION, sSubmission ); } //--------------------------------------------------------------------- @@ -1963,7 +1963,7 @@ namespace xmloff try { // currently exchanging the data with a database column? - ::rtl::OUString sBoundFieldPropertyName( "BoundField" ); + OUString sBoundFieldPropertyName( "BoundField" ); if ( m_xPropertyInfo.is() && m_xPropertyInfo->hasPropertyByName( sBoundFieldPropertyName ) ) { Reference< XPropertySet > xBoundField; @@ -2022,9 +2022,9 @@ namespace xmloff //= OColumnExport //===================================================================== //--------------------------------------------------------------------- - OColumnExport::OColumnExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxControl, const ::rtl::OUString& _rControlId, + OColumnExport::OColumnExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxControl, const OUString& _rControlId, const Sequence< ScriptEventDescriptor >& _rEvents) - :OControlExport(_rContext, _rxControl, _rControlId, ::rtl::OUString(), _rEvents) + :OControlExport(_rContext, _rxControl, _rControlId, OUString(), _rEvents) { } @@ -2038,8 +2038,8 @@ namespace xmloff void OColumnExport::exportServiceNameAttribute() { // the attribute "service name" (which has a slightly different meaning for columns - DBG_CHECK_PROPERTY( PROPERTY_COLUMNSERVICENAME, ::rtl::OUString ); - ::rtl::OUString sColumnServiceName; + DBG_CHECK_PROPERTY( PROPERTY_COLUMNSERVICENAME, OUString ); + OUString sColumnServiceName; m_xProps->getPropertyValue(PROPERTY_COLUMNSERVICENAME) >>= sColumnServiceName; // the service name is a full qualified one (i.e. com.sun.star.form.TextField), but the // real service name for the column (for use with the XGridColumnFactory) is only the last @@ -2077,7 +2077,7 @@ namespace xmloff PROPERTY_LABEL); // the style attribute - ::rtl::OUString sStyleName = m_rContext.getObjectStyleName( m_xProps ); + OUString sStyleName = m_rContext.getObjectStyleName( m_xProps ); if ( !sStyleName.isEmpty() ) { AddAttribute( @@ -2126,7 +2126,7 @@ namespace xmloff if ( m_bCreateConnectionResourceElement && m_xProps.is() ) { m_rContext.getGlobalContext().ClearAttrList(); - ::rtl::OUString sPropValue; + OUString sPropValue; m_xProps->getPropertyValue( PROPERTY_DATASOURCENAME ) >>= sPropValue; // if set it is a file url if ( sPropValue.isEmpty() ) m_xProps->getPropertyValue( PROPERTY_URL ) >>= sPropValue; @@ -2163,7 +2163,7 @@ namespace xmloff { faName, /*faAction,*/ faCommand, faFilter, faOrder }; - static ::rtl::OUString aStringPropertyNames[] = + static OUString aStringPropertyNames[] = { OUString(PROPERTY_NAME), /*OUString(PROPERTY_TARGETURL),*/ OUString(PROPERTY_COMMAND), OUString(PROPERTY_FILTER), OUString(PROPERTY_ORDER) }; @@ -2182,7 +2182,7 @@ namespace xmloff // #i112082# xlink:type is added as part of exportTargetLocationAttribute // now export the data source name or databaselocation or connection resource - ::rtl::OUString sPropValue; + OUString sPropValue; m_xProps->getPropertyValue( PROPERTY_DATASOURCENAME ) >>= sPropValue; m_bCreateConnectionResourceElement = sPropValue.isEmpty(); if ( !m_bCreateConnectionResourceElement ) diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx index 2da6cd91ccd8..d4b3e0a90476 100644 --- a/xmloff/source/forms/elementexport.hxx +++ b/xmloff/source/forms/elementexport.hxx @@ -92,8 +92,8 @@ namespace xmloff DECLARE_STL_STDKEY_SET(sal_Int16, Int16Set); // used below - ::rtl::OUString m_sControlId; // the control id to use when exporting - ::rtl::OUString m_sReferringControls; // list of referring controls (i.e. their id's) + OUString m_sControlId; // the control id to use when exporting + OUString m_sReferringControls; // list of referring controls (i.e. their id's) sal_Int16 m_nClassId; // class id of the control we're representing ElementType m_eType; // (XML) type of the control we're representing sal_Int32 m_nIncludeCommon; // common control attributes to include @@ -118,8 +118,8 @@ namespace xmloff */ OControlExport(IFormsExportContext& _rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, - const ::rtl::OUString& _rControlId, - const ::rtl::OUString& _rReferringControls, + const OUString& _rControlId, + const OUString& _rReferringControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rxEvents); ~OControlExport(); @@ -207,7 +207,7 @@ namespace xmloff @param _rOut out parameter. The set of integers. */ - void getSequenceInt16PropertyAsSet(const ::rtl::OUString& _rPropertyName, Int16Set& _rOut); + void getSequenceInt16PropertyAsSet(const OUString& _rPropertyName, Int16Set& _rOut); /** exports the attribute which descrives a cell value binding of a control in a spreadsheet document @@ -244,7 +244,7 @@ namespace xmloff /** retrieves the string specifying the ListSource of a list or combo box */ - ::rtl::OUString getScalarListSourceValue() const; + OUString getScalarListSourceValue() const; /** determines whether the list entries (of a combo or list box) are supplied by the user @@ -272,7 +272,7 @@ namespace xmloff */ OColumnExport(IFormsExportContext& _rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, - const ::rtl::OUString& _rControlId, + const OUString& _rControlId, const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rxEvents); ~OColumnExport(); diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 7c01677cbb0f..9e2bb7ef6742 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -88,13 +88,13 @@ namespace xmloff }; //===================================================================== - struct PropertyValueCompare : public ::std::binary_function< PropertyValue, ::rtl::OUString, bool> + struct PropertyValueCompare : public ::std::binary_function< PropertyValue, OUString, bool> { - bool operator() (const PropertyValue& lhs, const ::rtl::OUString& rhs) const + bool operator() (const PropertyValue& lhs, const OUString& rhs) const { return lhs.Name == rhs; } - bool operator() (const ::rtl::OUString& lhs, const PropertyValue& rhs) const + bool operator() (const OUString& lhs, const PropertyValue& rhs) const { return lhs == rhs.Name; } @@ -125,12 +125,12 @@ namespace xmloff } //--------------------------------------------------------------------- - OControlElement::ElementType OElementNameMap::getElementType(const ::rtl::OUString& _rName) + OControlElement::ElementType OElementNameMap::getElementType(const OUString& _rName) { if ( s_sElementTranslations.empty() ) { // initialize for (ElementType eType=(ElementType)0; eType<UNKNOWN; ++eType) - s_sElementTranslations[::rtl::OUString::createFromAscii(getElementName(eType))] = eType; + s_sElementTranslations[OUString::createFromAscii(getElementName(eType))] = eType; } ConstMapString2ElementIterator aPos = s_sElementTranslations.find(_rName); if (s_sElementTranslations.end() != aPos) @@ -143,7 +143,7 @@ namespace xmloff //= OElementImport //===================================================================== //--------------------------------------------------------------------- - OElementImport::OElementImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OElementImport::OElementImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer) :OPropertyImport(_rImport, _nPrefix, _rName) ,m_rFormImport(_rImport) @@ -161,9 +161,9 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OElementImport::determineDefaultServiceName() const + OUString OElementImport::determineDefaultServiceName() const { - return ::rtl::OUString(); + return OUString(); } //--------------------------------------------------------------------- @@ -172,13 +172,13 @@ namespace xmloff ENTER_LOG_CONTEXT( "xmloff::OElementImport - importing one element" ); const SvXMLNamespaceMap& rMap = m_rContext.getGlobalContext().GetNamespaceMap(); - const ::rtl::OUString sImplNameAttribute = rMap.GetQNameByKey( XML_NAMESPACE_FORM, GetXMLToken( XML_CONTROL_IMPLEMENTATION ) ); - const ::rtl::OUString sControlImplementation = _rxAttrList->getValueByName( sImplNameAttribute ); + const OUString sImplNameAttribute = rMap.GetQNameByKey( XML_NAMESPACE_FORM, GetXMLToken( XML_CONTROL_IMPLEMENTATION ) ); + const OUString sControlImplementation = _rxAttrList->getValueByName( sImplNameAttribute ); // retrieve the service name if ( !sControlImplementation.isEmpty() ) { - ::rtl::OUString sOOoImplementationName; + OUString sOOoImplementationName; const sal_uInt16 nImplPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sControlImplementation, &sOOoImplementationName ); m_sServiceName = ( nImplPrefix == XML_NAMESPACE_OOO ) ? sOOoImplementationName : sControlImplementation; } @@ -199,7 +199,7 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OElementImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OElementImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { if( token::IsXMLToken(_rLocalName, token::XML_EVENT_LISTENERS) && (XML_NAMESPACE_OFFICE == _nPrefix)) @@ -228,7 +228,7 @@ namespace xmloff new OGridColumnPropertyTranslator( Reference< XMultiPropertySet >( m_xElement, UNO_QUERY ) ); const_cast< XMLTextStyleContext* >( m_pStyleElement )->FillPropertySet( xPropTranslation ); - const ::rtl::OUString sNumberStyleName = const_cast< XMLTextStyleContext* >( m_pStyleElement )->GetDataStyleName( ); + const OUString sNumberStyleName = const_cast< XMLTextStyleContext* >( m_pStyleElement )->GetDataStyleName( ); if ( !sNumberStyleName.isEmpty() ) // the style also has a number (sub) style m_rContext.applyControlNumberStyle( m_xElement, sNumberStyleName ); @@ -266,8 +266,8 @@ namespace xmloff ) { OSL_ENSURE(m_xInfo->hasPropertyByName(aCheck->Name), - ::rtl::OStringBuffer("OElementImport::implApplySpecificProperties: read a property ("). - append(rtl::OUStringToOString(aCheck->Name, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("OElementImport::implApplySpecificProperties: read a property ("). + append(OUStringToOString(aCheck->Name, RTL_TEXTENCODING_ASCII_US)). append(") which does not exist on the element!").getStr()); } } @@ -284,8 +284,8 @@ namespace xmloff ::std::sort( m_aValues.begin(), m_aValues.end(), PropertyValueLess()); // the names - Sequence< ::rtl::OUString > aNames(m_aValues.size()); - ::rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString > aNames(m_aValues.size()); + OUString* pNames = aNames.getArray(); // the values Sequence< Any > aValues(m_aValues.size()); Any* pValues = aValues.getArray(); @@ -328,8 +328,8 @@ namespace xmloff } catch(Exception&) { - OSL_FAIL(::rtl::OStringBuffer("OElementImport::implApplySpecificProperties: could not set the property \""). - append(rtl::OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL(OStringBuffer("OElementImport::implApplySpecificProperties: could not set the property \""). + append(OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)). append("\"!").getStr()); } } @@ -362,8 +362,8 @@ namespace xmloff if ( !xDynamicProperties.is() ) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString aMessage( "OElementImport::implApplyGenericProperties: encountered an unknown property (" ); - aMessage += ::rtl::OUStringToOString( aPropValues->Name, RTL_TEXTENCODING_ASCII_US ); + OString aMessage( "OElementImport::implApplyGenericProperties: encountered an unknown property (" ); + aMessage += OUStringToOString( aPropValues->Name, RTL_TEXTENCODING_ASCII_US ); aMessage += "), but component is no PropertyBag!"; OSL_FAIL( aMessage.getStr() ); #endif @@ -470,32 +470,32 @@ namespace xmloff } catch(Exception&) { - OSL_FAIL(::rtl::OStringBuffer("OElementImport::EndElement: could not set the property \""). - append(::rtl::OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL(OStringBuffer("OElementImport::EndElement: could not set the property \""). + append(OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)). append("\"!").getStr()); } } } //--------------------------------------------------------------------- - ::rtl::OUString OElementImport::implGetDefaultName() const + OUString OElementImport::implGetDefaultName() const { // no optimization here. If this method gets called, the XML stream did not contain a name for the // element, which is a heavy error. So in this case we don't care for performance - static const ::rtl::OUString sUnnamedName("unnamed"); + static const OUString sUnnamedName("unnamed"); OSL_ENSURE(m_xParentContainer.is(), "OElementImport::implGetDefaultName: no parent container!"); if (!m_xParentContainer.is()) return sUnnamedName; - Sequence< ::rtl::OUString > aNames = m_xParentContainer->getElementNames(); + Sequence< OUString > aNames = m_xParentContainer->getElementNames(); - ::rtl::OUString sReturn; - const ::rtl::OUString* pNames = NULL; - const ::rtl::OUString* pNamesEnd = aNames.getConstArray() + aNames.getLength(); + OUString sReturn; + const OUString* pNames = NULL; + const OUString* pNamesEnd = aNames.getConstArray() + aNames.getLength(); for (sal_Int32 i=0; i<32768; ++i) // the limit is nearly arbitrary ... { // assemble the new name (suggestion) sReturn = sUnnamedName; - sReturn += ::rtl::OUString::valueOf(i); + sReturn += OUString::valueOf(i); // check the existence (this is the bad performance part ....) for (pNames = aNames.getConstArray(); pNames<pNamesEnd; ++pNames) { @@ -547,7 +547,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OElementImport::tryGenericAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue ) + bool OElementImport::tryGenericAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue ) { // the generic approach (which I hope all props will be migrated to, on the medium term): property handlers const AttributeDescription attribute( metadata::getAttributeDescription( _nNamespaceKey, _rLocalName ) ); @@ -604,7 +604,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OElementImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OElementImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { if ( token::IsXMLToken( _rLocalName, token::XML_CONTROL_IMPLEMENTATION ) ) // ignore this, it has already been handled in OElementImport::StartElement @@ -645,7 +645,7 @@ namespace xmloff Reference< XComponentContext > xContext = m_rFormImport.getGlobalContext().GetComponentContext(); Reference< XInterface > xPure = xContext->getServiceManager()->createInstanceWithContext(m_sServiceName, xContext); OSL_ENSURE(xPure.is(), - ::rtl::OStringBuffer("OElementImport::createElement: service factory gave me no object (service name: ").append(rtl::OUStringToOString(m_sServiceName, RTL_TEXTENCODING_ASCII_US)).append(")!").getStr()); + OStringBuffer("OElementImport::createElement: service factory gave me no object (service name: ").append(OUStringToOString(m_sServiceName, RTL_TEXTENCODING_ASCII_US)).append(")!").getStr()); xReturn = Reference< XPropertySet >(xPure, UNO_QUERY); } else @@ -662,15 +662,15 @@ namespace xmloff } //--------------------------------------------------------------------- - void OElementImport::simulateDefaultedAttribute(const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, const sal_Char* _pAttributeDefault) + void OElementImport::simulateDefaultedAttribute(const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault) { OSL_ENSURE( m_xInfo.is(), "OPropertyImport::simulateDefaultedAttribute: the component should be more gossipy about it's properties!" ); if ( !m_xInfo.is() || m_xInfo->hasPropertyByName( _rPropertyName ) ) { - ::rtl::OUString sLocalAttrName = ::rtl::OUString::createFromAscii(_pAttributeName); + OUString sLocalAttrName = OUString::createFromAscii(_pAttributeName); if ( !encounteredAttribute( sLocalAttrName ) ) - OSL_VERIFY( handleAttribute( XML_NAMESPACE_FORM, sLocalAttrName, ::rtl::OUString::createFromAscii( _pAttributeDefault ) ) ); + OSL_VERIFY( handleAttribute( XML_NAMESPACE_FORM, sLocalAttrName, OUString::createFromAscii( _pAttributeDefault ) ) ); } } @@ -678,7 +678,7 @@ namespace xmloff //= OControlImport //===================================================================== //--------------------------------------------------------------------- - OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer) :OElementImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) ,m_eElementType(OControlElement::UNKNOWN) @@ -687,7 +687,7 @@ namespace xmloff } //--------------------------------------------------------------------- - OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OElementImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) ,m_eElementType(_eType) @@ -696,7 +696,7 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OControlImport::determineDefaultServiceName() const + OUString OControlImport::determineDefaultServiceName() const { const sal_Char* pServiceName = NULL; switch ( m_eElementType ) @@ -722,8 +722,8 @@ namespace xmloff default: break; } if ( pServiceName != NULL ) - return ::rtl::OUString::createFromAscii( pServiceName ); - return ::rtl::OUString(); + return OUString::createFromAscii( pServiceName ); + return OUString(); } //--------------------------------------------------------------------- @@ -734,7 +734,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { static const sal_Char* pLinkedCellAttributeName = OAttributeMetaData::getBindingAttributeName(BA_LINKED_CELL); @@ -915,9 +915,9 @@ namespace xmloff // transfer the name if (PROPID_VALUE == aValueProps->Handle) - aValueProps->Name = ::rtl::OUString::createFromAscii(pValueProperty); + aValueProps->Name = OUString::createFromAscii(pValueProperty); else - aValueProps->Name = ::rtl::OUString::createFromAscii(pCurrentValueProperty); + aValueProps->Name = OUString::createFromAscii(pCurrentValueProperty); bSuccess = true; } break; @@ -943,9 +943,9 @@ namespace xmloff // transfer the name if (PROPID_MIN_VALUE == aValueProps->Handle) - aValueProps->Name = ::rtl::OUString::createFromAscii(pMinValueProperty); + aValueProps->Name = OUString::createFromAscii(pMinValueProperty); else - aValueProps->Name = ::rtl::OUString::createFromAscii(pMaxValueProperty); + aValueProps->Name = OUString::createFromAscii(pMaxValueProperty); bSuccess = true; } break; @@ -972,7 +972,7 @@ namespace xmloff // retrieve the type of the property Property aProp = _rxPropInfo->getPropertyByName(_rPropValue.Name); // the untranslated string value as read in handleAttribute - ::rtl::OUString sValue; + OUString sValue; #if OSL_DEBUG_LEVEL > 0 sal_Bool bSuccess = #endif @@ -1063,7 +1063,7 @@ namespace xmloff // found it -> need to remember (and restore) the "value property value", which is not set explicitly try { - aValuePropertyValue = m_xElement->getPropertyValue( ::rtl::OUString::createFromAscii( pValueProperty ) ); + aValuePropertyValue = m_xElement->getPropertyValue( OUString::createFromAscii( pValueProperty ) ); } catch( const Exception& ) { @@ -1080,7 +1080,7 @@ namespace xmloff { try { - m_xElement->setPropertyValue( ::rtl::OUString::createFromAscii( pValueProperty ), aValuePropertyValue ); + m_xElement->setPropertyValue( OUString::createFromAscii( pValueProperty ), aValuePropertyValue ); } catch( const Exception& ) { @@ -1106,7 +1106,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OControlImport::doRegisterCellValueBinding( const ::rtl::OUString& _rBoundCellAddress ) + void OControlImport::doRegisterCellValueBinding( const OUString& _rBoundCellAddress ) { OSL_PRECOND( m_xElement.is(), "OControlImport::doRegisterCellValueBinding: invalid element!" ); OSL_PRECOND( !_rBoundCellAddress.isEmpty(), @@ -1116,7 +1116,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OControlImport::doRegisterXFormsValueBinding( const ::rtl::OUString& _rBindingID ) + void OControlImport::doRegisterXFormsValueBinding( const OUString& _rBindingID ) { OSL_PRECOND( m_xElement.is(), "need element" ); OSL_PRECOND( !_rBindingID.isEmpty(), "binding ID is not valid" ); @@ -1125,7 +1125,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OControlImport::doRegisterXFormsListBinding( const ::rtl::OUString& _rBindingID ) + void OControlImport::doRegisterXFormsListBinding( const OUString& _rBindingID ) { OSL_PRECOND( m_xElement.is(), "need element" ); OSL_PRECOND( !_rBindingID.isEmpty(), "binding ID is not valid" ); @@ -1134,7 +1134,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OControlImport::doRegisterXFormsSubmission( const ::rtl::OUString& _rSubmissionID ) + void OControlImport::doRegisterXFormsSubmission( const OUString& _rSubmissionID ) { OSL_PRECOND( m_xElement.is(), "need element" ); OSL_PRECOND( !_rSubmissionID.isEmpty(), "binding ID is not valid" ); @@ -1164,7 +1164,7 @@ namespace xmloff //===================================================================== //--------------------------------------------------------------------- OImagePositionImport::OImagePositionImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, - sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, + sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ) :OControlImport( _rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType ) ,m_nImagePosition( -1 ) @@ -1174,8 +1174,8 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OImagePositionImport::handleAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue ) + bool OImagePositionImport::handleAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, + const OUString& _rValue ) { if ( _rLocalName == GetXMLToken( XML_IMAGE_POSITION ) ) { @@ -1226,7 +1226,7 @@ namespace xmloff //===================================================================== //--------------------------------------------------------------------- OReferredControlImport::OReferredControlImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType ) :OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) @@ -1244,10 +1244,10 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OReferredControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue) + bool OReferredControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, + const OUString& _rValue) { - static const ::rtl::OUString s_sReferenceAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_FOR)); + static const OUString s_sReferenceAttributeName = OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_FOR)); if (_rLocalName == s_sReferenceAttributeName) { m_sReferringControls = _rValue; @@ -1260,16 +1260,16 @@ namespace xmloff //= OPasswordImport //===================================================================== //--------------------------------------------------------------------- - OPasswordImport::OPasswordImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OPasswordImport::OPasswordImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) { } //--------------------------------------------------------------------- - bool OPasswordImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OPasswordImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { - static const ::rtl::OUString s_sEchoCharAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getSpecialAttributeName(SCA_ECHO_CHAR)); + static const OUString s_sEchoCharAttributeName = OUString::createFromAscii(OAttributeMetaData::getSpecialAttributeName(SCA_ECHO_CHAR)); if (_rLocalName == s_sEchoCharAttributeName) { // need a special handling for the EchoChar property @@ -1291,14 +1291,14 @@ namespace xmloff //= ORadioImport //===================================================================== //--------------------------------------------------------------------- - ORadioImport::ORadioImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + ORadioImport::ORadioImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OImagePositionImport( _rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType ) { } //--------------------------------------------------------------------- - bool ORadioImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool ORadioImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { // need special handling for the State & CurrentState properties: // they're stored as booleans, but expected to be int16 properties @@ -1329,7 +1329,7 @@ namespace xmloff //===================================================================== //= OURLReferenceImport //===================================================================== - OURLReferenceImport::OURLReferenceImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OURLReferenceImport::OURLReferenceImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OImagePositionImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) @@ -1337,7 +1337,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OURLReferenceImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OURLReferenceImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { static const sal_Char* s_pTargetLocationAttributeName = OAttributeMetaData::getCommonControlAttributeName( CCA_TARGET_LOCATION ); static const sal_Char* s_pImageDataAttributeName = OAttributeMetaData::getCommonControlAttributeName( CCA_IMAGE_DATA ); @@ -1356,7 +1356,7 @@ namespace xmloff if ( bMakeAbsolute && !_rValue.isEmpty() ) { // make a global URL out of the local one - ::rtl::OUString sAdjustedValue; + OUString sAdjustedValue; // only resolve image related url // we don't want say form url targets to be resolved // using ResolveGraphicObjectURL @@ -1374,7 +1374,7 @@ namespace xmloff //= OButtonImport //===================================================================== //--------------------------------------------------------------------- - OButtonImport::OButtonImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OButtonImport::OButtonImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OURLReferenceImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) @@ -1395,7 +1395,7 @@ namespace xmloff //= OValueRangeImport //===================================================================== //--------------------------------------------------------------------- - OValueRangeImport::OValueRangeImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OValueRangeImport::OValueRangeImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ) :OControlImport( _rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType ) ,m_nStepSizeValue( 1 ) @@ -1404,7 +1404,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OValueRangeImport::handleAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue ) + bool OValueRangeImport::handleAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue ) { if ( _rLocalName.equalsAscii( OAttributeMetaData::getSpecialAttributeName( SCA_STEP_SIZE ) ) ) { @@ -1432,7 +1432,7 @@ namespace xmloff //= OTextLikeImport //===================================================================== //--------------------------------------------------------------------- - OTextLikeImport::OTextLikeImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OTextLikeImport::OTextLikeImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) @@ -1442,7 +1442,7 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OTextLikeImport::CreateChildContext( sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OTextLikeImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList ) { if ( ( XML_NAMESPACE_TEXT == _nPrefix ) && _rLocalName.equalsIgnoreAsciiCase("p") ) @@ -1553,8 +1553,8 @@ namespace xmloff //--------------------------------------------------------------------- struct EqualName : public ::std::unary_function< PropertyValue, bool > { - const ::rtl::OUString m_sName; - EqualName( const ::rtl::OUString& _rName ) : m_sName( _rName ) { } + const OUString m_sName; + EqualName( const OUString& _rName ) : m_sName( _rName ) { } inline bool operator()( const PropertyValue& _rProp ) { @@ -1571,11 +1571,11 @@ namespace xmloff PropertyValueArray::iterator aDefaultControlPropertyPos = ::std::find_if( m_aValues.begin(), m_aValues.end(), - EqualName( ::rtl::OUString( "DefaultControl" ) ) + EqualName( OUString( "DefaultControl" ) ) ); if ( aDefaultControlPropertyPos != m_aValues.end() ) { - ::rtl::OUString sDefaultControl; + OUString sDefaultControl; OSL_VERIFY( aDefaultControlPropertyPos->Value >>= sDefaultControl ); if ( sDefaultControl == "stardiv.one.form.control.Edit" ) { @@ -1608,7 +1608,7 @@ namespace xmloff // TODO (fs): stole this code somewhere - why don't we fix the text import?? m_xCursor->gotoEnd( sal_False ); m_xCursor->goLeft( 1, sal_True ); - m_xCursor->setString( ::rtl::OUString() ); + m_xCursor->setString( OUString() ); // reset cursor xTextImportHelper->ResetCursor(); @@ -1623,7 +1623,7 @@ namespace xmloff //= OListAndComboImport //===================================================================== //--------------------------------------------------------------------- - OListAndComboImport::OListAndComboImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OListAndComboImport::OListAndComboImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) @@ -1637,16 +1637,16 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OListAndComboImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OListAndComboImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { // is it the "option" sub tag of a listbox ? - static const ::rtl::OUString s_sOptionElementName("option"); + static const OUString s_sOptionElementName("option"); if (s_sOptionElementName == _rLocalName) return new OListOptionImport(GetImport(), _nPrefix, _rLocalName, this); // is it the "item" sub tag of a combobox ? - static const ::rtl::OUString s_sItemElementName("item"); + static const OUString s_sItemElementName("item"); if (s_sItemElementName == _rLocalName) return new OComboItemImport(GetImport(), _nPrefix, _rLocalName, this); @@ -1718,23 +1718,23 @@ namespace xmloff } //--------------------------------------------------------------------- - void OListAndComboImport::doRegisterCellValueBinding( const ::rtl::OUString& _rBoundCellAddress ) + void OListAndComboImport::doRegisterCellValueBinding( const OUString& _rBoundCellAddress ) { - ::rtl::OUString sBoundCellAddress( _rBoundCellAddress ); + OUString sBoundCellAddress( _rBoundCellAddress ); if ( m_bLinkWithIndexes ) { // This is a HACK. We register a string which is no valid address, but allows // (somewhere else) to determine that a non-standard binding should be created. // This hack is acceptable for OOo 1.1.1, since the file format for value // bindings of form controls is to be changed afterwards, anyway. - sBoundCellAddress += ::rtl::OUString( ":index" ); + sBoundCellAddress += OUString( ":index" ); } OControlImport::doRegisterCellValueBinding( sBoundCellAddress ); } //--------------------------------------------------------------------- - bool OListAndComboImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OListAndComboImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { static const sal_Char* pListSourceAttributeName = OAttributeMetaData::getDatabaseAttributeName(DA_LIST_SOURCE); if ( _rLocalName.equalsAscii(pListSourceAttributeName) ) @@ -1753,7 +1753,7 @@ namespace xmloff // a listbox which has a list-source attribute must have a list-source-type of something // not equal to ValueList. // In this case, the list-source value is simply the one and only element of the ListSource property. - Sequence< ::rtl::OUString > aListSourcePropValue( 1 ); + Sequence< OUString > aListSourcePropValue( 1 ); aListSourcePropValue[0] = _rValue; aListSource.Value <<= aListSourcePropValue; } @@ -1786,7 +1786,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OListAndComboImport::implPushBackLabel(const ::rtl::OUString& _rLabel) + void OListAndComboImport::implPushBackLabel(const OUString& _rLabel) { OSL_ENSURE(!m_nEmptyListItems, "OListAndComboImport::implPushBackValue: label list is already done!"); if (!m_nEmptyListItems) @@ -1794,7 +1794,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OListAndComboImport::implPushBackValue(const ::rtl::OUString& _rValue) + void OListAndComboImport::implPushBackValue(const OUString& _rValue) { OSL_ENSURE(!m_nEmptyValueItems, "OListAndComboImport::implPushBackValue: value list is already done!"); if (!m_nEmptyValueItems) @@ -1845,7 +1845,7 @@ namespace xmloff //= OListOptionImport //===================================================================== //--------------------------------------------------------------------- - OListOptionImport::OListOptionImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OListOptionImport::OListOptionImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OListAndComboImportRef& _rListBox) :SvXMLImportContext(_rImport, _nPrefix, _rName) ,m_xListBoxImport(_rListBox) @@ -1857,14 +1857,14 @@ namespace xmloff { // the label and the value const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); - const ::rtl::OUString sLabelAttribute = rMap.GetQNameByKey( - GetPrefix(), ::rtl::OUString("label")); - const ::rtl::OUString sValueAttribute = rMap.GetQNameByKey( - GetPrefix(), ::rtl::OUString("value")); + const OUString sLabelAttribute = rMap.GetQNameByKey( + GetPrefix(), OUString("label")); + const OUString sValueAttribute = rMap.GetQNameByKey( + GetPrefix(), OUString("value")); // ------------------- // the label attribute - ::rtl::OUString sValue = _rxAttrList->getValueByName(sLabelAttribute); + OUString sValue = _rxAttrList->getValueByName(sLabelAttribute); sal_Bool bNonexistentAttribute = sal_False; if (sValue.isEmpty()) if (_rxAttrList->getTypeByName(sLabelAttribute).isEmpty()) @@ -1891,10 +1891,10 @@ namespace xmloff m_xListBoxImport->implPushBackValue( sValue ); // the current-selected and selected - const ::rtl::OUString sSelectedAttribute = rMap.GetQNameByKey( - GetPrefix(), ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_CURRENT_SELECTED))); - const ::rtl::OUString sDefaultSelectedAttribute = rMap.GetQNameByKey( - GetPrefix(), ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_SELECTED))); + const OUString sSelectedAttribute = rMap.GetQNameByKey( + GetPrefix(), OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_CURRENT_SELECTED))); + const OUString sDefaultSelectedAttribute = rMap.GetQNameByKey( + GetPrefix(), OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_SELECTED))); // propagate the selected flag bool bSelected(false); @@ -1917,7 +1917,7 @@ namespace xmloff //= OComboItemImport //===================================================================== //--------------------------------------------------------------------- - OComboItemImport::OComboItemImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OComboItemImport::OComboItemImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OListAndComboImportRef& _rListBox) :SvXMLImportContext(_rImport, _nPrefix, _rName) ,m_xListBoxImport(_rListBox) @@ -1927,8 +1927,8 @@ namespace xmloff //--------------------------------------------------------------------- void OComboItemImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { - const ::rtl::OUString sLabelAttributeName = GetImport().GetNamespaceMap().GetQNameByKey( - GetPrefix(), ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL))); + const OUString sLabelAttributeName = GetImport().GetNamespaceMap().GetQNameByKey( + GetPrefix(), OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL))); m_xListBoxImport->implPushBackLabel(_rxAttrList->getValueByName(sLabelAttributeName)); SvXMLImportContext::StartElement(_rxAttrList); @@ -1939,7 +1939,7 @@ namespace xmloff //= OColumnWrapperImport //===================================================================== //--------------------------------------------------------------------- - OColumnWrapperImport::OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OColumnWrapperImport::OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer) :SvXMLImportContext(_rImport.getGlobalContext(), _nPrefix, _rName) ,m_xParentContainer(_rxParentContainer) @@ -1948,7 +1948,7 @@ namespace xmloff { } //--------------------------------------------------------------------- - SvXMLImportContext* OColumnWrapperImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OColumnWrapperImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >&) { OControlImport* pReturn = implCreateChildContext(_nPrefix, _rLocalName, OElementNameMap::getElementType(_rLocalName)); @@ -1974,7 +1974,7 @@ namespace xmloff //--------------------------------------------------------------------- OControlImport* OColumnWrapperImport::implCreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType) { OSL_ENSURE( (OControlElement::TEXT == _eType) @@ -2010,7 +2010,7 @@ namespace xmloff //= OGridImport //===================================================================== //--------------------------------------------------------------------- - OGridImport::OGridImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OGridImport::OGridImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OGridImport_Base(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, "column") @@ -2019,7 +2019,7 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OGridImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName) + SvXMLImportContext* OGridImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const OUString& _rLocalName) { return new OColumnWrapperImport(m_rFormImport, *this, _nPrefix, _rLocalName, m_xMeAsContainer); } @@ -2028,7 +2028,7 @@ namespace xmloff //= OFormImport //===================================================================== //--------------------------------------------------------------------- - OFormImport::OFormImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormImport::OFormImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer) :OFormImport_Base(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, "control") { @@ -2036,7 +2036,7 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OFormImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OFormImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { if( token::IsXMLToken(_rLocalName, token::XML_FORM) ) @@ -2072,18 +2072,18 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OFormImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName) + SvXMLImportContext* OFormImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const OUString& _rLocalName) { OSL_ENSURE( !this, "illegal call to OFormImport::implCreateControlWrapper" ); return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName ); } //--------------------------------------------------------------------- - bool OFormImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OFormImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { // handle the master/details field attributes (they're way too special to let the OPropertyImport handle them) - static const ::rtl::OUString s_sMasterFieldsAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faMasterFields)); - static const ::rtl::OUString s_sDetailFieldsAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faDetailFiels)); + static const OUString s_sMasterFieldsAttributeName = OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faMasterFields)); + static const OUString s_sDetailFieldsAttributeName = OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faDetailFiels)); if ( s_sMasterFieldsAttributeName == _rLocalName ) { @@ -2101,19 +2101,19 @@ namespace xmloff } //--------------------------------------------------------------------- - void OFormImport::implTranslateStringListProperty(const ::rtl::OUString& _rPropertyName, const ::rtl::OUString& _rValue) + void OFormImport::implTranslateStringListProperty(const OUString& _rPropertyName, const OUString& _rValue) { PropertyValue aProp; aProp.Name = _rPropertyName; - Sequence< ::rtl::OUString > aList; + Sequence< OUString > aList; // split up the value string if (!_rValue.isEmpty()) { // For the moment, we build a vector instead of a Sequence. It's easier to handle because of it's // push_back method - ::std::vector< ::rtl::OUString > aElements; + ::std::vector< OUString > aElements; // estimate the number of tokens sal_Int32 nEstimate = 0, nLength = _rValue.getLength(); const sal_Unicode* pChars = _rValue.getStr(); @@ -2127,7 +2127,7 @@ namespace xmloff sal_Int32 nElementStart = 0; sal_Int32 nNextSep = 0; sal_Int32 nElementLength; - ::rtl::OUString sElement; + OUString sElement; do { // extract the current element @@ -2152,8 +2152,8 @@ namespace xmloff } while (nElementStart < nLength); - ::rtl::OUString *pElements = aElements.empty() ? 0 : &aElements[0]; - aList = Sequence< ::rtl::OUString >(pElements, aElements.size()); + OUString *pElements = aElements.empty() ? 0 : &aElements[0]; + aList = Sequence< OUString >(pElements, aElements.size()); } else { @@ -2171,7 +2171,7 @@ namespace xmloff OXMLDataSourceImport::OXMLDataSourceImport( SvXMLImport& _rImport ,sal_uInt16 nPrfx - , const ::rtl::OUString& _sLocalName + , const OUString& _sLocalName ,const Reference< ::com::sun::star::xml::sax::XAttributeList > & _xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xElement) : SvXMLImportContext( _rImport, nPrfx, _sLocalName ) @@ -2182,15 +2182,15 @@ namespace xmloff sal_Int16 nLength = (_xElement.is() && _xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - ::rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName, &sLocalName ); if ( ( nPrefix == OAttributeMetaData::getCommonControlAttributeNamespace( CCA_TARGET_LOCATION ) ) && ( sLocalName.equalsAscii( OAttributeMetaData::getCommonControlAttributeName( CCA_TARGET_LOCATION ) ) ) ) { - ::rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); INetURLObject aURL(sValue); if ( aURL.GetProtocol() == INET_PROT_FILE ) @@ -2203,7 +2203,7 @@ namespace xmloff } //--------------------------------------------------------------------- OControlImport* OFormImport::implCreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType ) { switch (_eType) diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index 61fb2b2f0e82..b9792808b905 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -60,7 +60,7 @@ namespace xmloff OElementNameMap() { } public: - static ElementType getElementType(const ::rtl::OUString& _rName); + static ElementType getElementType(const OUString& _rName); }; //===================================================================== @@ -74,8 +74,8 @@ namespace xmloff ,public OStackedLogging { protected: - ::rtl::OUString m_sServiceName; // the service name as extracted from the service-name attribute - ::rtl::OUString m_sName; // the name of the object (redundant, already contained in the base class' array) + OUString m_sServiceName; // the service name as extracted from the service-name attribute + OUString m_sName; // the name of the object (redundant, already contained in the base class' array) OFormLayerXMLImport_Impl& m_rFormImport; // the form import context IEventAttacherManager& m_rEventManager; // the event attacher manager @@ -111,7 +111,7 @@ namespace xmloff */ OElementImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, - sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer ); virtual ~OElementImport(); @@ -121,14 +121,14 @@ namespace xmloff virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void EndElement(); // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); // IEventAttacher virtual void registerEvents( @@ -150,12 +150,12 @@ namespace xmloff property value as if the attribute was encountered.</p> @see encounteredAttribute */ - void simulateDefaultedAttribute(const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, const sal_Char* _pAttributeDefault); + void simulateDefaultedAttribute(const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault); /** to be called from within handleAttribute, checks whether the given attribute is covered by our generic attribute handler mechanisms */ - bool tryGenericAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue ); + bool tryGenericAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue ); /** controls whether |handleAttribute| implicitly calls |tryGenericAttribute|, or whether the derived class must do this explicitly at a suitable place in its own |handleAttribute| @@ -163,7 +163,7 @@ namespace xmloff void disableImplicitGenericAttributeHandling() { m_bImplicitGenericAttributeHandling = false; } private: - ::rtl::OUString implGetDefaultName() const; + OUString implGetDefaultName() const; void implApplyGenericProperties(); void implApplySpecificProperties(); @@ -173,7 +173,7 @@ namespace xmloff PropertyGroups::const_iterator impl_matchPropertyGroup( const PropertyGroups& i_propertyGroups ) const; - virtual ::rtl::OUString determineDefaultServiceName() const; + virtual OUString determineDefaultServiceName() const; }; //===================================================================== @@ -186,7 +186,7 @@ namespace xmloff ,public OValuePropertiesMetaData { protected: - ::rtl::OUString m_sControlId; + OUString m_sControlId; OControlElement::ElementType m_eElementType; PropertyValueArray m_aValueProperties; @@ -201,29 +201,29 @@ namespace xmloff /** the address of the calc cell which the control model should be bound to, if applicable */ - ::rtl::OUString m_sBoundCellAddress; + OUString m_sBoundCellAddress; /** name of a value binding (xforms:bind attribute) */ - ::rtl::OUString m_sBindingID; + OUString m_sBindingID; /** name of a list binding (form:xforms-list-source attribute) */ - ::rtl::OUString m_sListBindingID; + OUString m_sListBindingID; /** name of a submission (xforms:submission attribute) */ - ::rtl::OUString m_sSubmissionID; + OUString m_sSubmissionID; protected: // for use by derived classes only OControlImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, - sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer ); public: OControlImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, - sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -235,8 +235,8 @@ namespace xmloff // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); void addOuterAttributes(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxOuterAttribs); @@ -248,7 +248,7 @@ namespace xmloff const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, ::com::sun::star::beans::PropertyValue& /* [in/out] */ _rPropValue); - virtual ::rtl::OUString determineDefaultServiceName() const; + virtual OUString determineDefaultServiceName() const; /** registers the given cell address as value binding address for our element @@ -260,16 +260,16 @@ namespace xmloff @precond we have a valid element (m_xElement) */ - virtual void doRegisterCellValueBinding( const ::rtl::OUString& _rBoundCellAddress ); + virtual void doRegisterCellValueBinding( const OUString& _rBoundCellAddress ); /** register the given XForms binding */ - virtual void doRegisterXFormsValueBinding( const ::rtl::OUString& ); + virtual void doRegisterXFormsValueBinding( const OUString& ); /** register the given XForms list binding */ - virtual void doRegisterXFormsListBinding( const ::rtl::OUString& ); + virtual void doRegisterXFormsListBinding( const OUString& ); /** register the given XForms submission */ - virtual void doRegisterXFormsSubmission( const ::rtl::OUString& ); + virtual void doRegisterXFormsSubmission( const OUString& ); protected: @@ -294,7 +294,7 @@ namespace xmloff public: OImagePositionImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -306,8 +306,8 @@ namespace xmloff // OPropertyImport overridables virtual bool handleAttribute( sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue + const OUString& _rLocalName, + const OUString& _rValue ); }; @@ -317,11 +317,11 @@ namespace xmloff class OReferredControlImport : public OControlImport { protected: - ::rtl::OUString m_sReferringControls; // the list of ids of controls referring to the one beeing imported + OUString m_sReferringControls; // the list of ids of controls referring to the one beeing imported public: OReferredControlImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -332,8 +332,8 @@ namespace xmloff // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); }; //===================================================================== @@ -343,15 +343,15 @@ namespace xmloff { public: OPasswordImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); }; //===================================================================== @@ -361,7 +361,7 @@ namespace xmloff { public: ORadioImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -369,8 +369,8 @@ namespace xmloff protected: // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); }; //===================================================================== @@ -383,7 +383,7 @@ namespace xmloff { public: OURLReferenceImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -391,8 +391,8 @@ namespace xmloff protected: // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); }; //===================================================================== @@ -405,7 +405,7 @@ namespace xmloff { public: OButtonImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -429,7 +429,7 @@ namespace xmloff public: OValueRangeImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -441,8 +441,8 @@ namespace xmloff // OPropertyImport overridables virtual bool handleAttribute( sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue ); + const OUString& _rLocalName, + const OUString& _rValue ); }; //===================================================================== @@ -460,7 +460,7 @@ namespace xmloff public: OTextLikeImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -469,7 +469,7 @@ namespace xmloff virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void EndElement(); @@ -490,9 +490,9 @@ namespace xmloff friend class OComboItemImport; protected: - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > m_aListSource; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > m_aValueList; ::com::sun::star::uno::Sequence< sal_Int16 > @@ -500,7 +500,7 @@ namespace xmloff ::com::sun::star::uno::Sequence< sal_Int16 > m_aDefaultSelectedSeq; - ::rtl::OUString m_sCellListSource; /// the cell range which acts as list source for the control + OUString m_sCellListSource; /// the cell range which acts as list source for the control sal_Int32 m_nEmptyListItems; /// number of empty list items encountered during reading sal_Int32 m_nEmptyValueItems; /// number of empty value items encountered during reading @@ -512,7 +512,7 @@ namespace xmloff public: OListAndComboImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -521,21 +521,21 @@ namespace xmloff virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void EndElement(); // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); // OControlImport ovrridables - virtual void doRegisterCellValueBinding( const ::rtl::OUString& _rBoundCellAddress ); + virtual void doRegisterCellValueBinding( const OUString& _rBoundCellAddress ); protected: - void implPushBackLabel(const ::rtl::OUString& _rLabel); - void implPushBackValue(const ::rtl::OUString& _rValue); + void implPushBackLabel(const OUString& _rLabel); + void implPushBackValue(const OUString& _rValue); void implEmptyLabelFound(); void implEmptyValueFound(); @@ -556,7 +556,7 @@ namespace xmloff OListAndComboImportRef m_xListBoxImport; public: - OListOptionImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OListOptionImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OListAndComboImportRef& _rListBox); virtual void StartElement( @@ -574,7 +574,7 @@ namespace xmloff OListAndComboImportRef m_xListBoxImport; public: - OComboItemImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OComboItemImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OListAndComboImportRef& _rListBox); protected: @@ -595,20 +595,20 @@ namespace xmloff protected: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xMeAsContainer; - ::rtl::OUString m_sWrapperElementName; + OUString m_sWrapperElementName; protected: - OContainerImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OContainerImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, const sal_Char* _pWrapperElementName) :BASE(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) - ,m_sWrapperElementName(::rtl::OUString::createFromAscii(_pWrapperElementName)) + ,m_sWrapperElementName(OUString::createFromAscii(_pWrapperElementName)) { } // SvXMLImportContext overridables virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void EndElement(); @@ -619,7 +619,7 @@ namespace xmloff // create the child context for the given control type virtual SvXMLImportContext* implCreateControlWrapper( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName) = 0; + sal_uInt16 _nPrefix, const OUString& _rLocalName) = 0; }; //===================================================================== @@ -638,7 +638,7 @@ namespace xmloff m_xColumnFactory; public: - OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType); @@ -662,18 +662,18 @@ namespace xmloff IEventAttacherManager& m_rEventManager; public: - OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer); // SvXMLImportContext overridables virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); protected: OControlImport* implCreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType); }; @@ -687,14 +687,14 @@ namespace xmloff { public: OGridImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType); protected: // OContainerImport overridables virtual SvXMLImportContext* implCreateControlWrapper( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName); + sal_uInt16 _nPrefix, const OUString& _rLocalName); }; //===================================================================== @@ -707,14 +707,14 @@ namespace xmloff { public: OFormImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer ); protected: // SvXMLImportContext overridables virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); @@ -722,19 +722,19 @@ namespace xmloff // OContainerImport overridables virtual SvXMLImportContext* implCreateControlWrapper( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName); + sal_uInt16 _nPrefix, const OUString& _rLocalName); // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); OControlImport* implCreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType ); - void implTranslateStringListProperty(const ::rtl::OUString& _rPropertyName, const ::rtl::OUString& _rValue); + void implTranslateStringListProperty(const OUString& _rPropertyName, const OUString& _rValue); }; //===================================================================== @@ -745,7 +745,7 @@ namespace xmloff public: OXMLDataSourceImport( SvXMLImport& _rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xElement); }; diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx index 18d2d426f6cc..e9c245c9e5d5 100644 --- a/xmloff/source/forms/elementimport_impl.hxx +++ b/xmloff/source/forms/elementimport_impl.hxx @@ -32,7 +32,7 @@ //------------------------------------------------------------------------- template <class BASE> inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) { // maybe it's a sub control @@ -88,7 +88,7 @@ inline void OContainerImport< BASE >::EndElement() //========================================================================= //------------------------------------------------------------------------- template <class BASE> -OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, +OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :BASE(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx index 0cd93ed2b570..c35d201a3321 100644 --- a/xmloff/source/forms/eventexport.cxx +++ b/xmloff/source/forms/eventexport.cxx @@ -43,8 +43,8 @@ namespace xmloff // translate the events const ScriptEventDescriptor* pEvents = _rEvents.getConstArray(); - ::rtl::OUString sName; - ::rtl::OUString sLibrary, sLocalMacroName; + OUString sName; + OUString sLibrary, sLocalMacroName; for (sal_Int32 i=0; i<nEvents; ++i, ++pEvents) { // the name of the event is build from listener interface and listener method name @@ -93,29 +93,29 @@ namespace xmloff } //--------------------------------------------------------------------- - void SAL_CALL OEventDescriptorMapper::replaceByName( const ::rtl::OUString&, const Any& ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + void SAL_CALL OEventDescriptorMapper::replaceByName( const OUString&, const Any& ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { throw IllegalArgumentException( - ::rtl::OUString("replacing is not implemented for this wrapper class."), static_cast< ::cppu::OWeakObject* >(this), 1); + OUString("replacing is not implemented for this wrapper class."), static_cast< ::cppu::OWeakObject* >(this), 1); } //--------------------------------------------------------------------- - Any SAL_CALL OEventDescriptorMapper::getByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) + Any SAL_CALL OEventDescriptorMapper::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName); if (m_aMappedEvents.end() == aPos) throw NoSuchElementException( - ::rtl::OUString("There is no element named ") += _rName, + OUString("There is no element named ") += _rName, static_cast< ::cppu::OWeakObject* >(this)); return makeAny(aPos->second); } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OEventDescriptorMapper::getElementNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL OEventDescriptorMapper::getElementNames( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aReturn(m_aMappedEvents.size()); - ::rtl::OUString* pReturn = aReturn.getArray(); + Sequence< OUString > aReturn(m_aMappedEvents.size()); + OUString* pReturn = aReturn.getArray(); for ( ConstMapString2PropertyValueSequenceIterator aCollect = m_aMappedEvents.begin(); aCollect != m_aMappedEvents.end(); ++aCollect, ++pReturn @@ -126,7 +126,7 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool SAL_CALL OEventDescriptorMapper::hasByName( const ::rtl::OUString& _rName ) throw(RuntimeException) + sal_Bool SAL_CALL OEventDescriptorMapper::hasByName( const OUString& _rName ) throw(RuntimeException) { ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName); return m_aMappedEvents.end() != aPos; diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx index d0c9d36be38a..b919236275fa 100644 --- a/xmloff/source/forms/eventexport.hxx +++ b/xmloff/source/forms/eventexport.hxx @@ -57,12 +57,12 @@ namespace xmloff const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/xmloff/source/forms/eventimport.cxx b/xmloff/source/forms/eventimport.cxx index 20d184d83c68..d61fe5f4f9b7 100644 --- a/xmloff/source/forms/eventimport.cxx +++ b/xmloff/source/forms/eventimport.cxx @@ -37,7 +37,7 @@ namespace xmloff //= OFormEventsImportContext //===================================================================== //--------------------------------------------------------------------- - OFormEventsImportContext::OFormEventsImportContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, IEventAttacher& _rEventAttacher) + OFormEventsImportContext::OFormEventsImportContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rLocalName, IEventAttacher& _rEventAttacher) :XMLEventsImportContext(_rImport, _nPrefix, _rLocalName) ,m_rEventAttacher(_rEventAttacher) { @@ -64,7 +64,7 @@ namespace xmloff pTranslated->ListenerType = aEvent->first.copy(0, nSeparatorPos); pTranslated->EventMethod = aEvent->first.copy(nSeparatorPos + sizeof(EVENT_NAME_SEPARATOR) - 1); - ::rtl::OUString sLibrary; + OUString sLibrary; // the local macro name and the event type are specified as properties pEventDescription = aEvent->second.getConstArray(); @@ -89,7 +89,7 @@ namespace xmloff { // for StarBasic, the library is prepended sal_Unicode cLibSeparator = ':'; - sLibrary += ::rtl::OUString( &cLibSeparator, 1 ); + sLibrary += OUString( &cLibSeparator, 1 ); } sLibrary += pTranslated->ScriptCode; pTranslated->ScriptCode = sLibrary; diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx index d0ea88f31fb4..af7df463bade 100644 --- a/xmloff/source/forms/eventimport.hxx +++ b/xmloff/source/forms/eventimport.hxx @@ -40,7 +40,7 @@ namespace xmloff IEventAttacher& m_rEventAttacher; public: - OFormEventsImportContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + OFormEventsImportContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rLocalName, IEventAttacher& _rEventAttacher); protected: diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index aaafb1b08910..b944f5c1981e 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -251,7 +251,7 @@ namespace xmloff //--------------------------------------------------------------------- const OAttribute2Property::AttributeAssignment* OAttribute2Property::getAttributeTranslation( - const ::rtl::OUString& _rAttribName) + const OUString& _rAttribName) { ConstAttributeAssignmentsIterator aPos = m_aKnownProperties.find(_rAttribName); if (m_aKnownProperties.end() != aPos) @@ -261,19 +261,19 @@ namespace xmloff //--------------------------------------------------------------------- void OAttribute2Property::addStringProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault) { - implAdd(_pAttributeName, _rPropertyName, ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), - _pAttributeDefault ? ::rtl::OUString::createFromAscii(_pAttributeDefault) : ::rtl::OUString()); + implAdd(_pAttributeName, _rPropertyName, ::getCppuType( static_cast< OUString* >(NULL) ), + _pAttributeDefault ? OUString::createFromAscii(_pAttributeDefault) : OUString()); } //--------------------------------------------------------------------- void OAttribute2Property::addBooleanProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Bool _bAttributeDefault, const sal_Bool _bInverseSemantics) { - ::rtl::OUStringBuffer aDefault; + OUStringBuffer aDefault; ::sax::Converter::convertBool(aDefault, _bAttributeDefault); AttributeAssignment& aAssignment = implAdd(_pAttributeName, _rPropertyName, ::getBooleanCppuType(), aDefault.makeStringAndClear()); aAssignment.bInverseSemantics = _bInverseSemantics; @@ -281,31 +281,31 @@ namespace xmloff //--------------------------------------------------------------------- void OAttribute2Property::addInt16Property( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int16 _nAttributeDefault) { - ::rtl::OUStringBuffer aDefault; + OUStringBuffer aDefault; ::sax::Converter::convertNumber(aDefault, (sal_Int32)_nAttributeDefault); implAdd(_pAttributeName, _rPropertyName, ::getCppuType( static_cast< sal_Int16* >(NULL) ), aDefault.makeStringAndClear()); } //--------------------------------------------------------------------- void OAttribute2Property::addInt32Property( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int32 _nAttributeDefault) { - ::rtl::OUStringBuffer aDefault; + OUStringBuffer aDefault; ::sax::Converter::convertNumber( aDefault, _nAttributeDefault ); implAdd( _pAttributeName, _rPropertyName, ::getCppuType( static_cast< sal_Int32* >(NULL) ), aDefault.makeStringAndClear() ); } //--------------------------------------------------------------------- void OAttribute2Property::addEnumProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_uInt16 _nAttributeDefault, const SvXMLEnumMapEntry* _pValueMap, const ::com::sun::star::uno::Type* _pType) { - ::rtl::OUStringBuffer aDefault; + OUStringBuffer aDefault; SvXMLUnitConverter::convertEnum(aDefault, _nAttributeDefault, _pValueMap); AttributeAssignment& aAssignment = implAdd(_pAttributeName, _rPropertyName, _pType ? *_pType : ::getCppuType( static_cast< sal_Int32* >(NULL) ), @@ -316,13 +316,13 @@ namespace xmloff //--------------------------------------------------------------------- OAttribute2Property::AttributeAssignment& OAttribute2Property::implAdd( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, - const ::com::sun::star::uno::Type& _rType, const ::rtl::OUString& /*_rDefaultString*/) + const sal_Char* _pAttributeName, const OUString& _rPropertyName, + const ::com::sun::star::uno::Type& _rType, const OUString& /*_rDefaultString*/) { - OSL_ENSURE(m_aKnownProperties.end() == m_aKnownProperties.find(::rtl::OUString::createFromAscii(_pAttributeName)), + OSL_ENSURE(m_aKnownProperties.end() == m_aKnownProperties.find(OUString::createFromAscii(_pAttributeName)), "OAttribute2Property::implAdd: already have this attribute!"); - ::rtl::OUString sAttributeName = ::rtl::OUString::createFromAscii(_pAttributeName); + OUString sAttributeName = OUString::createFromAscii(_pAttributeName); AttributeAssignment aAssignment; aAssignment.sAttributeName = sAttributeName; diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx index 0c9d16b561e6..f535d0172ba0 100644 --- a/xmloff/source/forms/formattributes.hxx +++ b/xmloff/source/forms/formattributes.hxx @@ -237,10 +237,10 @@ namespace xmloff // store it's instances in a map, but in a vector for faster access. struct AttributeAssignment { - ::rtl::OUString sAttributeName; // the attribute name - ::rtl::OUString sPropertyName; // the property name + OUString sAttributeName; // the attribute name + OUString sPropertyName; // the property name ::com::sun::star::uno::Type aPropertyType; // the property type - ::rtl::OUString sAttributeDefault; // the default if the attribute is not present + OUString sAttributeDefault; // the default if the attribute is not present // entries which are special to some value types const SvXMLEnumMapEntry* pEnumMap; // the enum map, if appliable @@ -266,7 +266,7 @@ namespace xmloff does not represent a property. */ const AttributeAssignment* getAttributeTranslation( - const ::rtl::OUString& _rAttribName); + const OUString& _rAttribName); /** add a attribute assignment referring to a string property to the map @param _pAttributeName @@ -278,7 +278,7 @@ namespace xmloff an empty string. */ void addStringProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault = NULL); /** add a attribute assignment referring to a boolean property to the map @@ -294,7 +294,7 @@ namespace xmloff if <FALSE/>, the attribute value is used as property value directly */ void addBooleanProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Bool _bAttributeDefault, const sal_Bool _bInverseSemantics = sal_False); /** add a attribute assignment referring to an int16 property to the map @@ -307,7 +307,7 @@ namespace xmloff the default value for the attribute. */ void addInt16Property( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int16 _nAttributeDefault); /** add a attribute assignment referring to an int32 property to the map @@ -320,7 +320,7 @@ namespace xmloff the default value for the attribute. */ void addInt32Property( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int32 _nAttributeDefault ); /** add a attribute assignment referring to an enum property to the map @@ -337,15 +337,15 @@ namespace xmloff the type of the property. May be NULL, in this case 32bit integer is assumed. */ void addEnumProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_uInt16 _nAttributeDefault, const SvXMLEnumMapEntry* _pValueMap, const ::com::sun::star::uno::Type* _pType = NULL); protected: /// some common code for the various add*Property methods AttributeAssignment& implAdd( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, - const ::com::sun::star::uno::Type& _rType, const ::rtl::OUString& _rDefaultString); + const sal_Char* _pAttributeName, const OUString& _rPropertyName, + const ::com::sun::star::uno::Type& _rType, const OUString& _rDefaultString); }; //......................................................................... } // namespace xmloff diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx index 72c39c791c2e..a874c132ea62 100644 --- a/xmloff/source/forms/formcellbinding.cxx +++ b/xmloff/source/forms/formcellbinding.cxx @@ -86,15 +86,15 @@ namespace } //.................................................................... - struct StringCompare : public ::std::unary_function< ::rtl::OUString, bool > + struct StringCompare : public ::std::unary_function< OUString, bool > { private: - const ::rtl::OUString m_sReference; + const OUString m_sReference; public: - StringCompare( const ::rtl::OUString& _rReference ) : m_sReference( _rReference ) { } + StringCompare( const OUString& _rReference ) : m_sReference( _rReference ) { } - inline bool operator()( const ::rtl::OUString& _rCompare ) + inline bool operator()( const OUString& _rCompare ) { return ( _rCompare == m_sReference ); } @@ -124,7 +124,7 @@ sal_Bool FormCellBindingHelper::livesInSpreadsheetDocument( const Reference< XPr } //------------------------------------------------------------------------ -bool FormCellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress, sal_Int16 /*_nAssumeSheet*/ ) const +bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress, sal_Int16 /*_nAssumeSheet*/ ) const { Any aAddress; return doConvertAddressRepresentations( @@ -138,7 +138,7 @@ bool FormCellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddre } //------------------------------------------------------------------------ -bool FormCellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddressDescription, +bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellRangeAddress& /* [out] */ _rAddress ) const { Any aAddress; @@ -153,7 +153,7 @@ bool FormCellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddre } //------------------------------------------------------------------------ -Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAddress( const ::rtl::OUString& _rAddress, bool _bUseIntegerBinding ) const +Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAddress( const OUString& _rAddress, bool _bUseIntegerBinding ) const { Reference< XValueBinding > xBinding; if ( !m_xDocument.is() ) @@ -175,7 +175,7 @@ Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAdd } //------------------------------------------------------------------------ -Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStringAddress( const ::rtl::OUString& _rAddress ) const +Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStringAddress( const OUString& _rAddress ) const { Reference< XListEntrySource > xSource; @@ -194,11 +194,11 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr } //------------------------------------------------------------------------ -::rtl::OUString FormCellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const +OUString FormCellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const { OSL_PRECOND( !_rxBinding.is() || isCellBinding( _rxBinding ), "FormCellBindingHelper::getStringAddressFromCellBinding: this is no cell binding!" ); - ::rtl::OUString sAddress; + OUString sAddress; try { Reference< XPropertySet > xBindingProps( _rxBinding, UNO_QUERY ); @@ -224,11 +224,11 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr } //------------------------------------------------------------------------ -::rtl::OUString FormCellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const +OUString FormCellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const { OSL_PRECOND( !_rxSource.is() || isCellRangeListSource( _rxSource ), "FormCellBindingHelper::getStringAddressFromCellListSource: this is no cell list source!" ); - ::rtl::OUString sAddress; + OUString sAddress; try { Reference< XPropertySet > xSourceProps( _rxSource, UNO_QUERY ); @@ -253,7 +253,7 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr } //------------------------------------------------------------------------ -bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< XSpreadsheetDocument >& _rxDocument, const ::rtl::OUString& _rService ) SAL_THROW(()) +bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< XSpreadsheetDocument >& _rxDocument, const OUString& _rService ) SAL_THROW(()) { bool bYesItIs = false; @@ -265,11 +265,11 @@ bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< Reference< XMultiServiceFactory > xDocumentFactory( _rxDocument, UNO_QUERY ); OSL_ENSURE( xDocumentFactory.is(), "FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies: spreadsheet document, but no factory?" ); - Sequence< ::rtl::OUString > aAvailableServices; + Sequence< OUString > aAvailableServices; if ( xDocumentFactory.is() ) aAvailableServices = xDocumentFactory->getAvailableServiceNames( ); - const ::rtl::OUString* pFound = ::std::find_if( + const OUString* pFound = ::std::find_if( aAvailableServices.getConstArray(), aAvailableServices.getConstArray() + aAvailableServices.getLength(), StringCompare( _rService ) @@ -289,7 +289,7 @@ bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< } //------------------------------------------------------------------------ -bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const ::rtl::OUString& _rService ) const SAL_THROW(()) +bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const SAL_THROW(()) { return isSpreadsheetDocumentWhichSupplies( m_xDocument, _rService ); } @@ -361,7 +361,7 @@ bool FormCellBindingHelper::isCellRangeListSource( const Reference< XListEntrySo } //------------------------------------------------------------------------ -bool FormCellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const ::rtl::OUString& _rService ) const +bool FormCellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService ) const { Reference< XServiceInfo > xSI( _rxComponent, UNO_QUERY ); bool bDoes = xSI.is() && xSI->supportsService( _rService ); @@ -407,7 +407,7 @@ void FormCellBindingHelper::setListSource( const Reference< XListEntrySource >& } //------------------------------------------------------------------------ -Reference< XInterface > FormCellBindingHelper::createDocumentDependentInstance( const ::rtl::OUString& _rService, const ::rtl::OUString& _rArgumentName, +Reference< XInterface > FormCellBindingHelper::createDocumentDependentInstance( const OUString& _rService, const OUString& _rArgumentName, const Any& _rArgumentValue ) const { Reference< XInterface > xReturn; @@ -443,15 +443,15 @@ Reference< XInterface > FormCellBindingHelper::createDocumentDependentInstance( } //------------------------------------------------------------------------ -bool FormCellBindingHelper::doConvertAddressRepresentations( const ::rtl::OUString& _rInputProperty, const Any& _rInputValue, - const ::rtl::OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()) +bool FormCellBindingHelper::doConvertAddressRepresentations( const OUString& _rInputProperty, const Any& _rInputValue, + const OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()) { bool bSuccess = false; Reference< XPropertySet > xConverter( createDocumentDependentInstance( _bIsRange ? OUString(SERVICE_RANGEADDRESS_CONVERSION) : OUString(SERVICE_ADDRESS_CONVERSION), - ::rtl::OUString(), + OUString(), Any() ), UNO_QUERY diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx index 1ab30cd87f8e..55d3f885ce9e 100644 --- a/xmloff/source/forms/formcellbinding.hxx +++ b/xmloff/source/forms/formcellbinding.hxx @@ -77,14 +77,14 @@ namespace xmloff */ ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > createCellBindingFromStringAddress( - const ::rtl::OUString& _rAddress, + const OUString& _rAddress, bool _bUseIntegerBinding ) const; /** gets a cell range list source binding for the given address */ ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > - createCellListSourceFromStringAddress( const ::rtl::OUString& _rAddress ) const; + createCellListSourceFromStringAddress( const OUString& _rAddress ) const; /** creates a string representation for the given value binding's address @@ -95,7 +95,7 @@ namespace xmloff The binding is a valid cell binding, or <NULL/> @see isCellBinding */ - ::rtl::OUString getStringAddressFromCellBinding( + OUString getStringAddressFromCellBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding ) const; @@ -109,7 +109,7 @@ namespace xmloff The object is a valid cell range list source, or <NULL/> @see isCellRangeListSource */ - ::rtl::OUString getStringAddressFromCellListSource( + OUString getStringAddressFromCellListSource( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource ) const; @@ -186,7 +186,7 @@ namespace xmloff /** creates an address object from a string representation of a cell address */ bool convertStringAddress( - const ::rtl::OUString& _rAddressDescription, + const OUString& _rAddressDescription, ::com::sun::star::table::CellAddress& /* [out] */ _rAddress, sal_Int16 _nAssumeSheet = -1 ) const; @@ -194,28 +194,28 @@ namespace xmloff /** creates an address range object from a string representation of a cell range address */ bool convertStringAddress( - const ::rtl::OUString& _rAddressDescription, + const OUString& _rAddressDescription, ::com::sun::star::table::CellRangeAddress& /* [out] */ _rAddress ) const; /** determines if our document is a spreadsheet document, *and* can supply the given service */ - bool isSpreadsheetDocumentWhichSupplies( const ::rtl::OUString& _rService ) const SAL_THROW(()); + bool isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const SAL_THROW(()); /** determines if our document is a spreadsheet document, *and* can supply the given service */ static bool isSpreadsheetDocumentWhichSupplies( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >& _rxDocument, - const ::rtl::OUString& _rService + const OUString& _rService ) SAL_THROW(()); /** checkes whether a given component supports a given servive */ bool doesComponentSupport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent, - const ::rtl::OUString& _rService + const OUString& _rService ) const; /** uses the document (it's factory interface, respectively) to create a component instance @@ -230,8 +230,8 @@ namespace xmloff */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createDocumentDependentInstance( - const ::rtl::OUString& _rService, - const ::rtl::OUString& _rArgumentName, + const OUString& _rService, + const OUString& _rArgumentName, const ::com::sun::star::uno::Any& _rArgumentValue ) const; @@ -256,9 +256,9 @@ namespace xmloff @see com::sun::star::table::CellRangeAddressConversion */ bool doConvertAddressRepresentations( - const ::rtl::OUString& _rInputProperty, + const OUString& _rInputProperty, const ::com::sun::star::uno::Any& _rInputValue, - const ::rtl::OUString& _rOutputProperty, + const OUString& _rOutputProperty, ::com::sun::star::uno::Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()); diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx index 4219b3c308e2..b200503caad7 100644 --- a/xmloff/source/forms/formlayerexport.cxx +++ b/xmloff/source/forms/formlayerexport.cxx @@ -71,13 +71,13 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport::getControlId(const Reference< XPropertySet >& _rxControl) + OUString OFormLayerXMLExport::getControlId(const Reference< XPropertySet >& _rxControl) { return m_pImpl->getControlId(_rxControl); } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport::getControlNumberStyle( const Reference< XPropertySet >& _rxControl ) + OUString OFormLayerXMLExport::getControlNumberStyle( const Reference< XPropertySet >& _rxControl ) { return m_pImpl->getControlNumberStyle(_rxControl); } diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx index c9e06a012145..80245da6195b 100644 --- a/xmloff/source/forms/formlayerimport.cxx +++ b/xmloff/source/forms/formlayerimport.cxx @@ -68,7 +68,7 @@ namespace xmloff } //--------------------------------------------------------------------- - Reference< XPropertySet > OFormLayerXMLImport::lookupControl(const ::rtl::OUString& _rId) + Reference< XPropertySet > OFormLayerXMLImport::lookupControl(const OUString& _rId) { return m_pImpl->lookupControlId(_rId); } @@ -77,20 +77,20 @@ namespace xmloff SvXMLImportContext* OFormLayerXMLImport::createOfficeFormsContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName) + const OUString& _rLocalName) { return m_pImpl->createOfficeFormsContext(_rImport, _nPrefix, _rLocalName); } //--------------------------------------------------------------------- - SvXMLImportContext* OFormLayerXMLImport::createContext(const sal_uInt16 _nPrefix, const rtl::OUString& _rLocalName, + SvXMLImportContext* OFormLayerXMLImport::createContext(const sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< xml::sax::XAttributeList >& _rxAttribs) { return m_pImpl->createContext(_nPrefix, _rLocalName, _rxAttribs); } //--------------------------------------------------------------------- - void OFormLayerXMLImport::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const ::rtl::OUString& _rControlNumerStyleName) + void OFormLayerXMLImport::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName) { m_pImpl->applyControlNumberStyle(_rxControlModel, _rControlNumerStyleName); } diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx index 86fa2046359c..c8c553629b4f 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.cxx +++ b/xmloff/source/forms/gridcolumnproptranslator.cxx @@ -54,11 +54,11 @@ namespace xmloff } //---------------------------------------------------------------- - sal_Int32 findStringElement( const Sequence< ::rtl::OUString >& _rNames, const ::rtl::OUString& _rName ) + sal_Int32 findStringElement( const Sequence< OUString >& _rNames, const OUString& _rName ) { - const ::rtl::OUString* pStart = _rNames.getConstArray(); - const ::rtl::OUString* pEnd = _rNames.getConstArray() + _rNames.getLength(); - const ::rtl::OUString* pPos = ::std::find( pStart, pEnd, _rName ); + const OUString* pStart = _rNames.getConstArray(); + const OUString* pEnd = _rNames.getConstArray() + _rNames.getLength(); + const OUString* pPos = ::std::find( pStart, pEnd, _rName ); if ( pPos != pEnd ) return pPos - pStart; return -1; @@ -138,8 +138,8 @@ namespace xmloff // XPropertySetInfo virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException); }; //---------------------------------------------------------------- @@ -170,7 +170,7 @@ namespace xmloff } //---------------------------------------------------------------- - Property SAL_CALL OMergedPropertySetInfo::getPropertyByName( const ::rtl::OUString& aName ) throw (UnknownPropertyException, RuntimeException) + Property SAL_CALL OMergedPropertySetInfo::getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException) { if ( aName == getParaAlignProperty() ) return Property( getParaAlignProperty(), -1, @@ -183,7 +183,7 @@ namespace xmloff } //---------------------------------------------------------------- - ::sal_Bool SAL_CALL OMergedPropertySetInfo::hasPropertyByName( const ::rtl::OUString& Name ) throw (RuntimeException) + ::sal_Bool SAL_CALL OMergedPropertySetInfo::hasPropertyByName( const OUString& Name ) throw (RuntimeException) { if ( Name == getParaAlignProperty() ) return sal_True; @@ -221,7 +221,7 @@ namespace xmloff } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::setPropertyValue( const OUString& _rPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // we implement this by delegating it to setPropertyValues, which is to ignore unknown properties. On the other hand, our // contract requires us to throw a UnknownPropertyException for unknown properties, so check this first. @@ -229,15 +229,15 @@ namespace xmloff if ( !getPropertySetInfo()->hasPropertyByName( _rPropertyName ) ) throw UnknownPropertyException( _rPropertyName, *this ); - Sequence< ::rtl::OUString > aNames( &_rPropertyName, 1 ); + Sequence< OUString > aNames( &_rPropertyName, 1 ); Sequence< Any > aValues( &aValue, 1 ); setPropertyValues( aNames, aValues ); } //-------------------------------------------------------------------- - Any SAL_CALL OGridColumnPropertyTranslator::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + Any SAL_CALL OGridColumnPropertyTranslator::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - Sequence< ::rtl::OUString > aNames( &PropertyName, 1 ); + Sequence< OUString > aNames( &PropertyName, 1 ); Sequence< Any > aValues = getPropertyValues( aNames ); OSL_ENSURE( aValues.getLength() == 1, "OGridColumnPropertyTranslator::getPropertyValue: nonsense!" ); if ( aValues.getLength() == 1 ) @@ -246,31 +246,31 @@ namespace xmloff } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::addPropertyChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::removePropertyChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::addVetoableChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::removeVetoableChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { if ( !m_xGridColumn.is() ) return; @@ -278,7 +278,7 @@ namespace xmloff // if there's ever the need for more than one property being translated, then we should // certainly have a more clever implementation than this ... - Sequence< ::rtl::OUString > aTranslatedNames( aPropertyNames ); + Sequence< OUString > aTranslatedNames( aPropertyNames ); Sequence< Any > aTranslatedValues( aValues ); sal_Int32 nParaAlignPos = findStringElement( aTranslatedNames, getParaAlignProperty() ); @@ -292,13 +292,13 @@ namespace xmloff } //-------------------------------------------------------------------- - Sequence< Any > SAL_CALL OGridColumnPropertyTranslator::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames ) throw (RuntimeException) + Sequence< Any > SAL_CALL OGridColumnPropertyTranslator::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException) { Sequence< Any > aValues( aPropertyNames.getLength() ); if ( !m_xGridColumn.is() ) return aValues; - Sequence< ::rtl::OUString > aTranslatedNames( aPropertyNames ); + Sequence< OUString > aTranslatedNames( aPropertyNames ); sal_Int32 nAlignPos = findStringElement( aTranslatedNames, getParaAlignProperty() ); if ( nAlignPos != -1 ) aTranslatedNames[ nAlignPos ] = getAlignProperty(); @@ -311,7 +311,7 @@ namespace xmloff } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::addPropertiesChangeListener: not implemented - this should not be needed!" ); } @@ -323,7 +323,7 @@ namespace xmloff } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::firePropertiesChangeEvent: not implemented - this should not be needed!" ); } diff --git a/xmloff/source/forms/gridcolumnproptranslator.hxx b/xmloff/source/forms/gridcolumnproptranslator.hxx index ce391297496f..6c9313bdc7e7 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.hxx +++ b/xmloff/source/forms/gridcolumnproptranslator.hxx @@ -51,19 +51,19 @@ namespace xmloff // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); }; //........................................................................ diff --git a/xmloff/source/forms/handler/vcl_date_handler.cxx b/xmloff/source/forms/handler/vcl_date_handler.cxx index eeea8e4ca831..b306a65ce04b 100644 --- a/xmloff/source/forms/handler/vcl_date_handler.cxx +++ b/xmloff/source/forms/handler/vcl_date_handler.cxx @@ -47,14 +47,14 @@ namespace xmloff } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString VCLDateHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const + OUString VCLDateHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const { OSL_ENSURE( false, "VCLDateHandler::getAttributeValue: unexpected call!" ); - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString VCLDateHandler::getAttributeValue( const Any& i_propertyValue ) const + OUString VCLDateHandler::getAttributeValue( const Any& i_propertyValue ) const { sal_Int32 nVCLDate(0); OSL_VERIFY( i_propertyValue >>= nVCLDate ); @@ -65,13 +65,13 @@ namespace xmloff aDateTime.Month = aVCLDate.GetMonth(); aDateTime.Year = aVCLDate.GetYear(); - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertDateTime( aBuffer, aDateTime, false ); return aBuffer.makeStringAndClear(); } //------------------------------------------------------------------------------------------------------------------ - bool VCLDateHandler::getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const + bool VCLDateHandler::getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const { sal_Int32 nVCLDate(0); diff --git a/xmloff/source/forms/handler/vcl_date_handler.hxx b/xmloff/source/forms/handler/vcl_date_handler.hxx index 6863dbc802bb..720270ba04b0 100644 --- a/xmloff/source/forms/handler/vcl_date_handler.hxx +++ b/xmloff/source/forms/handler/vcl_date_handler.hxx @@ -36,9 +36,9 @@ namespace xmloff VCLDateHandler(); // IPropertyHandler - virtual ::rtl::OUString getAttributeValue( const PropertyValues& i_propertyValues ) const; - virtual ::rtl::OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const; - virtual bool getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const; + virtual OUString getAttributeValue( const PropertyValues& i_propertyValues ) const; + virtual OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const; + virtual bool getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const; }; //...................................................................................................................... diff --git a/xmloff/source/forms/handler/vcl_time_handler.cxx b/xmloff/source/forms/handler/vcl_time_handler.cxx index 4a29fbd71301..4339ed75c791 100644 --- a/xmloff/source/forms/handler/vcl_time_handler.cxx +++ b/xmloff/source/forms/handler/vcl_time_handler.cxx @@ -47,14 +47,14 @@ namespace xmloff } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString VCLTimeHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const + OUString VCLTimeHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const { OSL_ENSURE( false, "VCLTimeHandler::getAttributeValue: unexpected call!" ); - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString VCLTimeHandler::getAttributeValue( const Any& i_propertyValue ) const + OUString VCLTimeHandler::getAttributeValue( const Any& i_propertyValue ) const { sal_Int32 nVCLTime(0); OSL_VERIFY( i_propertyValue >>= nVCLTime ); @@ -66,13 +66,13 @@ namespace xmloff aDuration.Seconds = aVCLTime.GetSec(); aDuration.MilliSeconds = aVCLTime.Get100Sec() * 10; - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertDuration( aBuffer, aDuration ); return aBuffer.makeStringAndClear(); } //------------------------------------------------------------------------------------------------------------------ - bool VCLTimeHandler::getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const + bool VCLTimeHandler::getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const { sal_Int32 nVCLTime(0); diff --git a/xmloff/source/forms/handler/vcl_time_handler.hxx b/xmloff/source/forms/handler/vcl_time_handler.hxx index d9631f02d2c9..5785a78cbb08 100644 --- a/xmloff/source/forms/handler/vcl_time_handler.hxx +++ b/xmloff/source/forms/handler/vcl_time_handler.hxx @@ -36,9 +36,9 @@ namespace xmloff VCLTimeHandler(); // IPropertyHandler - virtual ::rtl::OUString getAttributeValue( const PropertyValues& i_propertyValues ) const; - virtual ::rtl::OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const; - virtual bool getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const; + virtual OUString getAttributeValue( const PropertyValues& i_propertyValues ) const; + virtual OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const; + virtual bool getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const; }; //...................................................................................................................... diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index 13e0ed37a93b..2b065c7d5165 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -74,9 +74,9 @@ namespace xmloff //= OFormLayerXMLExport_Impl //===================================================================== //--------------------------------------------------------------------- - const ::rtl::OUString& OFormLayerXMLExport_Impl::getControlNumberStyleNamePrefix() + const OUString& OFormLayerXMLExport_Impl::getControlNumberStyleNamePrefix() { - static const ::rtl::OUString s_sControlNumberStyleNamePrefix("C"); + static const OUString s_sControlNumberStyleNamePrefix("C"); return s_sControlNumberStyleNamePrefix; } @@ -96,7 +96,7 @@ namespace xmloff m_rContext.GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_CONTROL_ID, token::GetXMLToken(token::XML_PARAGRAPH), m_xStyleExportMapper.get(), - ::rtl::OUString( XML_STYLE_FAMILY_CONTROL_PREFIX ) + OUString( XML_STYLE_FAMILY_CONTROL_PREFIX ) ); // add our event translation table @@ -150,13 +150,13 @@ namespace xmloff const Sequence< ScriptEventDescriptor >& _rEvents) { // the list of the referring controls - ::rtl::OUString sReferringControls; + OUString sReferringControls; MapPropertySet2String::const_iterator aReferring = m_aCurrentPageReferring->second.find(_rxControl); if (aReferring != m_aCurrentPageReferring->second.end()) sReferringControls = aReferring->second; // the control id (should already have been created in examineForms) - ::rtl::OUString sControlId( getControlId( _rxControl ) ); + OUString sControlId( getControlId( _rxControl ) ); // do the exporting OControlExport aExportImpl(*this, _rxControl, sControlId, sReferringControls, _rEvents); @@ -241,9 +241,9 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport_Impl::getObjectStyleName( const Reference< XPropertySet >& _rxObject ) + OUString OFormLayerXMLExport_Impl::getObjectStyleName( const Reference< XPropertySet >& _rxObject ) { - ::rtl::OUString aObjectStyle; + OUString aObjectStyle; MapPropertySet2String::const_iterator aObjectStylePos = m_aGridColumnStyles.find( _rxObject ); if ( m_aGridColumnStyles.end() != aObjectStylePos ) @@ -389,10 +389,10 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport_Impl::getControlId(const Reference< XPropertySet >& _rxControl) + OUString OFormLayerXMLExport_Impl::getControlId(const Reference< XPropertySet >& _rxControl) { if (m_aCurrentPageIds == m_aControlIds.end()) - return ::rtl::OUString(); + return OUString(); OSL_ENSURE(m_aCurrentPageIds->second.end() != m_aCurrentPageIds->second.find(_rxControl), "OFormLayerXMLExport_Impl::getControlId: can not find the control!"); @@ -400,9 +400,9 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport_Impl::getImmediateNumberStyle( const Reference< XPropertySet >& _rxObject ) + OUString OFormLayerXMLExport_Impl::getImmediateNumberStyle( const Reference< XPropertySet >& _rxObject ) { - ::rtl::OUString sNumberStyle; + OUString sNumberStyle; sal_Int32 nOwnFormatKey = implExamineControlNumberFormat( _rxObject ); if ( -1 != nOwnFormatKey ) @@ -412,9 +412,9 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport_Impl::getControlNumberStyle( const Reference< XPropertySet >& _rxControl ) + OUString OFormLayerXMLExport_Impl::getControlNumberStyle( const Reference< XPropertySet >& _rxControl ) { - ::rtl::OUString sNumberStyle; + OUString sNumberStyle; ConstMapPropertySet2IntIterator aControlFormatPos = m_aControlNumberFormats.find(_rxControl); if (m_aControlNumberFormats.end() != aControlFormatPos) @@ -503,13 +503,13 @@ namespace xmloff } }; - ::rtl::OUString lcl_findFreeControlId( const MapPropertySet2Map& _rAllPagesControlIds ) + OUString lcl_findFreeControlId( const MapPropertySet2Map& _rAllPagesControlIds ) { - static const ::rtl::OUString sControlIdBase( "control" ); - ::rtl::OUString sControlId = sControlIdBase; + static const OUString sControlIdBase( "control" ); + OUString sControlId = sControlIdBase; size_t nKnownControlCount = ::std::accumulate( _rAllPagesControlIds.begin(), _rAllPagesControlIds.end(), (size_t)0, AccumulateSize() ); - sControlId += ::rtl::OUString::valueOf( (sal_Int32)nKnownControlCount + 1 ); + sControlId += OUString::valueOf( (sal_Int32)nKnownControlCount + 1 ); #ifdef DBG_UTIL // Check if the id is already used. It shouldn't, as we currently have no mechanism for removing entries @@ -545,7 +545,7 @@ namespace xmloff // generate a new control id // find a free id - ::rtl::OUString sCurrentId = lcl_findFreeControlId( m_aControlIds ); + OUString sCurrentId = lcl_findFreeControlId( m_aControlIds ); // add it to the map m_aCurrentPageIds->second[_rxObject] = sCurrentId; @@ -556,11 +556,11 @@ namespace xmloff Reference< XPropertySet > xCurrentReference( _rxObject->getPropertyValue( PROPERTY_CONTROLLABEL ), UNO_QUERY ); if (xCurrentReference.is()) { - ::rtl::OUString& sReferencedBy = m_aCurrentPageReferring->second[xCurrentReference]; + OUString& sReferencedBy = m_aCurrentPageReferring->second[xCurrentReference]; if (!sReferencedBy.isEmpty()) // it's not the first _rxObject referring to the xCurrentReference // -> separate the id - sReferencedBy += ::rtl::OUString(","); + sReferencedBy += OUString(","); sReferencedBy += sCurrentId; } } @@ -618,7 +618,7 @@ namespace xmloff // generate a new control id // find a free id - ::rtl::OUString sCurrentId = lcl_findFreeControlId( m_aControlIds ); + OUString sCurrentId = lcl_findFreeControlId( m_aControlIds ); // add it to the map m_aCurrentPageIds->second[ xColumnProperties ] = sCurrentId; @@ -629,7 +629,7 @@ namespace xmloff ::std::vector< XMLPropertyState > aPropertyStates = m_xStyleExportMapper->Filter( xColumnProperties ); // care for the number format, additionally - ::rtl::OUString sColumnNumberStyle; + OUString sColumnNumberStyle; if ( xColumnPropertiesMeta.is() && xColumnPropertiesMeta->hasPropertyByName( PROPERTY_FORMATKEY ) ) sColumnNumberStyle = getImmediateNumberStyle( xColumnProperties ); @@ -656,7 +656,7 @@ namespace xmloff if ( !aPropertyStates.empty() ) { // add to the style pool - ::rtl::OUString sColumnStyleName = m_rContext.GetAutoStylePool()->Add( XML_STYLE_FAMILY_CONTROL_ID, aPropertyStates ); + OUString sColumnStyleName = m_rContext.GetAutoStylePool()->Add( XML_STYLE_FAMILY_CONTROL_ID, aPropertyStates ); OSL_ENSURE( m_aGridColumnStyles.end() == m_aGridColumnStyles.find( xColumnProperties ), "OFormLayerXMLExport_Impl::collectGridColumnStylesAndIds: already have a style for this column!" ); @@ -723,7 +723,7 @@ namespace xmloff // obtain the persistent (does not depend on the formats supplier) representation of the control's format Locale aFormatLocale; - ::rtl::OUString sFormatDescription; + OUString sFormatDescription; if (xControlFormats.is()) { Reference< XPropertySet > xControlFormat = xControlFormats->getByKey(nControlFormatKey); @@ -762,9 +762,9 @@ namespace xmloff { // create it for en-US (does not really matter, as we will specify a locale for every // concrete language to use) - Locale aLocale ( ::rtl::OUString("en"), - ::rtl::OUString("US"), - ::rtl::OUString() + Locale aLocale ( OUString("en"), + OUString("US"), + OUString() ); xFormatsSupplier = NumberFormatsSupplier::createWithLocale( m_rContext.getComponentContext(), aLocale ); m_xControlNumberFormats = xFormatsSupplier->getNumberFormats(); diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx index 12fe435417cf..bd25986b478e 100644 --- a/xmloff/source/forms/layerexport.hxx +++ b/xmloff/source/forms/layerexport.hxx @@ -44,7 +44,7 @@ namespace xmloff // maps objects (property sets) to strings, e.g. control ids. typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - , ::rtl::OUString + , OUString , OPropertySetCompare > MapPropertySet2String; @@ -157,7 +157,7 @@ namespace xmloff <p>You must have sought to the page of the control before calling this.</p> */ - ::rtl::OUString + OUString getControlId(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl); /** retrieves the style name for the control's number style. @@ -165,13 +165,13 @@ namespace xmloff <p>For performance reasons, this method is allowed to be called for any controls, even those which do not have a number style. In this case, an empty string is returned.</p> */ - ::rtl::OUString + OUString getControlNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl ); // IFormsExportContext virtual void exportCollectionElements(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxCollection); virtual SvXMLExport& getGlobalContext(); - virtual ::rtl::OUString getObjectStyleName( + virtual OUString getObjectStyleName( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ); virtual ::rtl::Reference< SvXMLExportPropertyMapper > getStylePropertyMapper(); @@ -283,12 +283,12 @@ namespace xmloff /** determines the number format style for the given object without remembering it */ - ::rtl::OUString + OUString getImmediateNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ); /** returns the prefix to be used for control number styles */ - static const ::rtl::OUString& getControlNumberStyleNamePrefix(); + static const OUString& getControlNumberStyleNamePrefix(); /** exclude the given control (model) from export. diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index f87c791e6470..bbbb8d59405a 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -109,7 +109,7 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter) // properties not added because they're already present in another form OSL_ENSURE( - 0 == ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_TARGET_LOCATION)).compareToAscii( + 0 == OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_TARGET_LOCATION)).compareToAscii( OAttributeMetaData::getFormAttributeName(faAction)), "OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl: invalid attribute names (1)!"); // if this fails, we would have to add a translation from faAction->PROPERTY_TARGETURL @@ -117,7 +117,7 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter) // and CCA_TARGET_LOCATION and faAction should be represented by the same attribute OSL_ENSURE( - 0 == ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_NAME)).compareToAscii( + 0 == OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_NAME)).compareToAscii( OAttributeMetaData::getFormAttributeName(faName)), "OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl: invalid attribute names (2)!"); // the same for faName, CCA_NAME and PROPERTY_NAME @@ -252,7 +252,7 @@ void OFormLayerXMLImport_Impl::setAutoStyleContext(SvXMLStylesContext* _pNewCont } //--------------------------------------------------------------------- -void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const ::rtl::OUString& _rControlNumerStyleName) +void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName) { OSL_ENSURE(_rxControlModel.is() && (!_rControlNumerStyleName.isEmpty()), "OFormLayerXMLImport_Impl::applyControlNumberStyle: invalid arguments (this will crash)!"); @@ -304,7 +304,7 @@ void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropert } //--------------------------------------------------------------------- -void OFormLayerXMLImport_Impl::registerCellValueBinding( const Reference< XPropertySet >& _rxControlModel, const ::rtl::OUString& _rCellAddress ) +void OFormLayerXMLImport_Impl::registerCellValueBinding( const Reference< XPropertySet >& _rxControlModel, const OUString& _rCellAddress ) { OSL_ENSURE( _rxControlModel.is() && !_rCellAddress.isEmpty(), "OFormLayerXMLImport_Impl::registerCellValueBinding: invalid arguments!" ); @@ -314,7 +314,7 @@ void OFormLayerXMLImport_Impl::registerCellValueBinding( const Reference< XPrope //--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerXFormsValueBinding( const Reference< XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rBindingID ) + const OUString& _rBindingID ) { // TODO: is an empty binding name allowed? OSL_ENSURE( _rxControlModel.is(), "need model" ); @@ -326,7 +326,7 @@ void OFormLayerXMLImport_Impl::registerXFormsValueBinding( //--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerXFormsListBinding( const Reference< XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rBindingID ) + const OUString& _rBindingID ) { // TODO: is an empty binding name allowed? OSL_ENSURE( _rxControlModel.is(), "need model" ); @@ -338,7 +338,7 @@ void OFormLayerXMLImport_Impl::registerXFormsListBinding( //--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerXFormsSubmission( const Reference< XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rSubmissionID ) + const OUString& _rSubmissionID ) { // TODO: is an empty binding name allowed? OSL_ENSURE( _rxControlModel.is(), "need model" ); @@ -348,14 +348,14 @@ void OFormLayerXMLImport_Impl::registerXFormsSubmission( } //--------------------------------------------------------------------- -void OFormLayerXMLImport_Impl::registerCellRangeListSource( const Reference< XPropertySet >& _rxControlModel, const ::rtl::OUString& _rCellRangeAddress ) +void OFormLayerXMLImport_Impl::registerCellRangeListSource( const Reference< XPropertySet >& _rxControlModel, const OUString& _rCellRangeAddress ) { OSL_ENSURE( _rxControlModel.is() && !_rCellRangeAddress.isEmpty(), "OFormLayerXMLImport_Impl::registerCellRangeListSource: invalid arguments!" ); m_aCellRangeListSources.push_back( ModelStringPair( _rxControlModel, _rCellRangeAddress ) ); } //--------------------------------------------------------------------- -const SvXMLStyleContext* OFormLayerXMLImport_Impl::getStyleElement(const ::rtl::OUString& _rStyleName) const +const SvXMLStyleContext* OFormLayerXMLImport_Impl::getStyleElement(const OUString& _rStyleName) const { OSL_ENSURE( m_pAutoStyles, "OFormLayerXMLImport_Impl::getStyleElement: have no auto style context!" ); // did you use setAutoStyleContext? @@ -363,7 +363,7 @@ const SvXMLStyleContext* OFormLayerXMLImport_Impl::getStyleElement(const ::rtl:: const SvXMLStyleContext* pControlStyle = m_pAutoStyles ? m_pAutoStyles->FindStyleChildContext( XML_STYLE_FAMILY_TEXT_PARAGRAPH, _rStyleName ) : NULL; OSL_ENSURE( pControlStyle || !m_pAutoStyles, - ::rtl::OStringBuffer("OFormLayerXMLImport_Impl::getStyleElement: did not find the style named \"").append(rtl::OUStringToOString(_rStyleName, RTL_TEXTENCODING_ASCII_US)).append("\"!").getStr() ); + OStringBuffer("OFormLayerXMLImport_Impl::getStyleElement: did not find the style named \"").append(OUStringToOString(_rStyleName, RTL_TEXTENCODING_ASCII_US)).append("\"!").getStr() ); return pControlStyle; } @@ -383,7 +383,7 @@ void OFormLayerXMLImport_Impl::leaveEventContext() } //--------------------------------------------------------------------- -void OFormLayerXMLImport_Impl::registerControlId(const Reference< XPropertySet >& _rxControl, const ::rtl::OUString& _rId) +void OFormLayerXMLImport_Impl::registerControlId(const Reference< XPropertySet >& _rxControl, const OUString& _rId) { OSL_ENSURE(m_aCurrentPageIds != m_aControlIds.end(), "OFormLayerXMLImport_Impl::registerControlId: no current page!"); OSL_ENSURE(!_rId.isEmpty(), "OFormLayerXMLImport_Impl::registerControlId: invalid (empty) control id!"); @@ -393,7 +393,7 @@ void OFormLayerXMLImport_Impl::registerControlId(const Reference< XPropertySet > } //--------------------------------------------------------------------- -void OFormLayerXMLImport_Impl::registerControlReferences(const Reference< XPropertySet >& _rxControl, const ::rtl::OUString& _rReferringControls) +void OFormLayerXMLImport_Impl::registerControlReferences(const Reference< XPropertySet >& _rxControl, const OUString& _rReferringControls) { OSL_ENSURE(!_rReferringControls.isEmpty(), "OFormLayerXMLImport_Impl::registerControlReferences: invalid (empty) control id list!"); OSL_ENSURE(_rxControl.is(), "OFormLayerXMLImport_Impl::registerControlReferences: invalid (NULL) control!"); @@ -428,9 +428,9 @@ void OFormLayerXMLImport_Impl::endPage() try { static const sal_Unicode s_nSeparator = ','; - ::rtl::OUString sReferring; - ::rtl::OUString sCurrentReferring; - ::rtl::OUString sSeparator(&s_nSeparator, 1); + OUString sReferring; + OUString sCurrentReferring; + OUString sSeparator(&s_nSeparator, 1); Reference< XPropertySet > xCurrentReferring; sal_Int32 nSeparator, nPrevSep; ::std::vector< ModelStringPair >::const_iterator aEnd = m_aControlReferences.end(); @@ -479,7 +479,7 @@ void OFormLayerXMLImport_Impl::endPage() } //--------------------------------------------------------------------- -Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const ::rtl::OUString& _rControlId) +Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const OUString& _rControlId) { OSL_ENSURE(m_aCurrentPageIds != m_aControlIds.end(), "OFormLayerXMLImport_Impl::lookupControlId: no current page!"); Reference< XPropertySet > xReturn; @@ -498,13 +498,13 @@ Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const ::rtl: SvXMLImportContext* OFormLayerXMLImport_Impl::createOfficeFormsContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName) + const OUString& _rLocalName) { return new OFormsRootImport( _rImport, _nPrefix, _rLocalName ); } //--------------------------------------------------------------------- -SvXMLImportContext* OFormLayerXMLImport_Impl::createContext(const sal_uInt16 _nPrefix, const rtl::OUString& _rLocalName, +SvXMLImportContext* OFormLayerXMLImport_Impl::createContext(const sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< xml::sax::XAttributeList >&) { SvXMLImportContext* pContext = NULL; @@ -557,7 +557,7 @@ void OFormLayerXMLImport_Impl::documentDone( ) { // There are special bindings for listboxes. See // OListAndComboImport::doRegisterCellValueBinding for a comment on this HACK. - ::rtl::OUString sBoundCellAddress( aCellBindings->second ); + OUString sBoundCellAddress( aCellBindings->second ); sal_Int32 nIndicator = sBoundCellAddress.lastIndexOf( s_sIndex ); bool bUseIndexBinding = false; diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx index 1e7fb1427a2b..cb1b68d46435 100644 --- a/xmloff/source/forms/layerimport.hxx +++ b/xmloff/source/forms/layerimport.hxx @@ -67,7 +67,7 @@ namespace xmloff MapDrawPage2Map m_aControlIds; // ids of the controls on all known page MapDrawPage2MapIterator m_aCurrentPageIds; // ifs of the controls on the current page - typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, ::rtl::OUString > + typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, OUString > ModelStringPair; ::std::vector< ModelStringPair > m_aControlReferences; // control reference descriptions for current page @@ -89,44 +89,44 @@ namespace xmloff // IControlIdMap void registerControlId( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, - const ::rtl::OUString& _rId); + const OUString& _rId); void registerControlReferences( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, - const ::rtl::OUString& _rReferringControls); + const OUString& _rReferringControls); // OFormLayerXMLImport_Impl inline OAttribute2Property& getAttributeMap() { return m_aAttributeMetaData; } inline SvXMLImport& getGlobalContext() { return m_rImporter; } - const SvXMLStyleContext* getStyleElement(const ::rtl::OUString& _rStyleName) const; + const SvXMLStyleContext* getStyleElement(const OUString& _rStyleName) const; void enterEventContext(); void leaveEventContext(); void applyControlNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rControlNumerStyleName + const OUString& _rControlNumerStyleName ); void registerCellValueBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rCellAddress + const OUString& _rCellAddress ); void registerCellRangeListSource( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rCellRangeAddress + const OUString& _rCellRangeAddress ); void registerXFormsValueBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rBindingID + const OUString& _rBindingID ); void registerXFormsListBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rBindingID + const OUString& _rBindingID ); void registerXFormsSubmission( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rSubmissionID + const OUString& _rSubmissionID ); protected: @@ -147,20 +147,20 @@ namespace xmloff SvXMLImportContext* createOfficeFormsContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName); + const OUString& _rLocalName); /** create an <type>SvXMLImportContext</type> instance which is able to import the <form:form> element. */ SvXMLImportContext* createContext( const sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName, + const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttribs); /** get the control with the given id */ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - lookupControlId(const ::rtl::OUString& _rControlId); + lookupControlId(const OUString& _rControlId); /** announces the auto-style context to the form importer */ diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index 35c6b33570d1..1b1aeed8c461 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -48,7 +48,7 @@ namespace xmloff //========================================================================= TYPEINIT1(OFormsRootImport, SvXMLImportContext); //------------------------------------------------------------------------- - OFormsRootImport::OFormsRootImport( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName ) + OFormsRootImport::OFormsRootImport( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName ) :SvXMLImportContext(rImport, nPrfx, rLocalName) { } @@ -59,7 +59,7 @@ namespace xmloff } //------------------------------------------------------------------------- - SvXMLImportContext* OFormsRootImport::CreateChildContext( sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OFormsRootImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList>& xAttrList ) { return GetImport().GetFormImport()->createContext( _nPrefix, _rLocalName, xAttrList ); @@ -68,15 +68,15 @@ namespace xmloff //------------------------------------------------------------------------- void OFormsRootImport::implImportBool(const Reference< XAttributeList >& _rxAttributes, OfficeFormsAttributes _eAttribute, const Reference< XPropertySet >& _rxProps, const Reference< XPropertySetInfo >& _rxPropInfo, - const ::rtl::OUString& _rPropName, sal_Bool _bDefault) + const OUString& _rPropName, sal_Bool _bDefault) { // the complete attribute name to look for - ::rtl::OUString sCompleteAttributeName = GetImport().GetNamespaceMap().GetQNameByIndex( + OUString sCompleteAttributeName = GetImport().GetNamespaceMap().GetQNameByIndex( OAttributeMetaData::getOfficeFormsAttributeNamespace(_eAttribute), - ::rtl::OUString::createFromAscii(OAttributeMetaData::getOfficeFormsAttributeName(_eAttribute))); + OUString::createFromAscii(OAttributeMetaData::getOfficeFormsAttributeName(_eAttribute))); // get and convert the value - ::rtl::OUString sAttributeValue = _rxAttributes->getValueByName(sCompleteAttributeName); + OUString sAttributeValue = _rxAttributes->getValueByName(sCompleteAttributeName); bool bValue = _bDefault; ::sax::Converter::convertBool(bValue, sAttributeValue); @@ -141,7 +141,7 @@ namespace xmloff //------------------------------------------------------------------------- void OFormsRootExport::implExportBool(SvXMLExport& _rExp, OfficeFormsAttributes _eAttribute, const Reference< XPropertySet >& _rxProps, const Reference< XPropertySetInfo >& _rxPropInfo, - const ::rtl::OUString& _rPropName, sal_Bool _bDefault) + const OUString& _rPropName, sal_Bool _bDefault) { // retrieve the property value sal_Bool bValue = _bDefault; @@ -149,7 +149,7 @@ namespace xmloff bValue = ::cppu::any2bool(_rxProps->getPropertyValue(_rPropName)); // convert into a string - ::rtl::OUStringBuffer aValue; + OUStringBuffer aValue; ::sax::Converter::convertBool(aValue, bValue); // add the attribute diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx index 338d06adfdd1..7225ce9280b8 100644 --- a/xmloff/source/forms/officeforms.hxx +++ b/xmloff/source/forms/officeforms.hxx @@ -42,11 +42,11 @@ namespace xmloff public: TYPEINFO(); - OFormsRootImport( SvXMLImport& _rImport, sal_uInt16 _nPrfx, const rtl::OUString& _rLocalName); + OFormsRootImport( SvXMLImport& _rImport, sal_uInt16 _nPrfx, const OUString& _rLocalName); virtual ~OFormsRootImport(); // SvXMLImportContext overriabled - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, 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 >& _rxAttrList ); virtual void EndElement(); @@ -57,7 +57,7 @@ namespace xmloff OfficeFormsAttributes _eAttribute, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, - const ::rtl::OUString& _rPropName, + const OUString& _rPropName, sal_Bool _bDefault ); }; @@ -82,7 +82,7 @@ namespace xmloff OfficeFormsAttributes _eAttribute, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, - const ::rtl::OUString& _rPropName, + const OUString& _rPropName, sal_Bool _bDefault ); }; diff --git a/xmloff/source/forms/property_description.hxx b/xmloff/source/forms/property_description.hxx index 488e625c28f9..170b23d52269 100644 --- a/xmloff/source/forms/property_description.hxx +++ b/xmloff/source/forms/property_description.hxx @@ -70,7 +70,7 @@ namespace xmloff struct PropertyDescription { /// is the name of the property - const ::rtl::OUString propertyName; + const OUString propertyName; /** denotes the attribute which represents the property. Note that multiple properties might comprise a single attribute value. */ @@ -100,7 +100,7 @@ namespace xmloff } PropertyDescription( - const ::rtl::OUString& i_propertyName, + const OUString& i_propertyName, const sal_uInt16 i_namespacePrefix, const ::xmloff::token::XMLTokenEnum i_attributeToken, const PropertyHandlerFactory i_factory, diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx index d3d0ceba6611..c9583fff4976 100644 --- a/xmloff/source/forms/property_meta_data.cxx +++ b/xmloff/source/forms/property_meta_data.cxx @@ -74,7 +74,7 @@ namespace xmloff { namespace metadata // for some attribute or property, and otherwise delegate to the next instance. //.............................................................................................................. - typedef ::boost::unordered_map< ::rtl::OUString, const PropertyDescription*, ::rtl::OUStringHash > DescriptionsByName; + typedef ::boost::unordered_map< OUString, const PropertyDescription*, OUStringHash > DescriptionsByName; //.............................................................................................................. const DescriptionsByName& lcl_getPropertyDescriptions() @@ -115,7 +115,7 @@ namespace xmloff { namespace metadata } //.............................................................................................................. - typedef ::boost::unordered_map< ::rtl::OUString, XMLTokenEnum, ::rtl::OUStringHash > ReverseTokenLookup; + typedef ::boost::unordered_map< OUString, XMLTokenEnum, OUStringHash > ReverseTokenLookup; //.............................................................................................................. const ReverseTokenLookup& getReverseTokenLookup() @@ -192,7 +192,7 @@ namespace xmloff { namespace metadata } //------------------------------------------------------------------------------------------------------------------ - const PropertyDescription* getPropertyDescription( const ::rtl::OUString& i_propertyName ) + const PropertyDescription* getPropertyDescription( const OUString& i_propertyName ) { const DescriptionsByName& rAllDescriptions( lcl_getPropertyDescriptions() ); DescriptionsByName::const_iterator pos = rAllDescriptions.find( i_propertyName ); @@ -248,7 +248,7 @@ namespace xmloff { namespace metadata } //------------------------------------------------------------------------------------------------------------------ - AttributeDescription getAttributeDescription( const sal_uInt16 i_namespacePrefix, const ::rtl::OUString& i_attributeName ) + AttributeDescription getAttributeDescription( const sal_uInt16 i_namespacePrefix, const OUString& i_attributeName ) { AttributeDescription attribute; const ReverseTokenLookup& rTokenLookup( getReverseTokenLookup() ); diff --git a/xmloff/source/forms/property_meta_data.hxx b/xmloff/source/forms/property_meta_data.hxx index 27d21b9bef0d..7db6912190da 100644 --- a/xmloff/source/forms/property_meta_data.hxx +++ b/xmloff/source/forms/property_meta_data.hxx @@ -27,7 +27,7 @@ namespace xmloff { namespace metadata { //...................................................................................................................... - const PropertyDescription* getPropertyDescription( const ::rtl::OUString& i_propertyName ); + const PropertyDescription* getPropertyDescription( const OUString& i_propertyName ); /** retries the descriptions of all properties which add to the given XML attribute @@ -49,7 +49,7 @@ namespace xmloff { namespace metadata /** retrieves the attribute descriptor for the attribute given by namespace prefix and attribute name */ AttributeDescription - getAttributeDescription( const sal_uInt16 i_namespacePrefix, const ::rtl::OUString& i_attributeName ); + getAttributeDescription( const sal_uInt16 i_namespacePrefix, const OUString& i_attributeName ); //...................................................................................................................... } } // namespace xmloff::metadata diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index c86c6ac6ea72..a0de21a02029 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -65,7 +65,7 @@ namespace xmloff ,m_xPropertyState( _rxProps, UNO_QUERY ) { // caching - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertBool(aBuffer, true); m_sValueTrue = aBuffer.makeStringAndClear(); ::sax::Converter::convertBool(aBuffer, false); @@ -78,7 +78,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OPropertyExport::shouldExportProperty( const ::rtl::OUString& i_propertyName ) const + bool OPropertyExport::shouldExportProperty( const OUString& i_propertyName ) const { // if the property state is DEFAULT, it does not need to be written - at least // if it's a built-in property, and not a dynamically-added one. @@ -96,7 +96,7 @@ namespace xmloff OSequenceIterator< T > i(value); while (i.hasMoreElements()) { - ::rtl::OUString sValue(implConvertAny(i.nextElement())); + OUString sValue(implConvertAny(i.nextElement())); AddAttribute(XML_NAMESPACE_OFFICE, eValueAttName, sValue ); SvXMLElementExport aValueTag( m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, @@ -112,7 +112,7 @@ namespace xmloff try { Any aValue; - ::rtl::OUString sValue; + OUString sValue; // loop through all the properties which are yet to be exported for ( ConstStringSetIterator aProperty = m_aRemainingProps.begin(); @@ -123,7 +123,7 @@ namespace xmloff DBG_CHECK_PROPERTY_NO_TYPE(*aProperty); #if OSL_DEBUG_LEVEL > 0 - const ::rtl::OUString sPropertyName = *aProperty; (void)sPropertyName; + const OUString sPropertyName = *aProperty; (void)sPropertyName; #endif if ( !shouldExportProperty( *aProperty ) ) continue; @@ -194,7 +194,7 @@ namespace xmloff switch ( aExportType.getTypeClass() ) { case TypeClass_STRING: - exportRemainingPropertiesSequence< ::rtl::OUString >( + exportRemainingPropertiesSequence< OUString >( aValue, eValueAttName); break; case TypeClass_DOUBLE: @@ -257,9 +257,9 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportStringPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName ) + const OUString& _rPropertyName ) { - DBG_CHECK_PROPERTY( _rPropertyName, ::rtl::OUString ); + DBG_CHECK_PROPERTY( _rPropertyName, OUString ); // no try-catch here, this would be to expensive. The outer scope has to handle exceptions (which should not // happen if we're used correctly :) @@ -267,7 +267,7 @@ namespace xmloff // this is way simple, as we don't need to convert anything (the property already is a string) // get the string - ::rtl::OUString sPropValue; + OUString sPropValue; m_xProps->getPropertyValue( _rPropertyName ) >>= sPropValue; // add the attribute @@ -280,7 +280,7 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportBooleanPropertyAttribute(const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, const sal_Int8 _nBooleanAttributeFlags) + const OUString& _rPropertyName, const sal_Int8 _nBooleanAttributeFlags) { DBG_CHECK_PROPERTY_NO_TYPE( _rPropertyName ); // no check of the property value type: this method is allowed to be called with any interger properties @@ -319,7 +319,7 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportInt16PropertyAttribute(const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, const sal_Int16 _nDefault) + const OUString& _rPropertyName, const sal_Int16 _nDefault) { DBG_CHECK_PROPERTY( _rPropertyName, sal_Int16 ); @@ -331,7 +331,7 @@ namespace xmloff if (_nDefault != nCurrentValue) { // let the formatter of the export context build a string - ::rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, (sal_Int32)nCurrentValue); AddAttribute(_nNamespaceKey, _pAttributeName, sBuffer.makeStringAndClear()); @@ -343,7 +343,7 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportInt32PropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, const sal_Int32 _nDefault ) + const OUString& _rPropertyName, const sal_Int32 _nDefault ) { DBG_CHECK_PROPERTY( _rPropertyName, sal_Int32 ); @@ -355,7 +355,7 @@ namespace xmloff if ( _nDefault != nCurrentValue ) { // let the formatter of the export context build a string - ::rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber( sBuffer, nCurrentValue ); AddAttribute( _nNamespaceKey, _pAttributeName, sBuffer.makeStringAndClear() ); @@ -368,7 +368,7 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportEnumPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const rtl::OUString &rPropertyName, const SvXMLEnumMapEntry* _pValueMap, + const OUString &rPropertyName, const SvXMLEnumMapEntry* _pValueMap, const sal_Int32 _nDefault, const sal_Bool _bVoidDefault) { // get the value @@ -384,7 +384,7 @@ namespace xmloff { // the default does not equal the value, or the default is void and the value isn't // let the formatter of the export context build a string - ::rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; m_rContext.getGlobalContext().GetMM100UnitConverter().convertEnum(sBuffer, (sal_uInt16)nCurrentValue, _pValueMap); AddAttribute(_nNamespaceKey, _pAttributeName, sBuffer.makeStringAndClear()); @@ -403,9 +403,9 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportTargetFrameAttribute() { - DBG_CHECK_PROPERTY( PROPERTY_TARGETFRAME, ::rtl::OUString ); + DBG_CHECK_PROPERTY( PROPERTY_TARGETFRAME, OUString ); - ::rtl::OUString sTargetFrame = comphelper::getString(m_xProps->getPropertyValue(PROPERTY_TARGETFRAME)); + OUString sTargetFrame = comphelper::getString(m_xProps->getPropertyValue(PROPERTY_TARGETFRAME)); if (0 != sTargetFrame.compareToAscii("_blank")) { // an empty string and "_blank" have the same meaning and don't have to be written AddAttribute(OAttributeMetaData::getCommonControlAttributeNamespace(CCA_TARGET_FRAME) @@ -419,9 +419,9 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportRelativeTargetLocation(const OUString& _sPropertyName,sal_Int32 _nProperty,bool _bAddType) { - DBG_CHECK_PROPERTY( _sPropertyName, ::rtl::OUString ); + DBG_CHECK_PROPERTY( _sPropertyName, OUString ); - ::rtl::OUString sTargetLocation = comphelper::getString(m_xProps->getPropertyValue(_sPropertyName)); + OUString sTargetLocation = comphelper::getString(m_xProps->getPropertyValue(_sPropertyName)); if ( !sTargetLocation.isEmpty() ) // If this isn't a GraphicObject then GetRelativeReference // will be called anyway ( in AddEmbeddedGraphic ) @@ -467,7 +467,7 @@ namespace xmloff { DBG_CHECK_PROPERTY_ASCII_NO_TYPE( _pPropertyName ); - ::rtl::OUString sPropertyName = ::rtl::OUString::createFromAscii(_pPropertyName); + OUString sPropertyName = OUString::createFromAscii(_pPropertyName); exportedProperty(sPropertyName); Any aCurrentValue = m_xProps->getPropertyValue(sPropertyName); @@ -475,7 +475,7 @@ namespace xmloff // nothing to do without a concrete value return; - ::rtl::OUString sValue = implConvertAny(aCurrentValue); + OUString sValue = implConvertAny(aCurrentValue); if (sValue.isEmpty() && (TypeClass_STRING == aCurrentValue.getValueTypeClass())) { // check whether or not the property is allowed to be VOID @@ -492,26 +492,26 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportStringSequenceAttribute(const sal_uInt16 _nAttributeNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const sal_Unicode _aQuoteCharacter, const sal_Unicode _aListSeparator) { - DBG_CHECK_PROPERTY( _rPropertyName, Sequence< ::rtl::OUString > ); + DBG_CHECK_PROPERTY( _rPropertyName, Sequence< OUString > ); OSL_ENSURE(_aListSeparator != 0, "OPropertyExport::exportStringSequenceAttribute: invalid separator character!"); - Sequence< ::rtl::OUString > aItems; + Sequence< OUString > aItems; m_xProps->getPropertyValue( _rPropertyName ) >>= aItems; - ::rtl::OUString sFinalList; + OUString sFinalList; // unfortunately the OUString can't append single sal_Unicode characters ... - const ::rtl::OUString sQuote(&_aQuoteCharacter, 1); - const ::rtl::OUString sSeparator(&_aListSeparator, 1); + const OUString sQuote(&_aQuoteCharacter, 1); + const OUString sSeparator(&_aListSeparator, 1); const sal_Bool bQuote = !sQuote.isEmpty(); // concatenate the string items - const ::rtl::OUString* pItems = aItems.getConstArray(); - const ::rtl::OUString* pEnd = pItems + aItems.getLength(); - const ::rtl::OUString* pLastElement = pEnd - 1; + const OUString* pItems = aItems.getConstArray(); + const OUString* pEnd = pItems + aItems.getLength(); + const OUString* pLastElement = pEnd - 1; for ( ; pItems != pEnd; ++pItems @@ -539,14 +539,14 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OPropertyExport::implConvertAny(const Any& _rValue) + OUString OPropertyExport::implConvertAny(const Any& _rValue) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; switch (_rValue.getValueTypeClass()) { case TypeClass_STRING: { // extract the string - ::rtl::OUString sCurrentValue; + OUString sCurrentValue; _rValue >>= sCurrentValue; aBuffer.append(sCurrentValue); } @@ -646,16 +646,16 @@ namespace xmloff #ifdef DBG_UTIL //--------------------------------------------------------------------- - void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const ::rtl::OUString& _rValue) + void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue) { - OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(::rtl::OUString::createFromAscii(_pName)).isEmpty(), + OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(OUString::createFromAscii(_pName)).isEmpty(), "OPropertyExport::AddAttribute: already have such an attribute"); m_rContext.getGlobalContext().AddAttribute(_nPrefix, _pName, _rValue); } //--------------------------------------------------------------------- - void OPropertyExport::AddAttribute( sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, const ::rtl::OUString& _rValue ) + void OPropertyExport::AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const OUString& _rValue ) { OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName( _rName ).isEmpty(), "OPropertyExport::AddAttribute: already have such an attribute"); @@ -666,14 +666,14 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::AddAttributeASCII(sal_uInt16 _nPrefix, const sal_Char* _pName, const sal_Char *pValue) { - OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(::rtl::OUString::createFromAscii(_pName)).isEmpty(), + OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(OUString::createFromAscii(_pName)).isEmpty(), "OPropertyExport::AddAttributeASCII: already have such an attribute"); m_rContext.getGlobalContext().AddAttributeASCII(_nPrefix, _pName, pValue); } //--------------------------------------------------------------------- - void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const ::rtl::OUString& _rValue) + void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue) { OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(::xmloff::token::GetXMLToken(_eName)).isEmpty(), "OPropertyExport::AddAttribute: already have such an attribute"); @@ -691,15 +691,15 @@ namespace xmloff } //--------------------------------------------------------------------- - void OPropertyExport::dbg_implCheckProperty(const ::rtl::OUString& _rPropertyName, const Type* _pType) + void OPropertyExport::dbg_implCheckProperty(const OUString& _rPropertyName, const Type* _pType) { try { // the property must exist if (!m_xPropertyInfo->hasPropertyByName(_rPropertyName)) { - rtl::OStringBuffer aBuf("OPropertyExport::dbg_implCheckProperty: no property with the name "); - aBuf.append(rtl::OUStringToOString(_rPropertyName, RTL_TEXTENCODING_ASCII_US)).append('!'); + OStringBuffer aBuf("OPropertyExport::dbg_implCheckProperty: no property with the name "); + aBuf.append(OUStringToOString(_rPropertyName, RTL_TEXTENCODING_ASCII_US)).append('!'); OSL_FAIL(aBuf.getStr()); return; } diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx index 315edcee9007..3e59dc179288 100644 --- a/xmloff/source/forms/propertyexport.hxx +++ b/xmloff/source/forms/propertyexport.hxx @@ -58,7 +58,7 @@ namespace xmloff class OPropertyExport { private: - DECLARE_STL_STDKEY_SET(::rtl::OUString, StringSet); + DECLARE_STL_STDKEY_SET(OUString, StringSet); StringSet m_aRemainingProps; // see examinePersistence @@ -75,8 +75,8 @@ namespace xmloff m_xPropertyState; // caching - ::rtl::OUString m_sValueTrue; - ::rtl::OUString m_sValueFalse; + OUString m_sValueTrue; + OUString m_sValueFalse; public: /** constructs an object capable of handling attributes for export @@ -113,7 +113,7 @@ namespace xmloff <p>In this case you should call exportedProperty for every property you export yourself, so the property will be flagged as <em>already handled</em></p> */ - void exportedProperty(const ::rtl::OUString& _rPropertyName) + void exportedProperty(const OUString& _rPropertyName) { m_aRemainingProps.erase(_rPropertyName); } /** add an attribute which is represented by a string property to the export context @@ -129,7 +129,7 @@ namespace xmloff void exportStringPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName + const OUString& _rPropertyName ); /** add an attribute which is represented by a boolean property to the export context @@ -147,7 +147,7 @@ namespace xmloff void exportBooleanPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const sal_Int8 _nBooleanAttributeFlags); /** add an attribute which is represented by a sal_Int16 property to the export context @@ -166,7 +166,7 @@ namespace xmloff void exportInt16PropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const sal_Int16 _nDefault); /** add an attribute which is represented by a sal_Int32 property to the export context @@ -185,7 +185,7 @@ namespace xmloff void exportInt32PropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const sal_Int32 _nDefault); /** add an attribute which is represented by a enum property to the export context @@ -206,7 +206,7 @@ namespace xmloff void exportEnumPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const SvXMLEnumMapEntry* _pValueMap, const sal_Int32 _nDefault, const sal_Bool _bVoidDefault = sal_False); @@ -301,7 +301,7 @@ namespace xmloff void exportStringSequenceAttribute( const sal_uInt16 _nAttributeNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const sal_Unicode _aQuoteCharacter = '"', const sal_Unicode _aListSeparator = ','); @@ -311,7 +311,7 @@ namespace xmloff or whether the property is a dynamic property (i.e. added via an <code>XPropertyContainer</code>). So, take care when using the method - the heuristics is not applicable for all properties.</p> */ - bool shouldExportProperty( const ::rtl::OUString& i_propertyName ) const; + bool shouldExportProperty( const OUString& i_propertyName ) const; /** tries to convert an arbitrary <type scope="com.sun:star.uno">Any</type> into an string @@ -321,7 +321,7 @@ namespace xmloff @param _rValue the value to convert */ - ::rtl::OUString implConvertAny( + OUString implConvertAny( const ::com::sun::star::uno::Any& _rValue); /** @@ -341,20 +341,20 @@ namespace xmloff ::xmloff::token::XMLTokenEnum implGetPropertyXMLType(const ::com::sun::star::uno::Type& _rType); #ifdef DBG_UTIL - void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const ::rtl::OUString& _rValue); - void AddAttribute( sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, const ::rtl::OUString& _rValue ); + void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue); + void AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const OUString& _rValue ); void AddAttributeASCII( sal_uInt16 nPrefix, const sal_Char *pName, const sal_Char *pValue ); - void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const ::rtl::OUString& _rValue); + void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue); void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, ::xmloff::token::XMLTokenEnum _eValue ); #else // in the product version, inline this, so it does not cost us extra time calling into our method - inline void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const ::rtl::OUString& _rValue) + inline void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue) { m_rContext.getGlobalContext().AddAttribute(_nPrefix, _pName, _rValue); } - inline void AddAttribute( sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, const ::rtl::OUString& _rValue ) + inline void AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const OUString& _rValue ) { m_rContext.getGlobalContext().AddAttribute( _nPrefix, _rName, _rValue ); } inline void AddAttributeASCII( sal_uInt16 _nPrefix, const sal_Char* _pName, const sal_Char *pValue ) { m_rContext.getGlobalContext().AddAttributeASCII(_nPrefix, _pName, pValue); } - inline void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const ::rtl::OUString& _rValue) + inline void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue) { m_rContext.getGlobalContext().AddAttribute(_nPrefix, _eName, _rValue); } inline void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, ::xmloff::token::XMLTokenEnum _eValue ) { m_rContext.getGlobalContext().AddAttribute(_nPrefix, _eName, _eValue); } @@ -373,14 +373,14 @@ namespace xmloff @return sal_True, if the property exists and is of the correct type */ void dbg_implCheckProperty( - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const ::com::sun::star::uno::Type* _pType); // void dbg_implCheckProperty( // const sal_Char* _rPropertyName, // const ::com::sun::star::uno::Type* _pType) // { -// dbg_implCheckProperty(::rtl::OUString::createFromAscii(_rPropertyName), _pType); +// dbg_implCheckProperty(OUString::createFromAscii(_rPropertyName), _pType); // } #endif }; @@ -396,7 +396,7 @@ namespace xmloff dbg_implCheckProperty(name, NULL) #define DBG_CHECK_PROPERTY_ASCII_NO_TYPE( name ) \ - dbg_implCheckProperty( ::rtl::OUString::createFromAscii( name ), NULL ) + dbg_implCheckProperty( OUString::createFromAscii( name ), NULL ) #else #define DBG_CHECK_PROPERTY(name, type) #define DBG_CHECK_PROPERTY_NO_TYPE(name) diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 8bd21c6ecb77..a6c667c27166 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -93,7 +93,7 @@ namespace //--------------------------------------------------------------------- Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun::star::uno::Type& _rExpectedType, - const ::rtl::OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap, const sal_Bool _bInvertBoolean ) + const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap, const sal_Bool _bInvertBoolean ) { Any aReturn; sal_Bool bEnumAsInt = sal_False; @@ -107,8 +107,8 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun #endif ::sax::Converter::convertBool(bValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("PropertyConversion::convertString: could not convert \""). - append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("PropertyConversion::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into a boolean!").getStr()); aReturn = ::cppu::bool2any(_bInvertBoolean ? !bValue : bValue); } @@ -123,8 +123,8 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun #endif ::sax::Converter::convertNumber(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("PropertyConversion::convertString: could not convert \""). - append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("PropertyConversion::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into an integer!").getStr()); if (TypeClass_SHORT == _rExpectedType.getTypeClass()) aReturn <<= (sal_Int16)nValue; @@ -164,8 +164,8 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun #endif ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("PropertyConversion::convertString: could not convert \""). - append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("PropertyConversion::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into a double!").getStr()); aReturn <<= (double)nValue; } @@ -192,8 +192,8 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun #endif ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("PropertyConversion::convertString: could not convert \""). - append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("PropertyConversion::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into a double!").getStr()); // then convert it into the target type @@ -243,7 +243,7 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun } //--------------------------------------------------------------------- -Type PropertyConversion::xmlTypeToUnoType( const ::rtl::OUString& _rType ) +Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType ) { Type aUnoType( ::getVoidCppuType() ); @@ -252,7 +252,7 @@ Type PropertyConversion::xmlTypeToUnoType( const ::rtl::OUString& _rType ) { s_aTypeNameMap[ token::GetXMLToken( token::XML_BOOLEAN ) ] = ::getBooleanCppuType(); s_aTypeNameMap[ token::GetXMLToken( token::XML_FLOAT ) ] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[ token::GetXMLToken( token::XML_STRING ) ] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); + s_aTypeNameMap[ token::GetXMLToken( token::XML_STRING ) ] = ::getCppuType( static_cast< OUString* >(NULL) ); s_aTypeNameMap[ token::GetXMLToken( token::XML_VOID ) ] = ::getVoidCppuType(); } @@ -268,7 +268,7 @@ Type PropertyConversion::xmlTypeToUnoType( const ::rtl::OUString& _rType ) //= OPropertyImport //===================================================================== //--------------------------------------------------------------------- -OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName) +OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const OUString& _rName) :SvXMLImportContext(_rImport.getGlobalContext(), _nPrefix, _rName) ,m_rContext(_rImport) ,m_bTrackAttributes(sal_False) @@ -276,7 +276,7 @@ OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 } //--------------------------------------------------------------------- -SvXMLImportContext* OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, +SvXMLImportContext* OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { if( token::IsXMLToken( _rLocalName, token::XML_PROPERTIES) ) @@ -286,8 +286,8 @@ SvXMLImportContext* OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, con } else { - OSL_FAIL(::rtl::OStringBuffer("OPropertyImport::CreateChildContext: unknown sub element (only \"properties\" is recognized, but it is "). - append(rtl::OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL(OStringBuffer("OPropertyImport::CreateChildContext: unknown sub element (only \"properties\" is recognized, but it is "). + append(OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). append(")!").getStr()); return SvXMLImportContext::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList); } @@ -305,7 +305,7 @@ void OPropertyImport::StartElement(const Reference< XAttributeList >& _rxAttrLis const SvXMLNamespaceMap& rMap = m_rContext.getGlobalContext().GetNamespaceMap(); sal_uInt16 nNamespace; - ::rtl::OUString sLocalName; + OUString sLocalName; for (sal_Int16 i=0; i<nAttributeCount; ++i) { nNamespace = rMap.GetKeyByAttrName(_rxAttrList->getNameByIndex(i), &sLocalName); @@ -321,14 +321,14 @@ void OPropertyImport::StartElement(const Reference< XAttributeList >& _rxAttrLis } //--------------------------------------------------------------------- -sal_Bool OPropertyImport::encounteredAttribute(const ::rtl::OUString& _rAttributeName) const +sal_Bool OPropertyImport::encounteredAttribute(const OUString& _rAttributeName) const { OSL_ENSURE(m_bTrackAttributes, "OPropertyImport::encounteredAttribute: attribute tracking not enabled!"); return m_aEncounteredAttributes.end() != m_aEncounteredAttributes.find(_rAttributeName); } //--------------------------------------------------------------------- -void OPropertyImport::Characters(const ::rtl::OUString& +void OPropertyImport::Characters(const OUString& #if OSL_DEBUG_LEVEL > 0 _rChars #endif @@ -339,7 +339,7 @@ _rChars } //--------------------------------------------------------------------- -bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) +bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const OUString& _rLocalName, const OUString& _rValue) { const OAttribute2Property::AttributeAssignment* pProperty = m_rContext.getAttributeMap().getAttributeTranslation(_rLocalName); if (pProperty) @@ -356,11 +356,11 @@ bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const ::rtl if (!token::IsXMLToken(_rLocalName, token::XML_TYPE)) // xlink:type is valid but ignored for <form:form> { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "OPropertyImport::handleAttribute: Can't handle the following:\n" ); - sMessage += ::rtl::OString( " Attribute name: " ); - sMessage += ::rtl::OString( _rLocalName.getStr(), _rLocalName.getLength(), osl_getThreadTextEncoding() ); - sMessage += ::rtl::OString( "\n value: " ); - sMessage += ::rtl::OString( _rValue.getStr(), _rValue.getLength(), osl_getThreadTextEncoding() ); + OString sMessage( "OPropertyImport::handleAttribute: Can't handle the following:\n" ); + sMessage += OString( " Attribute name: " ); + sMessage += OString( _rLocalName.getStr(), _rLocalName.getLength(), osl_getThreadTextEncoding() ); + sMessage += OString( "\n value: " ); + sMessage += OString( _rValue.getStr(), _rValue.getLength(), osl_getThreadTextEncoding() ); OSL_FAIL( sMessage.getStr() ); #endif return false; @@ -372,7 +372,7 @@ bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const ::rtl //= OPropertyElementsContext //===================================================================== //--------------------------------------------------------------------- -OPropertyElementsContext::OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, +OPropertyElementsContext::OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter) :SvXMLImportContext(_rImport, _nPrefix, _rName) ,m_xPropertyImporter(_rPropertyImporter) @@ -380,7 +380,7 @@ OPropertyElementsContext::OPropertyElementsContext(SvXMLImport& _rImport, sal_uI } //--------------------------------------------------------------------- -SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, +SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >&) { if( token::IsXMLToken( _rLocalName, token::XML_PROPERTY ) ) @@ -393,8 +393,8 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr } else { - OSL_FAIL(::rtl::OStringBuffer("OPropertyElementsContext::CreateChildContext: unknown child element (\""). - append(::rtl::OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL(OStringBuffer("OPropertyElementsContext::CreateChildContext: unknown child element (\""). + append(OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). append("\")!").getStr()); return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName); } @@ -409,7 +409,7 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr } //--------------------------------------------------------------------- - void OPropertyElementsContext::Characters(const ::rtl::OUString& _rChars) + void OPropertyElementsContext::Characters(const OUString& _rChars) { OSL_ENSURE(0 == _rChars.trim(), "OPropertyElementsContext::Characters: non-whitespace characters detected!"); SvXMLImportContext::Characters(_rChars); @@ -421,7 +421,7 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr //= OSinglePropertyContext //===================================================================== //--------------------------------------------------------------------- -OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, +OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter) :SvXMLImportContext(_rImport, _nPrefix, _rName) ,m_xPropertyImporter(_rPropertyImporter) @@ -429,11 +429,11 @@ OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 } //--------------------------------------------------------------------- -SvXMLImportContext* OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, +SvXMLImportContext* OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >&) { - OSL_FAIL(::rtl::OStringBuffer("OSinglePropertyContext::CreateChildContext: unknown child element (\""). - append(::rtl::OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL(OStringBuffer("OSinglePropertyContext::CreateChildContext: unknown child element (\""). + append(OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). append("\")!").getStr()); return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName); } @@ -444,14 +444,14 @@ void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rx ::com::sun::star::beans::PropertyValue aPropValue; // the property the instance imports currently ::com::sun::star::uno::Type aPropType; // the type of the property the instance imports currently - ::rtl::OUString sType, sValue; + OUString sType, sValue; const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); const sal_Int16 nAttrCount = _rxAttrList.is() ? _rxAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - const ::rtl::OUString& rAttrName = _rxAttrList->getNameByIndex( i ); + const OUString& rAttrName = _rxAttrList->getNameByIndex( i ); - ::rtl::OUString aLocalName; + OUString aLocalName; sal_uInt16 nPrefix = rMap.GetKeyByAttrName( rAttrName, &aLocalName ); @@ -500,7 +500,7 @@ void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rx //= OListPropertyContext //===================================================================== //--------------------------------------------------------------------- -OListPropertyContext::OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, +OListPropertyContext::OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter ) :SvXMLImportContext( _rImport, _nPrefix, _rName ) ,m_xPropertyImporter( _rPropertyImporter ) @@ -513,7 +513,7 @@ void OListPropertyContext::StartElement( const Reference< XAttributeList >& _rxA sal_Int32 nAttributeCount = _rxAttrList->getLength(); sal_uInt16 nNamespace; - ::rtl::OUString sAttributeName; + OUString sAttributeName; const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); for ( sal_Int16 i = 0; i < nAttributeCount; ++i ) { @@ -532,8 +532,8 @@ void OListPropertyContext::StartElement( const Reference< XAttributeList >& _rxA } else { - OSL_FAIL( ::rtl::OStringBuffer( "OListPropertyContext::StartElement: unknown child element (\""). - append(rtl::OUStringToOString(sAttributeName, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL( OStringBuffer( "OListPropertyContext::StartElement: unknown child element (\""). + append(OUStringToOString(sAttributeName, RTL_TEXTENCODING_ASCII_US)). append("\")!").getStr() ); } } @@ -551,7 +551,7 @@ void OListPropertyContext::EndElement() Sequence< Any > aListElements( m_aListValues.size() ); Any* pListElement = aListElements.getArray(); com::sun::star::uno::Type aType = PropertyConversion::xmlTypeToUnoType( m_sPropertyType ); - for ( ::std::vector< ::rtl::OUString >::const_iterator values = m_aListValues.begin(); + for ( ::std::vector< OUString >::const_iterator values = m_aListValues.begin(); values != m_aListValues.end(); ++values, ++pListElement ) @@ -567,7 +567,7 @@ void OListPropertyContext::EndElement() } //--------------------------------------------------------------------- -SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, const Reference< XAttributeList >& /*_rxAttrList*/ ) +SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& /*_rxAttrList*/ ) { if ( token::IsXMLToken( _rLocalName, token::XML_LIST_VALUE ) ) { @@ -576,8 +576,8 @@ SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefi } else { - OSL_FAIL( ::rtl::OStringBuffer("OListPropertyContext::CreateChildContext: unknown child element (\""). - append(rtl::OUStringToOString(_rLocalName.getStr(), RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL( OStringBuffer("OListPropertyContext::CreateChildContext: unknown child element (\""). + append(OUStringToOString(_rLocalName.getStr(), RTL_TEXTENCODING_ASCII_US)). append("\")!").getStr() ); return new SvXMLImportContext( GetImport(), _nPrefix, _rLocalName ); } @@ -587,7 +587,7 @@ SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefi //= OListValueContext //===================================================================== //--------------------------------------------------------------------- -OListValueContext::OListValueContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, ::rtl::OUString& _rListValueHolder ) +OListValueContext::OListValueContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, OUString& _rListValueHolder ) :SvXMLImportContext( _rImport, _nPrefix, _rName ) ,m_rListValueHolder( _rListValueHolder ) { @@ -599,7 +599,7 @@ void OListValueContext::StartElement( const Reference< XAttributeList >& _rxAttr const sal_Int32 nAttributeCount = _rxAttrList->getLength(); sal_uInt16 nNamespace; - ::rtl::OUString sAttributeName; + OUString sAttributeName; const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); for ( sal_Int16 i = 0; i < nAttributeCount; ++i ) { @@ -616,8 +616,8 @@ void OListValueContext::StartElement( const Reference< XAttributeList >& _rxAttr } } - OSL_FAIL( ::rtl::OStringBuffer( "OListValueContext::StartElement: unknown child element (\""). - append(rtl::OUStringToOString(sAttributeName, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL( OStringBuffer( "OListValueContext::StartElement: unknown child element (\""). + append(OUStringToOString(sAttributeName, RTL_TEXTENCODING_ASCII_US)). append("\")!").getStr() ); } } diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index 9f890d33c65e..e813d383e348 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -46,12 +46,12 @@ namespace xmloff static ::com::sun::star::uno::Any convertString( SvXMLImport& _rImporter, const ::com::sun::star::uno::Type& _rExpectedType, - const ::rtl::OUString& _rReadCharacters, + const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap = NULL, const sal_Bool _bInvertBoolean = sal_False ); - static ::com::sun::star::uno::Type xmlTypeToUnoType( const ::rtl::OUString& _rType ); + static ::com::sun::star::uno::Type xmlTypeToUnoType( const OUString& _rType ); }; class OFormLayerXMLImport_Impl; @@ -74,7 +74,7 @@ namespace xmloff PropertyValueArray m_aGenericValues; // the values which the instance collects between StartElement and EndElement - DECLARE_STL_STDKEY_SET( ::rtl::OUString, StringSet ); + DECLARE_STL_STDKEY_SET( OUString, StringSet ); StringSet m_aEncounteredAttributes; OFormLayerXMLImport_Impl& m_rContext; @@ -86,15 +86,15 @@ namespace xmloff // style properties) can be done in our own EndElement instead of letting derived classes do this. public: - OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName); + OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const OUString& _rName); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); - virtual void Characters(const ::rtl::OUString& _rChars); + virtual void Characters(const OUString& _rChars); protected: /** handle one single attribute. @@ -112,20 +112,20 @@ namespace xmloff attribute value */ virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); /** determine if the element imported by the object had an given attribute. <p>Please be aware of the fact that the name given must be a local name, i.e. not contain a namespace. All form relevant attributes are in the same namespace, so this would be an redundant information.</p> */ - sal_Bool encounteredAttribute(const ::rtl::OUString& _rAttributeName) const; + sal_Bool encounteredAttribute(const OUString& _rAttributeName) const; /** determine if the element imported by the object had an given attribute. <p>Please be aware of the fact that the name given must be a local name, i.e. not contain a namespace. All form relevant attributes are in the same namespace, so this would be an redundant information.</p> */ - sal_Bool encounteredAttribute(const sal_Char* _pAttributeName) const { return encounteredAttribute(::rtl::OUString::createFromAscii(_pAttributeName)); } + sal_Bool encounteredAttribute(const sal_Char* _pAttributeName) const { return encounteredAttribute(OUString::createFromAscii(_pAttributeName)); } /** enables the tracking of the encountered attributes <p>The tracking will raise the import costs a little bit, but it's cheaper than @@ -138,7 +138,7 @@ namespace xmloff m_aValues.push_back(_rProp); } - inline void implPushBackPropertyValue( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& _rValue ) + inline void implPushBackPropertyValue( const OUString& _rName, const ::com::sun::star::uno::Any& _rValue ) { m_aValues.push_back( ::com::sun::star::beans::PropertyValue( _rName, -1, _rValue, ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) ); @@ -162,17 +162,17 @@ namespace xmloff OPropertyImportRef m_xPropertyImporter; // to add the properties public: - OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); #if OSL_DEBUG_LEVEL > 0 virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); - virtual void Characters(const ::rtl::OUString& _rChars); + virtual void Characters(const OUString& _rChars); #endif }; @@ -186,11 +186,11 @@ namespace xmloff OPropertyImportRef m_xPropertyImporter; // to add the properties public: - OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void StartElement( @@ -203,12 +203,12 @@ namespace xmloff class OListPropertyContext : public SvXMLImportContext { OPropertyImportRef m_xPropertyImporter; - ::rtl::OUString m_sPropertyName; - ::rtl::OUString m_sPropertyType; - ::std::vector< ::rtl::OUString > m_aListValues; + OUString m_sPropertyName; + OUString m_sPropertyType; + ::std::vector< OUString > m_aListValues; public: - OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter ); virtual void StartElement( @@ -217,7 +217,7 @@ namespace xmloff virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); }; @@ -226,11 +226,11 @@ namespace xmloff //===================================================================== class OListValueContext : public SvXMLImportContext { - ::rtl::OUString& m_rListValueHolder; + OUString& m_rListValueHolder; public: - OListValueContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, - ::rtl::OUString& _rListValueHolder ); + OListValueContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, + OUString& _rListValueHolder ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList ); diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 515879dbaf8c..72ea7bd85244 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -81,7 +81,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) ::comphelper::PropertyMapEntry aInfoMap[] = { { "Class", sizeof("Class")-1, 0, - &::getCppuType((::rtl::OUString*)0), + &::getCppuType((OUString*)0), beans::PropertyAttribute::MAYBEVOID, 0}, { NULL, 0, 0, NULL, 0, 0 } }; @@ -92,7 +92,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) uno::Any aAny; aAny <<= GetXMLToken( XML_TEXT ); xConvPropSet->setPropertyValue( - ::rtl::OUString("Class"), aAny ); + OUString("Class"), aAny ); uno::Reference< beans::XPropertySet > xPropSet = getExportInfo().is() @@ -149,7 +149,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) if( pVersion ) AddAttribute( XML_NAMESPACE_OFFICE, XML_VERSION, - ::rtl::OUString::createFromAscii(pVersion) ); + OUString::createFromAscii(pVersion) ); SvXMLElementExport aDocElem( *this, XML_NAMESPACE_OFFICE, XML_DOCUMENT_META, sal_True, sal_True ); @@ -164,7 +164,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) void XMLMetaExportComponent::_ExportMeta() { if (mxDocProps.is()) { - ::rtl::OUString generator( ::utl::DocInfoHelper::GetGeneratorString() ); + OUString generator( ::utl::DocInfoHelper::GetGeneratorString() ); // update generator here mxDocProps->setGenerator(generator); SvXMLMetaExport * pMeta = new SvXMLMetaExport(*this, mxDocProps); @@ -181,18 +181,18 @@ void XMLMetaExportComponent::_ExportMasterStyles() {} void XMLMetaExportComponent::_ExportContent() {} -uno::Sequence< rtl::OUString > SAL_CALL XMLMetaExportComponent_getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL XMLMetaExportComponent_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( + const OUString aServiceName( "com.sun.star.document.XMLOasisMetaExporter" ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } -rtl::OUString SAL_CALL XMLMetaExportComponent_getImplementationName() throw() +OUString SAL_CALL XMLMetaExportComponent_getImplementationName() throw() { - return rtl::OUString( "XMLMetaExportComponent" ); + return OUString( "XMLMetaExportComponent" ); } uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportComponent_createInstance( @@ -202,18 +202,18 @@ uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportComponent_createInstance return (cppu::OWeakObject*)new XMLMetaExportComponent( comphelper::getComponentContext(rSMgr), EXPORT_META|EXPORT_OASIS); } -uno::Sequence< rtl::OUString > SAL_CALL XMLMetaExportOOO_getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL XMLMetaExportOOO_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( + const OUString aServiceName( "com.sun.star.document.XMLMetaExporter" ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } -rtl::OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw() +OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw() { - return rtl::OUString( "XMLMetaExportOOo" ); + return OUString( "XMLMetaExportOOo" ); } uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportOOO_createInstance( diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx index d19bb05492b8..07bf460122be 100644 --- a/xmloff/source/meta/MetaImportComponent.cxx +++ b/xmloff/source/meta/MetaImportComponent.cxx @@ -46,7 +46,7 @@ XMLMetaImportComponent::~XMLMetaImportComponent() throw() SvXMLImportContext* XMLMetaImportComponent::CreateContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList > & xAttrList ) { if ( (XML_NAMESPACE_OFFICE == nPrefix) && @@ -77,7 +77,7 @@ void SAL_CALL XMLMetaImportComponent::setTargetDocument( "XDocumentProperties"), uno::Reference<uno::XInterface>(*this), 0); } -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL XMLMetaImportComponent_getSupportedServiceNames() throw() { diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index 6bba79c777d6..cae4ee1e3426 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -46,19 +46,19 @@ using namespace ::xmloff::token; //------------------------------------------------------------------------- -static void lcl_AddTwoDigits( rtl::OUStringBuffer& rStr, sal_Int32 nVal ) +static void lcl_AddTwoDigits( OUStringBuffer& rStr, sal_Int32 nVal ) { if ( nVal < 10 ) rStr.append( sal_Unicode('0') ); rStr.append( nVal ); } -rtl::OUString +OUString SvXMLMetaExport::GetISODateTimeString( const util::DateTime& rDateTime ) { // return ISO date string "YYYY-MM-DDThh:mm:ss" - rtl::OUStringBuffer sTmp; + OUStringBuffer sTmp; sTmp.append( (sal_Int32) rDateTime.Year ); sTmp.append( sal_Unicode('-') ); lcl_AddTwoDigits( sTmp, rDateTime.Month ); @@ -76,7 +76,7 @@ SvXMLMetaExport::GetISODateTimeString( const util::DateTime& rDateTime ) //------------------------------------------------------------------------- -void SvXMLMetaExport::SimpleStringElement( const rtl::OUString& rText, +void SvXMLMetaExport::SimpleStringElement( const OUString& rText, sal_uInt16 nNamespace, enum XMLTokenEnum eElementName ) { if ( !rText.isEmpty() ) { @@ -90,7 +90,7 @@ void SvXMLMetaExport::SimpleDateTimeElement( const util::DateTime & rDate, sal_uInt16 nNamespace, enum XMLTokenEnum eElementName ) { if (rDate.Month != 0) { // invalid dates are 0-0-0 - rtl::OUString sValue = GetISODateTimeString( rDate ); + OUString sValue = GetISODateTimeString( rDate ); if ( !sValue.isEmpty() ) { SvXMLElementExport aElem( mrExport, nNamespace, eElementName, sal_True, sal_False ); @@ -139,7 +139,7 @@ void SvXMLMetaExport::_MExport() XML_NAMESPACE_META, XML_PRINT_DATE ); // keywords - const uno::Sequence< ::rtl::OUString > keywords = mxDocProps->getKeywords(); + const uno::Sequence< OUString > keywords = mxDocProps->getKeywords(); for (sal_Int32 i = 0; i < keywords.getLength(); ++i) { SvXMLElementExport aKwElem( mrExport, XML_NAMESPACE_META, XML_KEYWORD, sal_True, sal_False ); @@ -149,11 +149,11 @@ void SvXMLMetaExport::_MExport() // document language { const lang::Locale aLocale = mxDocProps->getLanguage(); - ::rtl::OUString sValue = aLocale.Language; + OUString sValue = aLocale.Language; if (!sValue.isEmpty()) { if ( !aLocale.Country.isEmpty() ) { - sValue += rtl::OUString::valueOf((sal_Unicode)'-'); + sValue += OUString::valueOf((sal_Unicode)'-'); sValue += aLocale.Country; } SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DC, XML_LANGUAGE, @@ -167,7 +167,7 @@ void SvXMLMetaExport::_MExport() SvXMLElementExport aElem( mrExport, XML_NAMESPACE_META, XML_EDITING_CYCLES, sal_True, sal_False ); - mrExport.Characters( ::rtl::OUString::valueOf( + mrExport.Characters( OUString::valueOf( static_cast<sal_Int32>(mxDocProps->getEditingCycles()) ) ); } @@ -178,14 +178,14 @@ void SvXMLMetaExport::_MExport() SvXMLElementExport aElem( mrExport, XML_NAMESPACE_META, XML_EDITING_DURATION, sal_True, sal_False ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; ::sax::Converter::convertDuration(buf, util::Duration( false, 0, 0, 0, secs/3600, (secs%3600)/60, secs%60, 0)); mrExport.Characters(buf.makeStringAndClear()); } // default target - const ::rtl::OUString sDefTarget = mxDocProps->getDefaultTarget(); + const OUString sDefTarget = mxDocProps->getDefaultTarget(); if ( !sDefTarget.isEmpty() ) { mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_TARGET_FRAME_NAME, @@ -201,14 +201,14 @@ void SvXMLMetaExport::_MExport() } // auto-reload - const ::rtl::OUString sReloadURL = mxDocProps->getAutoloadURL(); + const OUString sReloadURL = mxDocProps->getAutoloadURL(); const sal_Int32 sReloadDelay = mxDocProps->getAutoloadSecs(); if (sReloadDelay != 0 || !sReloadURL.isEmpty()) { mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, mrExport.GetRelativeReference( sReloadURL ) ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; ::sax::Converter::convertDuration(buf, util::Duration(false, 0, 0, 0, sReloadDelay/3600, (sReloadDelay%3600)/60, sReloadDelay%60, 0)); mrExport.AddAttribute( XML_NAMESPACE_META, XML_DELAY, @@ -219,7 +219,7 @@ void SvXMLMetaExport::_MExport() } // template - const rtl::OUString sTplPath = mxDocProps->getTemplateURL(); + const OUString sTplPath = mxDocProps->getTemplateURL(); if ( !sTplPath.isEmpty() ) { mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); @@ -247,8 +247,8 @@ void SvXMLMetaExport::_MExport() const uno::Sequence< beans::PropertyValue > props = xUserDefined->getPropertyValues(); for (sal_Int32 i = 0; i < props.getLength(); ++i) { - ::rtl::OUStringBuffer sValueBuffer; - ::rtl::OUStringBuffer sType; + OUStringBuffer sValueBuffer; + OUStringBuffer sType; if (!::sax::Converter::convertAny(sValueBuffer, sType, props[i].Value)) { continue; @@ -271,7 +271,7 @@ void SvXMLMetaExport::_MExport() sal_Int32 nValue = 0; if ( aDocStatistic[nInd].Value >>= nValue ) { - ::rtl::OUString aValue = rtl::OUString::valueOf( nValue ); + OUString aValue = OUString::valueOf( nValue ); if ( aDocStatistic[nInd].Name == "TableCount" ) mrExport.AddAttribute( XML_NAMESPACE_META, XML_TABLE_COUNT, aValue ); @@ -339,7 +339,7 @@ void SvXMLMetaExport::Export() for (sal_uInt16 key = rNsMap.GetFirstKey(); key != USHRT_MAX; key = rNsMap.GetNextKey(key)) { beans::StringPair ns; - const ::rtl::OUString attrname = rNsMap.GetAttrNameByKey(key); + const OUString attrname = rNsMap.GetAttrNameByKey(key); if (attrname.matchAsciiL(s_xmlns2, strlen(s_xmlns2))) { ns.First = attrname.copy(strlen(s_xmlns2)); } else if (attrname.equalsAsciiL(s_xmlns, strlen(s_xmlns))) { @@ -379,7 +379,7 @@ SvXMLMetaExport::endDocument() // unfortunately, this method contains far too much ugly namespace mangling. void SAL_CALL -SvXMLMetaExport::startElement(const ::rtl::OUString & i_rName, +SvXMLMetaExport::startElement(const OUString & i_rName, const uno::Reference< xml::sax::XAttributeList > & i_xAttribs) throw (uno::RuntimeException, xml::sax::SAXException) { @@ -389,7 +389,7 @@ SvXMLMetaExport::startElement(const ::rtl::OUString & i_rName, // non-default ones must be preserved here const sal_Int16 nCount = i_xAttribs->getLength(); for (sal_Int16 i = 0; i < nCount; ++i) { - const ::rtl::OUString name(i_xAttribs->getNameByIndex(i)); + const OUString name(i_xAttribs->getNameByIndex(i)); if (name.matchAsciiL(s_xmlns, strlen(s_xmlns))) { bool found(false); const SvXMLNamespaceMap & rNsMap(mrExport.GetNamespaceMap()); @@ -415,12 +415,12 @@ SvXMLMetaExport::startElement(const ::rtl::OUString & i_rName, // attach preserved namespace decls from root node here for (std::vector<beans::StringPair>::const_iterator iter = m_preservedNSs.begin(); iter != m_preservedNSs.end(); ++iter) { - const ::rtl::OUString ns(iter->First); + const OUString ns(iter->First); bool found(false); // but only if it is not already there const sal_Int16 nCount = i_xAttribs->getLength(); for (sal_Int16 i = 0; i < nCount; ++i) { - const ::rtl::OUString name(i_xAttribs->getNameByIndex(i)); + const OUString name(i_xAttribs->getNameByIndex(i)); if (ns.equals(name)) { found = true; break; @@ -438,8 +438,8 @@ SvXMLMetaExport::startElement(const ::rtl::OUString & i_rName, // xlink:href attributes; these must be made relative const sal_Int16 nLength = i_xAttribs->getLength(); for (sal_Int16 i = 0; i < nLength; ++i) { - const ::rtl::OUString name (i_xAttribs->getNameByIndex (i)); - ::rtl::OUString value(i_xAttribs->getValueByIndex(i)); + const OUString name (i_xAttribs->getNameByIndex (i)); + OUString value(i_xAttribs->getValueByIndex(i)); if (name.matchAsciiL(s_href, strlen(s_href))) { value = mrExport.GetRelativeReference(value); } @@ -448,8 +448,8 @@ SvXMLMetaExport::startElement(const ::rtl::OUString & i_rName, } else { const sal_Int16 nLength = i_xAttribs->getLength(); for (sal_Int16 i = 0; i < nLength; ++i) { - const ::rtl::OUString name (i_xAttribs->getNameByIndex(i)); - const ::rtl::OUString value (i_xAttribs->getValueByIndex(i)); + const OUString name (i_xAttribs->getNameByIndex(i)); + const OUString value (i_xAttribs->getValueByIndex(i)); mrExport.AddAttribute(name, value); } } @@ -462,7 +462,7 @@ SvXMLMetaExport::startElement(const ::rtl::OUString & i_rName, } void SAL_CALL -SvXMLMetaExport::endElement(const ::rtl::OUString & i_rName) +SvXMLMetaExport::endElement(const OUString & i_rName) throw (uno::RuntimeException, xml::sax::SAXException) { --m_level; @@ -475,22 +475,22 @@ SvXMLMetaExport::endElement(const ::rtl::OUString & i_rName) } void SAL_CALL -SvXMLMetaExport::characters(const ::rtl::OUString & i_rChars) +SvXMLMetaExport::characters(const OUString & i_rChars) throw (uno::RuntimeException, xml::sax::SAXException) { mrExport.Characters(i_rChars); } void SAL_CALL -SvXMLMetaExport::ignorableWhitespace(const ::rtl::OUString & /*i_rWhitespaces*/) +SvXMLMetaExport::ignorableWhitespace(const OUString & /*i_rWhitespaces*/) throw (uno::RuntimeException, xml::sax::SAXException) { mrExport.IgnorableWhitespace(/*i_rWhitespaces*/); } void SAL_CALL -SvXMLMetaExport::processingInstruction(const ::rtl::OUString & i_rTarget, - const ::rtl::OUString & i_rData) +SvXMLMetaExport::processingInstruction(const OUString & i_rTarget, + const OUString & i_rData) throw (uno::RuntimeException, xml::sax::SAXException) { // ignore; the exporter cannot handle these diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx index f7be45771743..28a49edcfb0a 100644 --- a/xmloff/source/meta/xmlmetai.cxx +++ b/xmloff/source/meta/xmlmetai.cxx @@ -32,8 +32,6 @@ #include "xmloff/xmlnmspe.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace com::sun::star; using namespace ::xmloff::token; @@ -49,7 +47,7 @@ private: public: XMLDocumentBuilderContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const ::com::sun::star::uno::Reference< @@ -58,20 +56,20 @@ public: virtual ~XMLDocumentBuilderContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, 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 Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; XMLDocumentBuilderContext::XMLDocumentBuilderContext(SvXMLImport& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>&, const uno::Reference<xml::dom::XSAXDocumentBuilder2>& rDocBuilder) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -85,7 +83,7 @@ XMLDocumentBuilderContext::~XMLDocumentBuilderContext() SvXMLImportContext * XMLDocumentBuilderContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& rAttrs) { return new XMLDocumentBuilderContext( @@ -100,7 +98,7 @@ void XMLDocumentBuilderContext::StartElement( xAttrList); } -void XMLDocumentBuilderContext::Characters( const ::rtl::OUString& rChars ) +void XMLDocumentBuilderContext::Characters( const OUString& rChars ) { mxDocBuilder->characters(rChars); } @@ -137,7 +135,7 @@ lcl_initDocumentProperties(SvXMLImport & rImport, throw; } catch (const uno::Exception& e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "SvXMLMetaDocumentContext::initDocumentProperties: " "properties init exception"), rImport, makeAny(e)); @@ -156,7 +154,7 @@ lcl_initGenerator(SvXMLImport & rImport, xPath->registerNS(GetXMLToken(XML_NP_OFFICE),GetXMLToken(XML_N_OFFICE)); xPath->registerNS(GetXMLToken(XML_NP_META), GetXMLToken(XML_N_META)); - ::rtl::OUString const expr( "string(/office:document-meta/office:meta/meta:generator)"); + OUString const expr( "string(/office:document-meta/office:meta/meta:generator)"); uno::Reference< xml::xpath::XXPathObject > const xObj( xPath->eval(xDoc.get(), expr), uno::UNO_SET_THROW); OUString const value(xObj->getString()); @@ -165,14 +163,14 @@ lcl_initGenerator(SvXMLImport & rImport, throw; } catch (const uno::Exception& e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "SvXMLMetaDocumentContext::initGenerator: exception"), rImport, makeAny(e)); } } SvXMLMetaDocumentContext::SvXMLMetaDocumentContext(SvXMLImport& rImport, - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<document::XDocumentProperties>& xDocProps) : SvXMLImportContext( rImport, nPrfx, rLName ), mxDocProps(xDocProps), @@ -189,7 +187,7 @@ SvXMLMetaDocumentContext::~SvXMLMetaDocumentContext() } SvXMLImportContext *SvXMLMetaDocumentContext::CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& rAttrs) { if ( (XML_NAMESPACE_OFFICE == nPrefix) && @@ -233,7 +231,7 @@ void SvXMLMetaDocumentContext::EndElement() } } -void SvXMLMetaDocumentContext::setBuildId(::rtl::OUString const& i_rBuildId, const uno::Reference<beans::XPropertySet>& xImportInfo ) +void SvXMLMetaDocumentContext::setBuildId(OUString const& i_rBuildId, const uno::Reference<beans::XPropertySet>& xImportInfo ) { OUString sBuildId; // skip to second product diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index ab6ed5402b7c..899eccb90aa1 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -using ::rtl::OUString; // ------------------------------------------------------------------------ @@ -237,7 +236,7 @@ XMLVersionContext::~XMLVersionContext( void ) // ------------------------------------------------------------------------ sal_Bool XMLVersionContext::ParseISODateTimeString( - const rtl::OUString& rString, + const OUString& rString, util::DateTime& rDateTime ) { sal_Bool bSuccess = sal_True; @@ -404,7 +403,7 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con if ( xProps.is() ) { try { - xProps->getPropertyValue( ::rtl::OUString("URL") ) >>= aParserInput.sSystemId; + xProps->getPropertyValue( OUString("URL") ) >>= aParserInput.sSystemId; } catch( uno::Exception& ) {} @@ -447,18 +446,18 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con return aVersions; } -uno::Sequence< rtl::OUString > SAL_CALL XMLVersionListPersistence_getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL XMLVersionListPersistence_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( + const OUString aServiceName( "com.sun.star.document.DocumentRevisionListPersistence" ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } -rtl::OUString SAL_CALL XMLVersionListPersistence_getImplementationName() throw() +OUString SAL_CALL XMLVersionListPersistence_getImplementationName() throw() { - return rtl::OUString( "XMLVersionListPersistence" ); + return OUString( "XMLVersionListPersistence" ); } uno::Reference< uno::XInterface > SAL_CALL XMLVersionListPersistence_createInstance( @@ -468,18 +467,18 @@ uno::Reference< uno::XInterface > SAL_CALL XMLVersionListPersistence_createInsta return (cppu::OWeakObject*)new XMLVersionListPersistence; } -uno::Sequence< rtl::OUString > SAL_CALL XMLVersionImExportOOO_getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL XMLVersionImExportOOO_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( + const OUString aServiceName( "com.sun.star.document.DocumentRevisionListPersistence" ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } -rtl::OUString SAL_CALL XMLVersionImExportOOO_getImplementationName() throw() +OUString SAL_CALL XMLVersionImExportOOO_getImplementationName() throw() { - return rtl::OUString( "XMLVersionImExportOOo" ); + return OUString( "XMLVersionImExportOOo" ); } uno::Reference< uno::XInterface > SAL_CALL XMLVersionImExportOOO_createInstance( diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx index 0eda53dfbf7f..e619d96a6db2 100644 --- a/xmloff/source/script/XMLEventExport.cxx +++ b/xmloff/source/script/XMLEventExport.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::uno; using std::map; -using ::rtl::OUString; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::document::XEventsSupplier; using ::com::sun::star::container::XNameReplace; @@ -146,8 +145,8 @@ void XMLEventExport::Export( Reference<XNameAccess> & rAccess, else { // don't proceed further - ::rtl::OString aStr("Unknown event name:" ); - aStr += ::rtl::OUStringToOString( aNames[i], RTL_TEXTENCODING_UTF8 ); + OString aStr("Unknown event name:" ); + aStr += OUStringToOString( aNames[i], RTL_TEXTENCODING_UTF8 ); OSL_FAIL( aStr.getStr() ); } #endif @@ -196,8 +195,8 @@ void XMLEventExport::ExportSingleEvent( else { // don't proceed further - ::rtl::OString aStr("Unknown event name:" ); - aStr += ::rtl::OUStringToOString( rApiEventName, RTL_TEXTENCODING_UTF8 ); + OString aStr("Unknown event name:" ); + aStr += OUStringToOString( rApiEventName, RTL_TEXTENCODING_UTF8 ); OSL_FAIL( aStr.getStr() ); } #endif diff --git a/xmloff/source/script/XMLEventImportHelper.cxx b/xmloff/source/script/XMLEventImportHelper.cxx index 810070283a64..cdd7f008d308 100644 --- a/xmloff/source/script/XMLEventImportHelper.cxx +++ b/xmloff/source/script/XMLEventImportHelper.cxx @@ -25,7 +25,6 @@ #include "xmloff/xmlnmspe.hxx" #include "xmloff/xmlerror.hxx" -using ::rtl::OUString; using ::com::sun::star::xml::sax::XAttributeList; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx index 8326b7fc050f..1f3329de7105 100644 --- a/xmloff/source/script/XMLEventsImportContext.cxx +++ b/xmloff/source/script/XMLEventsImportContext.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star::uno; using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::xml::sax::XAttributeList; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::container::XNameReplace; diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx b/xmloff/source/script/XMLScriptContextFactory.cxx index 1990d67fa581..b867ad0e7fa1 100644 --- a/xmloff/source/script/XMLScriptContextFactory.cxx +++ b/xmloff/source/script/XMLScriptContextFactory.cxx @@ -27,7 +27,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::xml::sax::XAttributeList; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx index 51057b71a62d..ff3a09ce0926 100644 --- a/xmloff/source/script/XMLScriptExportHandler.cxx +++ b/xmloff/source/script/XMLScriptExportHandler.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno; using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::PropertyValue; diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx b/xmloff/source/script/XMLStarBasicContextFactory.cxx index b9825be04b74..0eee892b033d 100644 --- a/xmloff/source/script/XMLStarBasicContextFactory.cxx +++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx @@ -27,7 +27,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::xml::sax::XAttributeList; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx index bfa115505b81..66eb60c450da 100644 --- a/xmloff/source/script/XMLStarBasicExportHandler.cxx +++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx @@ -29,8 +29,6 @@ using namespace ::com::sun::star::uno; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::PropertyValue; diff --git a/xmloff/source/script/xmlbasici.cxx b/xmloff/source/script/xmlbasici.cxx index b67b56fe8955..107e47feb878 100644 --- a/xmloff/source/script/xmlbasici.cxx +++ b/xmloff/source/script/xmlbasici.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star::uno; // XMLBasicImportContext // ============================================================================= -XMLBasicImportContext::XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, +XMLBasicImportContext::XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< frame::XModel >& rxModel ) :SvXMLImportContext( rImport, nPrfx, rLName ) ,m_xModel( rxModel ) @@ -53,7 +53,7 @@ XMLBasicImportContext::~XMLBasicImportContext() // ----------------------------------------------------------------------------- SvXMLImportContext* XMLBasicImportContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; @@ -84,7 +84,7 @@ void XMLBasicImportContext::StartElement( sal_uInt16 nPos = rNamespaceMap.GetFirstKey(); while ( nPos != USHRT_MAX ) { - ::rtl::OUString aAttrName( rNamespaceMap.GetAttrNameByKey( nPos ) ); + OUString aAttrName( rNamespaceMap.GetAttrNameByKey( nPos ) ); if ( xAttrList->getValueByName( aAttrName ).isEmpty() ) pAttrList->AddAttribute( aAttrName, rNamespaceMap.GetNameByKey( nPos ) ); nPos = rNamespaceMap.GetNextKey( nPos ); @@ -110,7 +110,7 @@ void XMLBasicImportContext::EndElement() // ----------------------------------------------------------------------------- -void XMLBasicImportContext::Characters( const ::rtl::OUString& rChars ) +void XMLBasicImportContext::Characters( const OUString& rChars ) { if ( m_xHandler.is() ) m_xHandler->characters( rChars ); @@ -121,7 +121,7 @@ void XMLBasicImportContext::Characters( const ::rtl::OUString& rChars ) // XMLBasicImportChildContext // ============================================================================= -XMLBasicImportChildContext::XMLBasicImportChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, +XMLBasicImportChildContext::XMLBasicImportChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XDocumentHandler >& rxHandler ) :SvXMLImportContext( rImport, nPrfx, rLName ) ,m_xHandler( rxHandler ) @@ -137,7 +137,7 @@ XMLBasicImportChildContext::~XMLBasicImportChildContext() // ----------------------------------------------------------------------------- SvXMLImportContext* XMLBasicImportChildContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList >& ) { return new XMLBasicImportChildContext( GetImport(), nPrefix, rLocalName, m_xHandler ); @@ -169,7 +169,7 @@ void XMLBasicImportChildContext::EndElement() // ----------------------------------------------------------------------------- -void XMLBasicImportChildContext::Characters( const ::rtl::OUString& rChars ) +void XMLBasicImportChildContext::Characters( const OUString& rChars ) { if ( m_xHandler.is() ) m_xHandler->characters( rChars ); diff --git a/xmloff/source/script/xmlbasici.hxx b/xmloff/source/script/xmlbasici.hxx index 207f296e0627..8c79d2edf764 100644 --- a/xmloff/source/script/xmlbasici.hxx +++ b/xmloff/source/script/xmlbasici.hxx @@ -36,19 +36,19 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::document::XXMLOasisBasicImporter > m_xHandler; public: - XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel ); virtual ~XMLBasicImportContext(); - virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rxAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rxAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; @@ -62,19 +62,19 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler; public: - XMLBasicImportChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + XMLBasicImportChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rxHandler ); virtual ~XMLBasicImportChildContext(); - virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, 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_XMLBASICI_HXX diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx index 6269493e8f6b..87f24b3def7d 100644 --- a/xmloff/source/script/xmlscripti.cxx +++ b/xmloff/source/script/xmlscripti.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> -using ::rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -38,7 +37,6 @@ using namespace com::sun::star::document; using namespace com::sun::star::xml::sax; using namespace ::xmloff::token; -using rtl::OUString; // ============================================================================= // XMLScriptChildContext: context for <office:script> element @@ -49,15 +47,15 @@ class XMLScriptChildContext : public SvXMLImportContext private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > m_xDocumentScripts; - ::rtl::OUString m_aLanguage; + OUString m_aLanguage; public: - XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& rxModel, - const ::rtl::OUString& rLanguage ); + const OUString& rLanguage ); virtual ~XMLScriptChildContext(); - virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); @@ -65,8 +63,8 @@ public: // ----------------------------------------------------------------------------- -XMLScriptChildContext::XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, - const Reference< frame::XModel >& rxModel, const ::rtl::OUString& rLanguage ) +XMLScriptChildContext::XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, + const Reference< frame::XModel >& rxModel, const OUString& rLanguage ) :SvXMLImportContext( rImport, nPrfx, rLName ) ,m_xModel( rxModel ) ,m_xDocumentScripts( rxModel, UNO_QUERY ) @@ -83,7 +81,7 @@ XMLScriptChildContext::~XMLScriptChildContext() // ----------------------------------------------------------------------------- SvXMLImportContext* XMLScriptChildContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList >& xAttrList ) { SvXMLImportContext* pContext = NULL; @@ -143,11 +141,11 @@ SvXMLImportContext* XMLScriptContext::CreateChildContext( } else if ( IsXMLToken( rLName, XML_SCRIPT ) ) { - ::rtl::OUString aAttrName( GetImport().GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_SCRIPT ) ); + OUString aAttrName( GetImport().GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_SCRIPT ) ); aAttrName += ":language"; if ( xAttrList.is() ) { - ::rtl::OUString aLanguage = xAttrList->getValueByName( aAttrName ); + OUString aLanguage = xAttrList->getValueByName( aAttrName ); if ( m_xModel.is() ) { diff --git a/xmloff/source/style/AttributeContainerHandler.cxx b/xmloff/source/style/AttributeContainerHandler.cxx index 3ba4d49394c6..169e1cd22c80 100644 --- a/xmloff/source/style/AttributeContainerHandler.cxx +++ b/xmloff/source/style/AttributeContainerHandler.cxx @@ -25,8 +25,6 @@ #include "AttributeContainerHandler.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index 547901446c8d..20ae5d287852 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -37,8 +37,6 @@ #include <xmloff/xmltkmap.hxx> using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/style/DrawAspectHdl.cxx b/xmloff/source/style/DrawAspectHdl.cxx index 71dbb57891a9..b39140babc76 100644 --- a/xmloff/source/style/DrawAspectHdl.cxx +++ b/xmloff/source/style/DrawAspectHdl.cxx @@ -32,8 +32,6 @@ #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/DrawAspectHdl.hxx b/xmloff/source/style/DrawAspectHdl.hxx index 66d3f3ace5ea..786fc2fdad29 100644 --- a/xmloff/source/style/DrawAspectHdl.hxx +++ b/xmloff/source/style/DrawAspectHdl.hxx @@ -30,8 +30,8 @@ class DrawAspectHdl : public XMLPropertyHandler public: virtual ~DrawAspectHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_DRAWASPECTHDL_HXX diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx index 826a5ad03c52..789baa04e799 100644 --- a/xmloff/source/style/EnumPropertyHdl.cxx +++ b/xmloff/source/style/EnumPropertyHdl.cxx @@ -24,8 +24,6 @@ #include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/Any.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx index 563da21714eb..015629e628b8 100644 --- a/xmloff/source/style/FillStyleContext.cxx +++ b/xmloff/source/style/FillStyleContext.cxx @@ -32,8 +32,6 @@ #include <xmloff/XMLBase64ImportContext.hxx> using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; ////////////////////////////////////////////////////////////////////////////// @@ -148,7 +146,7 @@ XMLBitmapStyleContext::~XMLBitmapStyleContext() { } -SvXMLImportContext* XMLBitmapStyleContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) +SvXMLImportContext* XMLBitmapStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; if( (XML_NAMESPACE_OFFICE == nPrefix) && xmloff::token::IsXMLToken( rLocalName, xmloff::token::XML_BINARY_DATA ) ) diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx index b8d1d795864b..6bfae84fb858 100644 --- a/xmloff/source/style/FillStyleContext.hxx +++ b/xmloff/source/style/FillStyleContext.hxx @@ -31,12 +31,12 @@ class XMLGradientStyleContext: public SvXMLStyleContext { private: ::com::sun::star::uno::Any maAny; - rtl::OUString maStrName; + OUString maStrName; public: TYPEINFO(); - XMLGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLGradientStyleContext(); @@ -52,12 +52,12 @@ class XMLHatchStyleContext: public SvXMLStyleContext { private: ::com::sun::star::uno::Any maAny; - rtl::OUString maStrName; + OUString maStrName; public: TYPEINFO(); - XMLHatchStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLHatchStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLHatchStyleContext(); @@ -73,19 +73,19 @@ class XMLBitmapStyleContext: public SvXMLStyleContext { private: ::com::sun::star::uno::Any maAny; - rtl::OUString maStrName; + OUString maStrName; ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; public: TYPEINFO(); - XMLBitmapStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLBitmapStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLBitmapStyleContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); @@ -100,12 +100,12 @@ class XMLTransGradientStyleContext: public SvXMLStyleContext { private: ::com::sun::star::uno::Any maAny; - rtl::OUString maStrName; + OUString maStrName; public: TYPEINFO(); - XMLTransGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLTransGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLTransGradientStyleContext(); @@ -121,12 +121,12 @@ class XMLMarkerStyleContext: public SvXMLStyleContext { private: ::com::sun::star::uno::Any maAny; - rtl::OUString maStrName; + OUString maStrName; public: TYPEINFO(); - XMLMarkerStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLMarkerStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLMarkerStyleContext(); @@ -142,12 +142,12 @@ class XMLDashStyleContext: public SvXMLStyleContext { private: ::com::sun::star::uno::Any maAny; - rtl::OUString maStrName; + OUString maStrName; public: TYPEINFO(); - XMLDashStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLDashStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLDashStyleContext(); diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index eb432e7dba01..bc200d8ef6a2 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -39,8 +39,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index eef90629013c..5d852c952d9d 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -36,8 +36,6 @@ #include <xmloff/xmltkmap.hxx> using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx index ff4be1d1235f..de3bfc8f3e8f 100644 --- a/xmloff/source/style/ImageStyle.cxx +++ b/xmloff/source/style/ImageStyle.cxx @@ -32,8 +32,6 @@ #include <xmloff/xmltkmap.hxx> using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx index 2bdc23d7eaaf..53bf23eca1d6 100644 --- a/xmloff/source/style/MarkerStyle.cxx +++ b/xmloff/source/style/MarkerStyle.cxx @@ -31,8 +31,6 @@ #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx index c1e450cea5ca..298f7293594a 100644 --- a/xmloff/source/style/MultiPropertySetHelper.cxx +++ b/xmloff/source/style/MultiPropertySetHelper.cxx @@ -38,7 +38,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY; using ::comphelper::UStringLess; -using ::rtl::OUString; using ::std::sort; diff --git a/xmloff/source/style/NamedBoolPropertyHdl.cxx b/xmloff/source/style/NamedBoolPropertyHdl.cxx index 148afc01c42d..7dacca646b3d 100644 --- a/xmloff/source/style/NamedBoolPropertyHdl.cxx +++ b/xmloff/source/style/NamedBoolPropertyHdl.cxx @@ -24,8 +24,6 @@ #include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/Any.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx index 6d7e7788f4a5..b58301f48b1b 100644 --- a/xmloff/source/style/PageHeaderFooterContext.cxx +++ b/xmloff/source/style/PageHeaderFooterContext.cxx @@ -30,7 +30,7 @@ using ::xmloff::token::XML_HEADER_FOOTER_PROPERTIES; PageHeaderFooterContext::PageHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>&, ::std::vector< XMLPropertyState > & rTempProperties, @@ -51,7 +51,7 @@ PageHeaderFooterContext::~PageHeaderFooterContext() } SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/xmloff/source/style/PageHeaderFooterContext.hxx b/xmloff/source/style/PageHeaderFooterContext.hxx index 7180c4063a5d..21710ee69f4a 100644 --- a/xmloff/source/style/PageHeaderFooterContext.hxx +++ b/xmloff/source/style/PageHeaderFooterContext.hxx @@ -32,7 +32,7 @@ class PageHeaderFooterContext : public SvXMLImportContext public: PageHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ::std::vector< XMLPropertyState > & rProperties, @@ -43,7 +43,7 @@ public: virtual ~PageHeaderFooterContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index 7fc9a3b88f96..72fcc6796d68 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -63,7 +63,7 @@ static void lcl_RemoveStateIfZero16( XMLPropertyState* pState ) lcl_RemoveState( pState ); } -static void lcl_AddState(::std::vector< XMLPropertyState >& rPropState, sal_Int32 nIndex, const rtl::OUString& rProperty, uno::Reference< beans::XPropertySet >& xProps) +static void lcl_AddState(::std::vector< XMLPropertyState >& rPropState, sal_Int32 nIndex, const OUString& rProperty, uno::Reference< beans::XPropertySet >& xProps) { if(::cppu::any2bool(xProps->getPropertyValue(rProperty))) rPropState.push_back(XMLPropertyState (nIndex, cppu::bool2any(sal_True))); diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index fe312d6d9a7d..10bdf96fe3f6 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -34,8 +34,8 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; void PageStyleContext::SetAttribute( sal_uInt16 nPrefixKey, - const rtl::OUString& rLocalName, - const rtl::OUString& rValue ) + const OUString& rLocalName, + const OUString& rValue ) { // TODO: use a map here if( XML_NAMESPACE_STYLE == nPrefixKey && IsXMLToken( rLocalName, XML_PAGE_USAGE ) ) @@ -51,7 +51,7 @@ void PageStyleContext::SetAttribute( sal_uInt16 nPrefixKey, TYPEINIT1( PageStyleContext, XMLPropStyleContext ); PageStyleContext::PageStyleContext( SvXMLImport& rImport, - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_Bool bDefaultStyle) : @@ -66,7 +66,7 @@ PageStyleContext::~PageStyleContext() SvXMLImportContext *PageStyleContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = NULL; diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx index c060b09dde36..056b80cf8bba 100644 --- a/xmloff/source/style/PageMasterImportPropMapper.cxx +++ b/xmloff/source/style/PageMasterImportPropMapper.cxx @@ -50,7 +50,7 @@ PageMasterImportPropertyMapper::~PageMasterImportPropertyMapper() bool PageMasterImportPropertyMapper::handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const { @@ -60,7 +60,7 @@ bool PageMasterImportPropertyMapper::handleSpecialItem( if( CTF_PM_REGISTER_STYLE==nContextID ) { - ::rtl::OUString sDisplayName( rImport.GetStyleDisplayName( + OUString sDisplayName( rImport.GetStyleDisplayName( XML_STYLE_FAMILY_TEXT_PARAGRAPH, rValue ) ); Reference < XNameContainer > xParaStyles = rImport.GetTextImport()->GetParaStyles(); diff --git a/xmloff/source/style/PageMasterImportPropMapper.hxx b/xmloff/source/style/PageMasterImportPropMapper.hxx index 1911f83efaf5..effb6c61a129 100644 --- a/xmloff/source/style/PageMasterImportPropMapper.hxx +++ b/xmloff/source/style/PageMasterImportPropMapper.hxx @@ -41,7 +41,7 @@ public: virtual bool handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const; diff --git a/xmloff/source/style/PageMasterPropHdl.cxx b/xmloff/source/style/PageMasterPropHdl.cxx index 399a853e6c90..d37db396b9b1 100644 --- a/xmloff/source/style/PageMasterPropHdl.cxx +++ b/xmloff/source/style/PageMasterPropHdl.cxx @@ -32,8 +32,6 @@ #include <comphelper/types.hxx> #include <comphelper/extract.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/PageMasterPropHdl.hxx b/xmloff/source/style/PageMasterPropHdl.hxx index 421fa7a07bc1..43b2ec371909 100644 --- a/xmloff/source/style/PageMasterPropHdl.hxx +++ b/xmloff/source/style/PageMasterPropHdl.hxx @@ -37,12 +37,12 @@ public: const ::com::sun::star::uno::Any& rAny2 ) const; virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; @@ -57,12 +57,12 @@ class XMLPMPropHdl_NumFormat : public XMLPropertyHandler public: virtual ~XMLPMPropHdl_NumFormat(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; @@ -77,12 +77,12 @@ class XMLPMPropHdl_NumLetterSync : public XMLPropertyHandler public: virtual ~XMLPMPropHdl_NumLetterSync(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; @@ -97,12 +97,12 @@ class XMLPMPropHdl_PaperTrayNumber : public XMLPropertyHandler public: virtual ~XMLPMPropHdl_PaperTrayNumber(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; @@ -115,19 +115,19 @@ public: class XMLPMPropHdl_Print : public XMLPropertyHandler { protected: - ::rtl::OUString sAttrValue; + OUString sAttrValue; public: XMLPMPropHdl_Print( enum ::xmloff::token::XMLTokenEnum eValue ); virtual ~XMLPMPropHdl_Print(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; @@ -141,12 +141,12 @@ class XMLPMPropHdl_CenterHorizontal : public XMLPropertyHandler public: virtual ~XMLPMPropHdl_CenterHorizontal(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; @@ -157,12 +157,12 @@ class XMLPMPropHdl_CenterVertical : public XMLPropertyHandler public: virtual ~XMLPMPropHdl_CenterVertical(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx index 21b4dcc64366..0923cee3a5f8 100644 --- a/xmloff/source/style/PageMasterPropHdlFactory.cxx +++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx @@ -29,8 +29,6 @@ #include <com/sun/star/text/TextGridMode.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; using namespace ::com::sun::star; diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx index 82b73338dff1..7f194e15ce7a 100644 --- a/xmloff/source/style/PagePropertySetContext.cxx +++ b/xmloff/source/style/PagePropertySetContext.cxx @@ -24,7 +24,6 @@ #include <xmloff/PageMasterStyleMap.hxx> #include "XMLFootnoteSeparatorImport.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; diff --git a/xmloff/source/style/PagePropertySetContext.hxx b/xmloff/source/style/PagePropertySetContext.hxx index 756ad5f27cc0..45c68b46b208 100644 --- a/xmloff/source/style/PagePropertySetContext.hxx +++ b/xmloff/source/style/PagePropertySetContext.hxx @@ -35,7 +35,7 @@ class PagePropertySetContext : public SvXMLPropertySetContext public: PagePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFam, @@ -48,7 +48,7 @@ public: using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp); diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index d2d64f07dba0..41ab751b8b28 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -38,8 +38,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx index 138db8f1307a..04623adf6d0f 100644 --- a/xmloff/source/style/WordWrapPropertyHdl.cxx +++ b/xmloff/source/style/WordWrapPropertyHdl.cxx @@ -26,8 +26,6 @@ #include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/Any.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index b1ea5193d1c6..aba949681f76 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -33,8 +33,6 @@ #include <xmloff/XMLBase64ImportContext.hxx> #include "XMLBackgroundImageContext.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/XMLBackgroundImageExport.cxx b/xmloff/source/style/XMLBackgroundImageExport.cxx index 1ecd5c1a34cd..362c84af2792 100644 --- a/xmloff/source/style/XMLBackgroundImageExport.cxx +++ b/xmloff/source/style/XMLBackgroundImageExport.cxx @@ -28,8 +28,6 @@ #include <xmloff/xmlexp.hxx> #include "XMLBackgroundImageExport.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -50,7 +48,7 @@ void XMLBackgroundImageExport::exportXML( const Any& rURL, const Any *pFilter, const Any *pTransparency, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName ) + const OUString& rLocalName ) { GraphicLocation ePos; if( !(pPos && ((*pPos) >>= ePos)) ) diff --git a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx index 9a6c6f4f60ca..8e926ff2f0a6 100644 --- a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx +++ b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx @@ -25,8 +25,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; XMLBitmapLogicalSizePropertyHandler::XMLBitmapLogicalSizePropertyHandler() diff --git a/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx index 983d67eca7a1..5dd665793559 100644 --- a/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx +++ b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::xmloff::token::GetXMLToken; diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx index ec0e1d59de1a..bdcc4fe0e8cc 100644 --- a/xmloff/source/style/XMLClipPropertyHandler.cxx +++ b/xmloff/source/style/XMLClipPropertyHandler.cxx @@ -24,8 +24,6 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/XMLConstantsPropertyHandler.cxx b/xmloff/source/style/XMLConstantsPropertyHandler.cxx index 2e26d62d1840..096891164b17 100644 --- a/xmloff/source/style/XMLConstantsPropertyHandler.cxx +++ b/xmloff/source/style/XMLConstantsPropertyHandler.cxx @@ -23,8 +23,6 @@ #include <xmloff/XMLConstantsPropertyHandler.hxx> using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::xmloff::token::XMLTokenEnum; diff --git a/xmloff/source/style/XMLElementPropertyContext.cxx b/xmloff/source/style/XMLElementPropertyContext.cxx index 33e4f355a4fc..d4f9241c09b9 100644 --- a/xmloff/source/style/XMLElementPropertyContext.cxx +++ b/xmloff/source/style/XMLElementPropertyContext.cxx @@ -19,7 +19,6 @@ #include "XMLElementPropertyContext.hxx" -using ::rtl::OUString; TYPEINIT1( XMLElementPropertyContext , SvXMLImportContext ); diff --git a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx index 8d0d5ac17e8c..61269a6f805d 100644 --- a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx +++ b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx @@ -27,8 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; XMLFillBitmapSizePropertyHandler::XMLFillBitmapSizePropertyHandler() diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index 8f603ab0419a..1f56d66dfa2f 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -32,8 +32,6 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -51,16 +49,16 @@ class XMLFontAutoStylePoolEntry_Impl public: inline XMLFontAutoStylePoolEntry_Impl( - const ::rtl::OUString& rName, - const ::rtl::OUString& rFamilyName, - const ::rtl::OUString& rStyleName, + const OUString& rName, + const OUString& rFamilyName, + const OUString& rStyleName, FontFamily nFamily, FontPitch nPitch, rtl_TextEncoding eEnc ); inline XMLFontAutoStylePoolEntry_Impl( - const ::rtl::OUString& rFamilyName, - const ::rtl::OUString& rStyleName, + const OUString& rFamilyName, + const OUString& rStyleName, FontFamily nFamily, FontPitch nPitch, rtl_TextEncoding eEnc ); @@ -75,9 +73,9 @@ public: inline XMLFontAutoStylePoolEntry_Impl::XMLFontAutoStylePoolEntry_Impl( - const ::rtl::OUString& rName, - const ::rtl::OUString& rFamilyName, - const ::rtl::OUString& rStyleName, + const OUString& rName, + const OUString& rFamilyName, + const OUString& rStyleName, FontFamily nFam, FontPitch nP, rtl_TextEncoding eE ) : @@ -91,8 +89,8 @@ inline XMLFontAutoStylePoolEntry_Impl::XMLFontAutoStylePoolEntry_Impl( } inline XMLFontAutoStylePoolEntry_Impl::XMLFontAutoStylePoolEntry_Impl( - const ::rtl::OUString& rFamilyName, - const ::rtl::OUString& rStyleName, + const OUString& rFamilyName, + const OUString& rStyleName, FontFamily nFam, FontPitch nP, rtl_TextEncoding eE ) : @@ -200,7 +198,7 @@ OUString XMLFontAutoStylePool::Add( return sPoolName; } -::rtl::OUString XMLFontAutoStylePool::Find( +OUString XMLFontAutoStylePool::Find( const OUString& rFamilyName, const OUString& rStyleName, FontFamily nFamily, diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index 37de311e0d78..4887f013940e 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -35,8 +35,6 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/maptype.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -178,7 +176,7 @@ void XMLFontStyleContextFontFace::FillProperties( SvXMLImportContext * XMLFontStyleContextFontFace::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) { if( nPrefix == XML_NAMESPACE_SVG && IsXMLToken( rLocalName, XML_FONT_FACE_SRC )) @@ -206,7 +204,7 @@ XMLFontStyleContextFontFaceSrc::XMLFontStyleContextFontFaceSrc( SvXMLImport& rIm SvXMLImportContext * XMLFontStyleContextFontFaceSrc::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) { if( nPrefix == XML_NAMESPACE_SVG && IsXMLToken( rLocalName, XML_FONT_FACE_URI )) @@ -265,7 +263,7 @@ void XMLFontStyleContextFontFaceUri::handleEmbeddedFont( const OUString& url ) SvXMLStyleContext *XMLFontStylesContext::CreateStyleChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) { diff --git a/xmloff/source/style/XMLFontStylesContext_impl.hxx b/xmloff/source/style/XMLFontStylesContext_impl.hxx index 1787bf2faddb..6a794b9668bc 100644 --- a/xmloff/source/style/XMLFontStylesContext_impl.hxx +++ b/xmloff/source/style/XMLFontStylesContext_impl.hxx @@ -43,7 +43,7 @@ public: TYPEINFO(); XMLFontStyleContextFontFace( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, XMLFontStylesContext& rStyles ); @@ -63,7 +63,7 @@ public: SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; @@ -76,12 +76,12 @@ public: TYPEINFO(); XMLFontStyleContextFontFaceSrc( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const XMLFontStyleContextFontFace& font ); virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; @@ -95,7 +95,7 @@ public: TYPEINFO(); XMLFontStyleContextFontFaceUri( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const XMLFontStyleContextFontFace& font ); diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx index 1eec7273d7bf..761ffdccd8ff 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUStringBuffer; using ::std::vector; XMLFootnoteSeparatorExport::XMLFootnoteSeparatorExport(SvXMLExport& rExp) : diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx index 226b052a9107..6b129d06d67d 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; using ::std::vector; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx index b4fb27482cf2..dbc5f932ef04 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx @@ -54,7 +54,7 @@ public: XMLFootnoteSeparatorImport( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::std::vector<XMLPropertyState> & rProperties, const UniReference<XMLPropertySetMapper> & rMapperRef, sal_Int32 nIndex); diff --git a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx index 03078be257dd..628805ee9069 100644 --- a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx +++ b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx @@ -23,8 +23,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; XMLIsPercentagePropertyHandler::~XMLIsPercentagePropertyHandler() diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 371bf42ecf42..48e429550dd7 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -33,8 +33,6 @@ #include "PageMasterPropMapper.hxx" #include "PageMasterExportPropMapper.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -202,9 +200,9 @@ void XMLPageExport::exportStyles( sal_Bool bUsed, sal_Bool bAutoStyles ) { if( xPageStyles.is() ) { - uno::Sequence< ::rtl::OUString> aSeq = xPageStyles->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + uno::Sequence< OUString> aSeq = xPageStyles->getElementNames(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { Reference< XStyle > xStyle(xPageStyles->getByName( *pIter ),uno::UNO_QUERY); diff --git a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx index d1bd289c492d..fc13561ed928 100644 --- a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx +++ b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx @@ -30,8 +30,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; XMLPercentOrMeasurePropertyHandler::XMLPercentOrMeasurePropertyHandler( sal_Bool bPercent ) diff --git a/xmloff/source/style/XMLRectangleMembersHandler.cxx b/xmloff/source/style/XMLRectangleMembersHandler.cxx index 0477f3e5de07..5233ef6fb25a 100644 --- a/xmloff/source/style/XMLRectangleMembersHandler.cxx +++ b/xmloff/source/style/XMLRectangleMembersHandler.cxx @@ -27,8 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; XMLRectangleMembersHdl::XMLRectangleMembersHdl( sal_Int32 nType ) @@ -105,7 +103,7 @@ sal_Bool XMLRectangleMembersHdl::exportXML( break; } - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; rUnitConverter.convertMeasureToXML( sBuffer, nValue ); rStrExpValue = sBuffer.makeStringAndClear(); return sal_True; diff --git a/xmloff/source/style/adjushdl.cxx b/xmloff/source/style/adjushdl.cxx index b7d7fe2b3266..1f10b2a8fb7e 100644 --- a/xmloff/source/style/adjushdl.cxx +++ b/xmloff/source/style/adjushdl.cxx @@ -26,8 +26,6 @@ #include <com/sun/star/uno/Any.hxx> using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/style/adjushdl.hxx b/xmloff/source/style/adjushdl.hxx index c3cac7998706..634b5cfa2404 100644 --- a/xmloff/source/style/adjushdl.hxx +++ b/xmloff/source/style/adjushdl.hxx @@ -30,8 +30,8 @@ class XMLParaAdjustPropHdl : public XMLPropertyHandler public: virtual ~XMLParaAdjustPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -42,8 +42,8 @@ class XMLLastLineAdjustPropHdl : public XMLPropertyHandler public: virtual ~XMLLastLineAdjustPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_ADJUSTTYPES_HXX diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx index b9567cef7d66..53cc76470408 100644 --- a/xmloff/source/style/backhdl.cxx +++ b/xmloff/source/style/backhdl.cxx @@ -25,8 +25,6 @@ #include <com/sun/star/uno/Any.hxx> #include <rtl/ustrbuf.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/backhdl.hxx b/xmloff/source/style/backhdl.hxx index 77a0b015fd77..13e0df9aaec2 100644 --- a/xmloff/source/style/backhdl.hxx +++ b/xmloff/source/style/backhdl.hxx @@ -33,8 +33,8 @@ public: /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. using XMLPropertyHandler::importXML; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; private: void MergeXMLHoriPos( ::com::sun::star::style::GraphicLocation& ePos, ::com::sun::star::style::GraphicLocation eHori ) const; diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx index 9da972d28779..736551b9cb68 100644 --- a/xmloff/source/style/bordrhdl.cxx +++ b/xmloff/source/style/bordrhdl.cxx @@ -26,8 +26,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/table/BorderLine2.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/bordrhdl.hxx b/xmloff/source/style/bordrhdl.hxx index 41beb8be5642..95c4ed203e96 100644 --- a/xmloff/source/style/bordrhdl.hxx +++ b/xmloff/source/style/bordrhdl.hxx @@ -30,8 +30,8 @@ class XMLBorderWidthHdl : public XMLPropertyHandler public: virtual ~XMLBorderWidthHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLBorderHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLBorderHdl : public XMLPropertyHandler public: virtual ~XMLBorderHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_CHARLOCALETYPES_HXX diff --git a/xmloff/source/style/breakhdl.cxx b/xmloff/source/style/breakhdl.cxx index c82daaf4a37a..3e9f15c8f79e 100644 --- a/xmloff/source/style/breakhdl.cxx +++ b/xmloff/source/style/breakhdl.cxx @@ -24,8 +24,6 @@ #include <com/sun/star/style/BreakType.hpp> #include <com/sun/star/uno/Any.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/breakhdl.hxx b/xmloff/source/style/breakhdl.hxx index 5e3dfc6fef46..51d2c9959fe1 100644 --- a/xmloff/source/style/breakhdl.hxx +++ b/xmloff/source/style/breakhdl.hxx @@ -30,8 +30,8 @@ class XMLFmtBreakBeforePropHdl : public XMLPropertyHandler public: virtual ~XMLFmtBreakBeforePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -42,8 +42,8 @@ class XMLFmtBreakAfterPropHdl : public XMLPropertyHandler public: virtual ~XMLFmtBreakAfterPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_BREAKTYPES_HXX diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx index 8ea49063b909..c92b30b04016 100644 --- a/xmloff/source/style/cdouthdl.cxx +++ b/xmloff/source/style/cdouthdl.cxx @@ -25,8 +25,6 @@ #include <com/sun/star/awt/FontStrikeout.hpp> #include <com/sun/star/uno/Any.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::awt; diff --git a/xmloff/source/style/cdouthdl.hxx b/xmloff/source/style/cdouthdl.hxx index d4edabf4b3c6..bcb636965141 100644 --- a/xmloff/source/style/cdouthdl.hxx +++ b/xmloff/source/style/cdouthdl.hxx @@ -30,8 +30,8 @@ class XMLCrossedOutTypePropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutTypePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLCrossedOutStylePropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLCrossedOutStylePropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutStylePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLCrossedOutWidthPropHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLCrossedOutWidthPropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutWidthPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLCrossedOutTextPropHdl : public XMLPropertyHandler @@ -57,8 +57,8 @@ class XMLCrossedOutTextPropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutTextPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_CROSSEDOUTTYPES_HXX diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx index 36bf6bb36609..3d2602aa22b0 100644 --- a/xmloff/source/style/chrhghdl.cxx +++ b/xmloff/source/style/chrhghdl.cxx @@ -28,8 +28,6 @@ #include <xmloff/xmluconv.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/style/chrhghdl.hxx b/xmloff/source/style/chrhghdl.hxx index be6e4f70bc38..80b6517d27dc 100644 --- a/xmloff/source/style/chrhghdl.hxx +++ b/xmloff/source/style/chrhghdl.hxx @@ -30,8 +30,8 @@ class XMLCharHeightHdl : public XMLPropertyHandler public: virtual ~XMLCharHeightHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLCharHeightPropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLCharHeightPropHdl : public XMLPropertyHandler public: virtual ~XMLCharHeightPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLCharHeightDiffHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLCharHeightDiffHdl : public XMLPropertyHandler public: virtual ~XMLCharHeightDiffHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_CHARHEIGHTTYPES_HXX diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx index 486fe1d85a78..9a702723f8a7 100644 --- a/xmloff/source/style/chrlohdl.cxx +++ b/xmloff/source/style/chrlohdl.cxx @@ -24,8 +24,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/lang/Locale.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/chrlohdl.hxx b/xmloff/source/style/chrlohdl.hxx index 44e31cef830c..241b96279d5e 100644 --- a/xmloff/source/style/chrlohdl.hxx +++ b/xmloff/source/style/chrlohdl.hxx @@ -32,8 +32,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLCharCountryHdl : public XMLPropertyHandler @@ -43,8 +43,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_CHARLOCALETYPES_HXX diff --git a/xmloff/source/style/csmaphdl.cxx b/xmloff/source/style/csmaphdl.cxx index 33193747ef87..1df628f8d48d 100644 --- a/xmloff/source/style/csmaphdl.cxx +++ b/xmloff/source/style/csmaphdl.cxx @@ -24,8 +24,6 @@ #include <com/sun/star/style/CaseMap.hpp> #include <com/sun/star/uno/Any.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/csmaphdl.hxx b/xmloff/source/style/csmaphdl.hxx index 00cffdec3195..e098cc38cf62 100644 --- a/xmloff/source/style/csmaphdl.hxx +++ b/xmloff/source/style/csmaphdl.hxx @@ -30,8 +30,8 @@ class XMLCaseMapPropHdl : public XMLPropertyHandler public: virtual ~XMLCaseMapPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLCaseMapVariantHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLCaseMapVariantHdl : public XMLPropertyHandler public: virtual ~XMLCaseMapVariantHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_CASEMAPTYPES_HXX diff --git a/xmloff/source/style/durationhdl.cxx b/xmloff/source/style/durationhdl.cxx index 7db11c30c233..73cae30f78be 100644 --- a/xmloff/source/style/durationhdl.cxx +++ b/xmloff/source/style/durationhdl.cxx @@ -23,8 +23,6 @@ #include <rtl/ustrbuf.hxx> #include <sax/tools/converter.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; diff --git a/xmloff/source/style/durationhdl.hxx b/xmloff/source/style/durationhdl.hxx index cae2e2704398..70bc47f14579 100644 --- a/xmloff/source/style/durationhdl.hxx +++ b/xmloff/source/style/durationhdl.hxx @@ -30,8 +30,8 @@ class XMLDurationMS16PropHdl_Impl : public XMLPropertyHandler public: virtual ~XMLDurationMS16PropHdl_Impl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_FMTSPLITTYPES_HXX diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx index f3d4b0e92566..0bfd631c84dd 100644 --- a/xmloff/source/style/escphdl.cxx +++ b/xmloff/source/style/escphdl.cxx @@ -26,8 +26,6 @@ #include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/Any.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/escphdl.hxx b/xmloff/source/style/escphdl.hxx index 031b369c68bb..a5b1d932fc8d 100644 --- a/xmloff/source/style/escphdl.hxx +++ b/xmloff/source/style/escphdl.hxx @@ -30,8 +30,8 @@ class XMLEscapementPropHdl : public XMLPropertyHandler public: virtual ~XMLEscapementPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLEscapementHeightPropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLEscapementHeightPropHdl : public XMLPropertyHandler public: virtual ~XMLEscapementHeightPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_ESCAPETYPES_HXX diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx index fb9f18c049c8..f65efea29b7c 100644 --- a/xmloff/source/style/fonthdl.cxx +++ b/xmloff/source/style/fonthdl.cxx @@ -28,8 +28,6 @@ #include <com/sun/star/uno/Any.hxx> #include <tools/fontenum.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/fonthdl.hxx b/xmloff/source/style/fonthdl.hxx index 5c7718fe787d..10a89234c31e 100644 --- a/xmloff/source/style/fonthdl.hxx +++ b/xmloff/source/style/fonthdl.hxx @@ -30,8 +30,8 @@ class XMLFontFamilyNamePropHdl : public XMLPropertyHandler public: virtual ~XMLFontFamilyNamePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -42,8 +42,8 @@ class XMLFontFamilyPropHdl : public XMLPropertyHandler public: virtual ~XMLFontFamilyPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -54,8 +54,8 @@ class XMLFontEncodingPropHdl : public XMLPropertyHandler public: virtual ~XMLFontEncodingPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -66,8 +66,8 @@ class XMLFontPitchPropHdl : public XMLPropertyHandler public: virtual ~XMLFontPitchPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/source/style/impastp1.cxx b/xmloff/source/style/impastp1.cxx index fbd1a66389bd..b71368e93650 100644 --- a/xmloff/source/style/impastp1.cxx +++ b/xmloff/source/style/impastp1.cxx @@ -20,7 +20,6 @@ #include <tools/debug.hxx> #include "impastpl.hxx" -using ::rtl::OUString; //############################################################################# // @@ -34,7 +33,7 @@ using ::rtl::OUString; XMLFamilyData_Impl::XMLFamilyData_Impl( sal_Int32 nFamily, - const ::rtl::OUString& rStrName, + const OUString& rStrName, const UniReference < SvXMLExportPropertyMapper > &rMapper, const OUString& rStrPrefix, sal_Bool bAsFam ) diff --git a/xmloff/source/style/impastp2.cxx b/xmloff/source/style/impastp2.cxx index fe3978b2e84b..1cf90cd79ce5 100644 --- a/xmloff/source/style/impastp2.cxx +++ b/xmloff/source/style/impastp2.cxx @@ -22,8 +22,6 @@ using namespace std; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; //############################################################################# // diff --git a/xmloff/source/style/impastp3.cxx b/xmloff/source/style/impastp3.cxx index e134053f7492..41693a5d37d1 100644 --- a/xmloff/source/style/impastp3.cxx +++ b/xmloff/source/style/impastp3.cxx @@ -22,7 +22,6 @@ using namespace std; -using ::rtl::OUString; //############################################################################# // diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx index 286785819bff..4b2a31394349 100644 --- a/xmloff/source/style/impastp4.cxx +++ b/xmloff/source/style/impastp4.cxx @@ -30,8 +30,6 @@ #include <xmloff/PageMasterStyleMap.hxx> using namespace ::std; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index 61226700f09f..0b8daed91579 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -34,7 +34,7 @@ class SvXMLAutoStylePoolP; class SvXMLAutoStylePoolParentsP_Impl; -typedef std::set<rtl::OUString> SvXMLAutoStylePoolNamesP_Impl; +typedef std::set<OUString> SvXMLAutoStylePoolNamesP_Impl; class SvXMLExportPropertyMapper; class SvXMLExport; @@ -45,7 +45,7 @@ class SvXMLExport; // Implementationclass for stylefamily-information // -typedef ::rtl::OUString* OUStringPtr; +typedef OUString* OUStringPtr; typedef ::std::vector< OUStringPtr > SvXMLAutoStylePoolCache_Impl; class XMLFamilyData_Impl @@ -53,20 +53,20 @@ class XMLFamilyData_Impl public: SvXMLAutoStylePoolCache_Impl *pCache; sal_uInt32 mnFamily; - ::rtl::OUString maStrFamilyName; + OUString maStrFamilyName; UniReference < SvXMLExportPropertyMapper > mxMapper; SvXMLAutoStylePoolParentsP_Impl* mpParentList; SvXMLAutoStylePoolNamesP_Impl* mpNameList; sal_uInt32 mnCount; sal_uInt32 mnName; - ::rtl::OUString maStrPrefix; + OUString maStrPrefix; sal_Bool bAsFamily; public: - XMLFamilyData_Impl( sal_Int32 nFamily, const ::rtl::OUString& rStrName, + XMLFamilyData_Impl( sal_Int32 nFamily, const OUString& rStrName, const UniReference < SvXMLExportPropertyMapper > & rMapper, - const ::rtl::OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); + const OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); XMLFamilyData_Impl( sal_Int32 nFamily ) : pCache( 0 ), @@ -91,7 +91,7 @@ typedef boost::ptr_set<XMLFamilyData_Impl> XMLFamilyDataList_Impl; class SvXMLAutoStylePoolPropertiesP_Impl { - ::rtl::OUString msName; + OUString msName; ::std::vector< XMLPropertyState > maProperties; sal_uInt32 mnPos; @@ -103,11 +103,11 @@ public: { } - const ::rtl::OUString& GetName() const { return msName; } + const OUString& GetName() const { return msName; } const ::std::vector< XMLPropertyState >& GetProperties() const { return maProperties; } sal_uInt32 GetPos() const { return mnPos; } - void SetName( const ::rtl::OUString& rNew ) { msName = rNew; } + void SetName( const OUString& rNew ) { msName = rNew; } }; typedef SvXMLAutoStylePoolPropertiesP_Impl* SvXMLAutoStylePoolPropertiesPPtr; @@ -120,25 +120,25 @@ typedef ::std::vector< SvXMLAutoStylePoolPropertiesPPtr > SvXMLAutoStylePoolProp class SvXMLAutoStylePoolParentP_Impl { - ::rtl::OUString msParent; + OUString msParent; SvXMLAutoStylePoolPropertiesPList_Impl maPropertiesList; public: - SvXMLAutoStylePoolParentP_Impl( const ::rtl::OUString & rParent ) : + SvXMLAutoStylePoolParentP_Impl( const OUString & rParent ) : msParent( rParent ) { } ~SvXMLAutoStylePoolParentP_Impl(); - sal_Bool Add( XMLFamilyData_Impl& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties, ::rtl::OUString& rName, bool bDontSeek = false ); + sal_Bool Add( XMLFamilyData_Impl& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek = false ); - sal_Bool AddNamed( XMLFamilyData_Impl& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties, const ::rtl::OUString& rName ); + sal_Bool AddNamed( XMLFamilyData_Impl& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties, const OUString& rName ); - ::rtl::OUString Find( const XMLFamilyData_Impl& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties ) const; + OUString Find( const XMLFamilyData_Impl& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties ) const; - const ::rtl::OUString& GetParent() const { return msParent; } + const OUString& GetParent() const { return msParent; } const SvXMLAutoStylePoolPropertiesPList_Impl& GetPropertiesList() const { @@ -177,26 +177,26 @@ public: SvXMLExport& GetExport() const { return rExport; } - void AddFamily( sal_Int32 nFamily, const ::rtl::OUString& rStrName, + void AddFamily( sal_Int32 nFamily, const OUString& rStrName, const UniReference < SvXMLExportPropertyMapper > & rMapper, - const ::rtl::OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); + const OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); void SetFamilyPropSetMapper( sal_Int32 nFamily, const UniReference < SvXMLExportPropertyMapper > & rMapper ); - void RegisterName( sal_Int32 nFamily, const ::rtl::OUString& rName ); + void RegisterName( sal_Int32 nFamily, const OUString& rName ); void GetRegisteredNames( com::sun::star::uno::Sequence<sal_Int32>& aFamilies, - com::sun::star::uno::Sequence<rtl::OUString>& aNames ); + com::sun::star::uno::Sequence<OUString>& aNames ); - sal_Bool Add( ::rtl::OUString& rName, sal_Int32 nFamily, - const ::rtl::OUString& rParent, + sal_Bool Add( OUString& rName, sal_Int32 nFamily, + const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties, sal_Bool bCache = sal_False, bool bDontSeek = false ); - sal_Bool AddNamed( const ::rtl::OUString& rName, sal_Int32 nFamily, - const ::rtl::OUString& rParent, + sal_Bool AddNamed( const OUString& rName, sal_Int32 nFamily, + const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ); - ::rtl::OUString Find( sal_Int32 nFamily, const ::rtl::OUString& rParent, + OUString Find( sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) const; void exportXML( sal_Int32 nFamily, @@ -210,7 +210,7 @@ public: struct SvXMLAutoStylePoolPExport_Impl { - const ::rtl::OUString *mpParent; + const OUString *mpParent; const SvXMLAutoStylePoolPropertiesP_Impl *mpProperties; }; diff --git a/xmloff/source/style/kernihdl.cxx b/xmloff/source/style/kernihdl.cxx index 2f857d595892..74051eb33ff3 100644 --- a/xmloff/source/style/kernihdl.cxx +++ b/xmloff/source/style/kernihdl.cxx @@ -25,8 +25,6 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; diff --git a/xmloff/source/style/kernihdl.hxx b/xmloff/source/style/kernihdl.hxx index b23ba10a7abb..c7989629724f 100644 --- a/xmloff/source/style/kernihdl.hxx +++ b/xmloff/source/style/kernihdl.hxx @@ -30,8 +30,8 @@ class XMLKerningPropHdl : public XMLPropertyHandler public: virtual ~XMLKerningPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_KERNINGTYPES_HXX diff --git a/xmloff/source/style/lspachdl.cxx b/xmloff/source/style/lspachdl.cxx index 78373198f18d..a6fd84667e6e 100644 --- a/xmloff/source/style/lspachdl.cxx +++ b/xmloff/source/style/lspachdl.cxx @@ -26,8 +26,6 @@ #include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/LineSpacingMode.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using ::xmloff::token::IsXMLToken; diff --git a/xmloff/source/style/lspachdl.hxx b/xmloff/source/style/lspachdl.hxx index 38275f65485c..2de45b94011f 100644 --- a/xmloff/source/style/lspachdl.hxx +++ b/xmloff/source/style/lspachdl.hxx @@ -30,8 +30,8 @@ class XMLLineHeightHdl : public XMLPropertyHandler public: virtual ~XMLLineHeightHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLLineHeightAtLeastHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLLineHeightAtLeastHdl : public XMLPropertyHandler public: virtual ~XMLLineHeightAtLeastHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLLineSpacingHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLLineSpacingHdl : public XMLPropertyHandler public: virtual ~XMLLineSpacingHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_CHARHEIGHTTYPES_HXX diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index f5e0241de3ff..fcefcc690784 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -77,7 +77,7 @@ XMLNumberFormatAttributesExportHelper::~XMLNumberFormatAttributesExportHelper() { } -sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNumberFormat, rtl::OUString& sCurrency, bool& bIsStandard) +sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNumberFormat, OUString& sCurrency, bool& bIsStandard) { XMLNumberFormat aFormat(sEmpty, nNumberFormat, 0); XMLNumberFormatSet::iterator aItr(aNumberFormats.find(aFormat)); @@ -103,7 +103,7 @@ sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNu void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExport, const sal_Int16 nTypeKey, const double& rValue, - const rtl::OUString& rCurrency, + const OUString& rCurrency, sal_Bool bExportValue) { sal_Bool bWasSetTypeAttribute = sal_False; @@ -140,7 +140,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp if (bExportValue) { - rtl::OUString sValue( ::rtl::math::doubleToUString( rValue, + OUString sValue( ::rtl::math::doubleToUString( rValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', sal_True)); rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE, sValue); @@ -159,7 +159,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp { if ( rXMLExport.SetNullDateOnUnitConverter() ) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; rXMLExport.GetMM100UnitConverter().convertDateTime(sBuffer, rValue); rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_DATE_VALUE, sBuffer.makeStringAndClear()); } @@ -175,7 +175,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp } if (bExportValue) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDuration(sBuffer, rValue); rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_TIME_VALUE, sBuffer.makeStringAndClear()); } @@ -203,7 +203,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp } else { - rtl::OUString sValue( ::rtl::math::doubleToUString( + OUString sValue( ::rtl::math::doubleToUString( fTempValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', @@ -222,7 +222,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp bWasSetTypeAttribute = sal_True; if (bExportValue) { - rtl::OUString sValue( ::rtl::math::doubleToUString( rValue, + OUString sValue( ::rtl::math::doubleToUString( rValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', sal_True)); rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE, sValue); @@ -233,7 +233,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp } } -sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int32 nNumberFormat, rtl::OUString& sCurrencySymbol, +sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& sCurrencySymbol, uno::Reference <util::XNumberFormatsSupplier>& xNumberFormatsSupplier) { if (xNumberFormatsSupplier.is()) @@ -302,14 +302,14 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(SvXMLExpor { sal_Bool bIsStandard; sal_Int16 nTypeKey = GetCellType(nNumberFormat, bIsStandard, rXMLExport.GetNumberFormatsSupplier()); - rtl::OUString sCurrency; + OUString sCurrency; if ((nTypeKey & ~util::NumberFormat::DEFINED) == util::NumberFormat::CURRENCY) GetCurrencySymbol(nNumberFormat, sCurrency, rXMLExport.GetNumberFormatsSupplier()); WriteAttributes(rXMLExport, nTypeKey, rValue, sCurrency, bExportValue); } void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(SvXMLExport& rXMLExport, - const rtl::OUString& rValue, const rtl::OUString& rCharacters, + const OUString& rValue, const OUString& rCharacters, sal_Bool bExportValue, sal_Bool bExportTypeAttribute) { if (bExportTypeAttribute) @@ -318,7 +318,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(SvXMLExpor rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_STRING_VALUE, rValue); } -sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int32 nNumberFormat, rtl::OUString& rCurrencySymbol) +sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& rCurrencySymbol) { if (!xNumberFormats.is() && pExport && pExport->GetNumberFormatsSupplier().is()) xNumberFormats.set(pExport->GetNumberFormatsSupplier()->getNumberFormats()); @@ -383,7 +383,7 @@ sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNu void XMLNumberFormatAttributesExportHelper::WriteAttributes( const sal_Int16 nTypeKey, const double& rValue, - const rtl::OUString& rCurrency, + const OUString& rCurrency, sal_Bool bExportValue) { if (!pExport) @@ -423,7 +423,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( if (bExportValue) { - rtl::OUString sValue( ::rtl::math::doubleToUString( rValue, + OUString sValue( ::rtl::math::doubleToUString( rValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', sal_True)); pExport->AddAttribute(sAttrValue, sValue); @@ -442,7 +442,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( { if ( pExport->SetNullDateOnUnitConverter() ) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; pExport->GetMM100UnitConverter().convertDateTime(sBuffer, rValue); pExport->AddAttribute(sAttrDateValue, sBuffer.makeStringAndClear()); } @@ -458,7 +458,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( } if (bExportValue) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDuration(sBuffer, rValue); pExport->AddAttribute(sAttrTimeValue, sBuffer.makeStringAndClear()); } @@ -486,7 +486,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( } else { - rtl::OUString sValue( ::rtl::math::doubleToUString( + OUString sValue( ::rtl::math::doubleToUString( fTempValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', @@ -505,7 +505,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( bWasSetTypeAttribute = sal_True; if (bExportValue) { - rtl::OUString sValue( ::rtl::math::doubleToUString( rValue, + OUString sValue( ::rtl::math::doubleToUString( rValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', sal_True)); pExport->AddAttribute(sAttrValue, sValue); @@ -522,7 +522,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes( if (pExport) { bool bIsStandard; - rtl::OUString sCurrency; + OUString sCurrency; sal_Int16 nTypeKey = GetCellType(nNumberFormat, sCurrency, bIsStandard); WriteAttributes(nTypeKey, rValue, sCurrency, bExportValue); } @@ -532,7 +532,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes( } void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes( - const rtl::OUString& rValue, const rtl::OUString& rCharacters, + const OUString& rValue, const OUString& rCharacters, sal_Bool bExportValue, sal_Bool bExportTypeAttribute) { if (pExport) diff --git a/xmloff/source/style/opaquhdl.cxx b/xmloff/source/style/opaquhdl.cxx index fad5621cb4f0..d61e576f01bf 100644 --- a/xmloff/source/style/opaquhdl.cxx +++ b/xmloff/source/style/opaquhdl.cxx @@ -25,8 +25,6 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; diff --git a/xmloff/source/style/opaquhdl.hxx b/xmloff/source/style/opaquhdl.hxx index 223347e6c96b..c73abd18f099 100644 --- a/xmloff/source/style/opaquhdl.hxx +++ b/xmloff/source/style/opaquhdl.hxx @@ -30,8 +30,8 @@ class XMLOpaquePropHdl : public XMLPropertyHandler public: virtual ~XMLOpaquePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_OPAQUETYPES_HXX diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx index 20d02abb8895..a05fa74a8aa0 100644 --- a/xmloff/source/style/postuhdl.cxx +++ b/xmloff/source/style/postuhdl.cxx @@ -25,8 +25,6 @@ #include <com/sun/star/awt/FontSlant.hpp> #include <tools/fontenum.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/postuhdl.hxx b/xmloff/source/style/postuhdl.hxx index df33ccd8ea34..8bf2c2079927 100644 --- a/xmloff/source/style/postuhdl.hxx +++ b/xmloff/source/style/postuhdl.hxx @@ -30,8 +30,8 @@ class XMLPosturePropHdl : public XMLPropertyHandler public: virtual ~XMLPosturePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_POSTURETYPES_HXX diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index e68261e02719..dcdb0ed533af 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -35,8 +35,6 @@ #include <xmloff/attrlist.hxx> #include "xmloff/xmlerror.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -196,15 +194,15 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite ) { aValues.realloc( nLen + 2 ); PropertyValue *pProps = aValues.getArray() + nLen; - pProps->Name = rtl::OUString("ParaStyleName"); + pProps->Name = OUString("ParaStyleName"); OUString sParent( GetParentName() ); if( !sParent.isEmpty() ) sParent = GetImport().GetStyleDisplayName( GetFamily(), sParent ); else - sParent = rtl::OUString("Standard"); + sParent = OUString("Standard"); pProps->Value <<= sParent; ++pProps; - pProps->Name = rtl::OUString("ParaConditionalStyleName"); + pProps->Name = OUString("ParaConditionalStyleName"); pProps->Value <<= sParent; } @@ -213,8 +211,8 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite ) { Sequence< OUString > aPropNames(1); aPropNames[0] = GetFamily() == XML_STYLE_FAMILY_TEXT_PARAGRAPH ? - rtl::OUString("ParaAutoStyleName") : - rtl::OUString("CharAutoStyleName"); + OUString("ParaAutoStyleName") : + OUString("CharAutoStyleName"); Sequence< Any > aAny = xAutoStyle->getPropertyValues( aPropNames ); if( aAny.hasElements() ) { diff --git a/xmloff/source/style/shadwhdl.cxx b/xmloff/source/style/shadwhdl.cxx index 8df434f91be0..596694793860 100644 --- a/xmloff/source/style/shadwhdl.cxx +++ b/xmloff/source/style/shadwhdl.cxx @@ -28,8 +28,6 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/shadwhdl.hxx b/xmloff/source/style/shadwhdl.hxx index 952db4be6bc4..f49e0b56f6db 100644 --- a/xmloff/source/style/shadwhdl.hxx +++ b/xmloff/source/style/shadwhdl.hxx @@ -30,8 +30,8 @@ class XMLShadowPropHdl : public XMLPropertyHandler public: virtual ~XMLShadowPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_BASICTYPES_HXX diff --git a/xmloff/source/style/shdwdhdl.cxx b/xmloff/source/style/shdwdhdl.cxx index d0ef5dc084da..7fd14b598a2a 100644 --- a/xmloff/source/style/shdwdhdl.cxx +++ b/xmloff/source/style/shdwdhdl.cxx @@ -24,8 +24,6 @@ // -- #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; diff --git a/xmloff/source/style/shdwdhdl.hxx b/xmloff/source/style/shdwdhdl.hxx index a5259b4b45b3..265ace288f95 100644 --- a/xmloff/source/style/shdwdhdl.hxx +++ b/xmloff/source/style/shdwdhdl.hxx @@ -30,8 +30,8 @@ class XMLShadowedPropHdl : public XMLPropertyHandler public: virtual ~XMLShadowedPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_SHADOWEDTYPES_HXX diff --git a/xmloff/source/style/tabsthdl.cxx b/xmloff/source/style/tabsthdl.cxx index 5017f60ac4e9..4001950c3d0f 100644 --- a/xmloff/source/style/tabsthdl.cxx +++ b/xmloff/source/style/tabsthdl.cxx @@ -70,12 +70,12 @@ bool XMLTabStopPropHdl::equals( const uno::Any& r1, const uno::Any& r2 ) const return bEqual; } -sal_Bool XMLTabStopPropHdl::importXML( const ::rtl::OUString&, ::com::sun::star::uno::Any&, const SvXMLUnitConverter& ) const +sal_Bool XMLTabStopPropHdl::importXML( const OUString&, ::com::sun::star::uno::Any&, const SvXMLUnitConverter& ) const { return sal_False; } -sal_Bool XMLTabStopPropHdl::exportXML( ::rtl::OUString&, const ::com::sun::star::uno::Any&, const SvXMLUnitConverter& ) const +sal_Bool XMLTabStopPropHdl::exportXML( OUString&, const ::com::sun::star::uno::Any&, const SvXMLUnitConverter& ) const { return sal_False; } diff --git a/xmloff/source/style/tabsthdl.hxx b/xmloff/source/style/tabsthdl.hxx index 5d1254b31cca..fb44c93ee405 100644 --- a/xmloff/source/style/tabsthdl.hxx +++ b/xmloff/source/style/tabsthdl.hxx @@ -33,8 +33,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_TABSTOPTYPES_HXX diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx index a4b4907ec4a0..b238491958de 100644 --- a/xmloff/source/style/undlihdl.cxx +++ b/xmloff/source/style/undlihdl.cxx @@ -26,8 +26,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/awt/FontUnderline.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::awt; diff --git a/xmloff/source/style/undlihdl.hxx b/xmloff/source/style/undlihdl.hxx index ce9cd4847f4e..53308a135a1a 100644 --- a/xmloff/source/style/undlihdl.hxx +++ b/xmloff/source/style/undlihdl.hxx @@ -30,8 +30,8 @@ class XMLUnderlineTypePropHdl : public XMLPropertyHandler public: virtual ~XMLUnderlineTypePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLUnderlineStylePropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLUnderlineStylePropHdl : public XMLPropertyHandler public: virtual ~XMLUnderlineStylePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLUnderlineWidthPropHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLUnderlineWidthPropHdl : public XMLPropertyHandler public: virtual ~XMLUnderlineWidthPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_UNDERLINETYPES_HXX diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx index ec506bc6fe09..0ef9c84ff701 100644 --- a/xmloff/source/style/weighhdl.cxx +++ b/xmloff/source/style/weighhdl.cxx @@ -35,8 +35,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/awt/FontWeight.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; diff --git a/xmloff/source/style/weighhdl.hxx b/xmloff/source/style/weighhdl.hxx index 4bcf0239f67a..54f47d29e8c5 100644 --- a/xmloff/source/style/weighhdl.hxx +++ b/xmloff/source/style/weighhdl.hxx @@ -30,8 +30,8 @@ class XMLFontWeightPropHdl : public XMLPropertyHandler public: virtual ~XMLFontWeightPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index dbdae04a8903..ef4718b309a9 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -33,8 +33,6 @@ using namespace ::std; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -47,7 +45,7 @@ namespace { DBG_ASSERT( _rxMapper.is(), "xmloff::lcl_exportDataStyle: invalid property mapper!" ); // obtain the data style name - ::rtl::OUString sDataStyleName; + OUString sDataStyleName; _rProperty.maValue >>= sDataStyleName; DBG_ASSERT( !sDataStyleName.isEmpty(), "xmloff::lcl_exportDataStyle: invalid property value for the data style name!" ); diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx index c2462c2e7f9c..9a7c0ed582bd 100644 --- a/xmloff/source/style/xmlbahdl.cxx +++ b/xmloff/source/style/xmlbahdl.cxx @@ -26,8 +26,6 @@ #include <com/sun/star/uno/Any.hxx> #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; diff --git a/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx index bc26c14dafdc..3f32dc5b607a 100644 --- a/xmloff/source/style/xmlbahdl.hxx +++ b/xmloff/source/style/xmlbahdl.hxx @@ -36,8 +36,8 @@ public: XMLNumberPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLNumberPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -45,15 +45,15 @@ public: */ class XMLNumberNonePropHdl : public XMLPropertyHandler { - ::rtl::OUString sZeroStr; + OUString sZeroStr; sal_Int8 nBytes; public: XMLNumberNonePropHdl( sal_Int8 nB = 4 ); XMLNumberNonePropHdl( enum ::xmloff::token::XMLTokenEnum eZeroString, sal_Int8 nB = 4 ); virtual ~XMLNumberNonePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -66,8 +66,8 @@ public: XMLMeasurePropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLMeasurePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -80,8 +80,8 @@ public: XMLPercentPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLPercentPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -90,8 +90,8 @@ public: */ class XMLDoublePercentPropHdl : public XMLPropertyHandler { - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -104,8 +104,8 @@ public: XMLNegPercentPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLNegPercentPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -118,8 +118,8 @@ public: XMLMeasurePxPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLMeasurePxPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -130,8 +130,8 @@ class XMLBoolPropHdl : public XMLPropertyHandler public: virtual ~XMLBoolPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLBoolFalsePropHdl : public XMLBoolPropHdl @@ -139,8 +139,8 @@ class XMLBoolFalsePropHdl : public XMLBoolPropHdl public: virtual ~XMLBoolFalsePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; @@ -152,8 +152,8 @@ class XMLColorPropHdl : public XMLPropertyHandler public: virtual ~XMLColorPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -164,8 +164,8 @@ class XMLHexPropHdl : public XMLPropertyHandler public: virtual ~XMLHexPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -176,8 +176,8 @@ class XMLStringPropHdl : public XMLPropertyHandler public: virtual ~XMLStringPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -188,7 +188,7 @@ class XMLStyleNamePropHdl : public XMLStringPropHdl public: virtual ~XMLStyleNamePropHdl(); - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; @@ -200,8 +200,8 @@ class XMLDoublePropHdl : public XMLPropertyHandler public: virtual ~XMLDoublePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -212,8 +212,8 @@ class XMLNBoolPropHdl : public XMLPropertyHandler public: virtual ~XMLNBoolPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -221,14 +221,14 @@ public: */ class XMLColorTransparentPropHdl : public XMLPropertyHandler { - const ::rtl::OUString sTransparent; + const OUString sTransparent; public: XMLColorTransparentPropHdl( enum ::xmloff::token::XMLTokenEnum eTransparent = xmloff::token::XML_TOKEN_INVALID ); virtual ~XMLColorTransparentPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -236,7 +236,7 @@ public: */ class XMLIsTransparentPropHdl : public XMLPropertyHandler { - const ::rtl::OUString sTransparent; + const OUString sTransparent; sal_Bool bTransPropValue; public: @@ -244,8 +244,8 @@ public: sal_Bool bTransPropValue = sal_True ); virtual ~XMLIsTransparentPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -257,8 +257,8 @@ public: XMLColorAutoPropHdl(); virtual ~XMLColorAutoPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -270,8 +270,8 @@ public: XMLIsAutoColorPropHdl(); virtual ~XMLIsAutoColorPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; @@ -284,8 +284,8 @@ class XMLCompareOnlyPropHdl : public XMLPropertyHandler public: virtual ~XMLCompareOnlyPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -300,8 +300,8 @@ public: XMLNumberWithoutZeroPropHdl( sal_Int8 nB = 4 ); virtual ~XMLNumberWithoutZeroPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -314,8 +314,8 @@ class XMLNumberWithAutoInsteadZeroPropHdl : public XMLNumberWithoutZeroPropHdl public: virtual ~XMLNumberWithAutoInsteadZeroPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_BASICTYPES_HXX diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index d8f0999fe765..c2c414b100d7 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -39,8 +39,6 @@ #include <xmloff/PropertySetInfoHash.hxx> #include <comphelper/stl_types.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::com::sun::star; @@ -155,13 +153,13 @@ void XMLPropertyStates_Impl::FillPropertyStateVector( class FilterPropertyInfo_Impl { - const rtl::OUString sApiName; + const OUString sApiName; std::list<sal_uInt32> aIndexes; sal_uInt32 nCount; public: - FilterPropertyInfo_Impl( const rtl::OUString& rApiName, + FilterPropertyInfo_Impl( const OUString& rApiName, const sal_uInt32 nIndex); const OUString& GetApiName() const { return sApiName; } @@ -181,7 +179,7 @@ public: }; FilterPropertyInfo_Impl::FilterPropertyInfo_Impl( - const rtl::OUString& rApiName, + const OUString& rApiName, const sal_uInt32 nIndex ) : sApiName( rApiName ), aIndexes(), @@ -206,7 +204,7 @@ public: FilterPropertiesInfo_Impl(); ~FilterPropertiesInfo_Impl(); - void AddProperty(const rtl::OUString& rApiName, const sal_uInt32 nIndex); + void AddProperty(const OUString& rApiName, const sal_uInt32 nIndex); const uno::Sequence<OUString>& GetApiNames(); void FillPropertyStateArray( vector< XMLPropertyState >& rPropStates, @@ -261,7 +259,7 @@ FilterPropertiesInfo_Impl::~FilterPropertiesInfo_Impl() } void FilterPropertiesInfo_Impl::AddProperty( - const rtl::OUString& rApiName, const sal_uInt32 nIndex) + const OUString& rApiName, const sal_uInt32 nIndex) { aPropInfos.push_back(FilterPropertyInfo_Impl(rApiName, nIndex)); nCount++; diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 23f8fcc24d78..5bf11a0404d9 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -47,8 +47,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::xml; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::xmloff::token; @@ -57,8 +55,6 @@ using ::com::sun::star::lang::WrappedTargetException; using ::com::sun::star::beans::UnknownPropertyException; using ::com::sun::star::beans::PropertyVetoException; -using rtl::OUString; -using rtl::OUStringBuffer; SvXMLImportPropertyMapper::SvXMLImportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, @@ -713,7 +709,7 @@ sal_Bool SvXMLImportPropertyMapper::_FillTolerantMultiPropertySet( { Sequence<OUString> aSeq(1); aSeq[0] = aResults[i].Name; - rtl::OUString sMessage; + OUString sMessage; switch (aResults[i].Result) { case TolerantPropertySetResultType::UNKNOWN_PROPERTY : diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 364860513f5c..7cbc207cc981 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -50,8 +50,6 @@ #include <tools/fontenum.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index c34a0e679794..8beeab70abe3 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -48,8 +48,6 @@ #include <set> #include <boost/ptr_container/ptr_vector.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -101,9 +99,9 @@ struct SvXMLEmbeddedTextEntry { sal_uInt16 nSourcePos; // position in NumberFormat (to skip later) sal_Int32 nFormatPos; // resulting position in embedded-text element - rtl::OUString aText; + OUString aText; - SvXMLEmbeddedTextEntry( sal_uInt16 nSP, sal_Int32 nFP, const rtl::OUString& rT ) : + SvXMLEmbeddedTextEntry( sal_uInt16 nSP, sal_Int32 nFP, const OUString& rT ) : nSourcePos(nSP), nFormatPos(nFP), aText(rT) {} }; @@ -257,7 +255,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport( SvXMLExport& rExp, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& rSupp, - const rtl::OUString& rPrefix ) : + const OUString& rPrefix ) : rExport( rExp ), sPrefix( rPrefix ), pFormatter( NULL ), @@ -301,7 +299,7 @@ SvXMLNumFmtExport::~SvXMLNumFmtExport() // helper methods // -static OUString lcl_CreateStyleName( sal_Int32 nKey, sal_Int32 nPart, sal_Bool bDefPart, const rtl::OUString& rPrefix ) +static OUString lcl_CreateStyleName( sal_Int32 nKey, sal_Int32 nPart, sal_Bool bDefPart, const OUString& rPrefix ) { OUStringBuffer aFmtName( 10L ); aFmtName.append( rPrefix ); @@ -628,7 +626,7 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl( sal_True, sal_False ); // text as element content - rtl::OUString aContent( pObj->aText ); + OUString aContent( pObj->aText ); while ( nEntry+1 < nEntryCount && rEmbeddedEntries[nEntry+1].nFormatPos == pObj->nFormatPos ) { // The array can contain several elements for the same position in the number @@ -1755,7 +1753,7 @@ OUString SvXMLNumFmtExport::GetStyleName( sal_uInt32 nKey ) else { OSL_FAIL("There is no written Data-Style"); - return rtl::OUString(); + return OUString(); } } diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index d2c589657085..beb620591c3a 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -46,8 +46,6 @@ #include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_set.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -56,11 +54,11 @@ using namespace ::xmloff::token; struct SvXMLNumFmtEntry { - rtl::OUString aName; + OUString aName; sal_uInt32 nKey; sal_Bool bRemoveAfterUse; - SvXMLNumFmtEntry( const rtl::OUString& rN, sal_uInt32 nK, sal_Bool bR ) : + SvXMLNumFmtEntry( const OUString& rN, sal_uInt32 nK, sal_Bool bR ) : aName(rN), nKey(nK), bRemoveAfterUse(bR) {} }; @@ -69,9 +67,9 @@ typedef ::boost::ptr_vector<SvXMLNumFmtEntry> SvXMLNumFmtEntryArr; struct SvXMLEmbeddedElement { sal_Int32 nFormatPos; - rtl::OUString aText; + OUString aText; - SvXMLEmbeddedElement( sal_Int32 nFP, const rtl::OUString& rT ) : + SvXMLEmbeddedElement( sal_Int32 nFP, const OUString& rT ) : nFormatPos(nFP), aText(rT) {} // comparison operators for PTRARR sorting - sorted by position @@ -107,8 +105,8 @@ public: const SvXMLTokenMap& GetStyleAttrTokenMap(); const SvXMLTokenMap& GetStyleElemAttrTokenMap(); const LocaleDataWrapper& GetLocaleData( LanguageType nLang ); - sal_uInt32 GetKeyForName( const rtl::OUString& rName ); - void AddKey( sal_uInt32 nKey, const rtl::OUString& rName, sal_Bool bRemoveAfterUse ); + sal_uInt32 GetKeyForName( const OUString& rName ); + void AddKey( sal_uInt32 nKey, const OUString& rName, sal_Bool bRemoveAfterUse ); void SetUsed( sal_uInt32 nKey ); void RemoveVolatileFormats(); }; @@ -140,51 +138,51 @@ class SvXMLNumFmtElementContext : public SvXMLImportContext { SvXMLNumFormatContext& rParent; sal_uInt16 nType; - rtl::OUStringBuffer aContent; + OUStringBuffer aContent; SvXMLNumberInfo aNumInfo; LanguageType nElementLang; sal_Bool bLong; sal_Bool bTextual; - rtl::OUString sCalendar; + OUString sCalendar; public: SvXMLNumFmtElementContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, SvXMLNumFormatContext& rParentContext, sal_uInt16 nNewType, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtElementContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters( const rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); - void AddEmbeddedElement( sal_Int32 nFormatPos, const rtl::OUString& rContent ); + void AddEmbeddedElement( sal_Int32 nFormatPos, const OUString& rContent ); }; class SvXMLNumFmtEmbeddedTextContext : public SvXMLImportContext { SvXMLNumFmtElementContext& rParent; - rtl::OUStringBuffer aContent; + OUStringBuffer aContent; sal_Int32 nTextPosition; public: SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, SvXMLNumFmtElementContext& rParentContext, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtEmbeddedTextContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters( const rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; @@ -192,22 +190,22 @@ public: class SvXMLNumFmtMapContext : public SvXMLImportContext { SvXMLNumFormatContext& rParent; - rtl::OUString sCondition; - rtl::OUString sName; + OUString sCondition; + OUString sName; public: SvXMLNumFmtMapContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, SvXMLNumFormatContext& rParentContext, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtMapContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters( const rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; @@ -220,17 +218,17 @@ class SvXMLNumFmtPropContext : public SvXMLImportContext public: SvXMLNumFmtPropContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, SvXMLNumFormatContext& rParentContext, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtPropContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters( const rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; @@ -402,7 +400,7 @@ SvXMLNumImpData::~SvXMLNumImpData() delete pLocaleData; } -sal_uInt32 SvXMLNumImpData::GetKeyForName( const rtl::OUString& rName ) +sal_uInt32 SvXMLNumImpData::GetKeyForName( const OUString& rName ) { sal_uInt16 nCount = aNameEntries.size(); for (sal_uInt16 i=0; i<nCount; i++) @@ -414,7 +412,7 @@ sal_uInt32 SvXMLNumImpData::GetKeyForName( const rtl::OUString& rName ) return NUMBERFORMAT_ENTRY_NOT_FOUND; } -void SvXMLNumImpData::AddKey( sal_uInt32 nKey, const rtl::OUString& rName, sal_Bool bRemoveAfterUse ) +void SvXMLNumImpData::AddKey( sal_uInt32 nKey, const OUString& rName, sal_Bool bRemoveAfterUse ) { if ( bRemoveAfterUse ) { @@ -613,7 +611,7 @@ const LocaleDataWrapper& SvXMLNumImpData::GetLocaleData( LanguageType nLang ) // SvXMLNumFmtMapContext::SvXMLNumFmtMapContext( SvXMLImport& rImport, - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, SvXMLNumFormatContext& rParentContext, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -641,14 +639,14 @@ SvXMLNumFmtMapContext::~SvXMLNumFmtMapContext() } SvXMLImportContext* SvXMLNumFmtMapContext::CreateChildContext( - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) { // no elements supported - use default context return new SvXMLImportContext( GetImport(), nPrfx, rLName ); } -void SvXMLNumFmtMapContext::Characters( const rtl::OUString& ) +void SvXMLNumFmtMapContext::Characters( const OUString& ) { } @@ -664,7 +662,7 @@ void SvXMLNumFmtMapContext::EndElement() // SvXMLNumFmtPropContext::SvXMLNumFmtPropContext( SvXMLImport& rImport, - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, SvXMLNumFormatContext& rParentContext, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -690,14 +688,14 @@ SvXMLNumFmtPropContext::~SvXMLNumFmtPropContext() } SvXMLImportContext* SvXMLNumFmtPropContext::CreateChildContext( - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) { // no elements supported - use default context return new SvXMLImportContext( GetImport(), nPrfx, rLName ); } -void SvXMLNumFmtPropContext::Characters( const rtl::OUString& ) +void SvXMLNumFmtPropContext::Characters( const OUString& ) { } @@ -714,7 +712,7 @@ void SvXMLNumFmtPropContext::EndElement() // SvXMLNumFmtEmbeddedTextContext::SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport, - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, SvXMLNumFmtElementContext& rParentContext, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -743,14 +741,14 @@ SvXMLNumFmtEmbeddedTextContext::~SvXMLNumFmtEmbeddedTextContext() } SvXMLImportContext* SvXMLNumFmtEmbeddedTextContext::CreateChildContext( - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) { // no elements supported - use default context return new SvXMLImportContext( GetImport(), nPrfx, rLName ); } -void SvXMLNumFmtEmbeddedTextContext::Characters( const rtl::OUString& rChars ) +void SvXMLNumFmtEmbeddedTextContext::Characters( const OUString& rChars ) { aContent.append( rChars ); } @@ -808,7 +806,7 @@ static sal_Bool lcl_ValidChar( sal_Unicode cChar, const SvXMLNumFormatContext& r return sal_False; } -static void lcl_EnquoteIfNecessary( rtl::OUStringBuffer& rContent, const SvXMLNumFormatContext& rParent ) +static void lcl_EnquoteIfNecessary( OUStringBuffer& rContent, const SvXMLNumFormatContext& rParent ) { sal_Bool bQuote = sal_True; sal_Int32 nLength = rContent.getLength(); @@ -828,7 +826,7 @@ static void lcl_EnquoteIfNecessary( rtl::OUStringBuffer& rContent, const SvXMLNu // the percent character in percentage styles must be left out of quoting // (one occurrence is enough even if there are several percent characters in the string) - rtl::OUString aString( rContent.getStr() ); + OUString aString( rContent.getStr() ); sal_Int32 nPos = aString.indexOf( (sal_Unicode) '%' ); if ( nPos >= 0 ) { @@ -917,7 +915,7 @@ static void lcl_EnquoteIfNecessary( rtl::OUStringBuffer& rContent, const SvXMLNu const sal_Int32 MAX_SECOND_DIGITS = 20; // fdo#58539 & gnome#627420: limit number of digits during import SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport, - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, SvXMLNumFormatContext& rParentContext, sal_uInt16 nNewType, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1017,7 +1015,7 @@ SvXMLNumFmtElementContext::~SvXMLNumFmtElementContext() } SvXMLImportContext* SvXMLNumFmtElementContext::CreateChildContext( - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { // only number:number supports number:embedded-text child element @@ -1031,12 +1029,12 @@ SvXMLImportContext* SvXMLNumFmtElementContext::CreateChildContext( return new SvXMLImportContext( GetImport(), nPrfx, rLName ); } -void SvXMLNumFmtElementContext::Characters( const rtl::OUString& rChars ) +void SvXMLNumFmtElementContext::Characters( const OUString& rChars ) { aContent.append( rChars ); } -void SvXMLNumFmtElementContext::AddEmbeddedElement( sal_Int32 nFormatPos, const rtl::OUString& rContent ) +void SvXMLNumFmtElementContext::AddEmbeddedElement( sal_Int32 nFormatPos, const OUString& rContent ) { if ( !rContent.isEmpty() ) { @@ -1277,7 +1275,7 @@ sal_uInt16 SvXMLNumFmtDefaults::GetDefaultDateFormat( SvXMLDateElementAttributes // SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const uno::Reference<xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles ) : @@ -1391,7 +1389,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, { aFormatCode.append( "][$-" ); // language code in upper hex: - aFormatCode.append(rtl::OUString::valueOf(sal_Int32(eLang), 16).toAsciiUpperCase()); + aFormatCode.append(OUString::valueOf(sal_Int32(eLang), 16).toAsciiUpperCase()); } aFormatCode.append( sal_Unicode(']') ); } @@ -1399,7 +1397,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, } SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, const sal_Int32 nTempKey, SvXMLStylesContext& rStyles ) : @@ -1437,7 +1435,7 @@ SvXMLNumFormatContext::~SvXMLNumFormatContext() } SvXMLImportContext* SvXMLNumFormatContext::CreateChildContext( - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext* pContext = NULL; @@ -1719,7 +1717,7 @@ void SvXMLNumFormatContext::AddToCode( sal_Unicode c ) bHasExtraText = sal_True; } -void SvXMLNumFormatContext::AddToCode( const rtl::OUString& rString ) +void SvXMLNumFormatContext::AddToCode( const OUString& rString ) { aFormatCode.append( rString ); bHasExtraText = sal_True; @@ -1863,7 +1861,7 @@ void SvXMLNumFormatContext::AddNumber( const SvXMLNumberInfo& rInfo ) } } -void SvXMLNumFormatContext::AddCurrency( const rtl::OUString& rContent, LanguageType nLang ) +void SvXMLNumFormatContext::AddCurrency( const OUString& rContent, LanguageType nLang ) { sal_Bool bAutomatic = sal_False; OUString aSymbol = rContent; @@ -1904,7 +1902,7 @@ void SvXMLNumFormatContext::AddCurrency( const rtl::OUString& rContent, Language if ( nFirst >= 0 ) { // remove both quotes from aFormatCode - rtl::OUString aOld = aFormatCode.makeStringAndClear(); + OUString aOld = aFormatCode.makeStringAndClear(); if ( nFirst > 0 ) aFormatCode.append( aOld.copy( 0, nFirst ) ); if ( nLength > nFirst + 2 ) @@ -1924,7 +1922,7 @@ void SvXMLNumFormatContext::AddCurrency( const rtl::OUString& rContent, Language { // '-' sign and language code in hex: aFormatCode.append( (sal_Unicode) '-' ); - aFormatCode.append(rtl::OUString::valueOf(sal_Int32(nLang), 16).toAsciiUpperCase()); + aFormatCode.append(OUString::valueOf(sal_Int32(nLang), 16).toAsciiUpperCase()); } aFormatCode.append( (sal_Unicode) ']' ); // end of "new" currency symbol @@ -1996,7 +1994,7 @@ void SvXMLNumFormatContext::AddNfKeyword( sal_uInt16 nIndex ) } } -static sal_Bool lcl_IsAtEnd( rtl::OUStringBuffer& rBuffer, const OUString& rToken ) +static sal_Bool lcl_IsAtEnd( OUStringBuffer& rBuffer, const OUString& rToken ) { sal_Int32 nBufLen = rBuffer.getLength(); sal_Int32 nTokLen = rToken.getLength(); @@ -2091,7 +2089,7 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex ) } } -void SvXMLNumFormatContext::AddCondition( const rtl::OUString& rCondition, const rtl::OUString& rApplyName ) +void SvXMLNumFormatContext::AddCondition( const OUString& rCondition, const OUString& rApplyName ) { MyCondition aCondition; aCondition.sCondition = rCondition; @@ -2121,7 +2119,7 @@ void SvXMLNumFormatContext::AddColor( sal_uInt32 const nColor ) } } -void SvXMLNumFormatContext::UpdateCalendar( const rtl::OUString& rNewCalendar ) +void SvXMLNumFormatContext::UpdateCalendar( const OUString& rNewCalendar ) { if ( rNewCalendar != sCalendar ) { diff --git a/xmloff/source/style/xmlprcon.cxx b/xmloff/source/style/xmlprcon.cxx index 1fcf7dff95c9..7c0594ad0831 100644 --- a/xmloff/source/style/xmlprcon.cxx +++ b/xmloff/source/style/xmlprcon.cxx @@ -22,8 +22,6 @@ #include <xmloff/xmlprcon.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::std; @@ -83,7 +81,7 @@ SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext( */ SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >&, ::std::vector< XMLPropertyState > &, const XMLPropertyState& ) diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx index c0094284c222..351c9127cb6c 100644 --- a/xmloff/source/style/xmlprmap.cxx +++ b/xmloff/source/style/xmlprmap.cxx @@ -29,8 +29,6 @@ using namespace ::std; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx index 4a8e14c769db..f8f2d42ed807 100644 --- a/xmloff/source/style/xmltabe.cxx +++ b/xmloff/source/style/xmltabe.cxx @@ -28,8 +28,6 @@ #include <xmloff/xmlexp.hxx> #include "xmloff/xmltabe.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index a457d5d10928..dad659ecdfc7 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -29,8 +29,6 @@ #include <xmloff/xmluconv.hxx> #include "xmltabi.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index 5be12e5a9a4f..651533c785b8 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -43,7 +43,6 @@ #include <xmloff/xmlexp.hxx> #include "table.hxx" -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index 099b48825b66..59254909af26 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -44,7 +44,6 @@ // -------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; @@ -237,7 +236,7 @@ SvXMLStyleContext* XMLTableImport::CreateTableTemplateContext( sal_uInt16 nPrfx, // -------------------------------------------------------------------- -void XMLTableImport::addTableTemplate( const rtl::OUString& rsStyleName, XMLTableTemplate& xTableTemplate ) +void XMLTableImport::addTableTemplate( const OUString& rsStyleName, XMLTableTemplate& xTableTemplate ) { boost::shared_ptr< XMLTableTemplate > xPtr( new XMLTableTemplate ); xPtr->swap( xTableTemplate ); diff --git a/xmloff/source/table/table.hxx b/xmloff/source/table/table.hxx index 56cdace50126..77ef971627ea 100644 --- a/xmloff/source/table/table.hxx +++ b/xmloff/source/table/table.hxx @@ -27,7 +27,7 @@ struct XMLPropertyMapEntry; struct TableStyleElement { ::xmloff::token::XMLTokenEnum meElement; - ::rtl::OUString msStyleName; + OUString msStyleName; }; extern const TableStyleElement* getTableStyleMap(); diff --git a/xmloff/source/text/XMLAnchorTypePropHdl.hxx b/xmloff/source/text/XMLAnchorTypePropHdl.hxx index 59b1b3f0f967..01049e5dc01e 100644 --- a/xmloff/source/text/XMLAnchorTypePropHdl.hxx +++ b/xmloff/source/text/XMLAnchorTypePropHdl.hxx @@ -30,14 +30,14 @@ public: virtual ~XMLAnchorTypePropHdl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - static sal_Bool convert( const ::rtl::OUString& rStrImpValue, + static sal_Bool convert( const OUString& rStrImpValue, ::com::sun::star::text::TextContentAnchorType& rType ); }; diff --git a/xmloff/source/text/XMLAutoMarkFileContext.cxx b/xmloff/source/text/XMLAutoMarkFileContext.cxx index 00cc9bf51b12..0d846b66178f 100644 --- a/xmloff/source/text/XMLAutoMarkFileContext.cxx +++ b/xmloff/source/text/XMLAutoMarkFileContext.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; diff --git a/xmloff/source/text/XMLAutoMarkFileContext.hxx b/xmloff/source/text/XMLAutoMarkFileContext.hxx index 73135cf9c52f..165cf33483f6 100644 --- a/xmloff/source/text/XMLAutoMarkFileContext.hxx +++ b/xmloff/source/text/XMLAutoMarkFileContext.hxx @@ -33,7 +33,7 @@ namespace rtl { class OUString; } class XMLAutoMarkFileContext : public SvXMLImportContext { - const ::rtl::OUString sIndexAutoMarkFileURL; + const OUString sIndexAutoMarkFileURL; public: @@ -42,7 +42,7 @@ public: XMLAutoMarkFileContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName); + const OUString& rLocalName); ~XMLAutoMarkFileContext(); diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx index e805cc9b8799..3d6a2186a297 100644 --- a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx index 57e9ea3021c4..d262a4998f27 100644 --- a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx +++ b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx @@ -48,7 +48,7 @@ public: XMLAutoTextContainerEventImport( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > & rEvents ); @@ -59,7 +59,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index 95e28fb9e7d0..0212621ad528 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -41,8 +41,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::std::set; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::PropertyValue; diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx index c90615b4a846..7aa502da04ca 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.hxx +++ b/xmloff/source/text/XMLAutoTextEventExport.hxx @@ -50,8 +50,8 @@ class XMLAutoTextEventExport : public SvXMLExport ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> xEvents; - const ::rtl::OUString sEventType; - const ::rtl::OUString sNone; + const OUString sEventType; + const OUString sNone; public: @@ -102,11 +102,11 @@ protected: // global functions to support the component -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL +::com::sun::star::uno::Sequence< OUString > SAL_CALL XMLAutoTextEventExport_getSupportedServiceNames() throw(); -::rtl::OUString SAL_CALL XMLAutoTextEventExport_getImplementationName() +OUString SAL_CALL XMLAutoTextEventExport_getImplementationName() throw(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL @@ -115,11 +115,11 @@ protected: ::com::sun::star::lang::XMultiServiceFactory > & ) throw( ::com::sun::star::uno::Exception ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL +::com::sun::star::uno::Sequence< OUString > SAL_CALL XMLAutoTextEventExportOOO_getSupportedServiceNames() throw(); -::rtl::OUString SAL_CALL XMLAutoTextEventExportOOO_getImplementationName() +OUString SAL_CALL XMLAutoTextEventExportOOO_getImplementationName() throw(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx index 0f6b43ca75c6..d7902c629b09 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextEventImport.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; diff --git a/xmloff/source/text/XMLAutoTextEventImport.hxx b/xmloff/source/text/XMLAutoTextEventImport.hxx index ec4de83c9d2b..62e122116d6a 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.hxx +++ b/xmloff/source/text/XMLAutoTextEventImport.hxx @@ -63,7 +63,7 @@ protected: virtual SvXMLImportContext* CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -72,11 +72,11 @@ protected: // global functions to support the component -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL +::com::sun::star::uno::Sequence< OUString > SAL_CALL XMLAutoTextEventImport_getSupportedServiceNames() throw(); -::rtl::OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() +OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() throw(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL diff --git a/xmloff/source/text/XMLCalculationSettingsContext.cxx b/xmloff/source/text/XMLCalculationSettingsContext.cxx index 8229bdd02820..8c1b410cbb88 100644 --- a/xmloff/source/text/XMLCalculationSettingsContext.cxx +++ b/xmloff/source/text/XMLCalculationSettingsContext.cxx @@ -31,8 +31,6 @@ #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -41,7 +39,7 @@ using namespace ::xmloff::token; XMLCalculationSettingsContext::XMLCalculationSettingsContext( SvXMLImport& rImport, sal_uInt16 p_nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) : SvXMLImportContext ( rImport, p_nPrefix, rLocalName ) @@ -50,11 +48,11 @@ XMLCalculationSettingsContext::XMLCalculationSettingsContext( SvXMLImport& rImpo sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_TABLE) { diff --git a/xmloff/source/text/XMLCalculationSettingsContext.hxx b/xmloff/source/text/XMLCalculationSettingsContext.hxx index 9a3e3fbd7040..5851d08a6aaf 100644 --- a/xmloff/source/text/XMLCalculationSettingsContext.hxx +++ b/xmloff/source/text/XMLCalculationSettingsContext.hxx @@ -28,7 +28,7 @@ class XMLCalculationSettingsContext : public SvXMLImportContext public: XMLCalculationSettingsContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx index 971ebb599af3..551729bb8137 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.cxx +++ b/xmloff/source/text/XMLChangeElementImportContext.cxx @@ -27,7 +27,6 @@ -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; using ::xmloff::token::IsXMLToken; diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx index 5246fb110d09..43a6810379d9 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.hxx +++ b/xmloff/source/text/XMLChangeElementImportContext.hxx @@ -53,7 +53,7 @@ public: XMLChangeElementImportContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, /// accept text content (paragraphs) in element as redline content? sal_Bool bAcceptContent, /// context of enclosing <text:changed-region> element @@ -61,7 +61,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList); diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx index 0e17413d5761..f05b5fd95ffe 100644 --- a/xmloff/source/text/XMLChangeImportContext.cxx +++ b/xmloff/source/text/XMLChangeImportContext.cxx @@ -25,7 +25,6 @@ #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::text::XTextRange; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLChangeImportContext.hxx b/xmloff/source/text/XMLChangeImportContext.hxx index e17a28d39cb3..8edaed4e783e 100644 --- a/xmloff/source/text/XMLChangeImportContext.hxx +++ b/xmloff/source/text/XMLChangeImportContext.hxx @@ -60,7 +60,7 @@ public: XMLChangeImportContext( SvXMLImport& rImport, sal_Int16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, sal_Bool bIsStart, /// mark start of a change sal_Bool bIsEnd, /// mark end of a change /// true if change mark is encountered outside of a paragraph diff --git a/xmloff/source/text/XMLChangeInfoContext.cxx b/xmloff/source/text/XMLChangeInfoContext.cxx index e20092db1f0c..ac02dc335f30 100644 --- a/xmloff/source/text/XMLChangeInfoContext.cxx +++ b/xmloff/source/text/XMLChangeInfoContext.cxx @@ -30,7 +30,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLChangeInfoContext.hxx b/xmloff/source/text/XMLChangeInfoContext.hxx index d5fe167a0141..9a292b7377d0 100644 --- a/xmloff/source/text/XMLChangeInfoContext.hxx +++ b/xmloff/source/text/XMLChangeInfoContext.hxx @@ -41,11 +41,11 @@ class XMLChangedRegionImportContext; */ class XMLChangeInfoContext : public SvXMLImportContext { - const ::rtl::OUString& rType; + const OUString& rType; - ::rtl::OUStringBuffer sAuthorBuffer; - ::rtl::OUStringBuffer sDateTimeBuffer; - ::rtl::OUStringBuffer sCommentBuffer; + OUStringBuffer sAuthorBuffer; + OUStringBuffer sDateTimeBuffer; + OUStringBuffer sCommentBuffer; XMLChangedRegionImportContext& rChangedRegion; @@ -56,9 +56,9 @@ public: XMLChangeInfoContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, XMLChangedRegionImportContext& rChangedRegion, - const ::rtl::OUString& rChangeType); + const OUString& rChangeType); ~XMLChangeInfoContext(); @@ -68,7 +68,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx index 3db31fd5d9d5..4d857501b63c 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.cxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx @@ -33,7 +33,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::text::XTextCursor; using namespace ::com::sun::star; diff --git a/xmloff/source/text/XMLChangedRegionImportContext.hxx b/xmloff/source/text/XMLChangedRegionImportContext.hxx index 7a8e3a840db8..c43df94f94d3 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.hxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.hxx @@ -40,14 +40,14 @@ namespace rtl { class XMLChangedRegionImportContext : public SvXMLImportContext { - const ::rtl::OUString sEmpty; + const OUString sEmpty; /// if we replace the current XTextCursor/XText by the ones for /// the redline, we remember the old cursor here. ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor> xOldCursor; - ::rtl::OUString sID; /// redline-ID + OUString sID; /// redline-ID sal_Bool bMergeLastPara; /// merge-last-paragraph flag @@ -58,7 +58,7 @@ public: XMLChangedRegionImportContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName); + const OUString& rLocalName); ~XMLChangedRegionImportContext(); @@ -68,7 +68,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList); @@ -76,10 +76,10 @@ public: /// change info: To be called from change-info context - void SetChangeInfo(const ::rtl::OUString& rType, - const ::rtl::OUString& rAuthor, - const ::rtl::OUString& rComment, - const ::rtl::OUString& rDate); + void SetChangeInfo(const OUString& rType, + const OUString& rAuthor, + const OUString& rComment, + const OUString& rDate); /// create redline XText/XTextCursor on demand and register with /// XMLTextImportHelper diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx index 135fc97ae860..8a7f5faf7bf2 100644 --- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx @@ -26,7 +26,6 @@ #include "xmloff/xmlnmspe.hxx" #include <com/sun/star/xml/sax/XAttributeList.hpp> -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx index a7b2e00c95da..53cb17b0efdc 100644 --- a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx +++ b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx @@ -45,13 +45,13 @@ public: XMLFootnoteBodyImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index 3088962b5595..cdcba8c49c6c 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -42,8 +42,6 @@ #include <com/sun/star/style/NumberingType.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx index 4957980a28f4..9146a9f3b53b 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteImportContext.cxx @@ -37,8 +37,6 @@ #include <com/sun/star/text/XFootnote.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/xmloff/source/text/XMLFootnoteImportContext.hxx b/xmloff/source/text/XMLFootnoteImportContext.hxx index 235982dd716a..9209e84bd56e 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.hxx +++ b/xmloff/source/text/XMLFootnoteImportContext.hxx @@ -41,7 +41,7 @@ class XMLTextImportHelper; /// import footnote elements (<text:footnote>) class XMLFootnoteImportContext : public SvXMLImportContext { - const ::rtl::OUString sPropertyReferenceId; + const OUString sPropertyReferenceId; /// old document cursor ::com::sun::star::uno::Reference< @@ -65,7 +65,7 @@ public: SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); protected: @@ -74,13 +74,13 @@ protected: ::com::sun::star::xml::sax::XAttributeList> & xAttrList); virtual void Characters( - const ::rtl::OUString& rChars); + const OUString& rChars); virtual void EndElement(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx index d050131ad381..28acc591322d 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx @@ -40,7 +40,6 @@ -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx index 6123e2b8ff04..6ae1f7fd7651 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx @@ -37,22 +37,22 @@ namespace rtl { class OUString; } */ class XMLIndexAlphabeticalSourceContext : public XMLIndexSourceBaseContext { - const ::rtl::OUString sMainEntryCharacterStyleName; - const ::rtl::OUString sUseAlphabeticalSeparators; - const ::rtl::OUString sUseCombinedEntries; - const ::rtl::OUString sIsCaseSensitive; - const ::rtl::OUString sUseKeyAsEntry; - const ::rtl::OUString sUseUpperCase; - const ::rtl::OUString sUseDash; - const ::rtl::OUString sUsePP; - const ::rtl::OUString sIsCommaSeparated; - const ::rtl::OUString sSortAlgorithm; - const ::rtl::OUString sLocale; + const OUString sMainEntryCharacterStyleName; + const OUString sUseAlphabeticalSeparators; + const OUString sUseCombinedEntries; + const OUString sIsCaseSensitive; + const OUString sUseKeyAsEntry; + const OUString sUseUpperCase; + const OUString sUseDash; + const OUString sUsePP; + const OUString sIsCommaSeparated; + const OUString sSortAlgorithm; + const OUString sLocale; ::com::sun::star::lang::Locale aLocale; - ::rtl::OUString sAlgorithm; + OUString sAlgorithm; - ::rtl::OUString sMainEntryStyleName; + OUString sMainEntryStyleName; sal_Bool bMainEntryStyleNameOK; sal_Bool bSeparators; @@ -71,7 +71,7 @@ public: XMLIndexAlphabeticalSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); @@ -81,13 +81,13 @@ protected: virtual void ProcessAttribute( enum IndexSourceParamEnum eParam, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx index 36f2a1e6847a..e838485154c1 100644 --- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::xml::sax::XAttributeList; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::XPropertySet; @@ -222,7 +221,7 @@ void XMLIndexBibliographyConfigurationContext::CreateAndInsert(sal_Bool) Reference<XMultiServiceFactory> xFactory(GetImport().GetModel(),UNO_QUERY); if( xFactory.is() ) { - Sequence<rtl::OUString> aServices = xFactory->getAvailableServiceNames(); + Sequence<OUString> aServices = xFactory->getAvailableServiceNames(); sal_Bool bFound(sal_False); sal_Int32 i(0); sal_Int32 nServiceCount(aServices.getLength()); diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx index 0d5be554541b..ad4eaa217481 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star::text; using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::PropertyValues; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx index 374497031384..b07c349838e0 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx @@ -52,7 +52,7 @@ public: SvXMLImport& rImport, XMLIndexTemplateContext& rTemplate, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLIndexBibliographyEntryContext(); diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx index 11535cef776c..fd8b6ae3b5b7 100644 --- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx @@ -35,7 +35,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx index 4bfcbf2a211c..b3377daea3e2 100644 --- a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx +++ b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx @@ -44,7 +44,7 @@ public: XMLIndexBibliographySourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); @@ -54,13 +54,13 @@ protected: virtual void ProcessAttribute( enum IndexSourceParamEnum eParam, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexBodyContext.cxx b/xmloff/source/text/XMLIndexBodyContext.cxx index 8994532b5a74..6ea03369103c 100644 --- a/xmloff/source/text/XMLIndexBodyContext.cxx +++ b/xmloff/source/text/XMLIndexBodyContext.cxx @@ -23,7 +23,6 @@ #include <xmloff/txtimp.hxx> #include <rtl/ustring.hxx> -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; @@ -33,7 +32,7 @@ TYPEINIT1( XMLIndexBodyContext, SvXMLImportContext); XMLIndexBodyContext::XMLIndexBodyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ) : + const OUString& rLocalName ) : SvXMLImportContext(rImport, nPrfx, rLocalName), bHasContent(sal_False) { diff --git a/xmloff/source/text/XMLIndexBodyContext.hxx b/xmloff/source/text/XMLIndexBodyContext.hxx index 7f7e65d1cf70..0161481daf70 100644 --- a/xmloff/source/text/XMLIndexBodyContext.hxx +++ b/xmloff/source/text/XMLIndexBodyContext.hxx @@ -47,7 +47,7 @@ public: XMLIndexBodyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLIndexBodyContext(); @@ -58,7 +58,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx index acbba31c4f47..20e08d6f9221 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::text; using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::PropertyValues; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx index 861484eef724..bd47cd15f5cf 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx @@ -52,7 +52,7 @@ public: SvXMLImport& rImport, XMLIndexTemplateContext& rTemplate, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, sal_Bool bTOC ); ~XMLIndexChapterInfoEntryContext(); diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx index dcc32e722ef6..812c2b9af18e 100644 --- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx +++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx @@ -29,7 +29,6 @@ #include <xmloff/xmluconv.hxx> #include <rtl/ustring.hxx> -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx index 3900377a7ca3..d1d0a70152d7 100644 --- a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx +++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx @@ -46,7 +46,7 @@ public: XMLIndexIllustrationSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); @@ -56,7 +56,7 @@ protected: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx index bd67bd5b069c..f829c796f36f 100644 --- a/xmloff/source/text/XMLIndexMarkExport.cxx +++ b/xmloff/source/text/XMLIndexMarkExport.cxx @@ -31,8 +31,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::XPropertySetInfo; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx index e5b3cc492308..a46864b56c9f 100644 --- a/xmloff/source/text/XMLIndexMarkExport.hxx +++ b/xmloff/source/text/XMLIndexMarkExport.hxx @@ -43,18 +43,18 @@ namespace rtl { */ class XMLIndexMarkExport { - ::rtl::OUString sLevel; - ::rtl::OUString sUserIndexName; - ::rtl::OUString sPrimaryKey; - ::rtl::OUString sSecondaryKey; - ::rtl::OUString sDocumentIndexMark; - ::rtl::OUString sIsStart; - ::rtl::OUString sIsCollapsed; - ::rtl::OUString sAlternativeText; - ::rtl::OUString sTextReading; - ::rtl::OUString sPrimaryKeyReading; - ::rtl::OUString sSecondaryKeyReading; - ::rtl::OUString sMainEntry; + OUString sLevel; + OUString sUserIndexName; + OUString sPrimaryKey; + OUString sSecondaryKey; + OUString sDocumentIndexMark; + OUString sIsStart; + OUString sIsCollapsed; + OUString sAlternativeText; + OUString sTextReading; + OUString sPrimaryKeyReading; + OUString sSecondaryKeyReading; + OUString sMainEntry; SvXMLExport& rExport; @@ -97,7 +97,7 @@ protected: /// create a numerical ID for this index mark /// (represented by its properties) void GetID( - ::rtl::OUStringBuffer& sBuffer, + OUStringBuffer& sBuffer, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx index ac542b01bba9..fc4e0e5339c6 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx @@ -38,7 +38,6 @@ #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.hxx b/xmloff/source/text/XMLIndexObjectSourceContext.hxx index 329c19b8cc9b..2b318d9b2fa6 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.hxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.hxx @@ -36,11 +36,11 @@ namespace rtl { class OUString; } */ class XMLIndexObjectSourceContext : public XMLIndexSourceBaseContext { - const ::rtl::OUString sCreateFromStarCalc; - const ::rtl::OUString sCreateFromStarChart; - const ::rtl::OUString sCreateFromStarDraw; - const ::rtl::OUString sCreateFromStarMath; - const ::rtl::OUString sCreateFromOtherEmbeddedObjects; + const OUString sCreateFromStarCalc; + const OUString sCreateFromStarChart; + const OUString sCreateFromStarDraw; + const OUString sCreateFromStarMath; + const OUString sCreateFromOtherEmbeddedObjects; sal_Bool bUseCalc; sal_Bool bUseChart; @@ -55,7 +55,7 @@ public: XMLIndexObjectSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); @@ -65,13 +65,13 @@ protected: virtual void ProcessAttribute( enum IndexSourceParamEnum eParam, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx index c0bd8222ba09..934129b37df3 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx @@ -27,7 +27,6 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> -using ::rtl::OUString; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::PropertyValues; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx index a88f7b090616..28f7b807f794 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx @@ -39,11 +39,11 @@ class XMLIndexSimpleEntryContext : public SvXMLImportContext { // entry type - const ::rtl::OUString& rEntryType; + const OUString& rEntryType; protected: // character style - ::rtl::OUString sCharStyleName; + OUString sCharStyleName; sal_Bool bCharStyleNameOK; // surrounding template @@ -58,10 +58,10 @@ public: XMLIndexSimpleEntryContext( SvXMLImport& rImport, - const ::rtl::OUString& rEntry, + const OUString& rEntry, XMLIndexTemplateContext& rTemplate, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLIndexSimpleEntryContext(); diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx index d29edc6ac512..eb44e58fea08 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx @@ -36,7 +36,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.hxx b/xmloff/source/text/XMLIndexSourceBaseContext.hxx index b3714e2b5e04..31ffd2662e43 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx @@ -73,8 +73,8 @@ enum IndexSourceParamEnum */ class XMLIndexSourceBaseContext : public SvXMLImportContext { - const ::rtl::OUString sCreateFromChapter; - const ::rtl::OUString sIsRelativeTabstops; + const OUString sCreateFromChapter; + const OUString sIsRelativeTabstops; sal_Bool bUseLevelFormats; @@ -94,7 +94,7 @@ public: XMLIndexSourceBaseContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, sal_Bool bLevelFormats); @@ -109,13 +109,13 @@ protected: virtual void ProcessAttribute( enum IndexSourceParamEnum eParam, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.cxx b/xmloff/source/text/XMLIndexSpanEntryContext.cxx index 285f30d13e4b..3c3ca1c76231 100644 --- a/xmloff/source/text/XMLIndexSpanEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSpanEntryContext.cxx @@ -23,7 +23,6 @@ #include <xmloff/xmlictxt.hxx> -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; using ::com::sun::star::beans::PropertyValue; diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.hxx b/xmloff/source/text/XMLIndexSpanEntryContext.hxx index f6fed5d421ed..fa61ca00ca91 100644 --- a/xmloff/source/text/XMLIndexSpanEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSpanEntryContext.hxx @@ -36,7 +36,7 @@ namespace rtl { class OUString; } */ class XMLIndexSpanEntryContext : public XMLIndexSimpleEntryContext { - ::rtl::OUStringBuffer sContent; + OUStringBuffer sContent; public: @@ -46,14 +46,14 @@ public: SvXMLImport& rImport, XMLIndexTemplateContext& rTemplate, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLIndexSpanEntryContext(); protected: /// Collect element contents - virtual void Characters(const ::rtl::OUString& sString); + virtual void Characters(const OUString& sString); /// add Text PropertyValue virtual void FillPropertyValues( diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index 4a92646df876..628c955c26ba 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -50,7 +50,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx b/xmloff/source/text/XMLIndexTOCContext.hxx index 4f05179124e1..c7e95af0db08 100644 --- a/xmloff/source/text/XMLIndexTOCContext.hxx +++ b/xmloff/source/text/XMLIndexTOCContext.hxx @@ -55,9 +55,9 @@ enum IndexTypeEnum */ class XMLIndexTOCContext : public SvXMLImportContext { - const ::rtl::OUString sTitle; - const ::rtl::OUString sIsProtected; - const ::rtl::OUString sName; + const OUString sTitle; + const OUString sIsProtected; + const OUString sName; /** XPropertySet of the index */ ::com::sun::star::uno::Reference< @@ -76,7 +76,7 @@ public: XMLIndexTOCContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLIndexTOCContext(); @@ -90,7 +90,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx index 98ce76534549..e7b3f1f93434 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx @@ -36,7 +36,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.hxx b/xmloff/source/text/XMLIndexTOCSourceContext.hxx index 9cb29f1ffe71..10c4c23ae133 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx @@ -36,11 +36,11 @@ namespace rtl { class OUString; } */ class XMLIndexTOCSourceContext : public XMLIndexSourceBaseContext { - const ::rtl::OUString sCreateFromMarks; - const ::rtl::OUString sLevel; - const ::rtl::OUString sCreateFromChapter; - const ::rtl::OUString sCreateFromOutline; - const ::rtl::OUString sCreateFromLevelParagraphStyles; + const OUString sCreateFromMarks; + const OUString sLevel; + const OUString sCreateFromChapter; + const OUString sCreateFromOutline; + const OUString sCreateFromLevelParagraphStyles; sal_Int32 nOutlineLevel; sal_Bool bUseOutline; @@ -54,7 +54,7 @@ public: XMLIndexTOCSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); @@ -64,13 +64,13 @@ protected: virtual void ProcessAttribute( enum IndexSourceParamEnum eParam, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.cxx b/xmloff/source/text/XMLIndexTOCStylesContext.cxx index 1270461101ee..877acc01a563 100644 --- a/xmloff/source/text/XMLIndexTOCStylesContext.cxx +++ b/xmloff/source/text/XMLIndexTOCStylesContext.cxx @@ -33,7 +33,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.hxx b/xmloff/source/text/XMLIndexTOCStylesContext.hxx index 4da8248503ca..b5c68fc8bd19 100644 --- a/xmloff/source/text/XMLIndexTOCStylesContext.hxx +++ b/xmloff/source/text/XMLIndexTOCStylesContext.hxx @@ -43,14 +43,14 @@ namespace rtl { class OUString; } */ class XMLIndexTOCStylesContext : public SvXMLImportContext { - const ::rtl::OUString sLevelParagraphStyles; + const OUString sLevelParagraphStyles; /// XPropertySet of the index ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rTOCPropertySet; /// style names for this level - ::std::vector< ::rtl::OUString > aStyleNames; + ::std::vector< OUString > aStyleNames; /// outline level sal_Int32 nOutlineLevel; @@ -64,7 +64,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLIndexTOCStylesContext(); @@ -78,7 +78,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx index d9bff350c7fe..eb87456201d6 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx @@ -35,7 +35,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx index 3b36fa824f06..f27901d4ecf0 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx @@ -37,7 +37,7 @@ class XMLIndexTemplateContext; */ class XMLIndexTabStopEntryContext : public XMLIndexSimpleEntryContext { - ::rtl::OUString sLeaderChar; /// fill ("leader") character + OUString sLeaderChar; /// fill ("leader") character sal_Int32 nTabPosition; /// tab position sal_Bool bTabPositionOK; /// is tab right aligned? sal_Bool bTabRightAligned; /// is nTabPosition valid? @@ -52,7 +52,7 @@ public: SvXMLImport& rImport, XMLIndexTemplateContext& rTemplate, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLIndexTabStopEntryContext(); diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx index ab11324247e3..38bce6e3f88b 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::text; using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexTableSourceContext.hxx b/xmloff/source/text/XMLIndexTableSourceContext.hxx index 593acd663533..30b0d1b2c876 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.hxx @@ -36,11 +36,11 @@ namespace rtl { class OUString; } */ class XMLIndexTableSourceContext : public XMLIndexSourceBaseContext { - const ::rtl::OUString sCreateFromLabels; - const ::rtl::OUString sLabelCategory; - const ::rtl::OUString sLabelDisplayType; + const OUString sCreateFromLabels; + const OUString sLabelCategory; + const OUString sLabelDisplayType; - ::rtl::OUString sSequence; + OUString sSequence; sal_Int16 nDisplayFormat; sal_Bool bSequenceOK; @@ -54,7 +54,7 @@ public: XMLIndexTableSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); @@ -64,13 +64,13 @@ protected: virtual void ProcessAttribute( enum IndexSourceParamEnum eParam, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index ec7eac4fede4..71ffbb9c2ed2 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -39,8 +39,6 @@ using namespace ::std; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::PropertyValues; diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx index 079da8b695c2..369eab7fe2b7 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTemplateContext.hxx @@ -69,7 +69,7 @@ class XMLIndexTemplateContext : public SvXMLImportContext // pick up PropertyValues to be turned into a sequence. ::std::vector< ::com::sun::star::beans::PropertyValues > aValueVector; - ::rtl::OUString sStyleName; + OUString sStyleName; const SvXMLEnumMapEntry* pOutlineLevelNameMap; enum ::xmloff::token::XMLTokenEnum eOutlineLevelAttrName; @@ -89,28 +89,28 @@ public: // constants made available to other contexts (template entry // contexts, in particular) - const ::rtl::OUString sTokenEntryNumber; - const ::rtl::OUString sTokenEntryText; - const ::rtl::OUString sTokenTabStop; - const ::rtl::OUString sTokenText; - const ::rtl::OUString sTokenPageNumber; - const ::rtl::OUString sTokenChapterInfo; - const ::rtl::OUString sTokenHyperlinkStart; - const ::rtl::OUString sTokenHyperlinkEnd; - const ::rtl::OUString sTokenBibliographyDataField; - - const ::rtl::OUString sCharacterStyleName; - const ::rtl::OUString sTokenType; - const ::rtl::OUString sText; - const ::rtl::OUString sTabStopRightAligned; - const ::rtl::OUString sTabStopPosition; - const ::rtl::OUString sTabStopFillCharacter; - const ::rtl::OUString sBibliographyDataField; - const ::rtl::OUString sChapterFormat; - const ::rtl::OUString sChapterLevel;//i53420 - - const ::rtl::OUString sLevelFormat; - const ::rtl::OUString sParaStyleLevel; + const OUString sTokenEntryNumber; + const OUString sTokenEntryText; + const OUString sTokenTabStop; + const OUString sTokenText; + const OUString sTokenPageNumber; + const OUString sTokenChapterInfo; + const OUString sTokenHyperlinkStart; + const OUString sTokenHyperlinkEnd; + const OUString sTokenBibliographyDataField; + + const OUString sCharacterStyleName; + const OUString sTokenType; + const OUString sText; + const OUString sTabStopRightAligned; + const OUString sTabStopPosition; + const OUString sTabStopFillCharacter; + const OUString sBibliographyDataField; + const OUString sChapterFormat; + const OUString sChapterLevel;//i53420 + + const OUString sLevelFormat; + const OUString sParaStyleLevel; TYPEINFO(); @@ -120,7 +120,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const SvXMLEnumMapEntry* aLevelNameMap, enum ::xmloff::token::XMLTokenEnum eLevelAttrName, const sal_Char** aLevelStylePropNameMap, @@ -143,7 +143,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx index 7a42c49c6c36..3b2ee8ce6c27 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx @@ -25,8 +25,6 @@ #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx index 876c8c2bf6c8..fd60dd7022de 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx @@ -38,15 +38,15 @@ namespace com { namespace sun { namespace star { class XMLIndexTitleTemplateContext : public SvXMLImportContext { - const ::rtl::OUString sTitle; - const ::rtl::OUString sParaStyleHeading; + const OUString sTitle; + const OUString sParaStyleHeading; // paragraph style - ::rtl::OUString sStyleName; + OUString sStyleName; sal_Bool bStyleNameOK; // content - ::rtl::OUStringBuffer sContent; + OUStringBuffer sContent; // TOC property set ::com::sun::star::uno::Reference< @@ -61,7 +61,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName); + const OUString& rLocalName); ~XMLIndexTitleTemplateContext(); @@ -76,7 +76,7 @@ protected: virtual void EndElement(); /** pick up title characters */ - virtual void Characters(const ::rtl::OUString& sString); + virtual void Characters(const OUString& sString); }; #endif diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx index 09ff595493ae..f3a714a3722c 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.cxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx @@ -33,7 +33,6 @@ #include <rtl/ustring.hxx> -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexUserSourceContext.hxx b/xmloff/source/text/XMLIndexUserSourceContext.hxx index 0ef806fa3039..476b9920404f 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.hxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.hxx @@ -36,14 +36,14 @@ namespace rtl { class OUString; } */ class XMLIndexUserSourceContext : public XMLIndexSourceBaseContext { - const ::rtl::OUString sCreateFromEmbeddedObjects; - const ::rtl::OUString sCreateFromGraphicObjects; - const ::rtl::OUString sCreateFromMarks; - const ::rtl::OUString sCreateFromTables; - const ::rtl::OUString sCreateFromTextFrames; - const ::rtl::OUString sUseLevelFromSource; - const ::rtl::OUString sCreateFromLevelParagraphStyles; - const ::rtl::OUString sUserIndexName; + const OUString sCreateFromEmbeddedObjects; + const OUString sCreateFromGraphicObjects; + const OUString sCreateFromMarks; + const OUString sCreateFromTables; + const OUString sCreateFromTextFrames; + const OUString sUseLevelFromSource; + const OUString sCreateFromLevelParagraphStyles; + const OUString sUserIndexName; sal_Bool bUseObjects; sal_Bool bUseGraphic; @@ -52,7 +52,7 @@ class XMLIndexUserSourceContext : public XMLIndexSourceBaseContext sal_Bool bUseFrames; sal_Bool bUseLevelFromSource; sal_Bool bUseLevelParagraphStyles; - ::rtl::OUString sIndexName; + OUString sIndexName; public: @@ -61,7 +61,7 @@ public: XMLIndexUserSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); @@ -71,13 +71,13 @@ protected: virtual void ProcessAttribute( enum IndexSourceParamEnum eParam, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx index 86c31ff6abb0..41eb51523f1b 100644 --- a/xmloff/source/text/XMLLineNumberingExport.cxx +++ b/xmloff/source/text/XMLLineNumberingExport.cxx @@ -33,8 +33,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::text::XLineNumberingProperties; diff --git a/xmloff/source/text/XMLLineNumberingExport.hxx b/xmloff/source/text/XMLLineNumberingExport.hxx index 6a9f8d995ed5..726511d64e06 100644 --- a/xmloff/source/text/XMLLineNumberingExport.hxx +++ b/xmloff/source/text/XMLLineNumberingExport.hxx @@ -29,17 +29,17 @@ class SvXMLExport; /** export <text:linenumbering-configuration> and it's child elements */ class XMLLineNumberingExport { - const ::rtl::OUString sCharStyleName; - const ::rtl::OUString sCountEmptyLines; - const ::rtl::OUString sCountLinesInFrames; - const ::rtl::OUString sDistance; - const ::rtl::OUString sInterval; - const ::rtl::OUString sSeparatorText; - const ::rtl::OUString sNumberPosition; - const ::rtl::OUString sNumberingType; - const ::rtl::OUString sIsOn; - const ::rtl::OUString sRestartAtEachPage; - const ::rtl::OUString sSeparatorInterval; + const OUString sCharStyleName; + const OUString sCountEmptyLines; + const OUString sCountLinesInFrames; + const OUString sDistance; + const OUString sInterval; + const OUString sSeparatorText; + const OUString sNumberPosition; + const OUString sNumberingType; + const OUString sIsOn; + const OUString sRestartAtEachPage; + const OUString sSeparatorInterval; SvXMLExport& rExport; diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx index 77dd3ba1da2c..b6cd75e719c1 100644 --- a/xmloff/source/text/XMLLineNumberingImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx @@ -40,7 +40,6 @@ using namespace ::xmloff::token; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::xml::sax::XAttributeList; using ::com::sun::star::text::XLineNumberingProperties; -using ::rtl::OUString; TYPEINIT1( XMLLineNumberingImportContext, SvXMLStyleContext ); diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx index e01d7a07f22f..a67f88eefcf9 100644 --- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx @@ -31,8 +31,6 @@ using namespace ::com::sun::star::uno; using ::com::sun::star::xml::sax::XAttributeList; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_INCREMENT; diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx index c15224c167a5..6cff4014ed0c 100644 --- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx +++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx @@ -35,7 +35,7 @@ class XMLLineNumberingImportContext; /** import <text:linenumbering-separator> elements */ class XMLLineNumberingSeparatorImportContext : public SvXMLImportContext { - ::rtl::OUStringBuffer sSeparatorBuf; + OUStringBuffer sSeparatorBuf; XMLLineNumberingImportContext& rLineNumberingContext; public: @@ -45,7 +45,7 @@ public: XMLLineNumberingSeparatorImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, XMLLineNumberingImportContext& rLineNumbering); ~XMLLineNumberingSeparatorImportContext(); @@ -56,7 +56,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx index de91fc51df28..7807dc73b82e 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.cxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx @@ -26,7 +26,6 @@ #include <xmloff/txtimp.hxx> // XMLTextImportHelper partially implemented here -using ::rtl::OUString; using ::std::vector; using ::std::map; using ::com::sun::star::uno::Reference; @@ -36,7 +35,7 @@ using ::com::sun::star::beans::XPropertySet; template<class A> XMLPropertyBackpatcher<A>::XMLPropertyBackpatcher( - const ::rtl::OUString& sPropName) + const OUString& sPropName) : sPropertyName(sPropName) , bDefaultHandling(sal_False) , bPreserveProperty(sal_False) @@ -164,7 +163,7 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::BackpatcherImpl ::std::auto_ptr< XMLPropertyBackpatcher<sal_Int16> > m_pSequenceIdBackpatcher; - ::std::auto_ptr< XMLPropertyBackpatcher< ::rtl::OUString> > + ::std::auto_ptr< XMLPropertyBackpatcher< OUString> > m_pSequenceNameBackpatcher; SAL_WNODEPRECATED_DECLARATIONS_POP }; @@ -176,9 +175,9 @@ XMLTextImportHelper::MakeBackpatcherImpl() return ::boost::shared_ptr<BackpatcherImpl>(new BackpatcherImpl); } -static ::rtl::OUString const& GetSequenceNumber() +static OUString const& GetSequenceNumber() { - static ::rtl::OUString s_SequenceNumber("SequenceNumber"); + static OUString s_SequenceNumber("SequenceNumber"); return s_SequenceNumber; } diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx index 38c7da5acc8e..de4fe8819e1f 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.hxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx @@ -61,7 +61,7 @@ class XMLPropertyBackpatcher { /// name of property that gets set or backpatched - ::rtl::OUString sPropertyName; + OUString sPropertyName; /// should a default value be set for unresolved properties sal_Bool bDefaultHandling; @@ -70,7 +70,7 @@ class XMLPropertyBackpatcher sal_Bool bPreserveProperty; /// name of the property to preserve - ::rtl::OUString sPreservePropertyName; + OUString sPreservePropertyName; /// default value for unresolved properties (if bDefaultHandling) A aDefault; @@ -85,23 +85,23 @@ class XMLPropertyBackpatcher >1200 chars. */ /// backpatch list for unresolved IDs - //::std::map<const ::rtl::OUString, BackpatchListType*> aBackpatchListMap; - ::std::map<const ::rtl::OUString, void*, ::comphelper::UStringLess> aBackpatchListMap; + //::std::map<const OUString, BackpatchListType*> aBackpatchListMap; + ::std::map<const OUString, void*, ::comphelper::UStringLess> aBackpatchListMap; /// mapping of names -> IDs - ::std::map<const ::rtl::OUString, A, ::comphelper::UStringLess> aIDMap; + ::std::map<const OUString, A, ::comphelper::UStringLess> aIDMap; public: XMLPropertyBackpatcher( - const ::rtl::OUString& sPropertyName); + const OUString& sPropertyName); ~XMLPropertyBackpatcher(); /// resolve a known ID. /// Call this as soon as the value for a particular name is known. void ResolveId( - const ::rtl::OUString& sName, + const OUString& sName, A aValue); /// Set property with the proper value for this name. If the value @@ -111,13 +111,13 @@ public: void SetProperty( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xPropSet, - const ::rtl::OUString& sName); + const OUString& sName); /// non-const version of SetProperty void SetProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xPropSet, - const ::rtl::OUString& sName); + const OUString& sName); /// set default (if bDefaultHandling) for unresolved names /// called by destructor diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx index 41171e4dce39..6cc8f2d74c36 100644 --- a/xmloff/source/text/XMLRedlineExport.cxx +++ b/xmloff/source/text/XMLRedlineExport.cxx @@ -55,8 +55,6 @@ using ::com::sun::star::text::XTextSection; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::std::list; diff --git a/xmloff/source/text/XMLRedlineExport.hxx b/xmloff/source/text/XMLRedlineExport.hxx index 258a7e5b6190..175c40ac5974 100644 --- a/xmloff/source/text/XMLRedlineExport.hxx +++ b/xmloff/source/text/XMLRedlineExport.hxx @@ -56,32 +56,32 @@ typedef ::std::map< */ class XMLRedlineExport { - const ::rtl::OUString sDelete; - const ::rtl::OUString sDeletion; - const ::rtl::OUString sFormat; - const ::rtl::OUString sFormatChange; - const ::rtl::OUString sInsert; - const ::rtl::OUString sInsertion; - const ::rtl::OUString sIsCollapsed; - const ::rtl::OUString sIsStart; - const ::rtl::OUString sRedlineAuthor; - const ::rtl::OUString sRedlineComment; - const ::rtl::OUString sRedlineDateTime; - const ::rtl::OUString sRedlineSuccessorData; - const ::rtl::OUString sRedlineText; - const ::rtl::OUString sRedlineType; - const ::rtl::OUString sStyle; - const ::rtl::OUString sTextTable; - const ::rtl::OUString sUnknownChange; - const ::rtl::OUString sStartRedline; - const ::rtl::OUString sEndRedline; - const ::rtl::OUString sRedlineIdentifier; - const ::rtl::OUString sIsInHeaderFooter; - const ::rtl::OUString sRedlineProtectionKey; - const ::rtl::OUString sRecordChanges; - const ::rtl::OUString sMergeLastPara; - - const ::rtl::OUString sChangePrefix; + const OUString sDelete; + const OUString sDeletion; + const OUString sFormat; + const OUString sFormatChange; + const OUString sInsert; + const OUString sInsertion; + const OUString sIsCollapsed; + const OUString sIsStart; + const OUString sRedlineAuthor; + const OUString sRedlineComment; + const OUString sRedlineDateTime; + const OUString sRedlineSuccessorData; + const OUString sRedlineText; + const OUString sRedlineType; + const OUString sStyle; + const OUString sTextTable; + const OUString sUnknownChange; + const OUString sStartRedline; + const OUString sEndRedline; + const OUString sRedlineIdentifier; + const OUString sIsInHeaderFooter; + const OUString sRedlineProtectionKey; + const OUString sRecordChanges; + const OUString sMergeLastPara; + + const OUString sChangePrefix; SvXMLExport& rExport; @@ -188,15 +188,15 @@ private: ::com::sun::star::beans::PropertyValue> & rValues); /// convert the change type from API to XML names - const ::rtl::OUString ConvertTypeName(const ::rtl::OUString& sApiName); + const OUString ConvertTypeName(const OUString& sApiName); /// Get ID string! - const ::rtl::OUString GetRedlineID( + const OUString GetRedlineID( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); /// write a comment string as sequence of <text:p> elements - void WriteComment(const ::rtl::OUString& rComment); + void WriteComment(const OUString& rComment); }; #endif diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 3fd68776628a..38330c77d5a2 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -62,8 +62,6 @@ using namespace ::com::sun::star::uno; using namespace ::std; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::PropertyValues; diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx index b1c972e634a8..f0cabf3ea614 100644 --- a/xmloff/source/text/XMLSectionExport.hxx +++ b/xmloff/source/text/XMLSectionExport.hxx @@ -74,65 +74,65 @@ enum SectionTypeEnum */ class XMLSectionExport { - const ::rtl::OUString sCondition; - const ::rtl::OUString sCreateFromChapter; - const ::rtl::OUString sCreateFromEmbeddedObjects; - const ::rtl::OUString sCreateFromGraphicObjects; - const ::rtl::OUString sCreateFromLabels; - const ::rtl::OUString sCreateFromMarks; - const ::rtl::OUString sCreateFromOtherEmbeddedObjects; - const ::rtl::OUString sCreateFromOutline; - const ::rtl::OUString sCreateFromStarCalc; - const ::rtl::OUString sCreateFromStarChart; - const ::rtl::OUString sCreateFromStarDraw; - const ::rtl::OUString sCreateFromStarImage; - const ::rtl::OUString sCreateFromStarMath; - const ::rtl::OUString sCreateFromTables; - const ::rtl::OUString sCreateFromTextFrames; - const ::rtl::OUString sDdeCommandElement; - const ::rtl::OUString sDdeCommandFile; - const ::rtl::OUString sDdeCommandType; - const ::rtl::OUString sFileLink; - const ::rtl::OUString sIsCaseSensitive; - const ::rtl::OUString sIsProtected; - const ::rtl::OUString sIsVisible; - const ::rtl::OUString sLabelCategory; - const ::rtl::OUString sLabelDisplayType; - const ::rtl::OUString sLevel; - const ::rtl::OUString sLevelFormat; - const ::rtl::OUString sLevelParagraphStyles; - const ::rtl::OUString sLinkRegion; - const ::rtl::OUString sMainEntryCharacterStyleName; - const ::rtl::OUString sParaStyleHeading; - const ::rtl::OUString sParaStyleLevel; - const ::rtl::OUString sTitle; - const ::rtl::OUString sName; - const ::rtl::OUString sUseAlphabeticalSeparators; - const ::rtl::OUString sUseCombinedEntries; - const ::rtl::OUString sUseDash; - const ::rtl::OUString sUseKeyAsEntry; - const ::rtl::OUString sUseLevelFromSource; - const ::rtl::OUString sUsePP; - const ::rtl::OUString sUseUpperCase; - const ::rtl::OUString sIsCommaSeparated; - const ::rtl::OUString sIsAutomaticUpdate; - const ::rtl::OUString sIsRelativeTabstops; - const ::rtl::OUString sCreateFromLevelParagraphStyles; - const ::rtl::OUString sDocumentIndex; - const ::rtl::OUString sContentSection; - const ::rtl::OUString sHeaderSection; - - const ::rtl::OUString sTextSection; - const ::rtl::OUString sIsGlobalDocumentSection; - const ::rtl::OUString sProtectionKey; - const ::rtl::OUString sSortAlgorithm; - const ::rtl::OUString sLocale; - const ::rtl::OUString sUserIndexName; - - const ::rtl::OUString sIsCurrentlyVisible; - const ::rtl::OUString sHeadingStyleName; - - const ::rtl::OUString sEmpty; + const OUString sCondition; + const OUString sCreateFromChapter; + const OUString sCreateFromEmbeddedObjects; + const OUString sCreateFromGraphicObjects; + const OUString sCreateFromLabels; + const OUString sCreateFromMarks; + const OUString sCreateFromOtherEmbeddedObjects; + const OUString sCreateFromOutline; + const OUString sCreateFromStarCalc; + const OUString sCreateFromStarChart; + const OUString sCreateFromStarDraw; + const OUString sCreateFromStarImage; + const OUString sCreateFromStarMath; + const OUString sCreateFromTables; + const OUString sCreateFromTextFrames; + const OUString sDdeCommandElement; + const OUString sDdeCommandFile; + const OUString sDdeCommandType; + const OUString sFileLink; + const OUString sIsCaseSensitive; + const OUString sIsProtected; + const OUString sIsVisible; + const OUString sLabelCategory; + const OUString sLabelDisplayType; + const OUString sLevel; + const OUString sLevelFormat; + const OUString sLevelParagraphStyles; + const OUString sLinkRegion; + const OUString sMainEntryCharacterStyleName; + const OUString sParaStyleHeading; + const OUString sParaStyleLevel; + const OUString sTitle; + const OUString sName; + const OUString sUseAlphabeticalSeparators; + const OUString sUseCombinedEntries; + const OUString sUseDash; + const OUString sUseKeyAsEntry; + const OUString sUseLevelFromSource; + const OUString sUsePP; + const OUString sUseUpperCase; + const OUString sIsCommaSeparated; + const OUString sIsAutomaticUpdate; + const OUString sIsRelativeTabstops; + const OUString sCreateFromLevelParagraphStyles; + const OUString sDocumentIndex; + const OUString sContentSection; + const OUString sHeaderSection; + + const OUString sTextSection; + const OUString sIsGlobalDocumentSection; + const OUString sProtectionKey; + const OUString sSortAlgorithm; + const OUString sLocale; + const OUString sUserIndexName; + + const OUString sIsCurrentlyVisible; + const OUString sHeadingStyleName; + + const OUString sEmpty; SvXMLExport& rExport; XMLTextParagraphExport& rParaExport; @@ -282,7 +282,7 @@ protected: ::com::sun::star::text::XDocumentIndex > & rIndex) const; /// map service name to section type - enum SectionTypeEnum MapSectionType(const ::rtl::OUString& rSectionName); + enum SectionTypeEnum MapSectionType(const OUString& rSectionName); /** * Export the index element start (for all index types). @@ -349,7 +349,7 @@ protected: void ExportBoolean( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, - const ::rtl::OUString& sPropertyName, + const OUString& sPropertyName, enum ::xmloff::token::XMLTokenEnum eAttributeName, sal_Bool bDefault, sal_Bool bInvert = sal_False); diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx index ac7d6a380940..05e3ab7f436e 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx @@ -40,8 +40,6 @@ using namespace ::xmloff::token; using ::std::vector; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::style::NumberingType::ARABIC; diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx index f96ef8c1d7b5..506db5b89e6d 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx @@ -40,7 +40,6 @@ using namespace ::xmloff::token; using namespace ::com::sun::star::style; -using ::rtl::OUString; using ::std::vector; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx index 4bbbed985213..a38632f82a28 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx @@ -53,7 +53,7 @@ public: XMLSectionFootnoteConfigImport( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::std::vector<XMLPropertyState> & rProperties, const UniReference<XMLPropertySetMapper> & rMapperRef); diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx index 00dc2780238b..689c3b716c02 100644 --- a/xmloff/source/text/XMLSectionImportContext.cxx +++ b/xmloff/source/text/XMLSectionImportContext.cxx @@ -36,7 +36,6 @@ #include <com/sun/star/text/ControlCharacter.hpp> -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx index 6feb1b492088..5ffc1df8d81f 100644 --- a/xmloff/source/text/XMLSectionImportContext.hxx +++ b/xmloff/source/text/XMLSectionImportContext.hxx @@ -52,19 +52,19 @@ class XMLSectionImportContext : public SvXMLImportContext ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xSectionPropertySet; - const ::rtl::OUString sTextSection; - const ::rtl::OUString sIndexHeaderSection; - const ::rtl::OUString sCondition; - const ::rtl::OUString sIsVisible; - const ::rtl::OUString sProtectionKey; - const ::rtl::OUString sIsProtected; - const ::rtl::OUString sIsCurrentlyVisible; - const ::rtl::OUString sEmpty; - - ::rtl::OUString sXmlId; - ::rtl::OUString sStyleName; - ::rtl::OUString sName; - ::rtl::OUString sCond; + const OUString sTextSection; + const OUString sIndexHeaderSection; + const OUString sCondition; + const OUString sIsVisible; + const OUString sProtectionKey; + const OUString sIsProtected; + const OUString sIsCurrentlyVisible; + const OUString sEmpty; + + OUString sXmlId; + OUString sStyleName; + OUString sName; + OUString sCond; ::com::sun::star::uno::Sequence<sal_Int8> aSequence; sal_Bool bProtect; sal_Bool bCondOK; @@ -83,7 +83,7 @@ public: XMLSectionImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLSectionImportContext(); @@ -97,7 +97,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx index d719fce62da7..5e7c20e4d9ba 100644 --- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <tools/debug.hxx> -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::XMultiPropertySet; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx index a8437246be2a..f8077299933c 100644 --- a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx +++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx @@ -34,10 +34,10 @@ class XMLSectionSourceDDEImportContext : public SvXMLImportContext ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rSectionPropertySet; - const ::rtl::OUString sDdeCommandFile; - const ::rtl::OUString sDdeCommandType; - const ::rtl::OUString sDdeCommandElement; - const ::rtl::OUString sIsAutomaticUpdate; + const OUString sDdeCommandFile; + const OUString sDdeCommandType; + const OUString sDdeCommandElement; + const OUString sIsAutomaticUpdate; public: @@ -46,7 +46,7 @@ public: XMLSectionSourceDDEImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rSectPropSet); @@ -62,7 +62,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx index 9162e64e8667..043725c7f375 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLSectionSourceImportContext.hxx b/xmloff/source/text/XMLSectionSourceImportContext.hxx index 637c5071af2b..9f8c94e3cf2e 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.hxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx @@ -41,7 +41,7 @@ public: XMLSectionSourceImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rSectPropSet); @@ -57,7 +57,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLStringBufferImportContext.cxx b/xmloff/source/text/XMLStringBufferImportContext.cxx index 51e8426a0298..3971dc1f0b21 100644 --- a/xmloff/source/text/XMLStringBufferImportContext.cxx +++ b/xmloff/source/text/XMLStringBufferImportContext.cxx @@ -22,8 +22,6 @@ #include "xmloff/xmlnmspe.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; using ::xmloff::token::IsXMLToken; diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx index 004cb6590f15..9d2e5a41d860 100644 --- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx +++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx @@ -28,7 +28,6 @@ namespace com { namespace sun { namespace star { using namespace ::com::sun::star::uno; using ::com::sun::star::beans::XPropertySet; -using ::rtl::OUString; using namespace ::xmloff::token; XMLTextCharStyleNamesElementExport::XMLTextCharStyleNamesElementExport( diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx index 1048f43a0da4..62995b94d62f 100644 --- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx +++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx @@ -32,7 +32,7 @@ class SvXMLExport; class XMLTextCharStyleNamesElementExport { SvXMLExport& rExport; - ::rtl::OUString aName; + OUString aName; sal_Int32 nCount; public: @@ -41,7 +41,7 @@ public: SvXMLExport& rExp, sal_Bool bDoSomething, sal_Bool bAllStyles, const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, - const ::rtl::OUString& rPropName ); + const OUString& rPropName ); ~XMLTextCharStyleNamesElementExport(); }; diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index a1cc8c3b1cc0..f046245f557a 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -31,8 +31,6 @@ #include <xmloff/xmltoken.hxx> #include "XMLTextColumnsContext.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx index f301aed9fb70..f3b268537490 100644 --- a/xmloff/source/text/XMLTextColumnsExport.cxx +++ b/xmloff/source/text/XMLTextColumnsExport.cxx @@ -37,8 +37,6 @@ using namespace ::com::sun::star::style; using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 6ed30d38fdf9..826b9e8c3e6c 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -56,8 +56,6 @@ #include <map> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -79,7 +77,7 @@ using ::com::sun::star::document::XEventsSupplier; #define XML_TEXT_FRAME_PLUGIN 6 #define XML_TEXT_FRAME_FLOATING_FRAME 7 -typedef ::std::map < const ::rtl::OUString, ::rtl::OUString, ::comphelper::UStringLess> ParamMap; +typedef ::std::map < const OUString, OUString, ::comphelper::UStringLess> ParamMap; class XMLTextFrameContextHyperlink_Impl { @@ -122,7 +120,7 @@ public: XMLTextFrameTitleOrDescContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, OUString& rTitleOrDesc ); virtual ~XMLTextFrameTitleOrDescContext_Impl(); @@ -159,7 +157,7 @@ public: TYPEINFO(); XMLTextFrameParam_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_uInt16 nType, @@ -175,7 +173,7 @@ XMLTextFrameParam_Impl::~XMLTextFrameParam_Impl() XMLTextFrameParam_Impl::XMLTextFrameParam_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_uInt16 /*nType*/, @@ -217,7 +215,7 @@ public: TYPEINFO(); XMLTextFrameContourContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const Reference < XPropertySet >& rPropSet, @@ -348,44 +346,44 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext /// old list item and block (#89891#) bool mbListContextPushed; - const ::rtl::OUString sWidth; - const ::rtl::OUString sWidthType; - const ::rtl::OUString sRelativeWidth; - const ::rtl::OUString sHeight; - const ::rtl::OUString sRelativeHeight; - const ::rtl::OUString sSizeType; - const ::rtl::OUString sIsSyncWidthToHeight; - const ::rtl::OUString sIsSyncHeightToWidth; - const ::rtl::OUString sHoriOrient; - const ::rtl::OUString sHoriOrientPosition; - const ::rtl::OUString sVertOrient; - const ::rtl::OUString sVertOrientPosition; - const ::rtl::OUString sChainNextName; - const ::rtl::OUString sAnchorType; - const ::rtl::OUString sAnchorPageNo; - const ::rtl::OUString sGraphicURL; - const ::rtl::OUString sGraphicFilter; - const ::rtl::OUString sTitle; - const ::rtl::OUString sDescription; - const ::rtl::OUString sFrameStyleName; - const ::rtl::OUString sGraphicRotation; - const ::rtl::OUString sTextBoxServiceName; - const ::rtl::OUString sGraphicServiceName; - - ::rtl::OUString sName; - ::rtl::OUString sStyleName; - ::rtl::OUString sNextName; - ::rtl::OUString sHRef; - ::rtl::OUString sFilterName; - ::rtl::OUString sCode; - ::rtl::OUString sObject; - ::rtl::OUString sArchive; - ::rtl::OUString sMimeType; - ::rtl::OUString sFrameName; - ::rtl::OUString sAppletName; - ::rtl::OUString sFilterService; - ::rtl::OUString sBase64CharsLeft; - ::rtl::OUString sTblName; + const OUString sWidth; + const OUString sWidthType; + const OUString sRelativeWidth; + const OUString sHeight; + const OUString sRelativeHeight; + const OUString sSizeType; + const OUString sIsSyncWidthToHeight; + const OUString sIsSyncHeightToWidth; + const OUString sHoriOrient; + const OUString sHoriOrientPosition; + const OUString sVertOrient; + const OUString sVertOrientPosition; + const OUString sChainNextName; + const OUString sAnchorType; + const OUString sAnchorPageNo; + const OUString sGraphicURL; + const OUString sGraphicFilter; + const OUString sTitle; + const OUString sDescription; + const OUString sFrameStyleName; + const OUString sGraphicRotation; + const OUString sTextBoxServiceName; + const OUString sGraphicServiceName; + + OUString sName; + OUString sStyleName; + OUString sNextName; + OUString sHRef; + OUString sFilterName; + OUString sCode; + OUString sObject; + OUString sArchive; + OUString sMimeType; + OUString sFrameName; + OUString sAppletName; + OUString sFilterService; + OUString sBase64CharsLeft; + OUString sTblName; ParamMap aParamMap; @@ -421,7 +419,7 @@ public: XMLTextFrameContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & rAttrList, ::com::sun::star::text::TextContentAnchorType eAnchorType, @@ -432,22 +430,22 @@ public: virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - void SetHyperlink( const ::rtl::OUString& rHRef, - const ::rtl::OUString& rName, - const ::rtl::OUString& rTargetFrameName, + void SetHyperlink( const OUString& rHRef, + const OUString& rName, + const OUString& rTargetFrameName, sal_Bool bMap ); // Implement Title/Description Elements UI (#i73249#) - void SetTitle( const ::rtl::OUString& rTitle ); + void SetTitle( const OUString& rTitle ); - void SetDesc( const ::rtl::OUString& rDesc ); + void SetDesc( const OUString& rDesc ); ::com::sun::star::text::TextContentAnchorType GetAnchorType() const { return eAnchorType; } @@ -798,9 +796,9 @@ void XMLTextFrameContext::removeGraphicFromImportContext(const SvXMLImportContex } } -rtl::OUString XMLTextFrameContext::getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const +OUString XMLTextFrameContext::getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const { - rtl::OUString aRetval; + OUString aRetval; const XMLTextFrameContext_Impl* pXMLTextFrameContext_Impl = dynamic_cast< const XMLTextFrameContext_Impl* >(&rContext); if(pXMLTextFrameContext_Impl) @@ -1251,8 +1249,8 @@ void XMLTextFrameContext_Impl::SetHyperlink( const OUString& rHRef, { static OUString s_HyperLinkURL("HyperLinkURL"); static OUString s_HyperLinkName("HyperLinkName"); - static ::rtl::OUString s_HyperLinkTarget("HyperLinkTarget"); - static ::rtl::OUString s_ServerMap("ServerMap"); + static OUString s_HyperLinkTarget("HyperLinkTarget"); + static OUString s_ServerMap("ServerMap"); if( !xPropSet.is() ) return; diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx index 2a4adfb0651a..818b3069222b 100644 --- a/xmloff/source/text/XMLTextFrameContext.hxx +++ b/xmloff/source/text/XMLTextFrameContext.hxx @@ -40,8 +40,8 @@ class XMLTextFrameContext : public SvXMLImportContext, public multiImageImportHe XMLTextFrameContextHyperlink_Impl *m_pHyperlink; // Implement Title/Description Elements UI (#i73249#) - ::rtl::OUString m_sTitle; - ::rtl::OUString m_sDesc; + OUString m_sTitle; + OUString m_sDesc; ::com::sun::star::text::TextContentAnchorType m_eDefaultAnchorType; @@ -59,7 +59,7 @@ class XMLTextFrameContext : public SvXMLImportContext, public multiImageImportHe protected: /// helper to get the created xShape instance, needs to be overloaded - virtual rtl::OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const; + virtual OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const; virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const; public: @@ -68,7 +68,7 @@ public: XMLTextFrameContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, ::com::sun::star::text::TextContentAnchorType eDfltAnchorType ); @@ -77,13 +77,13 @@ public: virtual void EndElement(); SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - void SetHyperlink( const ::rtl::OUString& rHRef, - const ::rtl::OUString& rName, - const ::rtl::OUString& rTargetFrameName, + void SetHyperlink( const OUString& rHRef, + const OUString& rName, + const OUString& rTargetFrameName, sal_Bool bMap ); ::com::sun::star::text::TextContentAnchorType GetAnchorType() const; diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx index 14c6e0a2eb67..73c99546fd8e 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx @@ -30,8 +30,6 @@ // OD 2004-04-21 #i26791# #include <txtparaimphint.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx index 5046831b236b..b44603938ace 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx @@ -31,9 +31,9 @@ namespace com { namespace sun { namespace star { class XMLTextFrameHyperlinkContext : public SvXMLImportContext { - ::rtl::OUString sHRef; - ::rtl::OUString sName; - ::rtl::OUString sTargetFrameName; + OUString sHRef; + OUString sName; + OUString sTargetFrameName; ::com::sun::star::text::TextContentAnchorType eDefaultAnchorType; SvXMLImportContextRef xFrameContext; sal_Bool bMap; @@ -44,7 +44,7 @@ public: XMLTextFrameHyperlinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, ::com::sun::star::text::TextContentAnchorType eDefaultAnchorType ); @@ -53,7 +53,7 @@ public: virtual void EndElement(); SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx index f152f1c8351e..8e4c2a68ebc2 100644 --- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx +++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx @@ -26,8 +26,6 @@ #include <xmloff/xmlimp.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx index 5a0a0ea45846..73385016f615 100644 --- a/xmloff/source/text/XMLTextListAutoStylePool.cxx +++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx @@ -27,8 +27,6 @@ #include "xmloff/XMLTextListAutoStylePool.hxx" #include <xmloff/xmlexp.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -217,7 +215,7 @@ OUString XMLTextListAutoStylePool::Add( return sName; } -::rtl::OUString XMLTextListAutoStylePool::Find( +OUString XMLTextListAutoStylePool::Find( const Reference < XIndexReplace > & rNumRules ) const { OUString sName; @@ -230,7 +228,7 @@ OUString XMLTextListAutoStylePool::Add( return sName; } -::rtl::OUString XMLTextListAutoStylePool::Find( +OUString XMLTextListAutoStylePool::Find( const OUString& rInternalName ) const { OUString sName; diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx index 0efd44f557d8..c57baee421c1 100644 --- a/xmloff/source/text/XMLTextListBlockContext.cxx +++ b/xmloff/source/text/XMLTextListBlockContext.cxx @@ -31,8 +31,6 @@ #include "XMLTextListBlockContext.hxx" #include "txtlists.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -62,7 +60,7 @@ XMLTextListBlockContext::XMLTextListBlockContext( , msListId() , msContinueListId() { - static ::rtl::OUString s_PropNameDefaultListId("DefaultListId"); + static OUString s_PropNameDefaultListId("DefaultListId"); { // get the parent list block context (if any); this is a bit ugly... XMLTextListBlockContext * pLB(0); @@ -139,7 +137,7 @@ XMLTextListBlockContext::XMLTextListBlockContext( { XMLTextListsHelper& rTextListsHelper( mrTxtImport.GetTextListHelper() ); // Inconsistent behavior regarding lists (#i92811#) - ::rtl::OUString sListStyleDefaultListId; + OUString sListStyleDefaultListId; { uno::Reference< beans::XPropertySet > xNumRuleProps( mxNumRules, UNO_QUERY ); if ( xNumRuleProps.is() ) @@ -190,7 +188,7 @@ XMLTextListBlockContext::XMLTextListBlockContext( if ( bIsContinueNumberingAttributePresent && !mbRestartNumbering && msContinueListId.isEmpty() ) { - ::rtl::OUString Last( rTextListsHelper.GetLastProcessedListId() ); + OUString Last( rTextListsHelper.GetLastProcessedListId() ); if ( rTextListsHelper.GetListStyleOfLastProcessedList() == msListStyleName && Last != msListId ) { @@ -208,7 +206,7 @@ XMLTextListBlockContext::XMLTextListBlockContext( { // search continue list chain for master list and // continue the master list. - ::rtl::OUString sTmpStr = + OUString sTmpStr = rTextListsHelper.GetContinueListIdOfProcessedList( msContinueListId ); while ( !sTmpStr.isEmpty() ) { @@ -283,12 +281,12 @@ SvXMLImportContext *XMLTextListBlockContext::CreateChildContext( return pContext; } -const ::rtl::OUString& XMLTextListBlockContext::GetListId() const +const OUString& XMLTextListBlockContext::GetListId() const { return msListId; } -const ::rtl::OUString& XMLTextListBlockContext::GetContinueListId() const +const OUString& XMLTextListBlockContext::GetContinueListId() const { return msContinueListId; } diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx index d69b5a3e9e77..7d9440c70af3 100644 --- a/xmloff/source/text/XMLTextListBlockContext.hxx +++ b/xmloff/source/text/XMLTextListBlockContext.hxx @@ -33,8 +33,8 @@ class XMLTextListBlockContext : public SvXMLImportContext ::com::sun::star::container::XIndexReplace > mxNumRules; // text:style-name property of <list> element - ::rtl::OUString msListStyleName; - ::rtl::OUString sXmlId; + OUString msListStyleName; + OUString sXmlId; SvXMLImportContextRef mxParentListBlock; @@ -43,9 +43,9 @@ class XMLTextListBlockContext : public SvXMLImportContext sal_Bool mbSetDefaults; // text:id property of <list> element, only valid for root <list> element - ::rtl::OUString msListId; + OUString msListId; // text:continue-list property of <list> element, only valid for root <list> element - ::rtl::OUString msContinueListId; + OUString msContinueListId; public: @@ -56,7 +56,7 @@ public: SvXMLImport& rImport, XMLTextImportHelper& rTxtImp, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bRestartNumberingAtSubList = sal_False ); @@ -65,11 +65,11 @@ public: virtual void EndElement(); SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - const ::rtl::OUString& GetListStyleName() const { return msListStyleName; } + const OUString& GetListStyleName() const { return msListStyleName; } sal_Int16 GetLevel() const { return mnLevel; } sal_Bool IsRestartNumbering() const { return mbRestartNumbering; } void ResetRestartNumbering() { mbRestartNumbering = sal_False; } @@ -78,8 +78,8 @@ public: ::com::sun::star::container::XIndexReplace >& GetNumRules() const { return mxNumRules; } - const ::rtl::OUString& GetListId() const; - const ::rtl::OUString& GetContinueListId() const; + const OUString& GetListId() const; + const OUString& GetContinueListId() const; }; diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx index 41c488a617d2..46378f4ef374 100644 --- a/xmloff/source/text/XMLTextListItemContext.cxx +++ b/xmloff/source/text/XMLTextListItemContext.cxx @@ -30,8 +30,6 @@ #include <xmloff/xmlnumi.hxx> #include "XMLTextListItemContext.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -52,7 +50,7 @@ XMLTextListItemContext::XMLTextListItemContext( mnSubListCount( 0 ), mxNumRulesOverride() { - static ::rtl::OUString s_NumberingRules("NumberingRules"); + static OUString s_NumberingRules("NumberingRules"); sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { @@ -73,7 +71,7 @@ XMLTextListItemContext::XMLTextListItemContext( else if ( nPrefix == XML_NAMESPACE_TEXT && IsXMLToken( aLocalName, XML_STYLE_OVERRIDE ) ) { - const ::rtl::OUString sListStyleOverrideName = rValue; + const OUString sListStyleOverrideName = rValue; if ( !sListStyleOverrideName.isEmpty() ) { OUString sDisplayStyleName( diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx index 3e11beb42a1a..ac71e7a2c99e 100644 --- a/xmloff/source/text/XMLTextListItemContext.hxx +++ b/xmloff/source/text/XMLTextListItemContext.hxx @@ -44,7 +44,7 @@ public: SvXMLImport& rImport, XMLTextImportHelper& rTxtImp, const sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bIsHeader = sal_False ); @@ -53,7 +53,7 @@ public: virtual void EndElement(); SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 2e6823000fd9..ae89ab099658 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -40,8 +40,6 @@ #include "RDFaImportHelper.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::text; @@ -52,7 +50,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; -using rtl::OUString; XMLFieldParamImportContext::XMLFieldParamImportContext( @@ -69,8 +66,8 @@ XMLFieldParamImportContext::XMLFieldParamImportContext( void XMLFieldParamImportContext::StartElement(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList) { SvXMLImport& rImport = GetImport(); - ::rtl::OUString sName; - ::rtl::OUString sValue; + OUString sName; + OUString sValue; sal_Int16 nLength = xAttrList->getLength(); for(sal_Int16 nAttr = 0; nAttr < nLength; nAttr++) @@ -130,7 +127,7 @@ static SvXMLEnumMapEntry const lcl_aMarkTypeMap[] = }; -static const char *lcl_getFormFieldmarkName(rtl::OUString &name) +static const char *lcl_getFormFieldmarkName(OUString &name) { static const char sCheckbox[]=ODF_FORMCHECKBOX; static const char sFormDropDown[]=ODF_FORMDROPDOWN; @@ -146,14 +143,14 @@ static const char *lcl_getFormFieldmarkName(rtl::OUString &name) return NULL; } -static rtl::OUString lcl_getFieldmarkName(rtl::OUString &name) +static OUString lcl_getFieldmarkName(OUString &name) { static const char sFormtext[]=ODF_FORMTEXT; if (name.compareToAscii("msoffice.field.FORMTEXT")==0 || name.compareToAscii("ecma.office-open-xml.field.FORMTEXT")==0) - return rtl::OUString::createFromAscii(sFormtext); + return OUString::createFromAscii(sFormtext); else if (name.compareToAscii(ODF_FORMTEXT)==0) - return rtl::OUString::createFromAscii(sFormtext); + return OUString::createFromAscii(sFormtext); else return name; } @@ -205,7 +202,7 @@ void XMLTextMarkImportContext::EndElement() sAPI_reference_mark, m_sBookmarkName, m_rHelper.GetCursorAsRange()->getStart(), - ::rtl::OUString()); + OUString()); break; case TypeFieldmark: @@ -224,7 +221,7 @@ void XMLTextMarkImportContext::EndElement() if (xContent.is() && bImportAsField) { // setup fieldmark... Reference< ::com::sun::star::text::XFormField> xFormField(xContent, UNO_QUERY); - xFormField->setFieldType(rtl::OUString::createFromAscii(formFieldmarkName)); + xFormField->setFieldType(OUString::createFromAscii(formFieldmarkName)); if (xFormField.is() && m_rHelper.hasCurrentFieldCtx()) { m_rHelper.setCurrentFieldParamsTo(xFormField); } @@ -314,8 +311,8 @@ void XMLTextMarkImportContext::EndElement() // setup fieldmark... Reference< ::com::sun::star::text::XFormField> xFormField(xContent, UNO_QUERY); if (xFormField.is() && m_rHelper.hasCurrentFieldCtx()) { - rtl::OUString givenTypeName=m_rHelper.getCurrentFieldType(); - rtl::OUString fieldmarkTypeName=lcl_getFieldmarkName(givenTypeName); + OUString givenTypeName=m_rHelper.getCurrentFieldType(); + OUString fieldmarkTypeName=lcl_getFieldmarkName(givenTypeName); xFormField->setFieldType(fieldmarkTypeName); m_rHelper.setCurrentFieldParamsTo(xFormField); @@ -344,7 +341,7 @@ void XMLTextMarkImportContext::EndElement() } SvXMLImportContext *XMLTextMarkImportContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) { return new XMLFieldParamImportContext(GetImport(), m_rHelper, diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx index 3e58e7867991..758f3b1b96ae 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.hxx +++ b/xmloff/source/text/XMLTextMarkImportContext.hxx @@ -47,7 +47,7 @@ public: SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); virtual void StartElement( const ::com::sun::star::uno::Reference< @@ -66,15 +66,15 @@ class XMLTextMarkImportContext : public SvXMLImportContext { XMLTextImportHelper & m_rHelper; - ::rtl::OUString m_sBookmarkName; - ::rtl::OUString m_sFieldName; - ::rtl::OUString m_sXmlId; + OUString m_sBookmarkName; + OUString m_sFieldName; + OUString m_sXmlId; // RDFa bool m_bHaveAbout; - ::rtl::OUString m_sAbout; - ::rtl::OUString m_sProperty; - ::rtl::OUString m_sContent; - ::rtl::OUString m_sDatatype; + OUString m_sAbout; + OUString m_sProperty; + OUString m_sContent; + OUString m_sDatatype; public: @@ -84,7 +84,7 @@ public: SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); protected: @@ -94,18 +94,18 @@ protected: virtual void EndElement(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); public: static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > CreateAndInsertMark( SvXMLImport& rImport, - const ::rtl::OUString& sServiceName, - const ::rtl::OUString& sMarkName, + const OUString& sServiceName, + const OUString& sMarkName, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & rRange, - const ::rtl::OUString& i_rXmlId = ::rtl::OUString()); + const OUString& i_rXmlId = OUString()); sal_Bool FindName( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 9f97d4b72828..3f2fb301eb8c 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -30,8 +30,6 @@ #include "PageMasterImportContext.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -237,7 +235,7 @@ SvXMLImportContext *XMLTextMasterPageContext::CreateChildContext( SvXMLImportContext *XMLTextMasterPageContext::CreateHeaderFooterContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bFooter, const sal_Bool bLeft, diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx index ab7f854bf07a..aafe94acd921 100644 --- a/xmloff/source/text/XMLTextMasterPageExport.cxx +++ b/xmloff/source/text/XMLTextMasterPageExport.cxx @@ -26,8 +26,6 @@ #include <xmloff/XMLTextMasterPageExport.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/XMLTextMasterStylesContext.cxx b/xmloff/source/text/XMLTextMasterStylesContext.cxx index 182411b288c9..119920ba25b5 100644 --- a/xmloff/source/text/XMLTextMasterStylesContext.cxx +++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx @@ -25,8 +25,6 @@ #include <xmloff/XMLTextMasterPageContext.hxx> #include <xmloff/XMLTextMasterStylesContext.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx index fd219c2535f8..d78f5664501b 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.cxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx @@ -27,7 +27,6 @@ #include "XMLTextNumRuleInfo.hxx" #include "xmloff/XMLTextListAutoStylePool.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -201,7 +200,7 @@ void XMLTextNumRuleInfo::Set( } } - msListLabelString = ::rtl::OUString(); + msListLabelString = OUString(); if ( bExportTextNumberElement && xPropSetInfo->hasPropertyByName( msListLabelStringProp ) ) { diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx index 255bb335850f..5c919f267b55 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.hxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx @@ -38,24 +38,24 @@ class XMLTextListAutoStylePool; */ class XMLTextNumRuleInfo { - const ::rtl::OUString msNumberingRules; - const ::rtl::OUString msNumberingLevel; - const ::rtl::OUString msNumberingStartValue; - const ::rtl::OUString msParaIsNumberingRestart; - const ::rtl::OUString msNumberingIsNumber; - const ::rtl::OUString msNumberingIsOutline; - const ::rtl::OUString msPropNameListId; - const ::rtl::OUString msPropNameStartWith; - const ::rtl::OUString msContinueingPreviousSubTree; - const ::rtl::OUString msListLabelStringProp; + const OUString msNumberingRules; + const OUString msNumberingLevel; + const OUString msNumberingStartValue; + const OUString msParaIsNumberingRestart; + const OUString msNumberingIsNumber; + const OUString msNumberingIsOutline; + const OUString msPropNameListId; + const OUString msPropNameStartWith; + const OUString msContinueingPreviousSubTree; + const OUString msListLabelStringProp; // numbering rules instance and its name ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexReplace > mxNumRules; - ::rtl::OUString msNumRulesName; + OUString msNumRulesName; // paragraph's list attributes - ::rtl::OUString msListId; + OUString msListId; sal_Int16 mnListStartValue; sal_Int16 mnListLevel; sal_Bool mbIsNumbered; @@ -68,7 +68,7 @@ class XMLTextNumRuleInfo sal_Bool mbOutlineStyleAsNormalListStyle; sal_Bool mbContinueingPreviousSubTree; - ::rtl::OUString msListLabelString; + OUString msListLabelString; public: @@ -83,7 +83,7 @@ public: const sal_Bool bExportTextNumberElement ); inline void Reset(); - inline const ::rtl::OUString& GetNumRulesName() const + inline const OUString& GetNumRulesName() const { return msNumRulesName; } @@ -97,7 +97,7 @@ public: return mnListLevelStartValue; } - inline const ::rtl::OUString& GetListId() const + inline const OUString& GetListId() const { return msListId; } @@ -136,7 +136,7 @@ public: { return mbContinueingPreviousSubTree; } - inline const ::rtl::OUString& ListLabelString() const + inline const OUString& ListLabelString() const { return msListLabelString; } diff --git a/xmloff/source/text/XMLTextPropertySetContext.cxx b/xmloff/source/text/XMLTextPropertySetContext.cxx index 9a34c0d80f55..33cb64542399 100644 --- a/xmloff/source/text/XMLTextPropertySetContext.cxx +++ b/xmloff/source/text/XMLTextPropertySetContext.cxx @@ -27,7 +27,6 @@ #include "xmltabi.hxx" #include "txtdropi.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; diff --git a/xmloff/source/text/XMLTextPropertySetContext.hxx b/xmloff/source/text/XMLTextPropertySetContext.hxx index c138a70de636..ef36f5a980a6 100644 --- a/xmloff/source/text/XMLTextPropertySetContext.hxx +++ b/xmloff/source/text/XMLTextPropertySetContext.hxx @@ -28,23 +28,23 @@ class XMLTextPropertySetContext : public SvXMLPropertySetContext // SvXMLImportContextRef xTabStop; // SvXMLImportContextRef xBackground; // SvXMLImportContextRef xDropCap; - ::rtl::OUString& rDropCapTextStyleName; + OUString& rDropCapTextStyleName; public: XMLTextPropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState > &rProps, const UniReference < SvXMLImportPropertyMapper > &rMap, - ::rtl::OUString& rDopCapTextStyleName ); + OUString& rDopCapTextStyleName ); virtual ~XMLTextPropertySetContext(); using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp); diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx index ab5ca78df7fe..842253308dc6 100644 --- a/xmloff/source/text/XMLTextShapeImportHelper.cxx +++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx @@ -31,8 +31,6 @@ #include <com/sun/star/drawing/XShapes.hpp> #include "xmloff/XMLTextShapeImportHelper.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx index 9b84ef671e4b..9296c3f45db4 100644 --- a/xmloff/source/text/XMLTextShapeStyleContext.cxx +++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx @@ -31,8 +31,6 @@ #include <xmloff/XMLTextShapeStyleContext.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::document; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/XMLTextTableContext.cxx b/xmloff/source/text/XMLTextTableContext.cxx index f110d29f747c..51f07557857f 100644 --- a/xmloff/source/text/XMLTextTableContext.cxx +++ b/xmloff/source/text/XMLTextTableContext.cxx @@ -19,7 +19,6 @@ #include <xmloff/XMLTextTableContext.hxx> -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx index b29465e291f0..1fcba989081d 100644 --- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx +++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx @@ -28,7 +28,6 @@ #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.hxx b/xmloff/source/text/XMLTrackedChangesImportContext.hxx index 53ac92838d0c..c0fc2d23c899 100644 --- a/xmloff/source/text/XMLTrackedChangesImportContext.hxx +++ b/xmloff/source/text/XMLTrackedChangesImportContext.hxx @@ -45,7 +45,7 @@ public: XMLTrackedChangesImportContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName); + const OUString& rLocalName); ~XMLTrackedChangesImportContext(); @@ -55,7 +55,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList); }; diff --git a/xmloff/source/text/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx index 94b76c870c8c..d3372cd4d582 100644 --- a/xmloff/source/text/txtdrope.cxx +++ b/xmloff/source/text/txtdrope.cxx @@ -29,8 +29,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::style; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/text/txtdrope.hxx b/xmloff/source/text/txtdrope.hxx index 76cfa30df9f5..7e56f6081f3b 100644 --- a/xmloff/source/text/txtdrope.hxx +++ b/xmloff/source/text/txtdrope.hxx @@ -36,7 +36,7 @@ public: void exportXML( const ::com::sun::star::uno::Any& rAny, sal_Bool bWholeWord, - const ::rtl::OUString& rStyleName ); + const OUString& rStyleName ); }; diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx index dd23d7e0fe76..f2957d24abde 100644 --- a/xmloff/source/text/txtdropi.cxx +++ b/xmloff/source/text/txtdropi.cxx @@ -31,8 +31,6 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/txtdropi.hxx b/xmloff/source/text/txtdropi.hxx index 77cb73a15c68..463ea8b86945 100644 --- a/xmloff/source/text/txtdropi.hxx +++ b/xmloff/source/text/txtdropi.hxx @@ -28,7 +28,7 @@ namespace rtl { class OUString; } class XMLTextDropCapImportContext :public XMLElementPropertyContext { XMLPropertyState aWholeWordProp; - ::rtl::OUString sStyleName; + OUString sStyleName; private: void ProcessAttrs( @@ -40,7 +40,7 @@ public: XMLTextDropCapImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const XMLPropertyState& rProp, @@ -51,7 +51,7 @@ public: virtual void EndElement(); - const ::rtl::OUString& GetStyleName() const { return sStyleName; } + const OUString& GetStyleName() const { return sStyleName; } }; diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 5392b229f66f..eb89488e1054 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -33,8 +33,6 @@ #include <xmloff/xmlexp.hxx> #include "XMLSectionFootnoteConfigExport.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx index c8213eabae77..2736cd22b7f7 100644 --- a/xmloff/source/text/txtexppr.hxx +++ b/xmloff/source/text/txtexppr.hxx @@ -31,7 +31,7 @@ class XMLTextExportPropertySetMapper: public SvXMLExportPropertyMapper { SvXMLExport& rExport; - ::rtl::OUString sDropCharStyle; + OUString sDropCharStyle; sal_Bool bDropWholeWord; void ContextFontFilter( diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 62c8bdf288fb..e53736572f27 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -69,8 +69,6 @@ #include <vector> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::com::sun::star; @@ -1498,7 +1496,7 @@ void XMLTextFieldExport::ExportFieldHelper( sPropertyIsFixedLanguage, rPropSet, xPropSetInfo, sal_False )); uno::Any aAny = rPropSet->getPropertyValue( sPropertyName ); - ::rtl::OUString sName; + OUString sName; aAny >>= sName; ProcessString(XML_NAME, sName); ProcessBoolean(XML_FIXED, GetBoolProperty(sPropertyIsFixed, rPropSet), sal_False); @@ -2481,8 +2479,8 @@ void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, /// export a string attribute void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, - const ::rtl::OUString& sValue, - const ::rtl::OUString& sDefault, + const OUString& sValue, + const OUString& sDefault, sal_uInt16 nPrefix) { if (sValue != sDefault) @@ -2494,8 +2492,8 @@ void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, /// export a string attribute void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, sal_uInt16 nValuePrefix, - const ::rtl::OUString& sValue, - const ::rtl::OUString& sDefault, + const OUString& sValue, + const OUString& sDefault, sal_uInt16 nPrefix) { if (sValue != sDefault) @@ -2539,7 +2537,7 @@ void XMLTextFieldExport::ProcessString( /// export a string as a sequence of paragraphs void XMLTextFieldExport::ProcessParagraphSequence( - const ::rtl::OUString& sParagraphSequence) + const OUString& sParagraphSequence) { // iterate over all string-pieces separated by return (0x0a) and // put each inside a paragraph element. diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 7e1fb2915450..cf6bc1024837 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -66,8 +66,6 @@ #include <tools/debug.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1241,7 +1239,7 @@ XMLDateFieldImportContext::XMLDateFieldImportContext( void XMLDateFieldImportContext::ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ) + const OUString& sAttrValue ) { switch (nAttrToken) { @@ -1527,7 +1525,7 @@ TYPEINIT1( XMLDatabaseSelectImportContext, XMLDatabaseNextImportContext ); XMLDatabaseSelectImportContext::XMLDatabaseSelectImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, - sal_uInt16 nPrfx, const ::rtl::OUString& sLocalName) : + sal_uInt16 nPrfx, const OUString& sLocalName) : XMLDatabaseNextImportContext(rImport, rHlp, sAPI_database_select, nPrfx, sLocalName), sPropertySetNumber(sAPI_set_number), @@ -1538,7 +1536,7 @@ XMLDatabaseSelectImportContext::XMLDatabaseSelectImportContext( void XMLDatabaseSelectImportContext::ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ) + const OUString& sAttrValue ) { if (XML_TOK_TEXTFIELD_ROW_NUMBER == nAttrToken) { @@ -2283,7 +2281,7 @@ XMLFileNameImportContext::XMLFileNameImportContext( void XMLFileNameImportContext::ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ) + const OUString& sAttrValue ) { switch (nAttrToken) { @@ -2665,7 +2663,7 @@ XMLPageVarSetFieldImportContext::XMLPageVarSetFieldImportContext( void XMLPageVarSetFieldImportContext::ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ) + const OUString& sAttrValue ) { switch (nAttrToken) { @@ -3197,7 +3195,7 @@ XMLDdeFieldImportContext::XMLDdeFieldImportContext( void XMLDdeFieldImportContext::ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ) + const OUString& sAttrValue ) { if (XML_TOK_TEXTFIELD_CONNECTION_NAME == nAttrToken) { @@ -3282,7 +3280,7 @@ XMLSheetNameImportContext::XMLSheetNameImportContext( void XMLSheetNameImportContext::ProcessAttribute( sal_uInt16, - const ::rtl::OUString& ) + const OUString& ) { // no attributes -> nothing to be done } @@ -3977,7 +3975,7 @@ XMLDropDownFieldImportContext::XMLDropDownFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, - const ::rtl::OUString& sLocalName) : + const OUString& sLocalName) : XMLTextFieldImportContext( rImport, rHlp, sAPI_drop_down, nPrfx, sLocalName ), aLabels(), @@ -4049,7 +4047,7 @@ SvXMLImportContext* XMLDropDownFieldImportContext::CreateChildContext( void XMLDropDownFieldImportContext::ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ) + const OUString& sAttrValue ) { if( nAttrToken == XML_TOK_TEXTFIELD_NAME ) { @@ -4118,7 +4116,7 @@ XMLHeaderFieldImportContext::XMLHeaderFieldImportContext( SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& sLocalName) /// element name w/o prefix + const OUString& sLocalName) /// element name w/o prefix : XMLTextFieldImportContext(rImport, rHlp, sAPI_header, nPrfx, sLocalName ) { sServicePrefix = OUString(sAPI_presentation_prefix ); @@ -4126,7 +4124,7 @@ XMLHeaderFieldImportContext::XMLHeaderFieldImportContext( } /// process attribute values -void XMLHeaderFieldImportContext::ProcessAttribute( sal_uInt16, const ::rtl::OUString& ) +void XMLHeaderFieldImportContext::ProcessAttribute( sal_uInt16, const OUString& ) { } @@ -4142,7 +4140,7 @@ XMLFooterFieldImportContext::XMLFooterFieldImportContext( SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& sLocalName) /// element name w/o prefix + const OUString& sLocalName) /// element name w/o prefix : XMLTextFieldImportContext(rImport, rHlp, sAPI_footer, nPrfx, sLocalName ) { sServicePrefix = OUString(sAPI_presentation_prefix ); @@ -4150,7 +4148,7 @@ XMLFooterFieldImportContext::XMLFooterFieldImportContext( } /// process attribute values -void XMLFooterFieldImportContext::ProcessAttribute( sal_uInt16, const ::rtl::OUString& ) +void XMLFooterFieldImportContext::ProcessAttribute( sal_uInt16, const OUString& ) { } @@ -4167,7 +4165,7 @@ XMLDateTimeFieldImportContext::XMLDateTimeFieldImportContext( SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& sLocalName) /// element name w/o prefix + const OUString& sLocalName) /// element name w/o prefix : XMLTextFieldImportContext(rImport, rHlp, sAPI_datetime, nPrfx, sLocalName ) { sServicePrefix = OUString(sAPI_presentation_prefix ); @@ -4176,7 +4174,7 @@ XMLDateTimeFieldImportContext::XMLDateTimeFieldImportContext( /// process attribute values void XMLDateTimeFieldImportContext::ProcessAttribute( sal_uInt16, - const ::rtl::OUString& ) + const OUString& ) { } diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx index a24597e646ff..237c16033f7f 100644 --- a/xmloff/source/text/txtftne.cxx +++ b/xmloff/source/text/txtftne.cxx @@ -53,8 +53,6 @@ #include <xmloff/XMLEventExport.hxx> #include <xmloff/txtparae.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index 871a2e2e2bb3..a5f49f0b1881 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -34,7 +34,6 @@ #define XML_LINE_TOP 2 #define XML_LINE_BOTTOM 3 -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -44,7 +43,7 @@ using namespace ::com::sun::star::text; bool XMLTextImportPropertyMapper::handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const { diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx index dad878cb1d5c..cdbb3c59ea87 100644 --- a/xmloff/source/text/txtlists.cxx +++ b/xmloff/source/text/txtlists.cxx @@ -133,10 +133,10 @@ void XMLTextListsHelper::SetListItem( XMLTextListItemContext *i_pListItem ) } // Handling for parameter <sListStyleDefaultListId> (#i92811#) -void XMLTextListsHelper::KeepListAsProcessed( ::rtl::OUString sListId, - ::rtl::OUString sListStyleName, - ::rtl::OUString sContinueListId, - ::rtl::OUString sListStyleDefaultListId ) +void XMLTextListsHelper::KeepListAsProcessed( OUString sListId, + OUString sListStyleName, + OUString sContinueListId, + OUString sListStyleDefaultListId ) { if ( IsListProcessed( sListId ) ) { @@ -150,7 +150,7 @@ void XMLTextListsHelper::KeepListAsProcessed( ::rtl::OUString sListId, mpProcessedLists = new tMapForLists(); } - ::std::pair< ::rtl::OUString, ::rtl::OUString > + ::std::pair< OUString, OUString > aListData( sListStyleName, sContinueListId ); (*mpProcessedLists)[ sListId ] = aListData; @@ -168,7 +168,7 @@ void XMLTextListsHelper::KeepListAsProcessed( ::rtl::OUString sListId, if ( mpMapListIdToListStyleDefaultListId->find( sListStyleName ) == mpMapListIdToListStyleDefaultListId->end() ) { - ::std::pair< ::rtl::OUString, ::rtl::OUString > + ::std::pair< OUString, OUString > aListIdMapData( sListId, sListStyleDefaultListId ); (*mpMapListIdToListStyleDefaultListId)[ sListStyleName ] = aListIdMapData; @@ -176,7 +176,7 @@ void XMLTextListsHelper::KeepListAsProcessed( ::rtl::OUString sListId, } } -sal_Bool XMLTextListsHelper::IsListProcessed( const ::rtl::OUString sListId ) const +sal_Bool XMLTextListsHelper::IsListProcessed( const OUString sListId ) const { if ( mpProcessedLists == 0 ) { @@ -186,8 +186,8 @@ sal_Bool XMLTextListsHelper::IsListProcessed( const ::rtl::OUString sListId ) co return mpProcessedLists->find( sListId ) != mpProcessedLists->end(); } -::rtl::OUString XMLTextListsHelper::GetListStyleOfProcessedList( - const ::rtl::OUString sListId ) const +OUString XMLTextListsHelper::GetListStyleOfProcessedList( + const OUString sListId ) const { if ( mpProcessedLists != 0 ) { @@ -198,11 +198,11 @@ sal_Bool XMLTextListsHelper::IsListProcessed( const ::rtl::OUString sListId ) co } } - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString XMLTextListsHelper::GetContinueListIdOfProcessedList( - const ::rtl::OUString sListId ) const +OUString XMLTextListsHelper::GetContinueListIdOfProcessedList( + const OUString sListId ) const { if ( mpProcessedLists != 0 ) { @@ -213,30 +213,30 @@ sal_Bool XMLTextListsHelper::IsListProcessed( const ::rtl::OUString sListId ) co } } - return ::rtl::OUString(); + return OUString(); } -const ::rtl::OUString& XMLTextListsHelper::GetLastProcessedListId() const +const OUString& XMLTextListsHelper::GetLastProcessedListId() const { return msLastProcessedListId; } -const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() const +const OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() const { return msListStyleOfLastProcessedList; } -::rtl::OUString XMLTextListsHelper::GenerateNewListId() const +OUString XMLTextListsHelper::GenerateNewListId() const { // Value of xml:id in element <text:list> has to be a valid ID type (#i92478#) - ::rtl::OUString sTmpStr( "list" ); + OUString sTmpStr( "list" ); sal_Int64 n = Time( Time::SYSTEM ).GetTime(); n += Date( Date::SYSTEM ).GetDate(); n += rand(); // Value of xml:id in element <text:list> has to be a valid ID type (#i92478#) - sTmpStr += ::rtl::OUString::valueOf( n ); + sTmpStr += OUString::valueOf( n ); - ::rtl::OUString sNewListId( sTmpStr ); + OUString sNewListId( sTmpStr ); if ( mpProcessedLists != 0 ) { long nHitCount = 0; @@ -244,7 +244,7 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con { ++nHitCount; sNewListId = sTmpStr; - sNewListId += ::rtl::OUString::valueOf( nHitCount ); + sNewListId += OUString::valueOf( nHitCount ); } } @@ -252,9 +252,9 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con } // Provide list id for a certain list block for import (#i92811#) -::rtl::OUString XMLTextListsHelper::GetListIdForListBlock( XMLTextListBlockContext& rListBlock ) +OUString XMLTextListsHelper::GetListIdForListBlock( XMLTextListBlockContext& rListBlock ) { - ::rtl::OUString sListBlockListId( rListBlock.GetContinueListId() ); + OUString sListBlockListId( rListBlock.GetContinueListId() ); if ( sListBlockListId.isEmpty() ) { sListBlockListId = rListBlock.GetListId(); @@ -264,7 +264,7 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con { if ( !sListBlockListId.isEmpty() ) { - const ::rtl::OUString sListStyleName = + const OUString sListStyleName = GetListStyleOfProcessedList( sListBlockListId ); tMapForLists::const_iterator aIter = @@ -282,8 +282,8 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con return sListBlockListId; } -void XMLTextListsHelper::StoreLastContinuingList( ::rtl::OUString sListId, - ::rtl::OUString sContinuingListId ) +void XMLTextListsHelper::StoreLastContinuingList( OUString sListId, + OUString sContinuingListId ) { if ( mpContinuingLists == 0 ) { @@ -293,8 +293,8 @@ void XMLTextListsHelper::StoreLastContinuingList( ::rtl::OUString sListId, (*mpContinuingLists)[ sListId ] = sContinuingListId; } -::rtl::OUString XMLTextListsHelper::GetLastContinuingListId( - ::rtl::OUString sListId ) const +OUString XMLTextListsHelper::GetLastContinuingListId( + OUString sListId ) const { if ( mpContinuingLists != 0) { @@ -309,14 +309,14 @@ void XMLTextListsHelper::StoreLastContinuingList( ::rtl::OUString sListId, return sListId; } -void XMLTextListsHelper::PushListOnStack( ::rtl::OUString sListId, - ::rtl::OUString sListStyleName ) +void XMLTextListsHelper::PushListOnStack( OUString sListId, + OUString sListStyleName ) { if ( mpListStack == 0 ) { mpListStack = new tStackForLists(); } - ::std::pair< ::rtl::OUString, ::rtl::OUString > + ::std::pair< OUString, OUString > aListData( sListId, sListStyleName ); mpListStack->push_back( aListData ); } @@ -329,17 +329,17 @@ void XMLTextListsHelper::PopListFromStack() } } -sal_Bool XMLTextListsHelper::EqualsToTopListStyleOnStack( const ::rtl::OUString sListId ) const +sal_Bool XMLTextListsHelper::EqualsToTopListStyleOnStack( const OUString sListId ) const { return mpListStack != 0 ? sListId == mpListStack->back().second : sal_False; } -::rtl::OUString +OUString XMLTextListsHelper::GetNumberedParagraphListId( const sal_uInt16 i_Level, - const ::rtl::OUString i_StyleName) + const OUString i_StyleName) { if (i_StyleName.isEmpty()) { OSL_FAIL("invalid numbered-paragraph: no style-name"); @@ -372,13 +372,13 @@ ClampLevel(uno::Reference<container::XIndexReplace> const& i_xNumRules, uno::Reference<container::XIndexReplace> XMLTextListsHelper::EnsureNumberedParagraph( SvXMLImport & i_rImport, - const ::rtl::OUString i_ListId, - sal_Int16 & io_rLevel, const ::rtl::OUString i_StyleName) + const OUString i_ListId, + sal_Int16 & io_rLevel, const OUString i_StyleName) { OSL_ENSURE(!i_ListId.isEmpty(), "invalid ListId"); OSL_ENSURE(io_rLevel >= 0, "invalid Level"); NumParaList_t & rNPList( mNPLists[i_ListId] ); - const ::rtl::OUString none; // default + const OUString none; // default if ( rNPList.empty() && (0 != io_rLevel)) { // create default list style for top level sal_Int16 lev(0); @@ -434,17 +434,17 @@ uno::Reference<container::XIndexReplace> XMLTextListsHelper::MakeNumRule( SvXMLImport & i_rImport, const uno::Reference<container::XIndexReplace>& i_rNumRule, - const ::rtl::OUString i_ParentStyleName, - const ::rtl::OUString i_StyleName, + const OUString i_ParentStyleName, + const OUString i_StyleName, sal_Int16 & io_rLevel, sal_Bool* o_pRestartNumbering, sal_Bool* io_pSetDefaults) { - static ::rtl::OUString s_NumberingRules( "NumberingRules"); + static OUString s_NumberingRules( "NumberingRules"); uno::Reference<container::XIndexReplace> xNumRules(i_rNumRule); if ( !i_StyleName.isEmpty() && i_StyleName != i_ParentStyleName ) { - const ::rtl::OUString sDisplayStyleName( + const OUString sDisplayStyleName( i_rImport.GetStyleDisplayName( XML_STYLE_FAMILY_TEXT_LIST, i_StyleName) ); const uno::Reference < container::XNameContainer >& rNumStyles( diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index cf8dcc8fbc7e..647aeff463df 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -112,8 +112,6 @@ #include <txtlists.hxx> #include <com/sun/star/rdf/XMetadatable.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::com::sun::star; @@ -403,14 +401,14 @@ void FieldParamExporter::Export() // Save the OLE object Reference< embed::XStorage > xTargetStg = m_pExport->GetTargetStorage(); Reference< embed::XStorage > xDstStg = xTargetStg->openStorageElement( - rtl::OUString("OLELinks"), embed::ElementModes::WRITE ); + OUString("OLELinks"), embed::ElementModes::WRITE ); if ( !xDstStg->hasByName( sValue ) ) { Reference< XStorageBasedDocument > xStgDoc ( m_pExport->GetModel( ), UNO_QUERY ); Reference< embed::XStorage > xDocStg = xStgDoc->getDocumentStorage(); Reference< embed::XStorage > xOleStg = xDocStg->openStorageElement( - rtl::OUString("OLELinks"), embed::ElementModes::READ ); + OUString("OLELinks"), embed::ElementModes::READ ); xOleStg->copyElementTo( sValue, xDstStg, sValue ); Reference< embed::XTransactedObject > xTransact( xDstStg, UNO_QUERY ); @@ -838,7 +836,7 @@ void XMLTextParagraphExport::exportListChange( do { for(size_t j = 0; j < 2; ++j) { - rtl::OUString aElem(pListElements->back()); + OUString aElem(pListElements->back()); pListElements->pop_back(); GetExport().EndElement(aElem, sal_True); } @@ -878,10 +876,10 @@ void XMLTextParagraphExport::exportListChange( if ( nListLevelsToBeOpened > 0 ) { - const ::rtl::OUString sListStyleName( rNextInfo.GetNumRulesName() ); + const OUString sListStyleName( rNextInfo.GetNumRulesName() ); // Currently only the text documents support <ListId>. // Thus, for other document types <sListId> is empty. - const ::rtl::OUString sListId( rNextInfo.GetListId() ); + const OUString sListId( rNextInfo.GetListId() ); bool bExportListStyle( true ); bool bRestartNumberingAtContinuedList( false ); sal_Int32 nRestartValueForContinuedList( -1 ); @@ -907,11 +905,11 @@ void XMLTextParagraphExport::exportListChange( } mpTextListsHelper->KeepListAsProcessed( sListId, sListStyleName, - ::rtl::OUString() ); + OUString() ); } else { - const ::rtl::OUString sNewListId( + const OUString sNewListId( mpTextListsHelper->GenerateNewListId() ); if ( bExportODF && eODFDefaultVersion >= SvtSaveOptions::ODFVER_012 && @@ -925,7 +923,7 @@ void XMLTextParagraphExport::exportListChange( sNewListId ); } - const ::rtl::OUString sContinueListId = + const OUString sContinueListId = mpTextListsHelper->GetLastContinuingListId( sListId ); // store that list with list id <sNewListId> is last list, // which has continued list with list id <sListId> @@ -1003,14 +1001,14 @@ void XMLTextParagraphExport::exportListChange( enum XMLTokenEnum eLName = XML_LIST; - rtl::OUString aElem(GetExport().GetNamespaceMap().GetQNameByKey( + OUString aElem(GetExport().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TEXT, GetXMLToken(eLName) ) ); GetExport().IgnorableWhitespace(); GetExport().StartElement(aElem, sal_False); if(!pListElements) - pListElements = new std::vector<rtl::OUString>; + pListElements = new std::vector<OUString>; pListElements->push_back(aElem); mpTextListsHelper->PushListOnStack( sListId, @@ -1043,7 +1041,7 @@ void XMLTextParagraphExport::exportListChange( eLName = ( rNextInfo.IsNumbered() || nListLevelsToBeOpened > 1 ) ? XML_LIST_ITEM : XML_LIST_HEADER; - aElem = rtl::OUString( GetExport().GetNamespaceMap().GetQNameByKey( + aElem = OUString( GetExport().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TEXT, GetXMLToken(eLName) ) ); GetExport().IgnorableWhitespace(); @@ -1055,7 +1053,7 @@ void XMLTextParagraphExport::exportListChange( eLName == XML_LIST_ITEM && nListLevelsToBeOpened == 1 && // last iteration --> last opened <text:list-item> !rNextInfo.ListLabelString().isEmpty() ) { - const ::rtl::OUString aTextNumberElem = + const OUString aTextNumberElem = OUString( GetExport().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TEXT, GetXMLToken(XML_NUMBER) ) ); @@ -1112,7 +1110,7 @@ void XMLTextParagraphExport::exportListChange( if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) != 0 && GetExport().getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) { - const ::rtl::OUString sListStyleName( rNextInfo.GetNumRulesName() ); + const OUString sListStyleName( rNextInfo.GetNumRulesName() ); if ( !mpTextListsHelper->EqualsToTopListStyleOnStack( sListStyleName ) ) { GetExport().AddAttribute( XML_NAMESPACE_TEXT, @@ -1120,7 +1118,7 @@ void XMLTextParagraphExport::exportListChange( GetExport().EncodeStyleName( sListStyleName ) ); } } - rtl::OUString aElem( GetExport().GetNamespaceMap().GetQNameByKey( + OUString aElem( GetExport().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TEXT, GetXMLToken(XML_LIST_ITEM) ) ); GetExport().IgnorableWhitespace(); @@ -1131,7 +1129,7 @@ void XMLTextParagraphExport::exportListChange( if ( GetExport().exportTextNumberElement() && !rNextInfo.ListLabelString().isEmpty() ) { - const ::rtl::OUString aTextNumberElem = + const OUString aTextNumberElem = OUString( GetExport().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TEXT, GetXMLToken(XML_NUMBER) ) ); @@ -1517,7 +1515,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres { Reference < XPropertySet > xSet( xTextField, UNO_QUERY ); Reference < XText > xText; - Any a = xSet->getPropertyValue( ::rtl::OUString("TextRange") ); + Any a = xSet->getPropertyValue( OUString("TextRange") ); a >>= xText; if ( xText.is() ) { @@ -2207,7 +2205,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( if (xPropInfo->hasPropertyByName(sTextPortionType)) { - rtl::OUString sType; + OUString sType; xPropSet->getPropertyValue(sTextPortionType) >>= sType; if( sType.equals(sText)) diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 039e9d45569f..90322650be13 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -58,8 +58,6 @@ class XMLHints_Impl : public boost::ptr_vector<XMLHint_Impl> {}; // OD 2004-04-21 #i26791# -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -153,7 +151,7 @@ void XMLCharContext::InsertControlCharacter(sal_Int16 _nControl) { GetImport().GetTextImport()->InsertControlCharacter( _nControl ); } -void XMLCharContext::InsertString(const ::rtl::OUString& _sString) +void XMLCharContext::InsertString(const OUString& _sString) { GetImport().GetTextImport()->InsertString( _sString ); } @@ -827,10 +825,10 @@ class XMLMetaImportContext : public XMLMetaImportContextBase { // RDFa bool m_bHaveAbout; - ::rtl::OUString m_sAbout; - ::rtl::OUString m_sProperty; - ::rtl::OUString m_sContent; - ::rtl::OUString m_sDatatype; + OUString m_sAbout; + OUString m_sProperty; + OUString m_sContent; + OUString m_sDatatype; public: TYPEINFO(); @@ -1000,8 +998,8 @@ void XMLMetaFieldImportContext::InsertMeta( if (-1 != nKey) { - static ::rtl::OUString sPropertyIsFixedLanguage( - ::rtl::OUString("IsFixedLanguage") ); + static OUString sPropertyIsFixedLanguage( + OUString("IsFixedLanguage") ); Any any; any <<= nKey; xPropertySet->setPropertyValue( @@ -2315,7 +2313,7 @@ XMLNumberedParaContext::XMLNumberedParaContext( m_ListId(), m_xNumRules() { - ::rtl::OUString StyleName; + OUString StyleName; const SvXMLTokenMap& rTokenMap( i_rImport.GetTextImport()->GetTextNumberedParagraphAttrTokenMap() ); @@ -2324,10 +2322,10 @@ XMLNumberedParaContext::XMLNumberedParaContext( i_xAttrList->getLength() : 0 ); for ( sal_Int16 i=0; i < nAttrCount; i++ ) { - const ::rtl::OUString& rAttrName( i_xAttrList->getNameByIndex( i ) ); - const ::rtl::OUString& rValue ( i_xAttrList->getValueByIndex( i ) ); + const OUString& rAttrName( i_xAttrList->getNameByIndex( i ) ); + const OUString& rValue ( i_xAttrList->getValueByIndex( i ) ); - ::rtl::OUString aLocalName; + OUString aLocalName; const sal_uInt16 nPrefix( GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName ) ); diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx index 0dc04ddce741..e4557ad8c847 100644 --- a/xmloff/source/text/txtparai.hxx +++ b/xmloff/source/text/txtparai.hxx @@ -37,12 +37,12 @@ class XMLParaContext : public SvXMLImportContext { ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextRange > xStart; // xub_StrLen nStart; - ::rtl::OUString sStyleName; - ::rtl::OUString m_sXmlId; - ::rtl::OUString m_sAbout; - ::rtl::OUString m_sProperty; - ::rtl::OUString m_sContent; - ::rtl::OUString m_sDatatype; + OUString sStyleName; + OUString m_sXmlId; + OUString m_sAbout; + OUString m_sProperty; + OUString m_sContent; + OUString m_sDatatype; bool m_bHaveAbout; sal_Int8 nOutlineLevel; XMLHints_Impl *pHints; @@ -61,7 +61,7 @@ public: XMLParaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_Bool bHeading ); @@ -69,11 +69,11 @@ public: virtual ~XMLParaContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; @@ -84,9 +84,9 @@ class XMLNumberedParaContext : public SvXMLImportContext /// text:start-value sal_Int16 m_StartValue; /// xml:id - ::rtl::OUString m_XmlId; + OUString m_XmlId; /// text:list-id - ::rtl::OUString m_ListId; + OUString m_ListId; /// text:style-name ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexReplace > m_xNumRules; @@ -97,7 +97,7 @@ public: XMLNumberedParaContext( SvXMLImport& i_rImport, sal_uInt16 i_nPrefix, - const ::rtl::OUString& i_rLocalName, + const OUString& i_rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & i_xAttrList ); @@ -106,7 +106,7 @@ public: virtual void EndElement(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 i_nPrefix, - const ::rtl::OUString& i_rLocalName, + const OUString& i_rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & i_xAttrList ); @@ -114,7 +114,7 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexReplace >& GetNumRules() const { return m_xNumRules; } - const ::rtl::OUString& GetListId() const { return m_ListId; } + const OUString& GetListId() const { return m_ListId; } sal_Int16 GetStartValue() const { return m_StartValue; } }; diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx index c04c14e5f6ae..893eb51da47f 100644 --- a/xmloff/source/text/txtparaimphint.hxx +++ b/xmloff/source/text/txtparaimphint.hxx @@ -25,7 +25,6 @@ #include "XMLTextFrameContext.hxx" #include <xmloff/XMLEventsImportContext.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index b86be39f7e06..3f2f5bee9de0 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -47,8 +47,6 @@ #include <com/sun/star/text/WrapInfluenceOnPosition.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -260,11 +258,11 @@ public: /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -313,11 +311,11 @@ public: virtual ~XMLOpaquePropHdl_Impl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -365,11 +363,11 @@ public: virtual ~XMLContourModePropHdl_Impl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -417,11 +415,11 @@ public: virtual ~XMLParagraphOnlyPropHdl_Impl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -483,11 +481,11 @@ public: virtual ~XMLWrapPropHdl_Impl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -539,11 +537,11 @@ public: virtual ~XMLFrameProtectPropHdl_Impl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -741,11 +739,11 @@ public: virtual ~XMLHoriMirrorPropHdl_Impl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -796,11 +794,11 @@ public: virtual ~XMLGrfMirrorPropHdl_Impl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -897,11 +895,11 @@ public: virtual ~XMLTextEmphasizePropHdl_Impl(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -1001,11 +999,11 @@ public: virtual ~XMLTextCombineCharPropHdl_Impl(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -1047,11 +1045,11 @@ public: virtual ~XMLTextRelWidthHeightPropHdl_Impl(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -1104,11 +1102,11 @@ public: virtual ~XMLTextSyncWidthHeightPropHdl_Impl(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -1153,11 +1151,11 @@ public: virtual ~XMLTextRotationAnglePropHdl_Impl(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -1217,11 +1215,11 @@ public: virtual ~XMLNumber8OneBasedHdl() {}; virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx index 1456b8c412ee..2ac90d804233 100644 --- a/xmloff/source/text/txtsecte.cxx +++ b/xmloff/source/text/txtsecte.cxx @@ -53,8 +53,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::std; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::PropertyValues; diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx index 3186708cb1ea..b507b09c9087 100644 --- a/xmloff/source/text/txtstyle.cxx +++ b/xmloff/source/text/txtstyle.cxx @@ -34,8 +34,6 @@ #include "txtexppr.hxx" #include <xmloff/txtprmap.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 348a9a042d17..4f30fa5890c4 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -49,8 +49,6 @@ #include <utility> #include <vector> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::com::sun::star; diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 58b25938a5fa..f837a561ffff 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -84,8 +84,6 @@ static const sal_Char sAPI_sequence_value[] = "SequenceValue"; static const sal_Char sAPI_is_fixed_language[] = "IsFixedLanguage"; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; 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 >& ); diff --git a/xmloff/source/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx index 35a34ce11a76..393b3e6b4b1e 100644 --- a/xmloff/source/xforms/SchemaContext.cxx +++ b/xmloff/source/xforms/SchemaContext.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp> #include <com/sun/star/xforms/XDataTypeRepository.hpp> -using rtl::OUString; using com::sun::star::uno::Reference; using com::sun::star::uno::Any; using com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx index 916e762b2ba1..449b6ab04abb 100644 --- a/xmloff/source/xforms/SchemaContext.hxx +++ b/xmloff/source/xforms/SchemaContext.hxx @@ -46,7 +46,7 @@ public: SchemaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository ); virtual ~SchemaContext(); @@ -59,12 +59,12 @@ protected: virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ); + const OUString& rValue ); virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx index 071a5afa05d1..facfafbcdc07 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.cxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx @@ -42,7 +42,6 @@ #include <tools/debug.hxx> -using rtl::OUString; using com::sun::star::uno::Reference; using com::sun::star::uno::Exception; using com::sun::star::uno::Any; diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx index 22f29946cb4c..47c5c5124058 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.hxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx @@ -42,16 +42,16 @@ class SchemaRestrictionContext : public TokenContext { com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository> mxRepository; com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> mxDataType; - ::rtl::OUString msTypeName; - ::rtl::OUString msBaseName; + OUString msTypeName; + OUString msBaseName; public: SchemaRestrictionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository, - const ::rtl::OUString& sTypeName ); + const OUString& sTypeName ); virtual ~SchemaRestrictionContext(); @@ -66,12 +66,12 @@ protected: virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ); + const OUString& rValue ); virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx index 5a773ef81052..747dd2288444 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp> -using rtl::OUString; using com::sun::star::uno::Reference; using com::sun::star::uno::Any; using com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx index f27f7ce2774b..4b91e8bf0607 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx @@ -41,13 +41,13 @@ class SvXMLImportContext; class SchemaSimpleTypeContext : public TokenContext { com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository> mxRepository; - rtl::OUString msTypeName; + OUString msTypeName; public: SchemaSimpleTypeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository ); virtual ~SchemaSimpleTypeContext(); @@ -61,12 +61,12 @@ protected: virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ); + const OUString& rValue ); virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx index 24f3fe2fd7f8..3790018ff531 100644 --- a/xmloff/source/xforms/TokenContext.cxx +++ b/xmloff/source/xforms/TokenContext.cxx @@ -25,7 +25,6 @@ #include <tools/debug.hxx> -using rtl::OUString; using com::sun::star::uno::Reference; using com::sun::star::xml::sax::XAttributeList; @@ -124,7 +123,7 @@ static bool lcl_IsWhiteSpace( sal_Unicode c ) || c == sal_Unicode( 0x0D ); } -void TokenContext::Characters( const ::rtl::OUString& rCharacters ) +void TokenContext::Characters( const OUString& rCharacters ) { // get iterators for string data const sal_Unicode* pBegin = rCharacters.getStr(); diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx index a7ced8e7936b..0e74939bc8a5 100644 --- a/xmloff/source/xforms/TokenContext.hxx +++ b/xmloff/source/xforms/TokenContext.hxx @@ -49,7 +49,7 @@ public: TokenContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const SvXMLTokenMapEntry* pAttributes = NULL, const SvXMLTokenMapEntry* pChildren = NULL ); @@ -72,20 +72,20 @@ public: * handling of defaults. */ virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); /** Create a warning for all non-namespace character * content. Classes that wish to deal with character content have * to overload this method anyway, and will thus get rid of the * warnings. */ - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); protected: /** will be called for each attribute */ virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ) = 0; + const OUString& rValue ) = 0; /** will be called for each child element */ virtual SvXMLImportContext* HandleChild( @@ -94,7 +94,7 @@ protected: // the following attributes are mainly to be used for child // context creation sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) = 0; }; diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx index 452156c65e85..4358dd76bd18 100644 --- a/xmloff/source/xforms/XFormsBindContext.cxx +++ b/xmloff/source/xforms/XFormsBindContext.cxx @@ -34,7 +34,6 @@ #include <tools/debug.hxx> -using rtl::OUString; using com::sun::star::beans::XPropertySet; using com::sun::star::uno::Reference; using com::sun::star::uno::makeAny; diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx index d376c60f7db3..1705b2f4cde1 100644 --- a/xmloff/source/xforms/XFormsBindContext.hxx +++ b/xmloff/source/xforms/XFormsBindContext.hxx @@ -48,7 +48,7 @@ public: XFormsBindContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel ); virtual ~XFormsBindContext(); @@ -62,12 +62,12 @@ public: protected: virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ); + const OUString& rValue ); virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nNamespace, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx index 1e437fa4902e..fbc218545537 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.cxx +++ b/xmloff/source/xforms/XFormsInstanceContext.cxx @@ -38,7 +38,6 @@ #include <xmloff/nmspmap.hxx> -using rtl::OUString; using com::sun::star::uno::Reference; using com::sun::star::uno::makeAny; using com::sun::star::uno::UNO_QUERY; @@ -121,7 +120,7 @@ void XFormsInstanceContext::EndElement() void XFormsInstanceContext::HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ) + const OUString& rValue ) { switch( nToken ) { diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx index 30b50c2176e5..d19fbadd52d4 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.hxx +++ b/xmloff/source/xforms/XFormsInstanceContext.hxx @@ -44,14 +44,14 @@ class XFormsInstanceContext : public TokenContext { com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> mxModel; com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument> mxInstance; - rtl::OUString msId; - rtl::OUString msURL; + OUString msId; + OUString msURL; public: XFormsInstanceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> & xModel ); virtual ~XFormsInstanceContext(); @@ -65,7 +65,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); @@ -74,12 +74,12 @@ protected: virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ); + const OUString& rValue ); virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nNamespace, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx index 0cccc425188b..947981dbc350 100644 --- a/xmloff/source/xforms/XFormsModelContext.cxx +++ b/xmloff/source/xforms/XFormsModelContext.cxx @@ -38,7 +38,6 @@ #include <com/sun/star/xforms/XModel2.hpp> -using rtl::OUString; using com::sun::star::xml::sax::XAttributeList; using com::sun::star::beans::XPropertySet; using com::sun::star::util::XUpdatable; diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx index 9339bc59eccd..8e538328dae9 100644 --- a/xmloff/source/xforms/XFormsModelContext.hxx +++ b/xmloff/source/xforms/XFormsModelContext.hxx @@ -46,7 +46,7 @@ public: XFormsModelContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName ); + const OUString& rLName ); virtual ~XFormsModelContext(); com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> getModel(); @@ -61,12 +61,12 @@ protected: virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ); + const OUString& rValue ); virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx index 23e470cdf619..fb0bdbbf0a3a 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.cxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx @@ -36,7 +36,6 @@ #include <tools/debug.hxx> -using rtl::OUString; using com::sun::star::beans::XPropertySet; using com::sun::star::container::XNameContainer; using com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx index 0c56d8bec171..bc09a4b6658f 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.hxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx @@ -47,7 +47,7 @@ public: XFormsSubmissionContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel ); virtual ~XFormsSubmissionContext(); @@ -58,12 +58,12 @@ public: protected: virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ); + const OUString& rValue ); virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nNamespace, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index b73af0ab43ca..9f1b32ce5c99 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -39,7 +39,6 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltkmap.hxx> -using rtl::OUString; using com::sun::star::uno::Reference; using com::sun::star::uno::Sequence; using com::sun::star::uno::UNO_QUERY; @@ -98,7 +97,7 @@ void xforms_addXFormsModel( static Reference<XPropertySet> lcl_findXFormsBindingOrSubmission( Reference<frame::XModel>& xDocument, - const rtl::OUString& rBindingID, + const OUString& rBindingID, bool bBinding ) { // find binding by iterating over all models, and look for the @@ -153,14 +152,14 @@ static Reference<XPropertySet> lcl_findXFormsBindingOrSubmission( Reference<XPropertySet> xforms_findXFormsBinding( Reference<frame::XModel>& xDocument, - const rtl::OUString& rBindingID ) + const OUString& rBindingID ) { return lcl_findXFormsBindingOrSubmission( xDocument, rBindingID, true ); } Reference<XPropertySet> xforms_findXFormsSubmission( Reference<frame::XModel>& xDocument, - const rtl::OUString& rBindingID ) + const OUString& rBindingID ) { return lcl_findXFormsBindingOrSubmission( xDocument, rBindingID, false ); } @@ -265,7 +264,7 @@ sal_uInt16 xforms_getTypeClass( } -rtl::OUString xforms_getTypeName( +OUString xforms_getTypeName( const Reference<XDataTypeRepository>& xRepository, const SvXMLNamespaceMap& rNamespaceMap, const OUString& rXMLName ) @@ -279,7 +278,7 @@ rtl::OUString xforms_getTypeName( : xforms_getBasicTypeName( xRepository, rNamespaceMap, rXMLName ); } -rtl::OUString xforms_getBasicTypeName( +OUString xforms_getBasicTypeName( const Reference<XDataTypeRepository>& xRepository, const SvXMLNamespaceMap& rNamespaceMap, const OUString& rXMLName ) diff --git a/xmloff/source/xforms/xformsapi.hxx b/xmloff/source/xforms/xformsapi.hxx index 75115b90c1e0..577599e18205 100644 --- a/xmloff/source/xforms/xformsapi.hxx +++ b/xmloff/source/xforms/xformsapi.hxx @@ -41,19 +41,19 @@ void xforms_addXFormsModel( const com::sun::star::uno::Reference<com::sun::star::frame::XModel>& xDocument, const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel ); -com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xforms_findXFormsBinding( com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, const rtl::OUString& ); +com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xforms_findXFormsBinding( com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, const OUString& ); -com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xforms_findXFormsSubmission( com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, const rtl::OUString& ); +com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xforms_findXFormsSubmission( com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, const OUString& ); void xforms_setValue( com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xPropSet, - const rtl::OUString& rName, + const OUString& rName, const com::sun::star::uno::Any rAny ); template<typename T> void xforms_setValue( com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xPropSet, - const rtl::OUString& rName, + const OUString& rName, T& aValue ) { xforms_setValue( xPropSet, rName, com::sun::star::uno::makeAny( aValue ) ); @@ -62,17 +62,17 @@ void xforms_setValue( sal_uInt16 xforms_getTypeClass( const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& xRepository, const SvXMLNamespaceMap& rNamespaceMap, - const rtl::OUString& rXMLName ); + const OUString& rXMLName ); -rtl::OUString xforms_getTypeName( +OUString xforms_getTypeName( const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& xRepository, const SvXMLNamespaceMap& rNamespaceMap, - const rtl::OUString& rXMLName ); + const OUString& rXMLName ); -rtl::OUString xforms_getBasicTypeName( +OUString xforms_getBasicTypeName( const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& xRepository, const SvXMLNamespaceMap& rNamespaceMap, - const rtl::OUString& rXMLName ); + const OUString& rXMLName ); #endif diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx index cda917f4c515..a19d11acf6f9 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -64,8 +64,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace xmloff::token; -using rtl::OUString; -using rtl::OUStringBuffer; using com::sun::star::beans::XPropertySet; using com::sun::star::beans::XPropertySetInfo; using com::sun::star::container::XIndexAccess; @@ -792,11 +790,11 @@ void getXFormsSettings( const Reference< XNameAccess >& _rXForms, Sequence< Prop // are the names of the XForm models, and which in turn provides named sequences of // PropertyValues - which denote the actual property values of the given named model. - Sequence< ::rtl::OUString > aModelNames( _rXForms->getElementNames() ); + Sequence< OUString > aModelNames( _rXForms->getElementNames() ); Reference< XNameContainer > xModelSettings = document::NamedPropertyValues::create( comphelper::getProcessComponentContext() ); - for ( const ::rtl::OUString* pModelName = aModelNames.getConstArray(); + for ( const OUString* pModelName = aModelNames.getConstArray(); pModelName != aModelNames.getConstArray() + aModelNames.getLength(); ++pModelName ) diff --git a/xmloff/source/xforms/xformsimport.cxx b/xmloff/source/xforms/xformsimport.cxx index b12ae09cfea5..daa9b23c90ef 100644 --- a/xmloff/source/xforms/xformsimport.cxx +++ b/xmloff/source/xforms/xformsimport.cxx @@ -54,12 +54,11 @@ using com::sun::star::form::binding::XListEntrySource; using com::sun::star::form::binding::XListEntrySink; using com::sun::star::form::submission::XSubmission; using com::sun::star::form::submission::XSubmissionSupplier; -using rtl::OUString; SvXMLImportContext* createXFormsModelContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName ) + const OUString& rLocalName ) { return new XFormsModelContext( rImport, nPrefix, rLocalName ); } @@ -153,8 +152,8 @@ void applyXFormsSettings( const Reference< XNameAccess >& _rXForms, const Sequen try { - Sequence< ::rtl::OUString > aSettingsForModels( xModelSettings->getElementNames() ); - for ( const ::rtl::OUString* pModelName = aSettingsForModels.getConstArray(); + Sequence< OUString > aSettingsForModels( xModelSettings->getElementNames() ); + for ( const OUString* pModelName = aSettingsForModels.getConstArray(); pModelName != aSettingsForModels.getConstArray() + aSettingsForModels.getLength(); ++pModelName ) |