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/inc | |
| 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/inc')
133 files changed, 1151 insertions, 1158 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 |