diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-26 08:43:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-26 10:47:02 +0000 |
| commit | 80735fcbb0503ff1de198d1d9936fed9f5ae77a2 (patch) | |
| tree | 7c126266aecb7561f46897bd9c997c085a3a96df /xmloff | |
| parent | 4112ecadd53f7ae48e007dd5024f077aca305062 (diff) | |
com::sun::star->css in xmloff/
Change-Id: Iee6e21e093fb1383f19a0716dbc1c341f446b8c2
Reviewed-on: https://gerrit.libreoffice.org/20192
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmloff')
353 files changed, 2437 insertions, 2892 deletions
diff --git a/xmloff/inc/AttributeContainerHandler.hxx b/xmloff/inc/AttributeContainerHandler.hxx index d3301986ad3e..0e986151e2c9 100644 --- a/xmloff/inc/AttributeContainerHandler.hxx +++ b/xmloff/inc/AttributeContainerHandler.hxx @@ -30,10 +30,10 @@ class XMLAttributeContainerHandler : public XMLPropertyHandler public: virtual ~XMLAttributeContainerHandler(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_INC_ATTRIBUTECONTAINERHANDLER_HXX diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx index 4031e46ab867..2b01b462d0ea 100644 --- a/xmloff/inc/DomBuilderContext.hxx +++ b/xmloff/inc/DomBuilderContext.hxx @@ -44,7 +44,7 @@ class SvXMLImportContext; * XML data from a sequence of SAX events */ class DomBuilderContext : public SvXMLImportContext { - com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> mxNode; + css::uno::Reference<css::xml::dom::XNode> mxNode; public: @@ -57,7 +57,7 @@ public: DomBuilderContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode>& ); + css::uno::Reference<css::xml::dom::XNode>& ); virtual ~DomBuilderContext(); @@ -67,7 +67,7 @@ public: /** access the DOM tree */ - com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument> getTree(); + css::uno::Reference<css::xml::dom::XDocument> getTree(); @@ -77,10 +77,10 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; diff --git a/xmloff/inc/DomExport.hxx b/xmloff/inc/DomExport.hxx index c8c9a5d36906..47745940cf63 100644 --- a/xmloff/inc/DomExport.hxx +++ b/xmloff/inc/DomExport.hxx @@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star { namespace xml { namespace dom { class XNode; } } } } } -void exportDom( SvXMLExport&, const com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument>& ); +void exportDom( SvXMLExport&, const css::uno::Reference<css::xml::dom::XDocument>& ); #endif diff --git a/xmloff/inc/MetaExportComponent.hxx b/xmloff/inc/MetaExportComponent.hxx index 31194b239693..58a3a059bf3d 100644 --- a/xmloff/inc/MetaExportComponent.hxx +++ b/xmloff/inc/MetaExportComponent.hxx @@ -26,12 +26,11 @@ class XMLMetaExportComponent : public SvXMLExport { - ::com::sun::star::uno::Reference< - ::com::sun::star::document::XDocumentProperties > mxDocProps; + css::uno::Reference< css::document::XDocumentProperties > mxDocProps; public: XMLMetaExportComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLExportFlags nFlags ); @@ -43,7 +42,7 @@ protected: enum ::xmloff::token::XMLTokenEnum eClass = xmloff::token::XML_TOKEN_INVALID ) override; // accept XDocumentProperties in addition to XModel - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // override virtual void _ExportMeta() override; diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx index 35650f5bc278..028a3437b6d3 100644 --- a/xmloff/inc/MultiPropertySetHelper.hxx +++ b/xmloff/inc/MultiPropertySetHelper.hxx @@ -62,20 +62,20 @@ class MultiPropertySetHelper /// the sequence of property names that the current (multi) /// property set implementation supports - ::com::sun::star::uno::Sequence< OUString > aPropertySequence; + css::uno::Sequence< OUString > aPropertySequence; /// an array of indices that maps from pPropertyNames indices to /// aPropertySequence indices sal_Int16* pSequenceIndex; /// the last set of values retrieved by getValues - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aValues; + css::uno::Sequence< css::uno::Any > aValues; /// result of aValues.getConstArray() - const ::com::sun::star::uno::Any* pValues; + const css::uno::Any* pValues; /// an empty Any - ::com::sun::star::uno::Any aEmptyAny; + css::uno::Any aEmptyAny; public: @@ -88,8 +88,7 @@ public: * Call hasPropertiesByName for the provided XPropertySetInfo and build * list of allowed properties. */ - void hasProperties( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo> & ); + void hasProperties( const css::uno::Reference<css::beans::XPropertySetInfo> & ); /** @@ -104,8 +103,7 @@ public: * May only be called after hasProperties() was called for the * appropriate XPropertySetInfo. */ - void getValues( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XMultiPropertySet> & ); + void getValues( const css::uno::Reference<css::beans::XMultiPropertySet> & ); /** * Get values from the XPropertySet. This can be much slower than @@ -115,8 +113,7 @@ public: * May only be called after hasProperties() was called for the * appropriate XPropertySetInfo. */ - void getValues( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & ); + void getValues( const css::uno::Reference<css::beans::XPropertySet> & ); @@ -125,7 +122,7 @@ public: * * May only be called after getValues() was called. */ - inline const ::com::sun::star::uno::Any& getValue( sal_Int16 nIndex ); + inline const css::uno::Any& getValue( sal_Int16 nIndex ); /** * Find out if this property is supported. @@ -144,9 +141,8 @@ public: * bTryMult is set, the XMultiPropertySet is used to get the values. * */ - const ::com::sun::star::uno::Any& getValue( sal_Int16 nIndex, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> &, + const css::uno::Any& getValue( sal_Int16 nIndex, + const css::uno::Reference<css::beans::XPropertySet> &, bool bTryMulti = false ); /** @@ -159,9 +155,8 @@ public: * XMultiPropertySet is used to get the values. * */ - const ::com::sun::star::uno::Any& getValue( sal_Int16 nIndex, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XMultiPropertySet> & ); + const css::uno::Any& getValue( sal_Int16 nIndex, + const css::uno::Reference<css::beans::XMultiPropertySet> & ); inline void resetValues() { pValues = nullptr; } }; @@ -169,7 +164,7 @@ public: // inline implementations of the often-called methods getValue and hasProperty: -const ::com::sun::star::uno::Any& MultiPropertySetHelper::getValue( +const css::uno::Any& MultiPropertySetHelper::getValue( sal_Int16 nValueNo ) { assert(pValues && "called getValue() without calling getValues()"); diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx index 05e0c090011d..9deea733781a 100644 --- a/xmloff/inc/PageMasterImportContext.hxx +++ b/xmloff/inc/PageMasterImportContext.hxx @@ -42,7 +42,7 @@ public: PageStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, bool bDefaultStyle=false); virtual ~PageStyleContext(); @@ -50,11 +50,10 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void FillPropertySet( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ) override; + const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override; //text grid enhancement virtual void SetDefaults() override; diff --git a/xmloff/inc/PropertySetMerger.hxx b/xmloff/inc/PropertySetMerger.hxx index ff966caa2054..7a711d3ebe58 100644 --- a/xmloff/inc/PropertySetMerger.hxx +++ b/xmloff/inc/PropertySetMerger.hxx @@ -22,10 +22,10 @@ #include <com/sun/star/beans/XPropertySet.hpp> -extern ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > +extern css::uno::Reference< css::beans::XPropertySet > PropertySetMerger_CreateInstance( - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rPropSet1, - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rPropSet2 ) throw(); + css::uno::Reference< css::beans::XPropertySet > rPropSet1, + css::uno::Reference< css::beans::XPropertySet > rPropSet2 ) throw(); #endif diff --git a/xmloff/inc/RDFaExportHelper.hxx b/xmloff/inc/RDFaExportHelper.hxx index 56e4c0a6157a..2b79a040a86d 100644 --- a/xmloff/inc/RDFaExportHelper.hxx +++ b/xmloff/inc/RDFaExportHelper.hxx @@ -42,8 +42,7 @@ class RDFaExportHelper private: SvXMLExport & m_rExport; - ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XDocumentRepository> m_xRepository; + css::uno::Reference<css::rdf::XDocumentRepository> m_xRepository; typedef ::std::map< OUString, OUString > BlankNodeMap_t; @@ -53,15 +52,13 @@ private: long m_Counter; OUString - LookupBlankNode( ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XBlankNode> const & i_xBlankNode); + LookupBlankNode( css::uno::Reference<css::rdf::XBlankNode> const & i_xBlankNode); public: RDFaExportHelper(SvXMLExport & i_rExport); void - AddRDFa(::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable> const & i_xMetadatable); + AddRDFa(css::uno::Reference<css::rdf::XMetadatable> const & i_xMetadatable); }; } // namespace xmloff diff --git a/xmloff/inc/RDFaImportHelper.hxx b/xmloff/inc/RDFaImportHelper.hxx index ceb4c2e50467..b25c09b8ab32 100644 --- a/xmloff/inc/RDFaImportHelper.hxx +++ b/xmloff/inc/RDFaImportHelper.hxx @@ -66,14 +66,12 @@ public: /** Add a RDFa statement; must have been parsed with ParseRDFa */ void AddRDFa( - ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable> - const & i_xObject, + css::uno::Reference< css::rdf::XMetadatable> const & i_xObject, std::shared_ptr<ParsedRDFaAttributes> & i_pRDFaAttributes); /** Parse and add a RDFa statement; parameters are XML attribute values */ void ParseAndAddRDFa( - ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable> - const & i_xObject, + css::uno::Reference< css::rdf::XMetadatable> const & i_xObject, OUString const & i_rAbout, OUString const & i_rProperty, OUString const & i_rContent, @@ -83,8 +81,7 @@ public: <p> This is done <em>after</em> the input file has been read, to prevent collision between generated ids and ids in the file.</p> */ - void InsertRDFa( ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XRepositorySupplier > const & i_xModel); + void InsertRDFa( css::uno::Reference< css::rdf::XRepositorySupplier > const & i_xModel); }; } // namespace xmloff diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx index 95c9b10f1fda..f61879bffa85 100644 --- a/xmloff/inc/SchXMLExport.hxx +++ b/xmloff/inc/SchXMLExport.hxx @@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { class SchXMLExport : public SvXMLExport { private: - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > mxStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator; rtl::Reference<SchXMLAutoStylePoolP> maAutoStylePool; rtl::Reference<SchXMLExportHelper> maExportHelper; @@ -51,7 +51,7 @@ protected: public: SchXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLExportFlags nExportFlags = SvXMLExportFlags::ALL ); virtual ~SchXMLExport(); diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx index 596b3f173519..aae955c3fd68 100644 --- a/xmloff/inc/SchXMLImport.hxx +++ b/xmloff/inc/SchXMLImport.hxx @@ -158,7 +158,7 @@ enum SchXMLRegEquationAttrMap class SchXMLImport : public SvXMLImport { private: - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > mxStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator; rtl::Reference<SchXMLImportHelper> maImportHelper; @@ -166,20 +166,20 @@ protected: virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; public: SchXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLImportFlags nImportFlags ); virtual ~SchXMLImport() throw (); SvXMLImportContext* CreateStylesContext( const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_XMLOFF_INC_SCHXMLIMPORT_HXX diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx index e47d3d17d250..4d838abc2683 100644 --- a/xmloff/inc/StyleMap.hxx +++ b/xmloff/inc/StyleMap.hxx @@ -63,7 +63,7 @@ inline bool StyleNameHash_Impl::operator()( } class StyleMap : - public ::cppu::WeakImplHelper< ::com::sun::star::lang::XUnoTunnel>, + public ::cppu::WeakImplHelper< css::lang::XUnoTunnel>, public std::unordered_map< StyleNameKey_Impl, OUString, StyleNameHash_Impl, StyleNameHash_Impl > { @@ -73,14 +73,13 @@ public: StyleMap(); virtual ~StyleMap(); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); static StyleMap* getImplementation( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > ) throw(); + css::uno::Reference< css::uno::XInterface > ) throw(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_XMLOFF_INC_STYLEMAP_HXX diff --git a/xmloff/inc/TransGradientStyle.hxx b/xmloff/inc/TransGradientStyle.hxx index b65f05e0c8a2..c2d8293ff8bc 100644 --- a/xmloff/inc/TransGradientStyle.hxx +++ b/xmloff/inc/TransGradientStyle.hxx @@ -42,9 +42,8 @@ public: ~XMLTransGradientStyleImport(); bool importXML( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList, - ::com::sun::star::uno::Any& rValue, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + css::uno::Any& rValue, OUString& rStrName ); }; @@ -56,7 +55,7 @@ public: XMLTransGradientStyleExport( SvXMLExport& rExport ); ~XMLTransGradientStyleExport(); - bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); + bool exportXML( const OUString& rStrName, const css::uno::Any& rValue ); }; #endif // INCLUDED_XMLOFF_INC_TRANSGRADIENTSTYLE_HXX diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx index 6ff4d06b7394..13da75c0bdc0 100644 --- a/xmloff/inc/XMLBackgroundImageContext.hxx +++ b/xmloff/inc/XMLBackgroundImageContext.hxx @@ -34,17 +34,16 @@ class XMLBackgroundImageContext : public XMLElementPropertyContext XMLPropertyState aFilterProp; XMLPropertyState aTransparencyProp; - ::com::sun::star::style::GraphicLocation ePos; + css::style::GraphicLocation ePos; OUString sURL; OUString sFilter; sal_Int8 nTransparency; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xBase64Stream; + css::uno::Reference < css::io::XOutputStream > xBase64Stream; private: void ProcessAttrs( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList ); public: @@ -52,8 +51,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList, const XMLPropertyState& rProp, sal_Int32 nPosIdx, sal_Int32 nFilterIdx, @@ -65,8 +63,7 @@ public: SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/inc/XMLBackgroundImageExport.hxx b/xmloff/inc/XMLBackgroundImageExport.hxx index 36c2291a3b0f..0eb74683f28f 100644 --- a/xmloff/inc/XMLBackgroundImageExport.hxx +++ b/xmloff/inc/XMLBackgroundImageExport.hxx @@ -41,10 +41,10 @@ public: ~XMLBackgroundImageExport(); - void exportXML( const ::com::sun::star::uno::Any& rURL, - const ::com::sun::star::uno::Any *pPos, - const ::com::sun::star::uno::Any *pFilter, - const ::com::sun::star::uno::Any *pTransparency, + void exportXML( const css::uno::Any& rURL, + const css::uno::Any *pPos, + const css::uno::Any *pFilter, + const css::uno::Any *pTransparency, sal_uInt16 nPrefix, const OUString& rLocalName ); }; diff --git a/xmloff/inc/XMLBase64Export.hxx b/xmloff/inc/XMLBase64Export.hxx index 1a2cf4d48391..f3cbac27651d 100644 --- a/xmloff/inc/XMLBase64Export.hxx +++ b/xmloff/inc/XMLBase64Export.hxx @@ -37,15 +37,12 @@ public: XMLBase64Export( SvXMLExport& rExport ); - bool exportXML( const ::com::sun::star::uno::Reference < - ::com::sun::star::io::XInputStream > & rIn ); - bool exportElement( const ::com::sun::star::uno::Reference < - ::com::sun::star::io::XInputStream > & rIn, + bool exportXML( const css::uno::Reference < css::io::XInputStream > & rIn ); + bool exportElement( const css::uno::Reference < css::io::XInputStream > & rIn, sal_uInt16 nNamespace, enum ::xmloff::token::XMLTokenEnum eName ); bool exportOfficeBinaryDataElement( - const ::com::sun::star::uno::Reference < - ::com::sun::star::io::XInputStream > & rIn ); + const css::uno::Reference < css::io::XInputStream > & rIn ); }; diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx index dac0afb27744..3fc8d5b38020 100644 --- a/xmloff/inc/XMLBasicExportFilter.hxx +++ b/xmloff/inc/XMLBasicExportFilter.hxx @@ -26,36 +26,36 @@ // class XMLBasicExportFilter typedef ::cppu::WeakImplHelper< - ::com::sun::star::xml::sax::XDocumentHandler > XMLBasicExportFilter_BASE; + css::xml::sax::XDocumentHandler > XMLBasicExportFilter_BASE; class XMLBasicExportFilter : public XMLBasicExportFilter_BASE { private: - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler; + css::uno::Reference< css::xml::sax::XDocumentHandler > m_xHandler; public: XMLBasicExportFilter( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rxHandler ); + const css::uno::Reference< css::xml::sax::XDocumentHandler >& rxHandler ); virtual ~XMLBasicExportFilter(); // XDocumentHandler virtual void SAL_CALL startDocument() - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endDocument() - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) + throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endElement( const OUString& aName ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL characters( const OUString& aChars ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) + throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX diff --git a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx index f451dcc22f3b..caf3c2bb61f7 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 bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; /// Exports the given value in cas of the given XML-data-type virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; diff --git a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx index 1f9ac3dc0c6f..523c87fcfd11 100644 --- a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx +++ b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx @@ -42,13 +42,13 @@ public: /// Imports the given value in cas of the given XML-data-type virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; /// Exports the given value in cas of the given XML-data-type virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx index 1f88294e187b..819865b5bf85 100644 --- a/xmloff/inc/XMLChartPropertySetMapper.hxx +++ b/xmloff/inc/XMLChartPropertySetMapper.hxx @@ -46,14 +46,13 @@ class XMLChartExportPropertyMapper : public SvXMLExportPropertyMapper { private: SvXMLExport& mrExport; - com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > mxChartDoc; + css::uno::Reference< css::chart2::XChartDocument > mxChartDoc; protected: virtual void ContextFilter( bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const override; + css::uno::Reference<css::beans::XPropertySet > rPropSet ) const override; private: /// this method is called for every item that has the MID_FLAG_ELEMENT_EXPORT flag set @@ -75,8 +74,7 @@ public: SvXMLExport& rExport ); virtual ~XMLChartExportPropertyMapper(); - void setChartDoc( com::sun::star::uno::Reference< - com::sun::star::chart2::XChartDocument > xChartDoc ); + void setChartDoc( css::uno::Reference< css::chart2::XChartDocument > xChartDoc ); }; class XMLChartImportPropertyMapper : public SvXMLImportPropertyMapper diff --git a/xmloff/inc/XMLChartStyleContext.hxx b/xmloff/inc/XMLChartStyleContext.hxx index 746261f73a9f..09751ba37ac6 100644 --- a/xmloff/inc/XMLChartStyleContext.hxx +++ b/xmloff/inc/XMLChartStyleContext.hxx @@ -39,20 +39,19 @@ public: XMLChartStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily ); virtual ~XMLChartStyleContext(); /// is called after all styles have been read to apply styles void FillPropertySet( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ) override; + const css::uno::Reference<css::beans::XPropertySet > & rPropSet ) override; /// necessary for property context (element-property symbol-image) virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; }; #endif // INCLUDED_XMLOFF_INC_XMLCHARTSTYLECONTEXT_HXX diff --git a/xmloff/inc/XMLClipPropertyHandler.hxx b/xmloff/inc/XMLClipPropertyHandler.hxx index b415fd253421..01b69400b461 100644 --- a/xmloff/inc/XMLClipPropertyHandler.hxx +++ b/xmloff/inc/XMLClipPropertyHandler.hxx @@ -32,9 +32,9 @@ public: XMLClipPropertyHandler( bool bODF11 ); virtual ~XMLClipPropertyHandler(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_INC_XMLCLIPPROPERTYHANDLER_HXX diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx index acb7a5f2d55e..f5c6cbcc57a9 100644 --- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx +++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx @@ -28,10 +28,8 @@ namespace com { namespace sun { namespace star { namespace lang { class XMLEmbeddedObjectImportContext : public SvXMLImportContext { - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XDocumentHandler > xHandler; - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent > xComp; + css::uno::Reference<css::xml::sax::XDocumentHandler > xHandler; + css::uno::Reference<css::lang::XComponent > xComp; OUString sFilterService; OUString sCLSID; @@ -43,24 +41,22 @@ public: XMLEmbeddedObjectImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLEmbeddedObjectImportContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual void Characters( const OUString& rChars ) override; bool SetComponent( - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent >& rComp ); + css::uno::Reference< css::lang::XComponent >& rComp ); }; diff --git a/xmloff/inc/XMLEventImportHelper.hxx b/xmloff/inc/XMLEventImportHelper.hxx index 27c7f9afe5af..23b7358834f6 100644 --- a/xmloff/inc/XMLEventImportHelper.hxx +++ b/xmloff/inc/XMLEventImportHelper.hxx @@ -85,8 +85,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList, XMLEventsImportContext* rEvents, const OUString& rXmlEventName, const OUString& rLanguage); diff --git a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx index 40b59bb3318b..6425a5832132 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 bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; /// Exports the given value in cas of the given XML-data-type virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx index 0a61d4de5cbe..1f05299169fa 100644 --- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx +++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx @@ -70,22 +70,19 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList); virtual ~XMLFootnoteConfigurationImportContext(); /// parse attributes virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override; /// for footnotes, also parse begin and end notices virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override; /// get token map for attributes const SvXMLTokenMap& GetFtnConfigAttrTokenMap(); @@ -98,8 +95,7 @@ public: /// set configuration at document void ProcessSettings( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rConfig); + const css::uno::Reference< css::beans::XPropertySet> & rConfig); /// for helper class: set begin notice void SetBeginNotice( const OUString& sText); diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx index aee890581c77..1c8db861f702 100644 --- a/xmloff/inc/XMLImageMapContext.hxx +++ b/xmloff/inc/XMLImageMapContext.hxx @@ -36,13 +36,11 @@ class XMLImageMapContext : public SvXMLImportContext const OUString sImageMap; /// the image map to be imported - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexContainer> xImageMap; + css::uno::Reference< css::container::XIndexContainer> xImageMap; /// the property set from which to get and where eventually to set the /// image map - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> xPropertySet; + css::uno::Reference< css::beans::XPropertySet> xPropertySet; public: @@ -50,16 +48,14 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet); + css::uno::Reference< css::beans::XPropertySet> & rPropertySet); virtual ~XMLImageMapContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/inc/XMLImageMapExport.hxx b/xmloff/inc/XMLImageMapExport.hxx index 84de7356287f..ada29c38f4d4 100644 --- a/xmloff/inc/XMLImageMapExport.hxx +++ b/xmloff/inc/XMLImageMapExport.hxx @@ -62,15 +62,13 @@ public: */ void Export( /// the property set containing the ImageMap property - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet); + const css::uno::Reference< css::beans::XPropertySet> & rPropertySet); /** * Export an ImageMap (XIndexContainer). */ void Export( /// the container containing the image map elements - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexContainer> & rContainer); + const css::uno::Reference< css::container::XIndexContainer> & rContainer); protected: @@ -80,32 +78,28 @@ protected: * Calls methods for specific image map entries. */ void ExportMapEntry( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet); + const css::uno::Reference< css::beans::XPropertySet> & rPropertySet); /** * Export the specifics of a rectangular image map entry. * To be called by ExportMapEntry. */ void ExportRectangle( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet); + const css::uno::Reference< css::beans::XPropertySet> & rPropertySet); /** * Export the specifics of a circular image map entry. * To be called by ExportMapEntry. */ void ExportCircle( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet); + const css::uno::Reference< css::beans::XPropertySet> & rPropertySet); /** * Export the specifics of a polygonal image map entry; * To be called by ExportMapEntry. */ void ExportPolygon( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet); + const css::uno::Reference< css::beans::XPropertySet> & rPropertySet); }; #endif diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx index babf25cf8b2c..2b157667b9b6 100644 --- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx +++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx @@ -61,8 +61,7 @@ class XMLIndexBibliographyConfigurationContext : public SvXMLStyleContext bool bNumberedEntries; bool bSortByPosition; - ::std::vector< ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> > aSortKeys; + ::std::vector< css::uno::Sequence< css::beans::PropertyValue> > aSortKeys; public: @@ -71,24 +70,21 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList); virtual ~XMLIndexBibliographyConfigurationContext(); protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override; virtual void CreateAndInsert( bool bOverwrite ) override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override; void ProcessAttribute( sal_uInt16 nPrefix, diff --git a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx index c1b5574214eb..d27fe046ac77 100644 --- a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx +++ b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx @@ -33,11 +33,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx index 6d1f6639faf7..f15d14cda902 100644 --- a/xmloff/inc/XMLLineNumberingImportContext.hxx +++ b/xmloff/inc/XMLLineNumberingImportContext.hxx @@ -82,8 +82,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList); + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList); virtual ~XMLLineNumberingImportContext(); @@ -94,8 +93,7 @@ public: protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; void ProcessAttribute( enum LineNumberingToken eToken, @@ -106,8 +104,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx index 05348002dfa2..be2de70d98d3 100644 --- a/xmloff/inc/XMLNumberStylesImport.hxx +++ b/xmloff/inc/XMLNumberStylesImport.hxx @@ -51,14 +51,14 @@ public: sal_uInt16 nPrfx, const OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles); virtual ~SdXMLNumberFormatImportContext(); virtual void EndElement() override; virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; sal_Int32 GetDrawKey() const { return mnKey; } }; diff --git a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx index ea8a59fe1d3b..b293accfca6f 100644 --- a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx +++ b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx @@ -35,11 +35,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; diff --git a/xmloff/inc/XMLRectangleMembersHandler.hxx b/xmloff/inc/XMLRectangleMembersHandler.hxx index 5667245366d0..ce21f0505761 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 bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; /// Exports the given value in cas of the given XML-data-type virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx index 4dae10a7cdc7..243db0bfaf0f 100644 --- a/xmloff/inc/XMLReplacementImageContext.hxx +++ b/xmloff/inc/XMLReplacementImageContext.hxx @@ -30,10 +30,8 @@ namespace com { namespace sun { namespace star { class XMLReplacementImageContext : public SvXMLImportContext { - ::com::sun::star::uno::Reference < - ::com::sun::star::io::XOutputStream > m_xBase64Stream; -::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > m_xPropSet; + css::uno::Reference < css::io::XOutputStream > m_xBase64Stream; + css::uno::Reference < css::beans::XPropertySet > m_xPropSet; OUString m_sHRef; const OUString m_sGraphicURL; @@ -44,18 +42,15 @@ public: XMLReplacementImageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & rAttrList, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet >& rPropSet ); + const css::uno::Reference< css::xml::sax::XAttributeList > & rAttrList, + const css::uno::Reference< css::beans::XPropertySet >& rPropSet ); virtual ~XMLReplacementImageContext(); virtual void EndElement() override; SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; }; diff --git a/xmloff/inc/XMLScriptContextFactory.hxx b/xmloff/inc/XMLScriptContextFactory.hxx index a054a5c681c8..9e687df7628e 100644 --- a/xmloff/inc/XMLScriptContextFactory.hxx +++ b/xmloff/inc/XMLScriptContextFactory.hxx @@ -45,8 +45,7 @@ public: sal_uInt16 nPrefix, /// element: namespace prefix const OUString & rLocalName, /// element: local name /// attribute list - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList, /// the context for the enclosing <script:events> element XMLEventsImportContext * rEvents, /// the event name (as understood by the API) diff --git a/xmloff/inc/XMLScriptExportHandler.hxx b/xmloff/inc/XMLScriptExportHandler.hxx index 994ce6322bd7..101f5ba6f1c1 100644 --- a/xmloff/inc/XMLScriptExportHandler.hxx +++ b/xmloff/inc/XMLScriptExportHandler.hxx @@ -43,8 +43,7 @@ public: virtual void Export( SvXMLExport& rExport, const OUString& rEventName, - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues, + css::uno::Sequence<css::beans::PropertyValue> & rValues, bool bUseWhitespace) override; }; diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx index 1893f4efdf99..9a11ad2d58a9 100644 --- a/xmloff/inc/XMLShapePropertySetContext.hxx +++ b/xmloff/inc/XMLShapePropertySetContext.hxx @@ -32,8 +32,7 @@ public: XMLShapePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFam, ::std::vector< XMLPropertyState > &rProps, const rtl::Reference < SvXMLImportPropertyMapper > &rMap ); @@ -45,7 +44,7 @@ public: using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp) override; }; diff --git a/xmloff/inc/XMLStarBasicContextFactory.hxx b/xmloff/inc/XMLStarBasicContextFactory.hxx index 0b5ef38a1113..f03e5660870f 100644 --- a/xmloff/inc/XMLStarBasicContextFactory.hxx +++ b/xmloff/inc/XMLStarBasicContextFactory.hxx @@ -46,8 +46,7 @@ public: SvXMLImport& rImport, /// import context sal_uInt16 nPrefix, /// element: namespace prefix const OUString& rLocalName, /// element: local name - const ::com::sun::star::uno::Reference< /// attribute list - ::com::sun::star::xml::sax::XAttributeList> & xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList,/// attribute list /// the context for the enclosing <script:events> element XMLEventsImportContext* rEvents, /// the event name (as understood by the API) diff --git a/xmloff/inc/XMLStarBasicExportHandler.hxx b/xmloff/inc/XMLStarBasicExportHandler.hxx index e5d8eef5f2fd..60d558b9817f 100644 --- a/xmloff/inc/XMLStarBasicExportHandler.hxx +++ b/xmloff/inc/XMLStarBasicExportHandler.hxx @@ -47,8 +47,7 @@ public: virtual void Export( SvXMLExport& rExport, const OUString& rEventName, - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues, + css::uno::Sequence<css::beans::PropertyValue> & rValues, bool bUseWhitespace) override; }; diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx index 97d2dae84011..db92e9cf829e 100644 --- a/xmloff/inc/XMLStringBufferImportContext.hxx +++ b/xmloff/inc/XMLStringBufferImportContext.hxx @@ -48,8 +48,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override; virtual void Characters( const OUString& rChars ) override; diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx index 6c6c7d9d52a8..f74363281b68 100644 --- a/xmloff/inc/XMLTextColumnsContext.hxx +++ b/xmloff/inc/XMLTextColumnsContext.hxx @@ -52,8 +52,7 @@ public: XMLTextColumnsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList, const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ); @@ -61,7 +60,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/inc/XMLTextColumnsExport.hxx b/xmloff/inc/XMLTextColumnsExport.hxx index 65aaf09b6114..11f206a15ff8 100644 --- a/xmloff/inc/XMLTextColumnsExport.hxx +++ b/xmloff/inc/XMLTextColumnsExport.hxx @@ -44,7 +44,7 @@ public: XMLTextColumnsExport( SvXMLExport& rExport ); - void exportXML( const ::com::sun::star::uno::Any& rAny ); + void exportXML( const css::uno::Any& rAny ); }; diff --git a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx index 2b04d84760f7..0b2f2d435165 100644 --- a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx +++ b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx @@ -31,17 +31,17 @@ public: virtual ~XMLTextColumnsPropertyHandler (); virtual bool equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const override; + const css::uno::Any& r1, + const css::uno::Any& r2 ) const override; /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx index 4ace7244dc4a..d22907451d8e 100644 --- a/xmloff/inc/XMLTextHeaderFooterContext.hxx +++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx @@ -29,10 +29,8 @@ namespace com { namespace sun { namespace star { class XMLTextHeaderFooterContext: public SvXMLImportContext { - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor > xOldTextCursor; - ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > xPropSet; + css::uno::Reference< css::text::XTextCursor > xOldTextCursor; + css::uno::Reference< css::beans::XPropertySet > xPropSet; const OUString sOn; const OUString sShareContent; @@ -49,10 +47,8 @@ public: XMLTextHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPageStylePropSet, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::beans::XPropertySet > & rPageStylePropSet, bool bFooter, bool bLft, bool bFrst ); virtual ~XMLTextHeaderFooterContext(); @@ -60,7 +56,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/inc/anim.hxx b/xmloff/inc/anim.hxx index 24385626b3dc..6dafc1fbfdc3 100644 --- a/xmloff/inc/anim.hxx +++ b/xmloff/inc/anim.hxx @@ -88,8 +88,8 @@ extern SvXMLEnumMapEntry aXML_AnimationDirection_EnumMap[]; extern SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[]; -void SdXMLImplSetEffect( ::com::sun::star::presentation::AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDirection& eDirection, sal_Int16& nStartScale, bool& bIn ); -::com::sun::star::presentation::AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, bool bIn ); +void SdXMLImplSetEffect( css::presentation::AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDirection& eDirection, sal_Int16& nStartScale, bool& bIn ); +css::presentation::AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, bool bIn ); #endif // INCLUDED_XMLOFF_INC_ANIM_HXX diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx index 307dafeaa922..afe509c49b9f 100644 --- a/xmloff/inc/animationimport.hxx +++ b/xmloff/inc/animationimport.hxx @@ -33,27 +33,27 @@ class AnimationNodeContext : public SvXMLImportContext { AnimationsImportHelperImpl* mpHelper; bool mbRootContext; - ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxNode; + css::uno::Reference< css::animations::XAnimationNode > mxNode; - void init_node( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + void init_node( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); public: AnimationNodeContext( - const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xParentNode, + const css::uno::Reference< css::animations::XAnimationNode >& xParentNode, SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, AnimationsImportHelperImpl* mpImpl = nullptr ); virtual ~AnimationNodeContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; - 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 ); + static void postProcessRootNode( SvXMLImport& rImport, const css::uno::Reference< css::animations::XAnimationNode >& xNode, css::uno::Reference< css::beans::XPropertySet >& xPageProps ); }; } diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx index 9d80281de6b7..19b9bbed303a 100644 --- a/xmloff/inc/animimp.hxx +++ b/xmloff/inc/animimp.hxx @@ -36,11 +36,11 @@ public: XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList); virtual ~XMLAnimationsContext(); virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_INC_ANIMIMP_HXX diff --git a/xmloff/inc/forms/property_handler.hxx b/xmloff/inc/forms/property_handler.hxx index daa1f0f9ec12..2f597950dd48 100644 --- a/xmloff/inc/forms/property_handler.hxx +++ b/xmloff/inc/forms/property_handler.hxx @@ -33,7 +33,7 @@ namespace xmloff { - typedef ::std::map< PropertyId, ::com::sun::star::uno::Any > PropertyValues; + typedef ::std::map< PropertyId, css::uno::Any > PropertyValues; class PropertyHandlerBase : public ::salhelper::SimpleReferenceObject { @@ -46,7 +46,7 @@ namespace xmloff /** is a convenience method for XML attributes whose value comprises of only one UNO API property */ virtual OUString - getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const = 0; + getAttributeValue( const css::uno::Any& i_propertyValue ) const = 0; /** retrieves the values of the properties controlled by an XML attributed, described by a given attribute value */ diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx index a3b723e3770c..a5201845e5cc 100644 --- a/xmloff/inc/txtflde.hxx +++ b/xmloff/inc/txtflde.hxx @@ -156,7 +156,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 >, + css::uno::Reference< css::text::XText >, ::std::set< OUString > > * pUsedMasters; @@ -169,16 +169,14 @@ public: /// Export this field and the surrounding span element with the formatting. /// To be called for every field in the document body. - void ExportField(const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextField > & rTextField, + void ExportField(const css::uno::Reference < css::text::XTextField > & rTextField, bool bProgress ); /// collect styles (character styles, data styles, ...) for this field /// (if appropriate). /// Also collect used field masters (if pUsedMasters is set) /// to be called for every field during style export. - void ExportFieldAutoStyle(const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextField > & rTextField, + void ExportFieldAutoStyle(const css::uno::Reference < css::text::XTextField > & rTextField, const bool bProgress, const bool bRecursive ); /// export field declarations. @@ -189,8 +187,7 @@ public: /// (Requires that a list of used field declarations has previously been /// built-up in ExportFieldAutoStyle() ) void ExportFieldDeclarations( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XText > & rText); + const css::uno::Reference < css::text::XText > & rText); /// export all field declarations, or only those that have been used? /// Calling this method will reset the list of used field declataions. @@ -209,13 +206,10 @@ public: static enum ::xmloff::token::XMLTokenEnum MapCountFieldName(FieldIdEnum nToken); static enum ::xmloff::token::XMLTokenEnum MapBibliographyFieldName(const 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, + enum ::xmloff::token::XMLTokenEnum MapPageNumberName(const css::uno::Reference< css::beans::XPropertySet> & xPropSet, sal_Int32& nOffset); /// also adjust page offset - enum ::xmloff::token::XMLTokenEnum MapAuthorFieldName(const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & xPropSet); - enum ::xmloff::token::XMLTokenEnum MapSenderFieldName(const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & xPropSet); + enum ::xmloff::token::XMLTokenEnum MapAuthorFieldName(const css::uno::Reference< css::beans::XPropertySet > & xPropSet); + enum ::xmloff::token::XMLTokenEnum MapSenderFieldName(const css::uno::Reference< css::beans::XPropertySet > & xPropSet); protected: @@ -223,12 +217,9 @@ protected: /// export a field after <text:span> is already written void ExportFieldHelper( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextField> & rTextField, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rRangePropSet, + const css::uno::Reference< css::text::XTextField> & rTextField, + const css::uno::Reference< css::beans::XPropertySet> & rPropSet, + const css::uno::Reference< css::beans::XPropertySet> & rRangePropSet, enum FieldIdEnum nToken, bool bProgress ); @@ -244,13 +235,11 @@ protected: /// element? /// export a macro (as used in the macro field) - void ExportMacro( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + void ExportMacro( const css::uno::Reference< css::beans::XPropertySet> & rPropSet, const OUString& rContent); /// export text:meta-field (RDF metadata) - void ExportMetaField( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & i_xMeta, + void ExportMetaField( const css::uno::Reference< css::beans::XPropertySet> & i_xMeta, bool i_bAutoStyles, bool i_bProgress ); /// export a boolean attribute @@ -363,70 +352,61 @@ protected: /// export times, dates and durations according to ISO 8601 void ProcessDateTime( enum ::xmloff::token::XMLTokenEnum eXMLName, /// attribute token - const ::com::sun::star::util::DateTime& rTime, /// date/time value + const css::util::DateTime& rTime, /// date/time value bool bIsDate, /// export as date (rather than date/time)? sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix /// export time or dateTime void ProcessTimeOrDateTime( enum ::xmloff::token::XMLTokenEnum eXMLName, /// attribute token - const ::com::sun::star::util::DateTime& rTime, /// date/time value + const css::util::DateTime& rTime, /// date/time value sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix /// export all attributes for bibliography data fields void ProcessBibliographyData( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropertySet); + const css::uno::Reference < + css::beans::XPropertySet > & rPropertySet); /// export CommandTypeAttribute void ProcessCommandType( - sal_Int32 nCommandType); /// com::sun::star::sdb::CommandType + sal_Int32 nCommandType); /// css::sdb::CommandType void ProcessStringSequence( - const ::com::sun::star::uno::Sequence<OUString>& rSequence, + const css::uno::Sequence<OUString>& rSequence, const OUString& sSelected ); void ProcessStringSequence( - const ::com::sun::star::uno::Sequence<OUString>& rSequence, + const css::uno::Sequence<OUString>& rSequence, sal_Int32 nSelected ); /// export attributes that describe a data source void ExportDataBaseElement( enum ::xmloff::token::XMLTokenEnum eElement, const OUString& sContent, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropertySet, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySetInfo > & rPropertySetInfo ); + const css::uno::Reference < css::beans::XPropertySet > & rPropertySet, + const css::uno::Reference < css::beans::XPropertySetInfo > & rPropertySetInfo ); /// for XDependentTextFields, get PropertySet of FieldMaster - static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > - GetMasterPropertySet(const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextField > & rTextField); + static css::uno::Reference < css::beans::XPropertySet > + GetMasterPropertySet(const css::uno::Reference < css::text::XTextField > & rTextField); /// get PropertySet of (any) DependentTextField for this FieldMaster bool GetDependentFieldPropertySet( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xmaster, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xField); + const css::uno::Reference< css::beans::XPropertySet> & xmaster, + css::uno::Reference< css::beans::XPropertySet> & xField); /// get field ID from XTextField (and it's Property-Set) - enum FieldIdEnum GetFieldID(const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextField > & rTextField, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & xPropSet); + enum FieldIdEnum GetFieldID(const css::uno::Reference < css::text::XTextField > & rTextField, + const css::uno::Reference < css::beans::XPropertySet > & xPropSet); /// get field ID from XTextField service name (and it's PropertySet) enum FieldIdEnum MapFieldName(const OUString& sFieldName, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet> & xPropSet); + const css::uno::Reference < css::beans::XPropertySet> & xPropSet); /// determine, whether field has string or numeric content bool IsStringField(FieldIdEnum nFieldType, /// field ID - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & xPropSet); + const css::uno::Reference < css::beans::XPropertySet > & xPropSet); /// explode a field master name into field type and field name diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index e9436c4918c4..c3c986d2a78f 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -139,8 +139,7 @@ public: /// parses attributes and calls ProcessAttribute virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override; /// create XTextField and insert into document; calls PrepareTextField virtual void EndElement() override; @@ -169,19 +168,16 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) = 0; + const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) = 0; /// create field from ServiceName - bool CreateField(::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xField, + bool CreateField(css::uno::Reference< css::beans::XPropertySet> & xField, const OUString& sServiceName); /// force an update of the field's value /// call update on optional XUptadeable interface; (disable Fixed property) static void ForceUpdate( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet); + const css::uno::Reference< css::beans::XPropertySet> & rPropertySet); }; class XMLSenderFieldImportContext : public XMLTextFieldImportContext @@ -210,8 +206,7 @@ public: protected: /// start element virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override; /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, @@ -219,8 +214,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override; }; /** inherit sender field because of fixed attribute in ProcessAttributes */ @@ -244,13 +238,11 @@ public: protected: /// start element virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override; /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override; }; class XMLPlaceholderFieldImportContext : public XMLTextFieldImportContext @@ -278,8 +270,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override; }; class XMLTimeFieldImportContext : public XMLTextFieldImportContext @@ -293,7 +284,7 @@ protected: const OUString sPropertyIsDate; const OUString sPropertyIsFixedLanguage; - ::com::sun::star::util::DateTime aDateTimeValue; + css::util::DateTime aDateTimeValue; sal_Int32 nAdjust; sal_Int32 nFormatKey; bool bTimeOK; @@ -317,8 +308,7 @@ public: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override; }; /** import date fields (<text:date>); @@ -346,7 +336,7 @@ class XMLPageContinuationImportContext : public XMLTextFieldImportContext const OUString sPropertyNumberingType; OUString sString; /// continuation string - com::sun::star::text::PageNumberType eSelectPage; /// previous, current + css::text::PageNumberType eSelectPage; /// previous, current /// or next page bool sStringOK; /// continuation string encountered? @@ -364,8 +354,7 @@ public: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override; }; /** import page number fields (<text:page-number>) */ @@ -378,7 +367,7 @@ class XMLPageNumberImportContext : public XMLTextFieldImportContext OUString sNumberFormat; OUString sNumberSync; sal_Int16 nPageAdjust; - com::sun::star::text::PageNumberType eSelectPage; /// previous, current + css::text::PageNumberType eSelectPage; /// previous, current /// or next page bool sNumberFormatOK; @@ -397,8 +386,7 @@ public: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override; }; /** superclass for database fields: handle database and table names */ @@ -443,15 +431,13 @@ public: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override; /// handle database-location children virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override; }; /** import database name fields (<text:database-name>) */ @@ -498,8 +484,7 @@ public: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override; }; /** import database select fields (<text:database-select>) */ @@ -522,8 +507,8 @@ public: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< + css::beans::XPropertySet> & xPropertySet) override; }; /** import database display number fields (<text:database-row-number>) */ @@ -549,8 +534,7 @@ public: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override; }; /** import docinfo fields with only fixed attribute */ @@ -583,8 +567,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override; static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken); }; @@ -617,8 +600,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override; }; /** import revision field (<text:editing-cycles>) */ @@ -637,8 +619,7 @@ public: protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import user docinfo field (<text:user-defined>) */ @@ -665,8 +646,7 @@ protected: virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ) override; virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import hidden paragraph fields (<text:hidden-paragraph>) */ @@ -692,8 +672,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import conditional text fields (<text:conditional-text>) */ @@ -728,8 +707,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import conditional text fields (<text:hidden-text>) */ @@ -760,8 +738,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import file name fields (<text:file-name>) */ @@ -788,8 +765,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import document template name fields (<text:template-name>) */ @@ -813,8 +789,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import chapter fields (<text:chapter>) */ @@ -840,8 +815,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import count fields (<text:[XXX]-count>) */ @@ -869,8 +843,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken); }; @@ -899,8 +872,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import page variable fields (<text:get-page-variable>) */ @@ -926,8 +898,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import macro fields (<text:execute-macro>) */ @@ -956,8 +927,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, @@ -965,8 +935,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import reference fields (<text:reference-get>) */ @@ -996,8 +965,7 @@ public: protected: /// start element virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, @@ -1005,8 +973,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import dde field declaration container (<text:dde-connection-decls>) */ @@ -1023,8 +990,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; /** import dde field declaration (<text:dde-connection-decl>) */ @@ -1047,8 +1013,7 @@ public: // create fieldmaster virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; }; /** import dde fields (<text:dde-connection>) */ @@ -1074,8 +1039,7 @@ protected: /// empty method virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import sheet name fields (Calc) dde fields (<text:sheet-name>) */ @@ -1096,8 +1060,7 @@ protected: /// no attributes -> empty method virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import page|slide name fields (<text:page-name>) */ @@ -1117,8 +1080,7 @@ public: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import hyperlinks as URL fields (Calc, Impress, Draw) (<office:a>) */ @@ -1146,8 +1108,7 @@ protected: /// no attributes -> empty method virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import bibliography info fields (<text:bibliography-mark>) */ @@ -1155,7 +1116,7 @@ class XMLBibliographyFieldImportContext : public XMLTextFieldImportContext { const OUString sPropertyFields; - ::std::vector< ::com::sun::star::beans::PropertyValue> aValues; + ::std::vector< css::beans::PropertyValue> aValues; public: @@ -1167,8 +1128,7 @@ public: protected: /// process attributes (fill aValues) virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; /// empty method; all attributes are handled in StartElement virtual void ProcessAttribute( sal_uInt16 nAttrToken, @@ -1176,8 +1136,7 @@ protected: /// convert aValues into sequence and set property virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; static const sal_Char* MapBibliographyFieldName(const OUString& sName); }; @@ -1198,9 +1157,9 @@ class XMLAnnotationImportContext : public XMLTextFieldImportContext OUStringBuffer aTextBuffer; OUStringBuffer aDateBuffer; - com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > mxField; - com::sun::star::uno::Reference < com::sun::star::text::XTextCursor > mxCursor; - com::sun::star::uno::Reference < com::sun::star::text::XTextCursor > mxOldCursor; + css::uno::Reference < css::beans::XPropertySet > mxField; + css::uno::Reference < css::text::XTextCursor > mxCursor; + css::uno::Reference < css::text::XTextCursor > mxOldCursor; sal_uInt16 m_nToken; @@ -1219,13 +1178,12 @@ protected: /// set properties virtual void PrepareField( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xPropertySet) override; + const css::uno::Reference< css::beans::XPropertySet > & xPropertySet) override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; @@ -1256,8 +1214,7 @@ protected: /// set properties virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import measure fields (<text:measure>) */ @@ -1279,8 +1236,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** dropdown field (filter legacy) */ @@ -1311,7 +1267,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override; protected: /// process attribute values @@ -1320,8 +1276,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import header fields (<draw:header>) */ @@ -1341,8 +1296,7 @@ public: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import footer fields (<draw:footer>) */ @@ -1362,8 +1316,7 @@ public: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; /** import footer fields (<draw:date-and-time>) */ @@ -1383,13 +1336,12 @@ public: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext { - ::com::sun::star::uno::Any aValue; + css::uno::Any aValue; public: @@ -1405,8 +1357,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; #endif diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx index b204eab460b8..46beb4b0e382 100644 --- a/xmloff/inc/txtlists.hxx +++ b/xmloff/inc/txtlists.hxx @@ -91,8 +91,7 @@ class XMLTextListsHelper : private boost::noncopyable note that the ID namespace for numbered-paragraph and regular list is distinct; we never combine a list and a n-p */ - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexReplace> + css::uno::Reference< css::container::XIndexReplace> EnsureNumberedParagraph( SvXMLImport & i_rImport, const OUString& i_ListId, @@ -112,11 +111,9 @@ class XMLTextListsHelper : private boost::noncopyable @param o_rRestartNumbering set to true if no style (defaulting) @param io_rSetDefaults set to true if no style (defaulting) */ - static ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexReplace> MakeNumRule( + static css::uno::Reference< css::container::XIndexReplace> MakeNumRule( SvXMLImport & i_rImport, - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexReplace>& i_xNumRule, + const css::uno::Reference< css::container::XIndexReplace>& i_xNumRule, const OUString& i_ParentStyleName, const OUString& i_StyleName, sal_Int16 & io_rLevel, @@ -168,9 +165,10 @@ class XMLTextListsHelper : private boost::noncopyable LastNumberedParagraphs_t mLastNumberedParagraphs; /// numbered-paragraphs - typedef ::std::vector< ::std::pair< OUString, - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexReplace > > > NumParaList_t; + typedef ::std::vector< + ::std::pair< + OUString, + css::uno::Reference< css::container::XIndexReplace > > > NumParaList_t; ::std::map< OUString, NumParaList_t > mNPLists; }; diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index 5dd636af7da4..43c8a28bd6e4 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -81,8 +81,7 @@ public: /// prepare XTextField for insertion into document void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet); + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet); /// is value a string (rather than double)? inline bool IsStringValue() { return bStringType; } @@ -186,8 +185,8 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< + css::beans::XPropertySet> & xPropertySet) override; // various accessor methods: inline OUString GetName() { return sName; } @@ -212,8 +211,8 @@ public: protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< + css::beans::XPropertySet> & xPropertySet) override; }; @@ -234,8 +233,8 @@ public: protected: virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< + css::beans::XPropertySet> & xPropertySet) override; }; /*** import text input fields (<text:text-input>) */ @@ -254,8 +253,8 @@ public: protected: virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference< + css::beans::XPropertySet> & xPropertySet) override; }; @@ -304,8 +303,8 @@ protected: /// find appropriate field master bool FindFieldMaster( - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xMaster); + css::uno::Reference< + css::beans::XPropertySet> & xMaster); }; @@ -327,8 +326,7 @@ public: protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; @@ -352,8 +350,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; @@ -386,8 +383,7 @@ public: const OUString& rLocalName); /// element name w/o prefix virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; @@ -420,8 +416,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; @@ -451,8 +446,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; /** @@ -479,13 +473,11 @@ public: XMLTextImportHelper& rHlp, /// text import helper sal_uInt16 nPrfx, /// namespace 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, + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList,/// list of element attributes enum VarType eVarType); /// variable type /// get field master for name and rename if appropriate - static bool FindFieldMaster(::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xMaster, + static bool FindFieldMaster(css::uno::Reference<css::beans::XPropertySet> & xMaster, SvXMLImport& rImport, XMLTextImportHelper& rHelper, const OUString& sVarName, @@ -522,8 +514,7 @@ protected: /// prepare XTextField for insertion into document virtual void PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) override; + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; }; diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx index 178fa5833a59..230fd5b5a722 100644 --- a/xmloff/inc/xexptran.hxx +++ b/xmloff/inc/xexptran.hxx @@ -78,10 +78,10 @@ public: void AddMatrix(const ::basegfx::B3DHomMatrix& rNew); - void AddHomogenMatrix(const com::sun::star::drawing::HomogenMatrix& xHomMat); + void AddHomogenMatrix(const css::drawing::HomogenMatrix& xHomMat); bool NeedsAction() const { return !maList.empty(); } void GetFullTransform(::basegfx::B3DHomMatrix& rFullTrans); - bool GetFullHomogenTransform(com::sun::star::drawing::HomogenMatrix& xHomMat); + bool GetFullHomogenTransform(css::drawing::HomogenMatrix& xHomMat); const OUString& GetExportString(const SvXMLUnitConverter& rConv); void SetString(const OUString& rNew, const SvXMLUnitConverter& rConv); }; diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx index dc4034313ced..5fb54e0fb548 100644 --- a/xmloff/inc/xmltabi.hxx +++ b/xmloff/inc/xmltabi.hxx @@ -43,7 +43,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx index e87ddc24375b..bf4275229ff7 100644 --- a/xmloff/inc/xmlversion.hxx +++ b/xmloff/inc/xmlversion.hxx @@ -35,13 +35,13 @@ class XMLVersionListExport : public SvXMLExport { private: - const com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& maVersions; + const css::uno::Sequence < css::util::RevisionTag >& maVersions; public: XMLVersionListExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, - const com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& rVersions, + const css::uno::Reference< css::uno::XComponentContext >& rContext, + const css::uno::Sequence < css::util::RevisionTag >& rVersions, const OUString &rFileName, - com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > &rHandler ); + css::uno::Reference< css::xml::sax::XDocumentHandler > &rHandler ); virtual ~XMLVersionListExport() {} sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) override; @@ -53,7 +53,7 @@ public: class XMLVersionListImport : public SvXMLImport { private: - com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& maVersions; + css::uno::Sequence < css::util::RevisionTag >& maVersions; protected: @@ -61,17 +61,16 @@ protected: // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; public: XMLVersionListImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, - com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& rVersions ); + const css::uno::Reference< css::uno::XComponentContext >& rContext, + css::uno::Sequence < css::util::RevisionTag >& rVersions ); virtual ~XMLVersionListImport() throw(); - com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& + css::uno::Sequence < css::util::RevisionTag >& GetList() { return maVersions; } }; @@ -85,15 +84,13 @@ public: XMLVersionListContext( XMLVersionListImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); virtual ~XMLVersionListContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; }; @@ -104,24 +101,23 @@ private: static bool ParseISODateTimeString( const OUString& rString, - com::sun::star::util::DateTime& rDateTime ); + css::util::DateTime& rDateTime ); public: XMLVersionContext( XMLVersionListImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); virtual ~XMLVersionContext(); }; -class XMLVersionListPersistence : public ::cppu::WeakImplHelper< ::com::sun::star::document::XDocumentRevisionListPersistence, css::lang::XServiceInfo > +class XMLVersionListPersistence : public ::cppu::WeakImplHelper< css::document::XDocumentRevisionListPersistence, css::lang::XServiceInfo > { public: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag > SAL_CALL load( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + virtual css::uno::Sequence< css::util::RevisionTag > SAL_CALL load( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL store( const css::uno::Reference< css::embed::XStorage >& Storage, const css::uno::Sequence< css::util::RevisionTag >& List ) throw (css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/xmloff/source/chart/ColorPropertySet.hxx b/xmloff/source/chart/ColorPropertySet.hxx index 9f7411dd0966..ac3c5d5b7aeb 100644 --- a/xmloff/source/chart/ColorPropertySet.hxx +++ b/xmloff/source/chart/ColorPropertySet.hxx @@ -30,8 +30,8 @@ namespace chart { class ColorPropertySet : public ::cppu::WeakImplHelper< - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::beans::XPropertyState > + css::beans::XPropertySet, + css::beans::XPropertyState > { public: // if bFillColor == false, the color is a LineColor @@ -40,68 +40,67 @@ public: protected: // ____ XPropertySet ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // ____ XPropertyState ____ - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( - const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( + const css::uno::Sequence< OUString >& aPropertyName ) + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; private: - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > m_xInfo; + css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo; OUString m_aColorPropName; sal_Int32 m_nColor; bool m_bIsFillColor; diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx index d62a7db8ef3a..f425c947f3f9 100644 --- a/xmloff/source/chart/MultiPropertySetHandler.hxx +++ b/xmloff/source/chart/MultiPropertySetHandler.hxx @@ -54,7 +54,7 @@ public: /** @descr Abstract interface of a method for setting a variables value to that of the property. */ - virtual void SetValue (const ::com::sun::star::uno::Any & rValue) = 0; + virtual void SetValue (const css::uno::Any & rValue) = 0; const OUString msName; }; @@ -75,7 +75,7 @@ public: /** descr Set the given value inside an Any to the variable referenced by the data member. */ - virtual void SetValue (const ::com::sun::star::uno::Any & rValue) override + virtual void SetValue (const css::uno::Any & rValue) override { rValue >>= mrValue; } @@ -121,8 +121,8 @@ public: not necessarily XPropertySet or XMultiPropertySet. It is casted later to one of the two of them. */ - explicit MultiPropertySetHandler (::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface> xObject); + explicit MultiPropertySetHandler (css::uno::Reference< + css::uno::XInterface> xObject); ~MultiPropertySetHandler(); /** @descr Add a property to handle. The type given implicitly by the reference to a variable is used to create an instance of @@ -152,7 +152,7 @@ private: containing the properties names. @return True if values could be derived. */ - inline bool MultiGet (const ::com::sun::star::uno::Sequence< + inline bool MultiGet (const css::uno::Sequence< OUString> & rNameList); /** @descr Try to use the XPropertySet interface to get the property @@ -161,7 +161,7 @@ private: containing the properties names. @return True if values could be derived. */ - inline bool SingleGet (const ::com::sun::star::uno::Sequence< + inline bool SingleGet (const css::uno::Sequence< OUString> & rNameList); /** @descr STL map that maps from property names to polymorphic instances of @@ -171,11 +171,11 @@ private: ::std::map< OUString, PropertyWrapperBase*, OUStringComparison> aPropertyList; /// The object from which to get the property values. - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> mxObject; + css::uno::Reference< css::uno::XInterface> mxObject; }; -MultiPropertySetHandler::MultiPropertySetHandler (::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface> xObject) +MultiPropertySetHandler::MultiPropertySetHandler (css::uno::Reference< + css::uno::XInterface> xObject) : mxObject (xObject) { } @@ -190,7 +190,7 @@ MultiPropertySetHandler::~MultiPropertySetHandler() bool MultiPropertySetHandler::GetProperties() { ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; - ::com::sun::star::uno::Sequence< OUString> aNameList (aPropertyList.size()); + css::uno::Sequence< OUString> aNameList (aPropertyList.size()); int i; for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I) aNameList[i++] = I->second->msName; @@ -200,22 +200,22 @@ bool MultiPropertySetHandler::GetProperties() return true; } -bool MultiPropertySetHandler::MultiGet (const ::com::sun::star::uno::Sequence< +bool MultiPropertySetHandler::MultiGet (const css::uno::Sequence< OUString> & rNameList) { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet> xMultiSet ( - mxObject, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::beans::XMultiPropertySet> xMultiSet ( + mxObject, css::uno::UNO_QUERY); if (xMultiSet.is()) try { ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; int i; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> aValueList = + css::uno::Sequence< css::uno::Any> aValueList = xMultiSet->getPropertyValues (rNameList); for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I) I->second->SetValue (aValueList[i++]); } - catch (const ::com::sun::star::beans::UnknownPropertyException&) + catch (const css::beans::UnknownPropertyException&) { return false; } @@ -225,11 +225,11 @@ bool MultiPropertySetHandler::MultiGet (const ::com::sun::star::uno::Sequen return true; } -bool MultiPropertySetHandler::SingleGet (const ::com::sun::star::uno::Sequence< +bool MultiPropertySetHandler::SingleGet (const css::uno::Sequence< OUString> & rNameList) { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xSingleSet ( - mxObject, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::beans::XPropertySet> xSingleSet ( + mxObject, css::uno::UNO_QUERY); if (xSingleSet.is()) try { @@ -238,7 +238,7 @@ bool MultiPropertySetHandler::SingleGet (const ::com::sun::star::uno::Sequen for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I) I->second->SetValue (xSingleSet->getPropertyValue (rNameList[i++])); } - catch (const ::com::sun::star::beans::UnknownPropertyException&) + catch (const css::beans::UnknownPropertyException&) { return false; } diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index e44ccef921a9..a7f1fba3d4a2 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -260,57 +260,57 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = const SvXMLEnumMapEntry aXMLChartAxisLabelPositionEnumMap[] = { - { ::xmloff::token::XML_NEAR_AXIS, ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS }, - { ::xmloff::token::XML_NEAR_AXIS_OTHER_SIDE, ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE }, - { ::xmloff::token::XML_OUTSIDE_START, ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START }, - { ::xmloff::token::XML_OUTSIDE_END, ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END }, - { ::xmloff::token::XML_OUTSIDE_MINIMUM, ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START },//#i114142# - { ::xmloff::token::XML_OUTSIDE_MAXIMUM, ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END },//#i114142# + { ::xmloff::token::XML_NEAR_AXIS, css::chart::ChartAxisLabelPosition_NEAR_AXIS }, + { ::xmloff::token::XML_NEAR_AXIS_OTHER_SIDE, css::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE }, + { ::xmloff::token::XML_OUTSIDE_START, css::chart::ChartAxisLabelPosition_OUTSIDE_START }, + { ::xmloff::token::XML_OUTSIDE_END, css::chart::ChartAxisLabelPosition_OUTSIDE_END }, + { ::xmloff::token::XML_OUTSIDE_MINIMUM, css::chart::ChartAxisLabelPosition_OUTSIDE_START },//#i114142# + { ::xmloff::token::XML_OUTSIDE_MAXIMUM, css::chart::ChartAxisLabelPosition_OUTSIDE_END },//#i114142# { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; const SvXMLEnumMapEntry aXMLChartAxisMarkPositionEnumMap[] = { - { ::xmloff::token::XML_AT_LABELS, ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS }, - { ::xmloff::token::XML_AT_AXIS, ::com::sun::star::chart::ChartAxisMarkPosition_AT_AXIS }, - { ::xmloff::token::XML_AT_LABELS_AND_AXIS, ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS }, + { ::xmloff::token::XML_AT_LABELS, css::chart::ChartAxisMarkPosition_AT_LABELS }, + { ::xmloff::token::XML_AT_AXIS, css::chart::ChartAxisMarkPosition_AT_AXIS }, + { ::xmloff::token::XML_AT_LABELS_AND_AXIS, css::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS }, { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; const SvXMLEnumMapEntry aXMLChartAxisArrangementEnumMap[] = { - { ::xmloff::token::XML_SIDE_BY_SIDE, ::com::sun::star::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE }, - { ::xmloff::token::XML_STAGGER_EVEN, ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_EVEN }, - { ::xmloff::token::XML_STAGGER_ODD, ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_ODD }, + { ::xmloff::token::XML_SIDE_BY_SIDE, css::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE }, + { ::xmloff::token::XML_STAGGER_EVEN, css::chart::ChartAxisArrangeOrderType_STAGGER_EVEN }, + { ::xmloff::token::XML_STAGGER_ODD, css::chart::ChartAxisArrangeOrderType_STAGGER_ODD }, { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; const SvXMLEnumMapEntry aXMLChartErrorBarStyleEnumMap[] = { - { ::xmloff::token::XML_NONE, ::com::sun::star::chart::ErrorBarStyle::NONE }, - { ::xmloff::token::XML_VARIANCE, ::com::sun::star::chart::ErrorBarStyle::VARIANCE }, - { ::xmloff::token::XML_STANDARD_DEVIATION, ::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION }, - { ::xmloff::token::XML_CONSTANT, ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE }, - { ::xmloff::token::XML_PERCENTAGE, ::com::sun::star::chart::ErrorBarStyle::RELATIVE }, - { ::xmloff::token::XML_ERROR_MARGIN, ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN }, - { ::xmloff::token::XML_STANDARD_ERROR, ::com::sun::star::chart::ErrorBarStyle::STANDARD_ERROR }, - { ::xmloff::token::XML_CELL_RANGE, ::com::sun::star::chart::ErrorBarStyle::FROM_DATA }, + { ::xmloff::token::XML_NONE, css::chart::ErrorBarStyle::NONE }, + { ::xmloff::token::XML_VARIANCE, css::chart::ErrorBarStyle::VARIANCE }, + { ::xmloff::token::XML_STANDARD_DEVIATION, css::chart::ErrorBarStyle::STANDARD_DEVIATION }, + { ::xmloff::token::XML_CONSTANT, css::chart::ErrorBarStyle::ABSOLUTE }, + { ::xmloff::token::XML_PERCENTAGE, css::chart::ErrorBarStyle::RELATIVE }, + { ::xmloff::token::XML_ERROR_MARGIN, css::chart::ErrorBarStyle::ERROR_MARGIN }, + { ::xmloff::token::XML_STANDARD_ERROR, css::chart::ErrorBarStyle::STANDARD_ERROR }, + { ::xmloff::token::XML_CELL_RANGE, css::chart::ErrorBarStyle::FROM_DATA }, { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; const SvXMLEnumMapEntry aXMLChartSolidTypeEnumMap[] = { - { ::xmloff::token::XML_CUBOID, ::com::sun::star::chart::ChartSolidType::RECTANGULAR_SOLID }, - { ::xmloff::token::XML_CYLINDER, ::com::sun::star::chart::ChartSolidType::CYLINDER }, - { ::xmloff::token::XML_CONE, ::com::sun::star::chart::ChartSolidType::CONE }, - { ::xmloff::token::XML_PYRAMID, ::com::sun::star::chart::ChartSolidType::PYRAMID }, + { ::xmloff::token::XML_CUBOID, css::chart::ChartSolidType::RECTANGULAR_SOLID }, + { ::xmloff::token::XML_CYLINDER, css::chart::ChartSolidType::CYLINDER }, + { ::xmloff::token::XML_CONE, css::chart::ChartSolidType::CONE }, + { ::xmloff::token::XML_PYRAMID, css::chart::ChartSolidType::PYRAMID }, { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; const SvXMLEnumMapEntry aXMLChartDataRowSourceTypeEnumMap[] = { - { ::xmloff::token::XML_COLUMNS, ::com::sun::star::chart::ChartDataRowSource_COLUMNS }, - { ::xmloff::token::XML_ROWS, ::com::sun::star::chart::ChartDataRowSource_ROWS }, + { ::xmloff::token::XML_COLUMNS, css::chart::ChartDataRowSource_COLUMNS }, + { ::xmloff::token::XML_ROWS, css::chart::ChartDataRowSource_ROWS }, { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; @@ -336,27 +336,27 @@ const SvXMLEnumMapEntry aXMLChartInterpolationTypeEnumMap[] = const SvXMLEnumMapEntry aXMLChartDataLabelPlacementEnumMap[] = { - { ::xmloff::token::XML_AVOID_OVERLAP, ::com::sun::star::chart::DataLabelPlacement::AVOID_OVERLAP }, - { ::xmloff::token::XML_CENTER, ::com::sun::star::chart::DataLabelPlacement::CENTER }, - { ::xmloff::token::XML_TOP, ::com::sun::star::chart::DataLabelPlacement::TOP }, - { ::xmloff::token::XML_TOP_LEFT, ::com::sun::star::chart::DataLabelPlacement::TOP_LEFT }, - { ::xmloff::token::XML_LEFT, ::com::sun::star::chart::DataLabelPlacement::LEFT }, - { ::xmloff::token::XML_BOTTOM_LEFT, ::com::sun::star::chart::DataLabelPlacement::BOTTOM_LEFT }, - { ::xmloff::token::XML_BOTTOM, ::com::sun::star::chart::DataLabelPlacement::BOTTOM }, - { ::xmloff::token::XML_BOTTOM_RIGHT, ::com::sun::star::chart::DataLabelPlacement::BOTTOM_RIGHT }, - { ::xmloff::token::XML_RIGHT, ::com::sun::star::chart::DataLabelPlacement::RIGHT }, - { ::xmloff::token::XML_TOP_RIGHT, ::com::sun::star::chart::DataLabelPlacement::TOP_RIGHT }, - { ::xmloff::token::XML_INSIDE, ::com::sun::star::chart::DataLabelPlacement::INSIDE }, - { ::xmloff::token::XML_OUTSIDE, ::com::sun::star::chart::DataLabelPlacement::OUTSIDE }, - { ::xmloff::token::XML_NEAR_ORIGIN, ::com::sun::star::chart::DataLabelPlacement::NEAR_ORIGIN }, + { ::xmloff::token::XML_AVOID_OVERLAP, css::chart::DataLabelPlacement::AVOID_OVERLAP }, + { ::xmloff::token::XML_CENTER, css::chart::DataLabelPlacement::CENTER }, + { ::xmloff::token::XML_TOP, css::chart::DataLabelPlacement::TOP }, + { ::xmloff::token::XML_TOP_LEFT, css::chart::DataLabelPlacement::TOP_LEFT }, + { ::xmloff::token::XML_LEFT, css::chart::DataLabelPlacement::LEFT }, + { ::xmloff::token::XML_BOTTOM_LEFT, css::chart::DataLabelPlacement::BOTTOM_LEFT }, + { ::xmloff::token::XML_BOTTOM, css::chart::DataLabelPlacement::BOTTOM }, + { ::xmloff::token::XML_BOTTOM_RIGHT, css::chart::DataLabelPlacement::BOTTOM_RIGHT }, + { ::xmloff::token::XML_RIGHT, css::chart::DataLabelPlacement::RIGHT }, + { ::xmloff::token::XML_TOP_RIGHT, css::chart::DataLabelPlacement::TOP_RIGHT }, + { ::xmloff::token::XML_INSIDE, css::chart::DataLabelPlacement::INSIDE }, + { ::xmloff::token::XML_OUTSIDE, css::chart::DataLabelPlacement::OUTSIDE }, + { ::xmloff::token::XML_NEAR_ORIGIN, css::chart::DataLabelPlacement::NEAR_ORIGIN }, { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; const SvXMLEnumMapEntry aXMLChartMissingValueTreatmentEnumMap[] = { - { ::xmloff::token::XML_LEAVE_GAP, ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP }, - { ::xmloff::token::XML_USE_ZERO, ::com::sun::star::chart::MissingValueTreatment::USE_ZERO }, - { ::xmloff::token::XML_IGNORE, ::com::sun::star::chart::MissingValueTreatment::CONTINUE }, + { ::xmloff::token::XML_LEAVE_GAP, css::chart::MissingValueTreatment::LEAVE_GAP }, + { ::xmloff::token::XML_USE_ZERO, css::chart::MissingValueTreatment::USE_ZERO }, + { ::xmloff::token::XML_IGNORE, css::chart::MissingValueTreatment::CONTINUE }, { ::xmloff::token::XML_TOKEN_INVALID,0 }, }; diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index 8d30f0845024..45b8f1734d7d 100644 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -61,9 +61,9 @@ static const SvXMLEnumMapEntry aXMLAxisDimensionMap[] = static const SvXMLEnumMapEntry aXMLAxisTypeMap[] = { - { XML_AUTO, ::com::sun::star::chart::ChartAxisType::AUTOMATIC }, - { XML_TEXT, ::com::sun::star::chart::ChartAxisType::CATEGORY }, - { XML_DATE, ::com::sun::star::chart::ChartAxisType::DATE }, + { XML_AUTO, css::chart::ChartAxisType::AUTOMATIC }, + { XML_TEXT, css::chart::ChartAxisType::CATEGORY }, + { XML_DATE, css::chart::ChartAxisType::DATE }, { XML_TOKEN_INVALID, 0 } }; @@ -78,7 +78,7 @@ public: const OUString& rLocalName, OUString& rAddress ); virtual ~SchXMLCategoriesContext(); - virtual void StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; class DateScaleContext : public SvXMLImportContext @@ -89,7 +89,7 @@ public: const Reference< beans::XPropertySet >& rAxisProps ); virtual ~DateScaleContext(); - virtual void StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: Reference< beans::XPropertySet > m_xAxisProps; @@ -769,7 +769,7 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc if( rChartTypeServiceName == "com.sun.star.chart2.ScatterChartType" ) { xMainYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) ); + , uno::makeAny( css::chart::ChartAxisPosition_VALUE) ); double fCrossoverValue = 0.0; aMainXScale.Origin >>= fCrossoverValue; xMainYAxisProp->setPropertyValue("CrossoverValue" @@ -778,22 +778,22 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE ) { xMainYAxisProp->setPropertyValue("LabelPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) ); + , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_END) ); xMainYAxisProp->setPropertyValue("MarkPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); + , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryYAxisProp.is() ) xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); + , uno::makeAny( css::chart::ChartAxisPosition_START) ); } else { xMainYAxisProp->setPropertyValue("LabelPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) ); + , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_START) ); xMainYAxisProp->setPropertyValue("MarkPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); + , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryYAxisProp.is() ) xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); + , uno::makeAny( css::chart::ChartAxisPosition_END) ); } } else @@ -801,24 +801,24 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE ) { xMainYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); + , uno::makeAny( css::chart::ChartAxisPosition_END) ); if( xSecondaryYAxisProp.is() ) xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); + , uno::makeAny( css::chart::ChartAxisPosition_START) ); } else { xMainYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); + , uno::makeAny( css::chart::ChartAxisPosition_START) ); if( xSecondaryYAxisProp.is() ) xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); + , uno::makeAny( css::chart::ChartAxisPosition_END) ); } } chart2::ScaleData aMainYScale = xMainYAxis->getScaleData(); xMainXAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) ); + , uno::makeAny( css::chart::ChartAxisPosition_VALUE) ); double fCrossoverValue = 0.0; aMainYScale.Origin >>= fCrossoverValue; xMainXAxisProp->setPropertyValue("CrossoverValue" @@ -827,22 +827,22 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc if( aMainYScale.Orientation == chart2::AxisOrientation_REVERSE ) { xMainXAxisProp->setPropertyValue("LabelPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) ); + , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_END) ); xMainXAxisProp->setPropertyValue("MarkPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); + , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryXAxisProp.is() ) xSecondaryXAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); + , uno::makeAny( css::chart::ChartAxisPosition_START) ); } else { xMainXAxisProp->setPropertyValue("LabelPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) ); + , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_START) ); xMainXAxisProp->setPropertyValue("MarkPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); + , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryXAxisProp.is() ) xSecondaryXAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); + , uno::makeAny( css::chart::ChartAxisPosition_END) ); } } } @@ -933,13 +933,13 @@ struct theDateScaleAttributeTokenMap : public rtl::Static< DateScaleAttributeTok sal_Int32 lcl_getTimeUnit( const OUString& rValue ) { - sal_Int32 nTimeUnit = ::com::sun::star::chart::TimeUnit::DAY; + sal_Int32 nTimeUnit = css::chart::TimeUnit::DAY; if( IsXMLToken( rValue, XML_DAYS ) ) - nTimeUnit = ::com::sun::star::chart::TimeUnit::DAY; + nTimeUnit = css::chart::TimeUnit::DAY; else if( IsXMLToken( rValue, XML_MONTHS ) ) - nTimeUnit = ::com::sun::star::chart::TimeUnit::MONTH; + nTimeUnit = css::chart::TimeUnit::MONTH; else if( IsXMLToken( rValue, XML_YEARS ) ) - nTimeUnit = ::com::sun::star::chart::TimeUnit::YEAR; + nTimeUnit = css::chart::TimeUnit::YEAR; return nTimeUnit; } diff --git a/xmloff/source/chart/SchXMLAxisContext.hxx b/xmloff/source/chart/SchXMLAxisContext.hxx index a734d3357ae8..bfc5c3e76dbe 100644 --- a/xmloff/source/chart/SchXMLAxisContext.hxx +++ b/xmloff/source/chart/SchXMLAxisContext.hxx @@ -27,7 +27,7 @@ class SchXMLAxisContext : public SvXMLImportContext public: SchXMLAxisContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName, - ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > xDiagram, + css::uno::Reference< css::chart::XDiagram > xDiagram, std::vector< SchXMLAxis >& aAxes, OUString& rCategoriesAddress, bool bAddMissingXAxisForNetCharts, @@ -36,27 +36,27 @@ public: bool& rbAxisPositionAttributeImported ); virtual ~SchXMLAxisContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - static void CorrectAxisPositions( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xNewDoc, + static void CorrectAxisPositions( const css::uno::Reference< css::chart2::XChartDocument >& xNewDoc, const OUString& rChartTypeServiceName, const OUString& rODFVersionOfFile, bool bAxisPositionAttributeImported ); private: SchXMLImportHelper& m_rImportHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > m_xDiagram; + css::uno::Reference< css::chart::XDiagram > m_xDiagram; SchXMLAxis m_aCurrentAxis; std::vector< SchXMLAxis >& m_rAxes; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAxisProps; + css::uno::Reference< css::beans::XPropertySet > m_xAxisProps; OUString m_aAutoStyleName; OUString& m_rCategoriesAddress; - sal_Int32 m_nAxisType;//::com::sun::star::chart::ChartAxisType + sal_Int32 m_nAxisType;//css::chart::ChartAxisType bool m_bAxisTypeImported; bool m_bDateScaleImported; bool m_bAddMissingXAxisForNetCharts; //to correct errors from older versions @@ -64,7 +64,7 @@ private: bool m_bAdaptXAxisOrientationForOld2DBarCharts; //to correct different behaviour from older versions bool& m_rbAxisPositionAttributeImported; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTitleShape(); + css::uno::Reference< css::drawing::XShape > getTitleShape(); void CreateGrid( const OUString& sAutoStyleName, bool bIsMajor ); void CreateAxis(); void SetAxisTitle(); diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx index 7bb876410044..d988c932c7ca 100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx @@ -38,8 +38,7 @@ using namespace ::xmloff::token; SchXMLCalculationSettingsContext::SchXMLCalculationSettingsContext( SvXMLImport& rImport, sal_uInt16 p_nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) : SvXMLImportContext ( rImport, p_nPrefix, rLocalName ) { const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); @@ -60,7 +59,7 @@ SchXMLCalculationSettingsContext::SchXMLCalculationSettingsContext( SvXMLImport& } SvXMLImportContext* SchXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) { return new SchXMLCalculationSettingsContext(GetImport(),nPrefix,rLocalName,xAttrList); } diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx index 762d0f11bd71..7d6ae3e84f2d 100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx @@ -24,17 +24,16 @@ class SchXMLCalculationSettingsContext : public SvXMLImportContext { - com::sun::star::uno::Any m_aNullDate; + css::uno::Any m_aNullDate; public: SchXMLCalculationSettingsContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index fa953f59dbc8..4161ba834bb6 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -384,16 +384,14 @@ namespace struct NewDonutSeries { - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > m_xSeries; + css::uno::Reference< css::chart2::XDataSeries > m_xSeries; OUString msStyleName; sal_Int32 mnAttachedAxis; ::std::vector< OUString > m_aSeriesStyles; ::std::vector< OUString > m_aPointStyles; - NewDonutSeries( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, sal_Int32 nPointCount ) + NewDonutSeries( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, sal_Int32 nPointCount ) : m_xSeries( xSeries ) , mnAttachedAxis( 1 ) { @@ -446,16 +444,15 @@ struct NewDonutSeries }; void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle >& rStyleList - , const ::std::map< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries> , sal_Int32 >& rSeriesMap ) + , const ::std::map< css::uno::Reference< css::chart2::XDataSeries> , sal_Int32 >& rSeriesMap ) { ::std::list< DataRowPointStyle >::iterator aIt(rStyleList.begin()); ::std::list< DataRowPointStyle >::iterator aEnd(rStyleList.end()); //detect old series count //and add old series to aSeriesMap - ::std::map< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >, sal_Int32 > aSeriesMap(rSeriesMap); + ::std::map< css::uno::Reference< + css::chart2::XDataSeries >, sal_Int32 > aSeriesMap(rSeriesMap); sal_Int32 nOldSeriesCount = 0; { sal_Int32 nMaxOldSeriesIndex = 0; @@ -581,7 +578,7 @@ bool lcl_SpecialHandlingForDonutChartNeeded( static void lcl_ApplyDataFromRectangularRangeToDiagram( const uno::Reference< chart2::XChartDocument >& xNewDoc , const OUString& rRectangularRange - , ::com::sun::star::chart::ChartDataRowSource eDataRowSource + , css::chart::ChartDataRowSource eDataRowSource , bool bRowHasLabels, bool bColHasLabels , bool bSwitchOnLabelsAndCategoriesForOwnData , const OUString& sColTrans @@ -1152,7 +1149,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut { sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; - com::sun::star::awt::Point maPosition; + css::awt::Point maPosition; bool bHasXPosition=false; bool bHasYPosition=false; diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx index 5aeed6577557..e5e67c776979 100644 --- a/xmloff/source/chart/SchXMLChartContext.hxx +++ b/xmloff/source/chart/SchXMLChartContext.hxx @@ -48,26 +48,26 @@ namespace com { namespace sun { namespace star { struct SeriesDefaultsAndStyles { //default values for series: - ::com::sun::star::uno::Any maSymbolTypeDefault; - ::com::sun::star::uno::Any maDataCaptionDefault; + css::uno::Any maSymbolTypeDefault; + css::uno::Any maDataCaptionDefault; - ::com::sun::star::uno::Any maErrorIndicatorDefault; - ::com::sun::star::uno::Any maErrorCategoryDefault; - ::com::sun::star::uno::Any maConstantErrorLowDefault; - ::com::sun::star::uno::Any maConstantErrorHighDefault; - ::com::sun::star::uno::Any maPercentageErrorDefault; - ::com::sun::star::uno::Any maErrorMarginDefault; + css::uno::Any maErrorIndicatorDefault; + css::uno::Any maErrorCategoryDefault; + css::uno::Any maConstantErrorLowDefault; + css::uno::Any maConstantErrorHighDefault; + css::uno::Any maPercentageErrorDefault; + css::uno::Any maErrorMarginDefault; - ::com::sun::star::uno::Any maMeanValueDefault; - ::com::sun::star::uno::Any maRegressionCurvesDefault; + css::uno::Any maMeanValueDefault; + css::uno::Any maRegressionCurvesDefault; - ::com::sun::star::uno::Any maStackedDefault; - ::com::sun::star::uno::Any maPercentDefault; - ::com::sun::star::uno::Any maDeepDefault; - ::com::sun::star::uno::Any maStackedBarsConnectedDefault; + css::uno::Any maStackedDefault; + css::uno::Any maPercentDefault; + css::uno::Any maDeepDefault; + css::uno::Any maStackedBarsConnectedDefault; //additional information - ::com::sun::star::uno::Any maLinesOnProperty; + css::uno::Any maLinesOnProperty; //styles for series and datapoints ::std::list< DataRowPointStyle > maSeriesStyleList; @@ -81,28 +81,26 @@ public: SvXMLImport& rImport, const OUString& rLocalName ); virtual ~SchXMLChartContext(); - virtual void StartElement( const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLTable maTable; SchXMLImportHelper& mrImportHelper; OUString maMainTitle, maSubTitle; - com::sun::star::awt::Point maMainTitlePos, maSubTitlePos, maLegendPos; + css::awt::Point maMainTitlePos, maSubTitlePos, maLegendPos; OUString m_aXLinkHRefAttributeToIndicateDataProvider; bool m_bHasRangeAtPlotArea; bool m_bHasTableElement; bool mbAllRangeAddressesAvailable; bool mbColHasLabels; bool mbRowHasLabels; - ::com::sun::star::chart::ChartDataRowSource meDataRowSource; + css::chart::ChartDataRowSource meDataRowSource; bool mbIsStockChart; OUString msCategoriesAddress; @@ -111,12 +109,12 @@ private: SeriesDefaultsAndStyles maSeriesDefaultsAndStyles; tSchXMLLSequencesPerIndex maLSequencesPerIndex; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxDrawPage; + css::uno::Reference< css::drawing::XShapes > mxDrawPage; OUString msColTrans; OUString msRowTrans; OUString maChartTypeServiceName; - ::com::sun::star::awt::Size maChartSize; + css::awt::Size maChartSize; /** @descr This method bundles some settings to the chart model and executes them with a locked controller. This includes setting the chart type. @@ -135,22 +133,21 @@ class SchXMLTitleContext : public SvXMLImportContext private: SchXMLImportHelper& mrImportHelper; OUString& mrTitle; - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxTitleShape; + css::uno::Reference< css::drawing::XShape > mxTitleShape; OUString msAutoStyleName; public: SchXMLTitleContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName, OUString& rTitle, - com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xTitleShape ); + css::uno::Reference< css::drawing::XShape >& xTitleShape ); virtual ~SchXMLTitleContext(); - virtual void StartElement( const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLCHARTCONTEXT_HXX diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 729b0311fa95..ac70a8e968b9 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -122,8 +122,8 @@ class SchXMLExportHelper_Impl: private boost::noncopyable { public: // first: data sequence for label, second: data sequence for values. - typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >, - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > > tLabelValuesDataPair; + typedef ::std::pair< css::uno::Reference< css::chart2::data::XDataSequence >, + css::uno::Reference< css::chart2::data::XDataSequence > > tLabelValuesDataPair; typedef ::std::vector< tLabelValuesDataPair > tDataSequenceCont; public: @@ -134,8 +134,7 @@ public: // auto-styles /// parse chart and collect all auto-styles used in current pool - void collectAutoStyles( com::sun::star::uno::Reference< - com::sun::star::chart::XChartDocument > rChartDoc ); + void collectAutoStyles( css::uno::Reference< css::chart::XChartDocument > rChartDoc ); /// write the styles collected into the current pool as <style:style> elements void exportAutoStyles(); @@ -151,8 +150,7 @@ public: which is the outer element of a chart. So these attributes can easily be parsed again by the container */ - void exportChart( com::sun::star::uno::Reference< - com::sun::star::chart::XChartDocument > rChartDoc, + void exportChart( css::uno::Reference< css::chart::XChartDocument > rChartDoc, bool bIncludeTable ); rtl::Reference<XMLPropertySetMapper> GetPropertySetMapper() const; @@ -163,12 +161,10 @@ public: { msTableNumberList = rList; } void InitRangeSegmentationProperties( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDoc ); + const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc ); - static ::com::sun::star::awt::Size getPageSize( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xChartDoc ); + static css::awt::Size getPageSize( + const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc ); /** first parseDocument: collect autostyles and store names in this queue second parseDocument: export content and use names from this queue @@ -183,20 +179,19 @@ public: { return mrAutoStylePool; } /// if bExportContent is false the auto-styles are collected - void parseDocument( com::sun::star::uno::Reference< - com::sun::star::chart::XChartDocument >& rChartDoc, + void parseDocument( css::uno::Reference< css::chart::XChartDocument >& rChartDoc, bool bExportContent, bool bIncludeTable = false ); void exportTable(); void exportPlotArea( - com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > xDiagram, - com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > xNewDiagram, - const ::com::sun::star::awt::Size & rPageSize, + css::uno::Reference< css::chart::XDiagram > xDiagram, + css::uno::Reference< css::chart2::XDiagram > xNewDiagram, + const css::awt::Size & rPageSize, bool bExportContent, bool bIncludeTable ); - void exportCoordinateRegion( const com::sun::star::uno::Reference< com::sun::star::chart::XDiagram >& xDiagram ); - void exportAxes( const com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > & xDiagram, - const com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > & xNewDiagram, + void exportCoordinateRegion( const css::uno::Reference< css::chart::XDiagram >& xDiagram ); + void exportAxes( const css::uno::Reference< css::chart::XDiagram > & xDiagram, + const css::uno::Reference< css::chart2::XDiagram > & xNewDiagram, bool bExportContent ); void exportAxis( enum XMLTokenEnum eDimension, enum XMLTokenEnum eAxisName, const Reference< beans::XPropertySet >& rAxisProps, const Reference< chart2::XAxis >& rChart2Axis, @@ -207,46 +202,42 @@ public: void exportAxisTitle( const Reference< beans::XPropertySet >& rTitleProps, bool bExportContent ); void exportSeries( - const com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > & xNewDiagram, - const ::com::sun::star::awt::Size & rPageSize, + const css::uno::Reference< css::chart2::XDiagram > & xNewDiagram, + const css::awt::Size & rPageSize, bool bExportContent, bool bHasTwoYAxes ); void exportPropertyMapping( - const com::sun::star::uno::Reference< com::sun::star::chart2::data::XDataSource > & xSource, + const css::uno::Reference< css::chart2::data::XDataSource > & xSource, Sequence< OUString >& rSupportedMappings ); void exportCandleStickSeries( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > > & aSeriesSeq, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram, + const css::uno::Sequence< + css::uno::Reference< css::chart2::XDataSeries > > & aSeriesSeq, + const css::uno::Reference< css::chart2::XDiagram > & xDiagram, bool bJapaneseCandleSticks, bool bExportContent ); void exportDataPoints( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xSeriesProperties, + const css::uno::Reference< css::beans::XPropertySet > & xSeriesProperties, sal_Int32 nSeriesLength, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram, + const css::uno::Reference< css::chart2::XDiagram > & xDiagram, bool bExportContent ); void exportRegressionCurve( - const com::sun::star::uno::Reference<com::sun::star::chart2::XDataSeries>& xSeries, - const com::sun::star::awt::Size& rPageSize, + const css::uno::Reference<css::chart2::XDataSeries>& xSeries, + const css::awt::Size& rPageSize, bool bExportContent ); void exportErrorBar ( - const ::com::sun::star::uno::Reference<beans::XPropertySet> &xSeriesProp, bool bYError, + const css::uno::Reference<beans::XPropertySet> &xSeriesProp, bool bYError, bool bExportContent ); /// add svg position as attribute for current element - void addPosition( const ::com::sun::star::awt::Point & rPosition ); - void addPosition( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape ); + void addPosition( const css::awt::Point & rPosition ); + void addPosition( css::uno::Reference< css::drawing::XShape > xShape ); /// add svg size as attribute for current element - void addSize( const ::com::sun::star::awt::Size & rSize, bool bIsOOoNamespace = false ); - void addSize( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape, bool bIsOOoNamespace = false ); + void addSize( const css::awt::Size & rSize, bool bIsOOoNamespace = false ); + void addSize( css::uno::Reference< css::drawing::XShape > xShape, bool bIsOOoNamespace = false ); /// exports a string as a paragraph element void exportText( const OUString& rText, bool bConvertTabsLFs = false ); @@ -266,14 +257,14 @@ public: bool mbRowSourceColumns; OUString msChartAddress; OUString msTableNumberList; - ::com::sun::star::uno::Sequence< sal_Int32 > maSequenceMapping; + css::uno::Sequence< sal_Int32 > maSequenceMapping; OUString msCLSID; OUString maSrcShellID; OUString maDestShellID; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxAdditionalShapes; + css::uno::Reference< css::drawing::XShapes > mxAdditionalShapes; tDataSequenceCont m_aDataSequencesToExport; OUString maCategoriesRange; @@ -1089,7 +1080,7 @@ void SchXMLExportHelper_Impl::exportChart( Reference< chart::XChartDocument > rC SAL_WARN_IF( !maAutoStyleNameQueue.empty(), "xmloff.chart", "There are still remaining autostyle names in the queue" ); } -static OUString lcl_GetStringFromNumberSequence( const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bRemoveOneFromEachIndex /*should be true if having categories*/ ) +static OUString lcl_GetStringFromNumberSequence( const css::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bRemoveOneFromEachIndex /*should be true if having categories*/ ) { const sal_Int32* pArray = rSequenceMapping.getConstArray(); const sal_Int32 nSize = rSequenceMapping.getLength(); @@ -2119,10 +2110,10 @@ namespace XMLTokenEnum eToken = XML_DAYS; switch( nTimeUnit ) { - case ::com::sun::star::chart::TimeUnit::YEAR: + case css::chart::TimeUnit::YEAR: eToken = XML_YEARS; break; - case ::com::sun::star::chart::TimeUnit::MONTH: + case css::chart::TimeUnit::MONTH: eToken = XML_MONTHS; break; default://days @@ -2140,7 +2131,7 @@ void SchXMLExportHelper_Impl::exportDateScale( const Reference< beans::XProperty chart::TimeIncrement aIncrement; if( (rAxisProps->getPropertyValue("TimeIncrement") >>= aIncrement) ) { - sal_Int32 nTimeResolution = ::com::sun::star::chart::TimeUnit::DAY; + sal_Int32 nTimeResolution = css::chart::TimeUnit::DAY; if( aIncrement.TimeResolution >>= nTimeResolution ) mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_BASE_TIME_UNIT, lcl_getTimeUnitToken( nTimeResolution ) ); @@ -2424,7 +2415,7 @@ void SchXMLExportHelper_Impl::exportAxes( // x axis - Reference< ::com::sun::star::chart2::XAxis > xNewAxis = lcl_getAxis( xCooSys, XML_X ); + Reference< css::chart2::XAxis > xNewAxis = lcl_getAxis( xCooSys, XML_X ); if( xNewAxis.is() ) { Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getAxis(0) : nullptr, uno::UNO_QUERY ); diff --git a/xmloff/source/chart/SchXMLLegendContext.hxx b/xmloff/source/chart/SchXMLLegendContext.hxx index 73751ce4efec..963d31cd62eb 100644 --- a/xmloff/source/chart/SchXMLLegendContext.hxx +++ b/xmloff/source/chart/SchXMLLegendContext.hxx @@ -27,7 +27,7 @@ public: SchXMLLegendContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName ); virtual ~SchXMLLegendContext(); - virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLImportHelper& mrImportHelper; diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx index b49272a362af..e8959c540a33 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.hxx +++ b/xmloff/source/chart/SchXMLParagraphContext.hxx @@ -40,13 +40,13 @@ public: OUString& rText, OUString * pOutId = nullptr ); virtual ~SchXMLParagraphContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void Characters( const OUString& rChars ) override; }; diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index a21f7a5f8c06..813a90e28a0d 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -608,8 +608,7 @@ void SchXMLPlotAreaContext::EndElement() SchXMLDataPointContext::SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName, ::std::list< DataRowPointStyle >& rStyleList, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, sal_Int32& rIndex, bool bSymbolSizeForSeriesIsMissingInFile ) : SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ), @@ -908,9 +907,9 @@ static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocume bool bPositiveValue, bool bYError, tSchXMLLSequencesPerIndex& rSequences) { - uno::Reference< com::sun::star::chart2::data::XDataProvider > xDataProvider(xDoc->getDataProvider()); - uno::Reference< com::sun::star::chart2::data::XDataSource > xDataSource( xBarProp, uno::UNO_QUERY ); - uno::Reference< com::sun::star::chart2::data::XDataSink > xDataSink( xDataSource, uno::UNO_QUERY ); + uno::Reference< css::chart2::data::XDataProvider > xDataProvider(xDoc->getDataProvider()); + uno::Reference< css::chart2::data::XDataSource > xDataSource( xBarProp, uno::UNO_QUERY ); + uno::Reference< css::chart2::data::XDataSink > xDataSink( xDataSource, uno::UNO_QUERY ); assert( xDataSink.is() && xDataSource.is() && xDataProvider.is() ); @@ -968,8 +967,7 @@ SchXMLStatisticsObjectContext::SchXMLStatisticsObjectContext( const OUString& rLocalName, const OUString &rSeriesStyleName, ::std::list< DataRowPointStyle >& rStyleList, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ContextType eContextType, const awt::Size & rChartSize, tSchXMLLSequencesPerIndex & rLSequencesPerIndex) : @@ -1018,7 +1016,7 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere if ( aAny.hasValue() ) { - sal_Int32 aBarStyle = com::sun::star::chart::ErrorBarStyle::NONE; + sal_Int32 aBarStyle = css::chart::ErrorBarStyle::NONE; aAny >>= aBarStyle; xBarProp->setPropertyValue("ErrorBarStyle", aAny); @@ -1085,7 +1083,7 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere aAny = SchXMLTools::getPropertyFromContext("PercentageError", pSeriesStyleContext, pStylesCtxt); - if( aAny.hasValue() && aBarStyle == com::sun::star::chart::ErrorBarStyle::RELATIVE ) + if( aAny.hasValue() && aBarStyle == css::chart::ErrorBarStyle::RELATIVE ) { xBarProp->setPropertyValue("PositiveError", aAny); xBarProp->setPropertyValue("NegativeError", aAny); @@ -1093,7 +1091,7 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere switch(aBarStyle) { - case com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN: + case css::chart::ErrorBarStyle::ERROR_MARGIN: { aAny = SchXMLTools::getPropertyFromContext("NegativeError", pSeriesStyleContext,pStylesCtxt); @@ -1161,7 +1159,7 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax uno::Reference< beans::XPropertySet > xBarProp( xFact->createInstance("com.sun.star.chart2.ErrorBar" ), uno::UNO_QUERY ); - xBarProp->setPropertyValue("ErrorBarStyle",uno::makeAny(com::sun::star::chart::ErrorBarStyle::NONE)); + xBarProp->setPropertyValue("ErrorBarStyle",uno::makeAny(css::chart::ErrorBarStyle::NONE)); xBarProp->setPropertyValue("PositiveError",uno::makeAny(static_cast<double>(0.0))); xBarProp->setPropertyValue("NegativeError",uno::makeAny(static_cast<double>(0.0))); xBarProp->setPropertyValue("Weight",uno::makeAny(static_cast<double>(1.0))); diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx index 0a77d653d1e1..f9cae3eb3cc8 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx @@ -48,7 +48,7 @@ public: explicit SchXML3DSceneAttributesHelper( SvXMLImport& rImporter ); virtual ~SchXML3DSceneAttributesHelper(); - void getCameraDefaultFromDiagram( const ::com::sun::star::uno::Reference< com::sun::star::chart::XDiagram >& xDiagram ); + void getCameraDefaultFromDiagram( const css::uno::Reference< css::chart::XDiagram >& xDiagram ); private: SchXML3DSceneAttributesHelper(); @@ -65,7 +65,7 @@ public: bool hasPosSize() const; bool isAutomatic() const; - ::com::sun::star::awt::Rectangle getRectangle() const { return css::awt::Rectangle( m_aPosition.X, m_aPosition.Y, m_aSize.Width, m_aSize.Height );} + css::awt::Rectangle getRectangle() const { return css::awt::Rectangle( m_aPosition.X, m_aPosition.Y, m_aSize.Width, m_aSize.Height );} private: bool hasSize() const; @@ -73,8 +73,8 @@ private: SvXMLImport& m_rImport; - ::com::sun::star::awt::Point m_aPosition; - ::com::sun::star::awt::Size m_aSize; + css::awt::Point m_aPosition; + css::awt::Size m_aSize; bool m_bHasSizeWidth; bool m_bHasSizeHeight; @@ -96,24 +96,24 @@ public: bool & rAllRangeAddressesAvailable, bool & rColHasLabels, bool & rRowHasLabels, - ::com::sun::star::chart::ChartDataRowSource & rDataRowSource, + css::chart::ChartDataRowSource & rDataRowSource, SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles, const OUString& aChartTypeServiceName, tSchXMLLSequencesPerIndex & rLSequencesPerIndex, - const ::com::sun::star::awt::Size & rChartSize ); + const css::awt::Size & rChartSize ); virtual ~SchXMLPlotAreaContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; private: SchXMLImportHelper& mrImportHelper; - ::com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > mxDiagram; - ::com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > mxNewDoc; + css::uno::Reference< css::chart::XDiagram > mxDiagram; + css::uno::Reference< css::chart2::XChartDocument > mxNewDoc; ::std::vector< SchXMLAxis > maAxes; OUString& mrCategoriesAddress; SeriesDefaultsAndStyles& mrSeriesDefaultsAndStyles; @@ -133,33 +133,32 @@ private: bool& m_rbHasRangeAtPlotArea; bool & mrColHasLabels; bool & mrRowHasLabels; - ::com::sun::star::chart::ChartDataRowSource & mrDataRowSource; + css::chart::ChartDataRowSource & mrDataRowSource; OUString maChartTypeServiceName; tSchXMLLSequencesPerIndex & mrLSequencesPerIndex; bool mbGlobalChartTypeUsedBySeries; - ::com::sun::star::awt::Size maChartSize; + css::awt::Size maChartSize; }; class SchXMLDataPointContext : public SvXMLImportContext { private: ::std::list< DataRowPointStyle >& mrStyleList; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > m_xSeries; + css::uno::Reference< css::chart2::XDataSeries > m_xSeries; sal_Int32& mrIndex; bool mbSymbolSizeForSeriesIsMissingInFile; public: SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName, ::std::list< DataRowPointStyle >& rStyleList, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, sal_Int32& rIndex, - bool bSymbolSizeForSeriesIsMissingInFile ); + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, + sal_Int32& rIndex, + bool bSymbolSizeForSeriesIsMissingInFile ); virtual ~SchXMLDataPointContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; class SchXMLCoordinateRegionContext : public SvXMLImportContext @@ -171,7 +170,7 @@ public: , const OUString& rLocalName , SchXMLPositonAttributesHelper& rPositioning ); virtual ~SchXMLCoordinateRegionContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLPositonAttributesHelper& m_rPositioning; @@ -188,7 +187,7 @@ public: private: SchXMLImportHelper& mrImportHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::chart::X3DDisplay > mxWallFloorSupplier; + css::uno::Reference< css::chart::X3DDisplay > mxWallFloorSupplier; ContextType meContextType; public: @@ -196,10 +195,10 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram >& xDiagram, + css::uno::Reference< css::chart::XDiagram >& xDiagram, ContextType eContextType ); virtual ~SchXMLWallFloorContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; class SchXMLStockContext : public SvXMLImportContext @@ -214,7 +213,7 @@ public: private: SchXMLImportHelper& mrImportHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::chart::XStatisticDisplay > mxStockPropProvider; + css::uno::Reference< css::chart::XStatisticDisplay > mxStockPropProvider; ContextType meContextType; public: @@ -222,10 +221,10 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram >& xDiagram, + css::uno::Reference< css::chart::XDiagram >& xDiagram, ContextType eContextType ); virtual ~SchXMLStockContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; class SchXMLStatisticsObjectContext : public SvXMLImportContext @@ -244,27 +243,25 @@ public: const OUString& rLocalName, const OUString &rSeriesStyleName, ::std::list< DataRowPointStyle >& rStyleList, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ContextType eContextType, - const ::com::sun::star::awt::Size & rChartSize, + const css::awt::Size & rChartSize, tSchXMLLSequencesPerIndex & rLSequencesPerIndex ); virtual ~SchXMLStatisticsObjectContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLImportHelper & mrImportHelper; ::std::list< DataRowPointStyle > & mrStyleList; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > m_xSeries; + css::uno::Reference< css::chart2::XDataSeries > m_xSeries; ContextType meContextType; - ::com::sun::star::awt::Size maChartSize; + css::awt::Size maChartSize; OUString maSeriesStyleName; tSchXMLLSequencesPerIndex& mrLSequencesPerIndex; }; diff --git a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx index e5e8e1b0a6be..afa6a7c42f9d 100644 --- a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx +++ b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx @@ -29,17 +29,17 @@ public: SchXMLPropertyMappingContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName, tSchXMLLSequencesPerIndex& rLSequencesPerIndex, - com::sun::star::uno::Reference< - com::sun::star::chart2::XDataSeries > xSeries ); + css::uno::Reference< + css::chart2::XDataSeries > xSeries ); virtual ~SchXMLPropertyMappingContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: - com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > mxChartDocument; + css::uno::Reference< css::chart2::XChartDocument > mxChartDocument; SchXMLImportHelper& mrImportHelper; - com::sun::star::uno::Reference< com::sun::star::chart2::XDataSeries > mxDataSeries; + css::uno::Reference< css::chart2::XDataSeries > mxDataSeries; tSchXMLLSequencesPerIndex& mrLSequencesPerIndex; diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx index 6ad9775f4dcb..49274b5d9a42 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx @@ -36,23 +36,22 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, std::list< RegressionStyle >& rRegressionStyleList, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, - const ::com::sun::star::awt::Size & rChartSize ); + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, + const css::awt::Size & rChartSize ); virtual ~SchXMLRegressionCurveObjectContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLImportHelper& mrImportHelper; - com::sun::star::uno::Reference<com::sun::star::chart2::XDataSeries > mxSeries; - com::sun::star::awt::Size maChartSize; + css::uno::Reference<css::chart2::XDataSeries > mxSeries; + css::awt::Size maChartSize; std::list< RegressionStyle >& mrRegressionStyleList; }; @@ -64,21 +63,19 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, - const ::com::sun::star::awt::Size & rChartSize, + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, + const css::awt::Size & rChartSize, RegressionStyle & rRegressionStyle ); virtual ~SchXMLEquationContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLImportHelper& mrImportHelper; RegressionStyle& mrRegressionStyle; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > mxSeries; - ::com::sun::star::awt::Size maChartSize; + css::uno::Reference< css::chart2::XDataSeries > mxSeries; + css::awt::Size maChartSize; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLREGRESSIONCURVEOBJECTCONTEXT_HXX diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx index 57c8d9f74cb1..03c723137a00 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.hxx +++ b/xmloff/source/chart/SchXMLSeries2Context.hxx @@ -43,13 +43,12 @@ class SchXMLSeries2Context : public SvXMLImportContext { private: SchXMLImportHelper& mrImportHelper; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > mxNewDoc; + css::uno::Reference< css::chart2::XChartDocument > mxNewDoc; ::std::vector< SchXMLAxis >& mrAxes; ::std::list< DataRowPointStyle >& mrStyleList; ::std::list< RegressionStyle >& mrRegressionStyleList; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > m_xSeries; + css::uno::Reference< css::chart2::XDataSeries > m_xSeries; sal_Int32 mnSeriesIndex; sal_Int32 mnDataPointIndex; bool m_bStockHasVolume; @@ -68,13 +67,12 @@ private: tSchXMLLSequencesPerIndex maPostponedSequences; bool& mrGlobalChartTypeUsedBySeries; bool mbSymbolSizeIsMissingInFile; - ::com::sun::star::awt::Size maChartSize; + css::awt::Size maChartSize; public: SchXMLSeries2Context( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xNewDoc, + const css::uno::Reference< css::chart2::XChartDocument > & xNewDoc, std::vector< SchXMLAxis >& rAxes, ::std::list< DataRowPointStyle >& rStyleList, ::std::list< RegressionStyle >& rRegressionStyleList, @@ -84,18 +82,18 @@ public: const OUString & aGlobalChartTypeName, tSchXMLLSequencesPerIndex & rLSequencesPerIndex, bool& rGlobalChartTypeUsedBySeries, - const ::com::sun::star::awt::Size & rChartSize ); + const css::awt::Size & rChartSize ); virtual ~SchXMLSeries2Context(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; static void initSeriesPropertySets( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles - , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); + , const css::uno::Reference< css::frame::XModel >& xChartModel ); static void setDefaultsToSeries( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles ); diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index 3ac2e358bd8c..d70b8f6ddb34 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -601,7 +601,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx index 67bbdb2bfeab..21ba2fdf63a9 100644 --- a/xmloff/source/chart/SchXMLTableContext.hxx +++ b/xmloff/source/chart/SchXMLTableContext.hxx @@ -43,8 +43,8 @@ private: bool mbHasRowPermutation; bool mbHasColumnPermutation; - ::com::sun::star::uno::Sequence< sal_Int32 > maRowPermutation; - ::com::sun::star::uno::Sequence< sal_Int32 > maColumnPermutation; + css::uno::Sequence< sal_Int32 > maRowPermutation; + css::uno::Sequence< sal_Int32 > maColumnPermutation; public: SchXMLTableContext( SchXMLImportHelper& rImpHelper, @@ -56,27 +56,27 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; - void setRowPermutation( const ::com::sun::star::uno::Sequence< sal_Int32 > & rPermutation ); - void setColumnPermutation( const ::com::sun::star::uno::Sequence< sal_Int32 > & rPermutation ); + void setRowPermutation( const css::uno::Sequence< sal_Int32 > & rPermutation ); + void setColumnPermutation( const css::uno::Sequence< sal_Int32 > & rPermutation ); }; class SchXMLTableHelper { public: static void applyTableToInternalDataProvider( const SchXMLTable& rTable, - com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > xChartDoc ); + css::uno::Reference< css::chart2::XChartDocument > xChartDoc ); /** This function reorders local data to fit the correct data structure. Call it after the data series got their styles set. */ static void switchRangesFromOuterToInternalIfNecessary( const SchXMLTable& rTable, const tSchXMLLSequencesPerIndex & rLSequencesPerIndex, - com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > xChartDoc, - ::com::sun::star::chart::ChartDataRowSource eDataRowSource ); + css::uno::Reference< css::chart2::XChartDocument > xChartDoc, + css::chart::ChartDataRowSource eDataRowSource ); }; // classes for columns @@ -100,7 +100,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; class SchXMLTableColumnContext : public SvXMLImportContext @@ -113,7 +113,7 @@ public: const OUString& rLocalName, SchXMLTable& aTable ); virtual ~SchXMLTableColumnContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; // classes for rows @@ -134,7 +134,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; class SchXMLTableRowContext : public SvXMLImportContext @@ -153,7 +153,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; // classes for cells and their content @@ -177,8 +177,8 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx index 786200b9e81d..e4a4ee06d162 100644 --- a/xmloff/source/chart/SchXMLTextListContext.cxx +++ b/xmloff/source/chart/SchXMLTextListContext.cxx @@ -41,7 +41,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: OUString& m_rText; diff --git a/xmloff/source/chart/SchXMLTextListContext.hxx b/xmloff/source/chart/SchXMLTextListContext.hxx index db4508fcff9b..f6f97bfcd5ef 100644 --- a/xmloff/source/chart/SchXMLTextListContext.hxx +++ b/xmloff/source/chart/SchXMLTextListContext.hxx @@ -32,18 +32,18 @@ class SchXMLTextListContext : public SvXMLImportContext public: SchXMLTextListContext( SvXMLImport& rImport, const OUString& rLocalName, - ::com::sun::star::uno::Sequence< OUString>& rTextList ); + css::uno::Sequence< OUString>& rTextList ); virtual ~SchXMLTextListContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: - ::com::sun::star::uno::Sequence< OUString>& m_rTextList; + css::uno::Sequence< OUString>& m_rTextList; std::vector< OUString> m_aTextVector; }; diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 0f1650595ae6..bb5d011d214f 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -830,7 +830,7 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame: return bResult; } -bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel) +bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const css::uno::Reference< css::frame::XModel >& xChartModel) { bool bResult = false; OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) ); diff --git a/xmloff/source/chart/SchXMLTools.hxx b/xmloff/source/chart/SchXMLTools.hxx index 004a2ab16bee..567fa3b5791b 100644 --- a/xmloff/source/chart/SchXMLTools.hxx +++ b/xmloff/source/chart/SchXMLTools.hxx @@ -42,14 +42,14 @@ class SvXMLExport; namespace SchXMLTools { - bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel); - bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel); - bool isDocumentGeneratedWithOpenOfficeOlderThan2_4( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel); - bool isDocumentGeneratedWithOpenOfficeOlderThan3_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel); - bool isDocumentGeneratedWithOpenOfficeOlderThan3_3( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel); + bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const css::uno::Reference< css::frame::XModel >& xChartModel); + bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const css::uno::Reference< css::frame::XModel >& xChartModel); + bool isDocumentGeneratedWithOpenOfficeOlderThan2_4( const css::uno::Reference< css::frame::XModel >& xChartModel); + bool isDocumentGeneratedWithOpenOfficeOlderThan3_0( const css::uno::Reference< css::frame::XModel >& xChartModel); + bool isDocumentGeneratedWithOpenOfficeOlderThan3_3( const css::uno::Reference< css::frame::XModel >& xChartModel); - void setBuildIDAtImportInfo( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel - , ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xImportInfo ); + void setBuildIDAtImportInfo( css::uno::Reference< css::frame::XModel > xModel + , css::uno::Reference< css::beans::XPropertySet > xImportInfo ); enum SchXMLChartTypeEnum { @@ -78,28 +78,26 @@ namespace SchXMLTools OUString GetNewChartTypeName( const OUString & rOldChartTypeName ); - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence2 > GetNewLabeledDataSequence(); + css::uno::Reference< + css::chart2::data::XLabeledDataSequence2 > GetNewLabeledDataSequence(); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > CreateDataSequence( + css::uno::Reference< css::chart2::data::XDataSequence > CreateDataSequence( const OUString& rRange, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument >& xChartDoc ); + const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc ); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > CreateDataSequenceWithoutConvert( + css::uno::Reference< css::chart2::data::XDataSequence > CreateDataSequenceWithoutConvert( const OUString& rRange, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument >& xChartDoc ); + const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc ); void CreateCategories( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > & xDataProvider, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xNewDoc, + const css::uno::Reference< css::chart2::data::XDataProvider > & xDataProvider, + const css::uno::Reference< css::chart2::XChartDocument > & xNewDoc, const OUString & rRangeAddress, sal_Int32 nCooSysIndex, sal_Int32 nDimensionIndex, tSchXMLLSequencesPerIndex * pLSequencesPerIndex = nullptr ); - ::com::sun::star::uno::Any getPropertyFromContext( const OUString& rPropertyName, const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ); + css::uno::Any getPropertyFromContext( const OUString& rPropertyName, const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ); void exportText( SvXMLExport& rExport, const OUString& rText, bool bConvertTabsLFs ); @@ -110,8 +108,7 @@ namespace SchXMLTools given in rXMLRange */ void setXMLRangePropertyAtDataSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > & xDataSequence, + const css::uno::Reference< css::chart2::data::XDataSequence > & xDataSequence, const OUString & rXMLRange ); /** checks if the data sequence has the property "CachedXMLRange" (true for @@ -124,20 +121,18 @@ namespace SchXMLTools @return true, if the property was found, assigned and is non-empty */ bool getXMLRangePropertyFromDataSequence( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > & xDataSequence, + const css::uno::Reference< css::chart2::data::XDataSequence > & xDataSequence, OUString & rOutXMLRange, bool bClearProp = false ); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > getDataProviderFromParent( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc ); + css::uno::Reference< css::chart2::data::XDataProvider > getDataProviderFromParent( const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc ); - bool switchBackToDataProviderFromParent( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument >& xChartDoc + bool switchBackToDataProviderFromParent( const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc , const tSchXMLLSequencesPerIndex & rLSequencesPerIndex ); void copyProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xSource, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xDestination ); + const css::uno::Reference< css::beans::XPropertySet > & xSource, + const css::uno::Reference< css::beans::XPropertySet > & xDestination ); } #endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLTOOLS_HXX diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx index de047a7444de..2f876e9dc8c5 100644 --- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx +++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx @@ -50,7 +50,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, { if( !m_bCrossingValue ) { - rValue <<= ::com::sun::star::chart::ChartAxisPosition_START; + rValue <<= css::chart::ChartAxisPosition_START; bResult = true; } } @@ -58,7 +58,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, { if( !m_bCrossingValue ) { - rValue <<= ::com::sun::star::chart::ChartAxisPosition_END; + rValue <<= css::chart::ChartAxisPosition_END; bResult = true; } } @@ -66,7 +66,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, { if( !m_bCrossingValue ) { - rValue <<= ::com::sun::star::chart::ChartAxisPosition_ZERO; + rValue <<= css::chart::ChartAxisPosition_ZERO; bResult = true; } } @@ -74,7 +74,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, { if( !m_bCrossingValue ) { - rValue <<= ::com::sun::star::chart::ChartAxisPosition_VALUE; + rValue <<= css::chart::ChartAxisPosition_VALUE; bResult = true; } else @@ -107,19 +107,19 @@ bool XMLAxisPositionPropertyHdl::exportXML( OUString& rStrExpValue, } else { - ::com::sun::star::chart::ChartAxisPosition ePosition( ::com::sun::star::chart::ChartAxisPosition_ZERO ); + css::chart::ChartAxisPosition ePosition( css::chart::ChartAxisPosition_ZERO ); rValue >>= ePosition; switch(ePosition) { - case ::com::sun::star::chart::ChartAxisPosition_START: + case css::chart::ChartAxisPosition_START: rStrExpValue = GetXMLToken( XML_START ); bResult = true; break; - case ::com::sun::star::chart::ChartAxisPosition_END: + case css::chart::ChartAxisPosition_END: rStrExpValue = GetXMLToken( XML_END ); bResult = true; break; - case ::com::sun::star::chart::ChartAxisPosition_ZERO: + case css::chart::ChartAxisPosition_ZERO: ::sax::Converter::convertDouble( sValueBuffer, 0.0 ); rStrExpValue = sValueBuffer.makeStringAndClear(); bResult = true; diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx index 97d0c9b271e4..3c845d372fda 100644 --- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx +++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx @@ -27,8 +27,8 @@ public: explicit XMLAxisPositionPropertyHdl( bool bCrossingValue ); virtual ~XMLAxisPositionPropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; private: bool m_bCrossingValue; diff --git a/xmloff/source/chart/XMLChartPropertyContext.hxx b/xmloff/source/chart/XMLChartPropertyContext.hxx index bbe9c444c849..6f139cd174a1 100644 --- a/xmloff/source/chart/XMLChartPropertyContext.hxx +++ b/xmloff/source/chart/XMLChartPropertyContext.hxx @@ -27,8 +27,7 @@ public: XMLChartPropertyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState >& rProps, const rtl::Reference< SvXMLImportPropertyMapper >& rMapper ); @@ -38,8 +37,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp ) override; diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx index 087ed323db0f..49237aa6b105 100644 --- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx +++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx @@ -25,7 +25,7 @@ using namespace com::sun::star; -XMLErrorBarStylePropertyHdl::XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ) +XMLErrorBarStylePropertyHdl::XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const css::uno::Type & rType ) : XMLEnumPropertyHdl( pEnumMap, rType ) { } @@ -44,10 +44,10 @@ bool XMLErrorBarStylePropertyHdl::exportXML( OUString& rStrExpValue, sal_Int32 nValue = 0; if(rValue >>= nValue ) { - if( nValue == ::com::sun::star::chart::ErrorBarStyle::STANDARD_ERROR - || nValue == ::com::sun::star::chart::ErrorBarStyle::FROM_DATA ) + if( nValue == css::chart::ErrorBarStyle::STANDARD_ERROR + || nValue == css::chart::ErrorBarStyle::FROM_DATA ) { - nValue = ::com::sun::star::chart::ErrorBarStyle::NONE; + nValue = css::chart::ErrorBarStyle::NONE; aValue = uno::makeAny(nValue); } } diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx index d1090b810b2c..f06d305848d0 100644 --- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx +++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx @@ -24,10 +24,10 @@ class XMLErrorBarStylePropertyHdl : public XMLEnumPropertyHdl { public: - XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ); + XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const css::uno::Type & rType ); virtual ~XMLErrorBarStylePropertyHdl(); - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORBARSTYLEPROPERTYHDL_HXX diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx index 3f02d57c93d4..2ce64cc86caf 100644 --- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx +++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx @@ -31,8 +31,8 @@ public: {} virtual ~XMLErrorIndicatorPropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORINDICATORPROPERTYHDL_HXX diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.hxx b/xmloff/source/chart/XMLLabelSeparatorContext.hxx index da52a4bf1717..9cd1b6c29516 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.hxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.hxx @@ -31,11 +31,11 @@ public: ::std::vector< XMLPropertyState > &rProps ); virtual ~XMLLabelSeparatorContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; private: diff --git a/xmloff/source/chart/XMLSymbolImageContext.hxx b/xmloff/source/chart/XMLSymbolImageContext.hxx index ffb55f7bc8f2..3b0d20d38a20 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.hxx +++ b/xmloff/source/chart/XMLSymbolImageContext.hxx @@ -35,16 +35,16 @@ public: ::std::vector< XMLPropertyState > &rProps ); virtual ~XMLSymbolImageContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; private: OUString msURL; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; + css::uno::Reference < css::io::XOutputStream > mxBase64Stream; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLSYMBOLIMAGECONTEXT_HXX diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx index 27382a26a2f4..009198e53cbb 100644 --- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx +++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx @@ -27,8 +27,8 @@ public: explicit XMLSymbolTypePropertyHdl( bool bIsNamedSymbol ); virtual ~XMLSymbolTypePropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; private: bool m_bIsNamedSymbol; diff --git a/xmloff/source/chart/XMLTextOrientationHdl.cxx b/xmloff/source/chart/XMLTextOrientationHdl.cxx index 8acec97d5673..7f23e58c1e68 100644 --- a/xmloff/source/chart/XMLTextOrientationHdl.cxx +++ b/xmloff/source/chart/XMLTextOrientationHdl.cxx @@ -30,7 +30,7 @@ XMLTextOrientationHdl::~XMLTextOrientationHdl() bool XMLTextOrientationHdl::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { bool bRetval( false ); @@ -51,7 +51,7 @@ bool XMLTextOrientationHdl::importXML( bool XMLTextOrientationHdl::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { bool bVal (false ); diff --git a/xmloff/source/chart/XMLTextOrientationHdl.hxx b/xmloff/source/chart/XMLTextOrientationHdl.hxx index 0300c1d6eafc..da7d0b37f100 100644 --- a/xmloff/source/chart/XMLTextOrientationHdl.hxx +++ b/xmloff/source/chart/XMLTextOrientationHdl.hxx @@ -28,10 +28,10 @@ public: virtual ~XMLTextOrientationHdl(); virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx index 091a068a379b..b4b7c0397c49 100644 --- a/xmloff/source/chart/contexts.hxx +++ b/xmloff/source/chart/contexts.hxx @@ -53,7 +53,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; // context for flat file xml format @@ -65,13 +65,13 @@ public: SchXMLImportHelper& i_rImpHelper, SchXMLImport& i_rImport, sal_uInt16 i_nPrefix, const OUString & i_rLName, - const com::sun::star::uno::Reference<com::sun::star::document::XDocumentProperties>& i_xDocProps); + const css::uno::Reference<css::document::XDocumentProperties>& i_xDocProps); virtual ~SchXMLFlatDocContext_Impl(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& i_xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& i_xAttrList) override; }; class SchXMLBodyContext : public SvXMLImportContext @@ -91,7 +91,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_CONTEXTS_HXX diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx index c32a5428e213..a384e2138e8c 100644 --- a/xmloff/source/chart/transporttypes.hxx +++ b/xmloff/source/chart/transporttypes.hxx @@ -36,7 +36,7 @@ enum SchXMLCellType struct SchXMLCell { OUString aString; - ::com::sun::star::uno::Sequence< OUString > aComplexString; + css::uno::Sequence< OUString > aComplexString; double fValue; SchXMLCellType eType; OUString aRangeId; @@ -84,7 +84,7 @@ enum SchXMLLabeledSequencePart }; typedef ::std::pair< tSchXMLIndex, SchXMLLabeledSequencePart > tSchXMLIndexWithPart; typedef ::std::multimap< tSchXMLIndexWithPart, - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > + css::uno::Reference< css::chart2::data::XLabeledDataSequence > > tSchXMLLSequencesPerIndex; bool operator < ( const tSchXMLIndexWithPart & rFirst, const tSchXMLIndexWithPart & rSecond ); @@ -147,15 +147,15 @@ struct GlobalSeriesImportInfo struct RegressionStyle { - com::sun::star::uno::Reference< - com::sun::star::chart2::XDataSeries > m_xSeries; - com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > m_xEquationProperties; + css::uno::Reference< + css::chart2::XDataSeries > m_xSeries; + css::uno::Reference< + css::beans::XPropertySet > m_xEquationProperties; OUString msStyleName; - RegressionStyle(const com::sun::star::uno::Reference< - com::sun::star::chart2::XDataSeries >& xSeries, + RegressionStyle(const css::uno::Reference< + css::chart2::XDataSeries >& xSeries, const OUString& sStyleName) : m_xSeries ( xSeries ), msStyleName ( sStyleName ) @@ -173,17 +173,13 @@ struct DataRowPointStyle }; StyleType meType; - com::sun::star::uno::Reference< - com::sun::star::chart2::XDataSeries > m_xSeries; + css::uno::Reference< css::chart2::XDataSeries > m_xSeries; - com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > m_xOldAPISeries; + css::uno::Reference< css::beans::XPropertySet > m_xOldAPISeries; - com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > m_xErrorXProperties; + css::uno::Reference< css::beans::XPropertySet > m_xErrorXProperties; - com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > m_xErrorYProperties; + css::uno::Reference< css::beans::XPropertySet > m_xErrorYProperties; sal_Int32 m_nPointIndex; sal_Int32 m_nPointRepeat; @@ -193,8 +189,7 @@ struct DataRowPointStyle bool mbSymbolSizeForSeriesIsMissingInFile; DataRowPointStyle( StyleType eType - , const com::sun::star::uno::Reference< - com::sun::star::chart2::XDataSeries >& xSeries + , const css::uno::Reference< css::chart2::XDataSeries >& xSeries , sal_Int32 nPointIndex , sal_Int32 nPointRepeat , const OUString& sStyleName @@ -210,8 +205,8 @@ struct DataRowPointStyle {} }; -typedef ::std::multimap< OUString, ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > > tSchXMLRangeSequenceMap; +typedef ::std::multimap< OUString, css::uno::Reference< + css::chart2::data::XDataSequence > > tSchXMLRangeSequenceMap; #endif // INCLUDED_XMLOFF_SOURCE_CHART_TRANSPORTTYPES_HXX diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index ead1ffdbd319..4cce86b80ba6 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -54,7 +54,7 @@ class XMLMyList std::list<beans::PropertyValue> aProps; sal_uInt32 nCount; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; public: explicit XMLMyList(const uno::Reference<uno::XComponentContext>& rxContext); @@ -124,11 +124,11 @@ class XMLConfigBaseContext : public SvXMLImportContext protected: XMLMyList maProps; beans::PropertyValue maProp; - com::sun::star::uno::Any& mrAny; + css::uno::Any& mrAny; XMLConfigBaseContext* mpBaseContext; public: XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - com::sun::star::uno::Any& rAny, + css::uno::Any& rAny, XMLConfigBaseContext* pBaseContext); virtual ~XMLConfigBaseContext(); @@ -140,23 +140,21 @@ class XMLConfigItemContext : public SvXMLImportContext OUString msType; OUString msValue; uno::Sequence<sal_Int8> maDecoded; - com::sun::star::uno::Any& mrAny; + css::uno::Any& mrAny; const OUString mrItemName; - XMLConfigBaseContext* mpBaseContext; + XMLConfigBaseContext* mpBaseContext; public: XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Any& rAny, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Any& rAny, const OUString& rItemName, XMLConfigBaseContext* pBaseContext); virtual ~XMLConfigItemContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void Characters( const OUString& rChars ) override; virtual void EndElement() override; @@ -168,16 +166,14 @@ class XMLConfigItemSetContext : public XMLConfigBaseContext { public: XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Any& rAny, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Any& rAny, XMLConfigBaseContext* pBaseContext); virtual ~XMLConfigItemSetContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -186,16 +182,14 @@ class XMLConfigItemMapNamedContext : public XMLConfigBaseContext { public: XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Any& rAny, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Any& rAny, XMLConfigBaseContext* pBaseContext); virtual ~XMLConfigItemMapNamedContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -208,17 +202,15 @@ private: public: XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Any& rAny, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Any& rAny, const OUString& rConfigItemName, XMLConfigBaseContext* pBaseContext); virtual ~XMLConfigItemMapIndexedContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -283,8 +275,8 @@ namespace struct XMLDocumentSettingsContext_Data { - com::sun::star::uno::Any aViewProps; - com::sun::star::uno::Any aConfigProps; + css::uno::Any aViewProps; + css::uno::Any aConfigProps; ::std::list< SettingsGroup > aDocSpecificSettings; }; @@ -302,8 +294,7 @@ XMLDocumentSettingsContext::~XMLDocumentSettingsContext() SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = nullptr; OUString sName; @@ -434,7 +425,7 @@ void XMLDocumentSettingsContext::EndElement() } XMLConfigBaseContext::XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, com::sun::star::uno::Any& rTempAny, + const OUString& rLName, css::uno::Any& rTempAny, XMLConfigBaseContext* pTempBaseContext) : SvXMLImportContext( rImport, nPrfx, rLName ), maProps( rImport.GetComponentContext() ), @@ -450,9 +441,8 @@ XMLConfigBaseContext::~XMLConfigBaseContext() XMLConfigItemSetContext::XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>&, - com::sun::star::uno::Any& rAny, + const css::uno::Reference< css::xml::sax::XAttributeList>&, + css::uno::Any& rAny, XMLConfigBaseContext* pBaseContext) : XMLConfigBaseContext( rImport, nPrfx, rLName, rAny, pBaseContext ) { @@ -465,8 +455,7 @@ XMLConfigItemSetContext::~XMLConfigItemSetContext() SvXMLImportContext *XMLConfigItemSetContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { return CreateSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList, maProp, this); } @@ -479,9 +468,8 @@ void XMLConfigItemSetContext::EndElement() } XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Any& rTempAny, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Any& rTempAny, const OUString& rTempItemName, XMLConfigBaseContext* pTempBaseContext) : SvXMLImportContext(rImport, nPrfx, rLName), @@ -512,8 +500,7 @@ XMLConfigItemContext::~XMLConfigItemContext() SvXMLImportContext *XMLConfigItemContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& ) + const css::uno::Reference< css::xml::sax::XAttributeList>& ) { SvXMLImportContext* pContext = new SvXMLImportContext(GetImport(), nPrefix, rLocalName); return pContext; @@ -667,9 +654,8 @@ void XMLConfigItemContext::ManipulateConfigItem() } XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>&, - com::sun::star::uno::Any& rAny, + const css::uno::Reference< css::xml::sax::XAttributeList>&, + css::uno::Any& rAny, XMLConfigBaseContext* pBaseContext) : XMLConfigBaseContext(rImport, nPrfx, rLName, rAny, pBaseContext) { @@ -681,8 +667,7 @@ XMLConfigItemMapNamedContext::~XMLConfigItemMapNamedContext() SvXMLImportContext *XMLConfigItemMapNamedContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { return CreateSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList, maProp, this); } @@ -701,9 +686,8 @@ void XMLConfigItemMapNamedContext::EndElement() XMLConfigItemMapIndexedContext::XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>&, - com::sun::star::uno::Any& rAny, + const css::uno::Reference< css::xml::sax::XAttributeList>&, + css::uno::Any& rAny, const OUString& rConfigItemName, XMLConfigBaseContext* pBaseContext) : XMLConfigBaseContext(rImport, nPrfx, rLName, rAny, pBaseContext), @@ -717,8 +701,7 @@ XMLConfigItemMapIndexedContext::~XMLConfigItemMapIndexedContext() SvXMLImportContext *XMLConfigItemMapIndexedContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { return CreateSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList, maProp, this); } diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx index 719ab804e3ad..d5a550acb3ba 100644 --- a/xmloff/source/core/ProgressBarHelper.cxx +++ b/xmloff/source/core/ProgressBarHelper.cxx @@ -26,7 +26,7 @@ using namespace ::com::sun::star; static const sal_Int32 nDefaultProgressBarRange = 1000000; -ProgressBarHelper::ProgressBarHelper(const ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator>& xTempStatusIndicator, +ProgressBarHelper::ProgressBarHelper(const css::uno::Reference < css::task::XStatusIndicator>& xTempStatusIndicator, const bool bTempStrict) : xStatusIndicator(xTempStatusIndicator) , nRange(nDefaultProgressBarRange) diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index 66d95ade842b..55089bfdee9d 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -70,23 +70,21 @@ const XMLServiceMapEntry_Impl aServiceMap[] = class XMLEmbeddedObjectImportContext_Impl : public SvXMLImportContext { - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XDocumentHandler > xHandler; + css::uno::Reference< css::xml::sax::XDocumentHandler > xHandler; public: XMLEmbeddedObjectImportContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XDocumentHandler >& rHandler ); + const css::uno::Reference< css::xml::sax::XDocumentHandler >& rHandler ); virtual ~XMLEmbeddedObjectImportContext_Impl(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx index 6be5a3c9b850..af62a69db10e 100644 --- a/xmloff/source/core/attrlist.cxx +++ b/xmloff/source/core/attrlist.cxx @@ -70,14 +70,14 @@ struct SvXMLAttributeList_Impl -sal_Int16 SAL_CALL SvXMLAttributeList::getLength() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvXMLAttributeList::getLength() throw( css::uno::RuntimeException, std::exception ) { return sal::static_int_cast< sal_Int16 >(m_pImpl->vecAttribute.size()); } SvXMLAttributeList::SvXMLAttributeList( const SvXMLAttributeList &r ) : - cppu::WeakImplHelper3<com::sun::star::xml::sax::XAttributeList, com::sun::star::util::XCloneable, com::sun::star::lang::XUnoTunnel>(r), + cppu::WeakImplHelper3<css::xml::sax::XAttributeList, css::util::XCloneable, css::lang::XUnoTunnel>(r), m_pImpl( new SvXMLAttributeList_Impl( *r.m_pImpl ) ) { } @@ -97,28 +97,28 @@ SvXMLAttributeList::SvXMLAttributeList( const uno::Reference< AppendAttributeList( rAttrList ); } -OUString SAL_CALL SvXMLAttributeList::getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +OUString SAL_CALL SvXMLAttributeList::getNameByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) { return ( static_cast< SvXMLAttributeList_Impl::size_type >( i ) < m_pImpl->vecAttribute.size() ) ? m_pImpl->vecAttribute[i].sName : OUString(); } -OUString SAL_CALL SvXMLAttributeList::getTypeByIndex(sal_Int16) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +OUString SAL_CALL SvXMLAttributeList::getTypeByIndex(sal_Int16) throw( css::uno::RuntimeException, std::exception ) { return sType; } -OUString SAL_CALL SvXMLAttributeList::getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +OUString SAL_CALL SvXMLAttributeList::getValueByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) { return ( static_cast< SvXMLAttributeList_Impl::size_type >( i ) < m_pImpl->vecAttribute.size() ) ? m_pImpl->vecAttribute[i].sValue : OUString(); } -OUString SAL_CALL SvXMLAttributeList::getTypeByName( const OUString& ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +OUString SAL_CALL SvXMLAttributeList::getTypeByName( const OUString& ) throw( css::uno::RuntimeException, std::exception ) { return sType; } -OUString SAL_CALL SvXMLAttributeList::getValueByName(const OUString& sName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +OUString SAL_CALL SvXMLAttributeList::getValueByName(const OUString& sName) throw( css::uno::RuntimeException, std::exception ) { ::std::vector<struct SvXMLTagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin(); @@ -131,9 +131,9 @@ OUString SAL_CALL SvXMLAttributeList::getValueByName(const OUString& sName) thro } -uno::Reference< ::com::sun::star::util::XCloneable > SvXMLAttributeList::createClone() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +uno::Reference< css::util::XCloneable > SvXMLAttributeList::createClone() throw( css::uno::RuntimeException, std::exception ) { - uno::Reference< ::com::sun::star::util::XCloneable > r = new SvXMLAttributeList( *this ); + uno::Reference< css::util::XCloneable > r = new SvXMLAttributeList( *this ); return r; } @@ -176,7 +176,7 @@ void SvXMLAttributeList::RemoveAttribute( const OUString& sName ) } } -void SvXMLAttributeList::AppendAttributeList( const uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &r ) +void SvXMLAttributeList::AppendAttributeList( const uno::Reference< css::xml::sax::XAttributeList > &r ) { OSL_ASSERT( r.is() ); diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index b196291cc725..eb1fc7caa917 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -97,12 +97,12 @@ namespace class theSvUnoAttributeContainerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvUnoAttributeContainerUnoTunnelId> {}; } -const ::com::sun::star::uno::Sequence< sal_Int8 > & SvUnoAttributeContainer::getUnoTunnelId() throw() +const css::uno::Sequence< sal_Int8 > & SvUnoAttributeContainer::getUnoTunnelId() throw() { return theSvUnoAttributeContainerUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL SvUnoAttributeContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SvUnoAttributeContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx index 0e2a2cbc2a24..43b36026d331 100644 --- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx +++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx @@ -20,8 +20,8 @@ #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> using namespace ::com::sun::star; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::XInterface; +using css::uno::Reference; +using css::uno::XInterface; namespace comphelper { diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 737e7d1cda2e..7f15295eaba2 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -165,7 +165,7 @@ public: virtual void Characters( const OUString& i_rCharacters ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + virtual css::uno::Reference< css::uno::XComponentContext > GetComponentContext() const override; private: SvXMLExport& m_rExport; @@ -207,7 +207,7 @@ Reference< XComponentContext > SettingsExportFacade::GetComponentContext() const } class SvXMLExportEventListener : public cppu::WeakImplHelper< - com::sun::star::lang::XEventListener > + css::lang::XEventListener > { private: SvXMLExport* pExport; @@ -217,7 +217,7 @@ public: virtual ~SvXMLExportEventListener(); // XEventListener - virtual void SAL_CALL disposing(const lang::EventObject& rEventObject) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const lang::EventObject& rEventObject) throw(css::uno::RuntimeException, std::exception) override; }; SvXMLExportEventListener::SvXMLExportEventListener(SvXMLExport* pTempExport) @@ -462,7 +462,7 @@ SvXMLExport::SvXMLExport( } SvXMLExport::SvXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, const OUString &rFileName, sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/, @@ -497,7 +497,7 @@ SvXMLExport::SvXMLExport( } SvXMLExport::SvXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, const OUString &rFileName, const uno::Reference< xml::sax::XDocumentHandler > & rHandler, @@ -671,7 +671,7 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo } } } - catch(const com::sun::star::uno::Exception&) + catch(const css::uno::Exception&) { } } @@ -682,7 +682,7 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo // XInitialize void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArguments ) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::Exception, css::uno::RuntimeException, std::exception) { // #93186# we need to queryInterface every single Any with any expected outcome. This variable hold the queryInterface results. @@ -871,13 +871,13 @@ void SAL_CALL SvXMLExport::cancel() throw(uno::RuntimeException, std::exception) } OUString SAL_CALL SvXMLExport::getName( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return msFilterName; } void SAL_CALL SvXMLExport::setName( const OUString& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { // do nothing, because it is not possible to set the FilterName } @@ -1010,7 +1010,7 @@ void SvXMLExport::AddAttribute( const OUString& rQName, } void SvXMLExport::AddLanguageTagAttributes( sal_uInt16 nPrefix, sal_uInt16 nPrefixRfc, - const ::com::sun::star::lang::Locale& rLocale, bool bWriteEmpty, + const css::lang::Locale& rLocale, bool bWriteEmpty, enum ::xmloff::token::XMLTokenEnum eClass ) { if (rLocale.Variant.isEmpty()) @@ -1343,7 +1343,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) bOwnEmbeddedResolver = mxEmbeddedResolver.is(); } } - catch(const com::sun::star::uno::Exception&) + catch(const css::uno::Exception&) { } } @@ -1389,7 +1389,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) mxExtHandler.set( mxHandler, UNO_QUERY ); } } - catch(const com::sun::star::uno::Exception&) + catch(const css::uno::Exception&) { } } diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx index 8b232e395669..aa1aa2ec6a7a 100644 --- a/xmloff/source/core/xmlictxt.cxx +++ b/xmloff/source/core/xmlictxt.cxx @@ -68,7 +68,7 @@ void SvXMLImportContext::Characters( const OUString& ) { } -// ::com::sun::star::xml::sax::XFastContextHandler: +// css::xml::sax::XFastContextHandler: void SAL_CALL SvXMLImportContext::startFastElement(sal_Int32, const uno::Reference< xml::sax::XFastAttributeList > &) throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index ad5f58a309a7..92fd16a82482 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -105,8 +105,7 @@ sal_Char const sXML_np__field[] = "_field"; sal_Char const sXML_np__xhtml[] = "_xhtml"; sal_Char const sXML_np__css3text[] = "_css3text"; -class SvXMLImportEventListener : public cppu::WeakImplHelper< - com::sun::star::lang::XEventListener > +class SvXMLImportEventListener : public cppu::WeakImplHelper< css::lang::XEventListener > { private: SvXMLImport* pImport; @@ -116,7 +115,7 @@ public: virtual ~SvXMLImportEventListener(); // XEventListener - virtual void SAL_CALL disposing(const lang::EventObject& rEventObject) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const lang::EventObject& rEventObject) throw(css::uno::RuntimeException, std::exception) override; }; SvXMLImportEventListener::SvXMLImportEventListener(SvXMLImport* pTempImport) @@ -419,7 +418,7 @@ void SvXMLImport::_InitCtor() } SvXMLImport::SvXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLImportFlags nImportFlags ) throw () : mpImpl( new SvXMLImport_Impl(xContext, implementationName) ), mpNamespaceMap( new SvXMLNamespaceMap ), @@ -529,7 +528,7 @@ void SAL_CALL SvXMLImport::startDocument() mpImpl->mbOwnEmbeddedResolver = mxEmbeddedResolver.is(); } } - catch( com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { } } @@ -964,7 +963,7 @@ void SAL_CALL SvXMLImport::cancel( ) // XInitialize void SAL_CALL SvXMLImport::initialize( const uno::Sequence< uno::Any >& aArguments ) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::Exception, css::uno::RuntimeException, std::exception) { const sal_Int32 nAnyCount = aArguments.getLength(); const uno::Any* pAny = aArguments.getConstArray(); @@ -1077,7 +1076,7 @@ OUString SAL_CALL SvXMLImport::getImplementationName() } sal_Bool SAL_CALL SvXMLImport::supportsService( const OUString& rServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } @@ -1455,11 +1454,11 @@ OUString SvXMLImport::GetStyleDisplayName( sal_uInt16 nFamily, return sName; } -void SvXMLImport::SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&) +void SvXMLImport::SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>&) { } -void SvXMLImport::SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&) +void SvXMLImport::SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>&) { } diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 9d0fc3cad9b4..c0a3a6bd4822 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -295,12 +295,12 @@ bool SvXMLUnitConverter::convertDouble(double& rValue, } /** get the Null Date of the XModel and set it to the UnitConverter */ -bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference <com::sun::star::frame::XModel>& xModel) +bool SvXMLUnitConverter::setNullDate(const css::uno::Reference <css::frame::XModel>& xModel) { - com::sun::star::uno::Reference <com::sun::star::util::XNumberFormatsSupplier> xNumberFormatsSupplier (xModel, com::sun::star::uno::UNO_QUERY); + css::uno::Reference <css::util::XNumberFormatsSupplier> xNumberFormatsSupplier (xModel, css::uno::UNO_QUERY); if (xNumberFormatsSupplier.is()) { - const com::sun::star::uno::Reference <com::sun::star::beans::XPropertySet> xPropertySet = xNumberFormatsSupplier->getNumberFormatSettings(); + const css::uno::Reference <css::beans::XPropertySet> xPropertySet = xNumberFormatsSupplier->getNumberFormatSettings(); return xPropertySet.is() && (xPropertySet->getPropertyValue(XML_NULLDATE) >>= m_pImpl->m_aNullDate); } return false; @@ -323,7 +323,7 @@ bool SvXMLUnitConverter::convertDateTime(double& fDateTime, /** convert double to ISO Date Time String */ void SvXMLUnitConverter::convertDateTime( OUStringBuffer& rBuffer, const double& fDateTime, - const com::sun::star::util::Date& aTempNullDate, + const css::util::Date& aTempNullDate, bool bAddTimeIf0AM ) { double fValue = fDateTime; @@ -430,9 +430,9 @@ void SvXMLUnitConverter::convertDateTime( OUStringBuffer& rBuffer, /** convert ISO Date Time String to double */ bool SvXMLUnitConverter::convertDateTime( double& fDateTime, - const OUString& rString, const com::sun::star::util::Date& aTempNullDate) + const OUString& rString, const css::util::Date& aTempNullDate) { - com::sun::star::util::DateTime aDateTime; + css::util::DateTime aDateTime; bool bSuccess = ::sax::Converter::parseDateTime(aDateTime, nullptr, rString); if (bSuccess) diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 7c313375eb1a..ee7290abfc73 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -129,21 +129,18 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexContainer> xMap, + css::uno::Reference<css::container::XIndexContainer> xMap, const sal_Char* pServiceName); void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override; void EndElement() override; SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; protected: @@ -152,8 +149,7 @@ protected: const OUString& rValue); virtual void Prepare( - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet); + css::uno::Reference<css::beans::XPropertySet> & rPropertySet); }; @@ -320,8 +316,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexContainer> xMap); + css::uno::Reference<css::container::XIndexContainer> xMap); virtual ~XMLImageMapRectangleContext(); @@ -331,8 +326,7 @@ protected: const OUString& rValue) override; virtual void Prepare( - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet) override; + css::uno::Reference<css::beans::XPropertySet> & rPropertySet) override; }; @@ -428,8 +422,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexContainer> xMap); + css::uno::Reference<css::container::XIndexContainer> xMap); virtual ~XMLImageMapPolygonContext(); @@ -439,8 +432,7 @@ protected: const OUString& rValue) override; virtual void Prepare( - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet) override; + css::uno::Reference<css::beans::XPropertySet> & rPropertySet) override; }; @@ -496,7 +488,7 @@ void XMLImageMapPolygonContext::Prepare(Reference<XPropertySet> & rPropertySet) { if(aPolygon.count()) { - com::sun::star::drawing::PointSequence aPointSequence; + css::drawing::PointSequence aPointSequence; uno::Any aAny; basegfx::tools::B2DPolygonToUnoPointSequence(aPolygon, aPointSequence); @@ -524,8 +516,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexContainer> xMap); + css::uno::Reference<css::container::XIndexContainer> xMap); virtual ~XMLImageMapCircleContext(); @@ -535,8 +526,7 @@ protected: const OUString& rValue) override; virtual void Prepare( - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet) override; + css::uno::Reference<css::beans::XPropertySet> & rPropertySet) override; }; @@ -639,7 +629,7 @@ XMLImageMapContext::XMLImageMapContext( if( xInfo.is() && xInfo->hasPropertyByName( sImageMap ) ) xPropertySet->getPropertyValue(sImageMap) >>= xImageMap; } - catch(const com::sun::star::uno::Exception& e) + catch(const css::uno::Exception& e) { uno::Sequence<OUString> aSeq(0); rImport.SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, nullptr ); diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index d7872d941f01..960869917239 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -492,16 +492,16 @@ public: SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ); virtual ~SdXMLNumberFormatMemberImportContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; @@ -509,7 +509,7 @@ public: }; -SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ) +SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ) : SvXMLImportContext(rImport, nPrfx, rLocalName), mpParent( pParent ), maNumberStyle( rLocalName ), @@ -552,12 +552,12 @@ SdXMLNumberFormatMemberImportContext::~SdXMLNumberFormatMemberImportContext() SvXMLImportContext *SdXMLNumberFormatMemberImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) { return mpSlaveContext->CreateChildContext( nPrefix, rLocalName, xAttrList ); } -void SdXMLNumberFormatMemberImportContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) +void SdXMLNumberFormatMemberImportContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) { mpSlaveContext->StartElement( xAttrList ); } @@ -577,7 +577,7 @@ void SdXMLNumberFormatMemberImportContext::Characters( const OUString& rChars ) } -SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles) +SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles) : SvXMLNumFormatContext(rImport, nPrfx, rLocalName, pNewData, nNewType, xAttrList, rStyles), mbAutomatic( false ), mnIndex(0), @@ -711,7 +711,7 @@ void SdXMLNumberFormatImportContext::EndElement() } } -SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { return new SdXMLNumberFormatMemberImportContext( GetImport(), nPrefix, rLocalName, xAttrList, this, SvXMLNumFormatContext::CreateChildContext( nPrefix, rLocalName, xAttrList ) ); } diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index 2a80b436737a..c54b682be09e 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -262,7 +262,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet rPropSet->setPropertyValue( rPropertyName, Any( sStyleName ) ); } } - catch ( const ::com::sun::star::lang::IllegalArgumentException& e ) + catch ( const css::lang::IllegalArgumentException& e ) { Sequence<OUString> aSeq { sStyleName }; GetImport().SetError( @@ -287,7 +287,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet rPropSet->setPropertyValue( rPropertyName, rState.maValue ); } } - catch ( const ::com::sun::star::lang::IllegalArgumentException& e ) + catch ( const css::lang::IllegalArgumentException& e ) { Sequence<OUString> aSeq; GetImport().SetError( diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index f911e6741307..3140586c56e8 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -541,7 +541,7 @@ AnimationsExporterImpl::AnimationsExporterImpl( SvXMLExport& rExport, const Refe { try { - mxExport = static_cast< ::com::sun::star::document::XFilter *>(&rExport); + mxExport = static_cast< css::document::XFilter *>(&rExport); } catch (const RuntimeException&) { @@ -1401,7 +1401,7 @@ void AnimationsExporterImpl::exportCommand( const Reference< XCommand >& xComman SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nCommand, getAnimationsEnumMap(Animations_EnumMap_Command) ); mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_COMMAND, sTmp.makeStringAndClear() ); -// todo virtual ::com::sun::star::uno::Any SAL_CALL getParameter() throw (::com::sun::star::uno::RuntimeException) = 0; +// todo virtual css::uno::Any SAL_CALL getParameter() throw (css::uno::RuntimeException) = 0; SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, true, true ); @@ -1615,7 +1615,7 @@ void AnimationsExporterImpl::convertTarget( OUStringBuffer& sTmp, const Any& rTa Reference< XInterface > xRef; - if( rTarget.getValueTypeClass() == ::com::sun::star::uno::TypeClass_INTERFACE ) + if( rTarget.getValueTypeClass() == css::uno::TypeClass_INTERFACE ) { rTarget >>= xRef; } @@ -1654,7 +1654,7 @@ void AnimationsExporterImpl::prepareValue( const Any& rValue ) for( nElement = 0; nElement < nLength; nElement++, pAny++ ) prepareValue( *pAny ); } - else if( rValue.getValueTypeClass() == ::com::sun::star::uno::TypeClass_INTERFACE ) + else if( rValue.getValueTypeClass() == css::uno::TypeClass_INTERFACE ) { Reference< XInterface> xRef( rValue, UNO_QUERY ); if( xRef.is() ) diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index f7c5e72c2739..a5951129936d 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -624,7 +624,7 @@ Any AnimationsImportHelperImpl::convertPath( const OUString& rValue ) AnimationNodeContext::AnimationNodeContext( const Reference< XAnimationNode >& xParentNode, SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, AnimationsImportHelperImpl* pHelper /* = NULL */ ) : SvXMLImportContext(rImport, nPrfx, rLocalName), mpHelper( pHelper ), @@ -726,7 +726,7 @@ AnimationNodeContext::~AnimationNodeContext() delete mpHelper; } -void AnimationNodeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) +void AnimationNodeContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& ) { // code of StartElement is moved to init_node that is now called // in c'tor before appending this node to its parent. @@ -734,7 +734,7 @@ void AnimationNodeContext::StartElement( const ::com::sun::star::uno::Reference< // set when child nodes are appended. } -void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) +void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) { if( mxNode.is() ) try { @@ -1152,7 +1152,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< : double fInterval = 0.0; if( rValue.match("P") ) { - ::com::sun::star::util::Duration aDuration; + css::util::Duration aDuration; if (::sax::Converter::convertDuration(aDuration, rValue)) { fInterval = ((((aDuration.Hours * 60) @@ -1240,7 +1240,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< : } SvXMLImportContext * AnimationNodeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { if( mxNode.is()) return new AnimationNodeContext( mxNode, GetImport(), nPrefix, rLocalName, xAttrList, mpHelper ); diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 1aae82c862fd..78505e4b9af3 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -646,7 +646,7 @@ void XMLAnimationsEffectContext::EndElement() XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& ) + const css::uno::Reference< css::xml::sax::XAttributeList>& ) : SvXMLImportContext(rImport, nPrfx, rLocalName) { mpImpl = new AnimImpImpl(); @@ -658,7 +658,7 @@ XMLAnimationsContext::~XMLAnimationsContext() } SvXMLImportContext * XMLAnimationsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { return new XMLAnimationsEffectContext( GetImport(), nPrefix, rLocalName, xAttrList, mpImpl ); } diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx index f820a830c59d..cc2eca055e3f 100644 --- a/xmloff/source/draw/descriptionimp.hxx +++ b/xmloff/source/draw/descriptionimp.hxx @@ -28,15 +28,15 @@ class SdXMLDescriptionContext : public SvXMLImportContext { private: - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; + css::uno::Reference< css::drawing::XShape > mxShape; OUString msText; public: SdXMLDescriptionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rxShape ); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::drawing::XShape >& rxShape ); virtual ~SdXMLDescriptionContext(); virtual void EndElement() override; diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index b19b343f66ec..8e6b65bd3a60 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -73,7 +73,7 @@ SvXMLEnumMapEntry const aXML_EventActions_EnumMap[] = class SdXMLEventContext : public SvXMLImportContext { private: - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; + css::uno::Reference< css::drawing::XShape > mxShape; public: @@ -490,7 +490,7 @@ SdXMLEventsContext::~SdXMLEventsContext() } SvXMLImportContext * SdXMLEventsContext::CreateChildContext( sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { return new SdXMLEventContext( GetImport(), nPrfx, rLocalName, xAttrList, mxShape ); } diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx index c190d8ca14a9..ff875b376cc5 100644 --- a/xmloff/source/draw/eventimp.hxx +++ b/xmloff/source/draw/eventimp.hxx @@ -28,19 +28,19 @@ class SdXMLEventsContext : public SvXMLImportContext { private: - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; + css::uno::Reference< css::drawing::XShape > mxShape; public: SdXMLEventsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rxShape ); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::drawing::XShape >& rxShape ); virtual ~SdXMLEventsContext(); virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_EVENTIMP_HXX diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index 3f42d3adc61a..b923c78fa0ad 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -58,7 +58,7 @@ public: virtual void EndElement() override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxLayerManager; + css::uno::Reference< css::container::XNameAccess > mxLayerManager; OUString msName; OUStringBuffer sDescriptionBuffer; OUStringBuffer sTitleBuffer; @@ -144,7 +144,7 @@ void SdXMLLayerContext::EndElement() SdXMLLayerSetContext::SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>&) + const css::uno::Reference< css::xml::sax::XAttributeList>&) : SvXMLImportContext(rImport, nPrfx, rLocalName) { Reference< XLayerSupplier > xLayerSupplier( rImport.GetModel(), UNO_QUERY ); @@ -158,7 +158,7 @@ SdXMLLayerSetContext::~SdXMLLayerSetContext() } SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { return new SdXMLLayerContext( GetImport(), nPrefix, rLocalName, xAttrList, mxLayerManager ); } diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx index fe788f5cc2c2..6538f6a0d088 100644 --- a/xmloff/source/draw/layerimp.hxx +++ b/xmloff/source/draw/layerimp.hxx @@ -28,18 +28,18 @@ class SdXMLLayerSetContext : public SvXMLImportContext { private: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxLayerManager; + css::uno::Reference< css::container::XNameAccess > mxLayerManager; public: SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList); virtual ~SdXMLLayerSetContext(); virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_LAYERIMP_HXX diff --git a/xmloff/source/draw/numithdl.cxx b/xmloff/source/draw/numithdl.cxx index 048d05b1b596..aac3002398bd 100644 --- a/xmloff/source/draw/numithdl.cxx +++ b/xmloff/source/draw/numithdl.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star; // class XMLNumRulePropHdl -XMLNumRulePropHdl::XMLNumRulePropHdl( ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > xNumRuleCompare ) +XMLNumRulePropHdl::XMLNumRulePropHdl( css::uno::Reference< css::ucb::XAnyCompare > xNumRuleCompare ) : mxNumRuleCompare( xNumRuleCompare ) { } @@ -40,12 +40,12 @@ bool XMLNumRulePropHdl::equals( const uno::Any& r1, const uno::Any& r2 ) const return mxNumRuleCompare.is() && mxNumRuleCompare->compare( r1, r2 ) == 0; } -bool XMLNumRulePropHdl::importXML( const OUString& /*rStrImpValue*/, ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const +bool XMLNumRulePropHdl::importXML( const OUString& /*rStrImpValue*/, css::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { return false; } -bool XMLNumRulePropHdl::exportXML( OUString& /*rStrExpValue*/, const ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const +bool XMLNumRulePropHdl::exportXML( OUString& /*rStrExpValue*/, const css::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { return false; } diff --git a/xmloff/source/draw/numithdl.hxx b/xmloff/source/draw/numithdl.hxx index 1242743c3b3d..99857ef04505 100644 --- a/xmloff/source/draw/numithdl.hxx +++ b/xmloff/source/draw/numithdl.hxx @@ -29,16 +29,16 @@ class XMLNumRulePropHdl : public XMLPropertyHandler { private: - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > mxNumRuleCompare; + css::uno::Reference< css::ucb::XAnyCompare > mxNumRuleCompare; public: - explicit XMLNumRulePropHdl( ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > xNumRuleCompare ); + explicit XMLNumRulePropHdl( css::uno::Reference< css::ucb::XAnyCompare > xNumRuleCompare ); virtual ~XMLNumRulePropHdl(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; /// NumRules will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_NUMITHDL_HXX diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx index 0ac8bf33b074..a52be4723c5e 100644 --- a/xmloff/source/draw/propimp0.cxx +++ b/xmloff/source/draw/propimp0.cxx @@ -44,7 +44,7 @@ XMLDurationPropertyHdl::~XMLDurationPropertyHdl() bool XMLDurationPropertyHdl::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const { util::Duration aDuration; @@ -67,7 +67,7 @@ bool XMLDurationPropertyHdl::importXML( bool XMLDurationPropertyHdl::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const { double nVal = 0; @@ -100,7 +100,7 @@ XMLOpacityPropertyHdl::~XMLOpacityPropertyHdl() bool XMLOpacityPropertyHdl::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const { bool bRet = false; @@ -148,7 +148,7 @@ bool XMLOpacityPropertyHdl::importXML( bool XMLOpacityPropertyHdl::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const { bool bRet = false; @@ -175,7 +175,7 @@ XMLTextAnimationStepPropertyHdl::~XMLTextAnimationStepPropertyHdl() bool XMLTextAnimationStepPropertyHdl::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { bool bRet = false; @@ -205,7 +205,7 @@ bool XMLTextAnimationStepPropertyHdl::importXML( bool XMLTextAnimationStepPropertyHdl::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { bool bRet = false; @@ -244,13 +244,13 @@ XMLDateTimeFormatHdl::~XMLDateTimeFormatHdl() { } -bool XMLDateTimeFormatHdl::importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLDateTimeFormatHdl::importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& ) const { rValue <<= rStrImpValue; return true; } -bool XMLDateTimeFormatHdl::exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLDateTimeFormatHdl::exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_Int32 nNumberFormat = 0; if( mpExport && (rValue >>= nNumberFormat) ) diff --git a/xmloff/source/draw/propimp0.hxx b/xmloff/source/draw/propimp0.hxx index a463827d2c78..ce351d0ecb7c 100644 --- a/xmloff/source/draw/propimp0.hxx +++ b/xmloff/source/draw/propimp0.hxx @@ -28,8 +28,8 @@ class XMLDurationPropertyHdl : public XMLPropertyHandler { public: virtual ~XMLDurationPropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class SvXMLImport; @@ -40,16 +40,16 @@ private: public: explicit XMLOpacityPropertyHdl( SvXMLImport* pImport ); virtual ~XMLOpacityPropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLTextAnimationStepPropertyHdl : public XMLPropertyHandler { public: virtual ~XMLTextAnimationStepPropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class SvXMLExport; @@ -61,8 +61,8 @@ private: public: explicit XMLDateTimeFormatHdl( SvXMLExport* pExport ); virtual ~XMLDateTimeFormatHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_PROPIMP0_HXX diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 1794fceb9d75..6011498a12d3 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -734,11 +734,11 @@ class XMLCaptionEscapeRelative : public XMLPropertyHandler public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; @@ -774,11 +774,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; private: const sal_Int32 mnType; @@ -813,8 +813,8 @@ class XMLSdHeaderFooterVisibilityTypeHdl : public XMLPropertyHandler public: virtual ~XMLSdHeaderFooterVisibilityTypeHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; XMLSdHeaderFooterVisibilityTypeHdl::~XMLSdHeaderFooterVisibilityTypeHdl() @@ -823,7 +823,7 @@ XMLSdHeaderFooterVisibilityTypeHdl::~XMLSdHeaderFooterVisibilityTypeHdl() bool XMLSdHeaderFooterVisibilityTypeHdl::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const { // #i38644# @@ -1025,26 +1025,26 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_BITMAP_REFPOINT: { - pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, cppu::UnoType<com::sun::star::drawing::RectanglePoint>::get()); + pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, cppu::UnoType<css::drawing::RectanglePoint>::get()); break; } case XML_TYPE_TEXT_ANIMATION: - pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Enum, cppu::UnoType<com::sun::star::drawing::TextAnimationKind>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Enum, cppu::UnoType<css::drawing::TextAnimationKind>::get()); break; case XML_TYPE_TEXT_ANIMATION_BLINKING: - pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Blinking_Enum, cppu::UnoType<com::sun::star::drawing::TextAnimationKind>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Blinking_Enum, cppu::UnoType<css::drawing::TextAnimationKind>::get()); break; case XML_TYPE_TEXT_ANIMATION_DIRECTION: - pHdl = new XMLEnumPropertyHdl( pXML_TextAnimationDirection_Enum, cppu::UnoType<com::sun::star::drawing::TextAnimationDirection>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_TextAnimationDirection_Enum, cppu::UnoType<css::drawing::TextAnimationDirection>::get()); break; case XML_TYPE_TEXT_ANIMATION_STEPS: pHdl = new XMLTextAnimationStepPropertyHdl; break; case XML_SD_TYPE_TEXT_ALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_TextAlign_Enum, cppu::UnoType<com::sun::star::drawing::TextHorizontalAdjust>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_TextAlign_Enum, cppu::UnoType<css::drawing::TextHorizontalAdjust>::get()); break; case XML_SD_TYPE_VERTICAL_ALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum, cppu::UnoType<com::sun::star::drawing::TextVerticalAdjust>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum, cppu::UnoType<css::drawing::TextVerticalAdjust>::get()); break; case XML_SD_TYPE_FITTOSIZE: { @@ -1052,12 +1052,12 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy <= SvtSaveOptions::ODFVER_012)) { pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum_Odf12, - cppu::UnoType<com::sun::star::drawing::TextFitToSizeType>::get()); + cppu::UnoType<css::drawing::TextFitToSizeType>::get()); } else { pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum, - cppu::UnoType<com::sun::star::drawing::TextFitToSizeType>::get()); + cppu::UnoType<css::drawing::TextFitToSizeType>::get()); } } break; @@ -1065,10 +1065,10 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy pHdl = new XMLEnumPropertyHdl( pXML_MeasureUnit_Enum, ::cppu::UnoType<sal_Int32>::get() ); break; case XML_SD_TYPE_MEASURE_HALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_Measure_HAlign_Enum, cppu::UnoType<com::sun::star::drawing::MeasureTextHorzPos>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_Measure_HAlign_Enum, cppu::UnoType<css::drawing::MeasureTextHorzPos>::get()); break; case XML_SD_TYPE_MEASURE_VALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_Measure_VAlign_Enum, cppu::UnoType<com::sun::star::drawing::MeasureTextVertPos>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_Measure_VAlign_Enum, cppu::UnoType<css::drawing::MeasureTextVertPos>::get()); break; case XML_SD_TYPE_MEASURE_PLACING: { @@ -1678,7 +1678,7 @@ void XMLPageExportPropertyMapper::ContextFilter( } } - if( pTransitionFadeColor && nTransitionType != ::com::sun::star::animations::TransitionType::FADE ) + if( pTransitionFadeColor && nTransitionType != css::animations::TransitionType::FADE ) pTransitionFadeColor->mnIndex = -1; if( pDateTimeFormat && pDateTimeUpdate ) diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index 7d84ffd11679..1b025704c381 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -55,13 +55,13 @@ class SvXMLImport; class XMLSdPropHdlFactory : public XMLPropertyHandlerFactory { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; + css::uno::Reference< css::frame::XModel > mxModel; SvXMLExport* mpExport; SvXMLImport* mpImport; public: - XMLSdPropHdlFactory( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >, SvXMLExport& rExport ); - XMLSdPropHdlFactory( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >, SvXMLImport& rImport ); + XMLSdPropHdlFactory( css::uno::Reference< css::frame::XModel >, SvXMLExport& rExport ); + XMLSdPropHdlFactory( css::uno::Reference< css::frame::XModel >, SvXMLImport& rImport ); virtual ~XMLSdPropHdlFactory(); virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const override; }; @@ -83,8 +83,7 @@ protected: virtual void ContextFilter( bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const override; + css::uno::Reference< css::beans::XPropertySet > rPropSet ) const override; public: XMLShapeExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ); virtual ~XMLShapeExportPropertyMapper(); @@ -117,8 +116,7 @@ protected: virtual void ContextFilter( bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const override; + css::uno::Reference< css::beans::XPropertySet > rPropSet ) const override; public: XMLPageExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ); virtual ~XMLPageExportPropertyMapper(); diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index a614e6767c6c..ec6a0d42b640 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -389,7 +389,7 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI } SdXMLExport::SdXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, bool bIsDraw, SvXMLExportFlags nExportFlags ) : SvXMLExport( util::MeasureUnit::CM, xContext, implementationName, @@ -1847,7 +1847,7 @@ void SdXMLExport::_ExportContent() AddAttribute ( XML_NAMESPACE_DRAW, XML_NAV_ORDER, sNavigationOrder ); rtl::Reference< xmloff::AnimationsExporter > xAnimationsExporter; - uno::Reference< ::com::sun::star::animations::XAnimationNodeSupplier > xAnimNodeSupplier; + uno::Reference< css::animations::XAnimationNodeSupplier > xAnimNodeSupplier; // prepare animation export if(IsImpress()) @@ -2707,13 +2707,13 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage ) { // date time - com::sun::star::util::DateTime aDate( xAnnotation->getDateTime() ); + css::util::DateTime aDate( xAnnotation->getDateTime() ); ::sax::Converter::convertDateTime(sStringBuffer, aDate, nullptr, true); SvXMLElementExport aDateElem( *this, XML_NAMESPACE_DC, XML_DATE, true, false ); Characters(sStringBuffer.makeStringAndClear()); } - com::sun::star::uno::Reference < com::sun::star::text::XText > xText( xAnnotation->getTextRange() ); + css::uno::Reference < css::text::XText > xText( xAnnotation->getTextRange() ); if( xText.is() ) this->GetTextParagraphExport()->exportText( xText ); } diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index e0fd5daf8a17..b6a32c9c5d15 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -77,9 +77,9 @@ struct DateTimeDeclImpl class SdXMLExport : public SvXMLExport { - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > mxDocStyleFamilies; - com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > mxDocMasterPages; - com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > mxDocDrawPages; + css::uno::Reference< css::container::XNameAccess > mxDocStyleFamilies; + css::uno::Reference< css::container::XIndexAccess > mxDocMasterPages; + css::uno::Reference< css::container::XIndexAccess > mxDocDrawPages; sal_Int32 mnDocMasterPageCount; sal_Int32 mnDocDrawPageCount; sal_uInt32 mnObjectCount; @@ -91,7 +91,7 @@ class SdXMLExport : public SvXMLExport ImpXMLEXPPageMasterInfo* mpHandoutPageMaster; ImpXMLAutoLayoutInfoList* mpAutoLayoutInfoList; - com::sun::star::uno::Sequence< OUString > maDrawPagesAutoLayoutNames; + css::uno::Sequence< OUString > maDrawPagesAutoLayoutNames; ::std::vector< OUString > maDrawPagesStyleNames; ::std::vector< OUString > maDrawNotesPagesStyleNames; @@ -124,43 +124,43 @@ class SdXMLExport : public SvXMLExport virtual void _ExportContent() override; virtual void _ExportMeta() override; - ImpXMLEXPPageMasterInfo* ImpGetOrCreatePageMasterInfo( com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > xMasterPage ); + ImpXMLEXPPageMasterInfo* ImpGetOrCreatePageMasterInfo( css::uno::Reference< css::drawing::XDrawPage > xMasterPage ); void ImpPrepPageMasterInfos(); void ImpWritePageMasterInfos(); void ImpPrepAutoLayoutInfos(); - HeaderFooterPageSettingsImpl ImpPrepDrawPageHeaderFooterDecls( const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xDrawPage ); + HeaderFooterPageSettingsImpl ImpPrepDrawPageHeaderFooterDecls( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage ); ImpXMLEXPPageMasterInfo* ImpGetPageMasterInfoByName(const OUString& rName); void ImpPrepDrawPageInfos(); void ImpPrepMasterPageInfos(); void ImpWritePresentationStyles(); - OUString ImpCreatePresPageStyleName( com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> xDrawPage, bool bExportBackground = true ); + OUString ImpCreatePresPageStyleName( css::uno::Reference<css::drawing::XDrawPage> xDrawPage, bool bExportBackground = true ); - bool ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, OUString& rName); + bool ImpPrepAutoLayoutInfo(const css::uno::Reference< css::drawing::XDrawPage >& xPage, OUString& rName); void ImpWriteAutoLayoutInfos(); void ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectangle& rRect); void ImpWriteHeaderFooterDecls(); void ImplExportHeaderFooterDeclAttributes( const HeaderFooterPageSettingsImpl& aSettings ); - void exportFormsElement( com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > xDrawPage ); + void exportFormsElement( css::uno::Reference< css::drawing::XDrawPage > xDrawPage ); void exportPresentationSettings(); // #82003# helper function for recursive object count - sal_uInt32 ImpRecursiveObjectCount( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xShapes); + sal_uInt32 ImpRecursiveObjectCount( css::uno::Reference< css::drawing::XShapes > xShapes); - OUString getNavigationOrder( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage ); + OUString getNavigationOrder( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage ); - void collectAnnotationAutoStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage ); - void exportAnnotations( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage ); + void collectAnnotationAutoStyles( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage ); + void exportAnnotations( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage ); protected: - virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override; - virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override; + virtual void GetViewSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override; + virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override; virtual XMLFontAutoStylePool* CreateFontAutoStylePool() override; public: SdXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, bool bIsDraw, SvXMLExportFlags nExportFlags = SvXMLExportFlags::ALL ); virtual ~SdXMLExport(); @@ -168,7 +168,7 @@ public: void SetProgress(sal_Int32 nProg); // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // get factories and mappers XMLShapeExportPropertyMapper* GetPropertySetMapper() const { return mpPropertySetMapper; } diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 9a34294350d9..a4df0e843844 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -279,7 +279,7 @@ SERVICE( XMLImpressSettingsImportOasis, "com.sun.star.comp.Impress.XMLOasisSetti SERVICE( XMLDrawSettingsImportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", true, SvXMLImportFlags::SETTINGS ) SdXMLImport::SdXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, bool bIsDraw, SvXMLImportFlags nImportFlags ) : SvXMLImport( xContext, implementationName, nImportFlags ), @@ -751,7 +751,7 @@ SvXMLImportContext *SdXMLImport::CreateScriptContext( return pContext; } -void SdXMLImport::SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) +void SdXMLImport::SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) { uno::Reference< beans::XPropertySet > xPropSet( GetModel(), uno::UNO_QUERY ); if( !xPropSet.is() ) @@ -791,7 +791,7 @@ void SdXMLImport::SetViewSettings(const com::sun::star::uno::Sequence<com::sun:: { xPropSet->setPropertyValue("VisibleArea", uno::makeAny( aVisArea ) ); } - catch(const com::sun::star::uno::Exception&) + catch(const css::uno::Exception&) { /* #i79978# since old documents may contain invalid view settings, this is nothing to worry the user about. uno::Sequence<OUString> aSeq(0); @@ -800,7 +800,7 @@ void SdXMLImport::SetViewSettings(const com::sun::star::uno::Sequence<com::sun:: } } -void SdXMLImport::SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) +void SdXMLImport::SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps) { uno::Reference< lang::XMultiServiceFactory > xFac( GetModel(), uno::UNO_QUERY ); if( !xFac.is() ) diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 4f59459a88b2..3d251d55b9f2 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -169,10 +169,10 @@ typedef std::map<OUString, DateTimeDeclContextImpl> DateTimeDeclMap; class SdXMLImport: public SvXMLImport { - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > mxDocStyleFamilies; - com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > mxDocMasterPages; - com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > mxDocDrawPages; - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > mxPageLayouts; + css::uno::Reference< css::container::XNameAccess > mxDocStyleFamilies; + css::uno::Reference< css::container::XIndexAccess > mxDocMasterPages; + css::uno::Reference< css::container::XIndexAccess > mxDocDrawPages; + css::uno::Reference< css::container::XNameAccess > mxPageLayouts; // contexts for Style and AutoStyle import SdXMLMasterStylesContext* mpMasterStylesContext; @@ -196,7 +196,7 @@ class SdXMLImport: public SvXMLImport bool mbLoadDoc; bool mbPreview; - std::map< sal_Int32, com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >, SdXMLltXDrawPageId > + std::map< sal_Int32, css::uno::Reference< css::drawing::XDrawPage >, SdXMLltXDrawPageId > maDrawPageIds; OUString msPageLayouts; @@ -211,41 +211,40 @@ protected: // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; public: SdXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, bool bIsDraw, SvXMLImportFlags nImportFlags ); virtual ~SdXMLImport() throw (); // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // 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, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) override; - virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) override; + virtual void SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) override; + virtual void SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps) override; // namespace office // NB: in contrast to other CreateFooContexts, this particular one handles // the root element (i.e. office:document-meta) SvXMLImportContext* CreateMetaContext(const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); SvXMLImportContext* CreateScriptContext( const OUString& rLocalName ); SvXMLImportContext* CreateBodyContext(const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); SvXMLStylesContext* CreateStylesContext(const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); SvXMLStylesContext* CreateAutoStylesContext(const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); SvXMLImportContext* CreateMasterStylesContext(const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); SvXMLImportContext *CreateFontDeclsContext(const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); // Styles and AutoStyles contexts @@ -263,25 +262,22 @@ public: const SvXMLTokenMap& GetPresentationPlaceholderAttrTokenMap(); // export local parameters concerning page access and similar - const com::sun::star::uno::Reference< - com::sun::star::container::XNameAccess >& GetLocalDocStyleFamilies() const { return mxDocStyleFamilies; } - const com::sun::star::uno::Reference< - com::sun::star::container::XIndexAccess >& GetLocalMasterPages() const { return mxDocMasterPages; } - const com::sun::star::uno::Reference< - com::sun::star::container::XIndexAccess >& GetLocalDrawPages() const { return mxDocDrawPages; } + const css::uno::Reference< css::container::XNameAccess >& GetLocalDocStyleFamilies() const { return mxDocStyleFamilies; } + const css::uno::Reference< css::container::XIndexAccess >& GetLocalMasterPages() const { return mxDocMasterPages; } + const css::uno::Reference< css::container::XIndexAccess >& GetLocalDrawPages() const { return mxDocDrawPages; } sal_Int32 GetNewPageCount() const { return mnNewPageCount; } void IncrementNewPageCount() { mnNewPageCount++; } sal_Int32 GetNewMasterPageCount() const { return mnNewMasterPageCount; } void IncrementNewMasterPageCount() { mnNewMasterPageCount++; } - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getPageLayouts() const { return mxPageLayouts; } + css::uno::Reference< css::container::XNameAccess > getPageLayouts() const { return mxPageLayouts; } bool IsDraw() const { return mbIsDraw; } bool IsImpress() const { return !mbIsDraw; } virtual void SetStatistics( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) override; + const css::uno::Sequence< css::beans::NamedValue> & i_rStats) override; bool IsPreview() const { return mbPreview; } diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index d98b12bab154..150b7b11c3a1 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -573,7 +573,7 @@ namespace // This method exports the given XShape void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape, XMLShapeExportFlags nFeatures /* = SEF_DEFAULT */, - com::sun::star::awt::Point* pRefPoint /* = NULL */, + css::awt::Point* pRefPoint /* = NULL */, SvXMLAttributeList* pAttrList /* = NULL */ ) { SAL_INFO("xmloff", xShape->getShapeType()); @@ -1279,7 +1279,7 @@ void XMLShapeExport::ExportGraphicDefaults() } } -void XMLShapeExport::onExport( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& ) +void XMLShapeExport::onExport( const css::uno::Reference < css::drawing::XShape >& ) { } @@ -1320,7 +1320,7 @@ void XMLShapeExport::ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& { /* Get <TransformationInHoriL2R>, if it exist and if the document is exported into the OpenOffice.org file format. - This property only exists at service com::sun::star::text::Shape - the + This property only exists at service css::text::Shape - the Writer UNO service for shapes. This code is needed, because the positioning attributes in the OpenOffice.org file format are given in horizontal left-to-right layout @@ -1354,7 +1354,7 @@ void XMLShapeExport::ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& } void XMLShapeExport::ImpExportNewTrans_DecomposeAndRefPoint(const ::basegfx::B2DHomMatrix& rMatrix, ::basegfx::B2DTuple& rTRScale, - double& fTRShear, double& fTRRotate, ::basegfx::B2DTuple& rTRTranslate, com::sun::star::awt::Point* pRefPoint) + double& fTRShear, double& fTRRotate, ::basegfx::B2DTuple& rTRTranslate, css::awt::Point* pRefPoint) { // decompose matrix rMatrix.decompose(rTRScale, rTRTranslate, fTRRotate, fTRShear); @@ -1934,7 +1934,7 @@ void XMLShapeExport::ImpExportTextBoxShape( void XMLShapeExport::ImpExportRectangleShape( const uno::Reference< drawing::XShape >& xShape, - XmlShapeType, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint) + XmlShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint) { const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if(xPropSet.is()) @@ -2479,7 +2479,7 @@ void XMLShapeExport::ImpExportConnectorShape( /* Get <StartPositionInHoriL2R> and <EndPositionInHoriL2R>, if they exist and if the document is exported into the OpenOffice.org file format. - These properties only exist at service com::sun::star::text::Shape - the + These properties only exist at service css::text::Shape - the Writer UNO service for shapes. This code is needed, because the positioning attributes in the OpenOffice.org file format are given in horizontal left-to-right layout @@ -2651,7 +2651,7 @@ void XMLShapeExport::ImpExportMeasureShape( /* Get <StartPositionInHoriL2R> and <EndPositionInHoriL2R>, if they exist and if the document is exported into the OpenOffice.org file format. - These properties only exist at service com::sun::star::text::Shape - the + These properties only exist at service css::text::Shape - the Writer UNO service for shapes. This code is needed, because the positioning attributes in the OpenOffice.org file format are given in horizontal left-to-right layout @@ -2972,7 +2972,7 @@ void XMLShapeExport::ImpExportCaptionShape( void XMLShapeExport::ImpExportFrameShape( const uno::Reference< drawing::XShape >& xShape, - XmlShapeType, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint) + XmlShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint) { const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if(xPropSet.is()) @@ -3006,7 +3006,7 @@ void XMLShapeExport::ImpExportFrameShape( void XMLShapeExport::ImpExportAppletShape( const uno::Reference< drawing::XShape >& xShape, - XmlShapeType, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint) + XmlShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint) { const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if(xPropSet.is()) @@ -3061,7 +3061,7 @@ void XMLShapeExport::ImpExportAppletShape( void XMLShapeExport::ImpExportPluginShape( const uno::Reference< drawing::XShape >& xShape, - XmlShapeType, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint) + XmlShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint) { const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if(xPropSet.is()) @@ -3308,7 +3308,7 @@ static void lcl_StoreGltfFallback( void XMLShapeExport::ImpExportMediaShape( const uno::Reference< drawing::XShape >& xShape, - XmlShapeType eShapeType, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint) + XmlShapeType eShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint) { const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if(xPropSet.is()) @@ -3609,7 +3609,7 @@ void XMLShapeExport::ImpExport3DShape( } /** helper for chart that adds all attributes of a 3d scene element to the export */ -void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ) +void XMLShapeExport::export3DSceneAttributes( const css::uno::Reference< css::beans::XPropertySet >& xPropSet ) { OUString aStr; OUStringBuffer sStringBuffer; @@ -3727,7 +3727,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen } /** helper for chart that exports all lamps from the propertyset */ -void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ) +void XMLShapeExport::export3DLamps( const css::uno::Reference< css::beans::XPropertySet >& xPropSet ) { // write lamps 1..8 as content OUString aStr; @@ -3782,11 +3782,11 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s } -// using namespace ::com::sun::star::io; +// using namespace css::io; // using namespace ::xmloff::EnhancedCustomShapeToken; -void ExportParameter( OUStringBuffer& rStrBuffer, const com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter ) +void ExportParameter( OUStringBuffer& rStrBuffer, const css::drawing::EnhancedCustomShapeParameter& rParameter ) { if ( !rStrBuffer.isEmpty() ) rStrBuffer.append( ' ' ); @@ -3803,42 +3803,42 @@ void ExportParameter( OUStringBuffer& rStrBuffer, const com::sun::star::drawing: switch( rParameter.Type ) { - case com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION : + case css::drawing::EnhancedCustomShapeParameterType::EQUATION : { rStrBuffer.append( "?f" + OUString::number( nValue ) ); } break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT : + case css::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT : { rStrBuffer.append( '$' ); rStrBuffer.append( OUString::number( nValue ) ); } break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::BOTTOM : + case css::drawing::EnhancedCustomShapeParameterType::BOTTOM : rStrBuffer.append( GetXMLToken( XML_BOTTOM ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::RIGHT : + case css::drawing::EnhancedCustomShapeParameterType::RIGHT : rStrBuffer.append( GetXMLToken( XML_RIGHT ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::TOP : + case css::drawing::EnhancedCustomShapeParameterType::TOP : rStrBuffer.append( GetXMLToken( XML_TOP ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::LEFT : + case css::drawing::EnhancedCustomShapeParameterType::LEFT : rStrBuffer.append( GetXMLToken( XML_LEFT ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::XSTRETCH : + case css::drawing::EnhancedCustomShapeParameterType::XSTRETCH : rStrBuffer.append( GetXMLToken( XML_XSTRETCH ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::YSTRETCH : + case css::drawing::EnhancedCustomShapeParameterType::YSTRETCH : rStrBuffer.append( GetXMLToken( XML_YSTRETCH ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::HASSTROKE : + case css::drawing::EnhancedCustomShapeParameterType::HASSTROKE : rStrBuffer.append( GetXMLToken( XML_HASSTROKE ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::HASFILL : + case css::drawing::EnhancedCustomShapeParameterType::HASFILL : rStrBuffer.append( GetXMLToken( XML_HASFILL ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::WIDTH : + case css::drawing::EnhancedCustomShapeParameterType::WIDTH : rStrBuffer.append( GetXMLToken( XML_WIDTH ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::HEIGHT : + case css::drawing::EnhancedCustomShapeParameterType::HEIGHT : rStrBuffer.append( GetXMLToken( XML_HEIGHT ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::LOGWIDTH : + case css::drawing::EnhancedCustomShapeParameterType::LOGWIDTH : rStrBuffer.append( GetXMLToken( XML_LOGWIDTH ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::LOGHEIGHT : + case css::drawing::EnhancedCustomShapeParameterType::LOGHEIGHT : rStrBuffer.append( GetXMLToken( XML_LOGHEIGHT ) ); break; default : rStrBuffer.append( OUString::number( nValue ) ); @@ -3891,7 +3891,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert { case EAS_Position : { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition; + css::drawing::EnhancedCustomShapeParameterPair aPosition; if ( rPropVal.Value >>= aPosition ) { ExportParameter( aStrBuffer, aPosition.First ); @@ -3928,7 +3928,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_Polar : { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aPolar; + css::drawing::EnhancedCustomShapeParameterPair aPolar; if ( rPropVal.Value >>= aPolar ) { ExportParameter( aStrBuffer, aPolar.First ); @@ -3940,7 +3940,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_RadiusRangeMinimum : { - com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; + css::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; if ( rPropVal.Value >>= aRadiusRangeMinimum ) { ExportParameter( aStrBuffer, aRadiusRangeMinimum ); @@ -3951,7 +3951,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_RadiusRangeMaximum : { - com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; + css::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; if ( rPropVal.Value >>= aRadiusRangeMaximum ) { ExportParameter( aStrBuffer, aRadiusRangeMaximum ); @@ -3962,7 +3962,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_RangeXMinimum : { - com::sun::star::drawing::EnhancedCustomShapeParameter aXRangeMinimum; + css::drawing::EnhancedCustomShapeParameter aXRangeMinimum; if ( rPropVal.Value >>= aXRangeMinimum ) { ExportParameter( aStrBuffer, aXRangeMinimum ); @@ -3973,7 +3973,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_RangeXMaximum : { - com::sun::star::drawing::EnhancedCustomShapeParameter aXRangeMaximum; + css::drawing::EnhancedCustomShapeParameter aXRangeMaximum; if ( rPropVal.Value >>= aXRangeMaximum ) { ExportParameter( aStrBuffer, aXRangeMaximum ); @@ -3984,7 +3984,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_RangeYMinimum : { - com::sun::star::drawing::EnhancedCustomShapeParameter aYRangeMinimum; + css::drawing::EnhancedCustomShapeParameter aYRangeMinimum; if ( rPropVal.Value >>= aYRangeMinimum ) { ExportParameter( aStrBuffer, aYRangeMinimum ); @@ -3995,7 +3995,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_RangeYMaximum : { - com::sun::star::drawing::EnhancedCustomShapeParameter aYRangeMaximum; + css::drawing::EnhancedCustomShapeParameter aYRangeMaximum; if ( rPropVal.Value >>= aYRangeMaximum ) { ExportParameter( aStrBuffer, aYRangeMaximum ); @@ -4017,8 +4017,8 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert } void ImpExportEnhancedPath( SvXMLExport& rExport, - const uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair >& rCoordinates, - const uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment >& rSegments, + const uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair >& rCoordinates, + const uno::Sequence< css::drawing::EnhancedCustomShapeSegment >& rSegments, bool bExtended = false ) { @@ -4035,7 +4035,7 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, nSegments = 4; for ( j = i = 0; j < nSegments; j++ ) { - com::sun::star::drawing::EnhancedCustomShapeSegment aSegment; + css::drawing::EnhancedCustomShapeSegment aSegment; if ( bSimpleSegments ) { // if there are not enough segments we will default them @@ -4044,25 +4044,25 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, case 0 : { aSegment.Count = 1; - aSegment.Command = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::MOVETO; + aSegment.Command = css::drawing::EnhancedCustomShapeSegmentCommand::MOVETO; } break; case 1 : { aSegment.Count = (sal_Int16)std::min( nCoords - 1, (sal_Int32)32767 ); - aSegment.Command = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LINETO; + aSegment.Command = css::drawing::EnhancedCustomShapeSegmentCommand::LINETO; } break; case 2 : { aSegment.Count = 1; - aSegment.Command = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; + aSegment.Command = css::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; } break; case 3 : { aSegment.Count = 1; - aSegment.Command = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH; + aSegment.Command = css::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH; } break; } @@ -4076,40 +4076,40 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, sal_Int32 nParameter = 0; switch( aSegment.Command ) { - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH : + case css::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH : aStrBuffer.append( 'Z' ); break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH : + case css::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH : aStrBuffer.append( 'N' ); break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::NOFILL : + case css::drawing::EnhancedCustomShapeSegmentCommand::NOFILL : aStrBuffer.append( 'F' ); break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::NOSTROKE : + case css::drawing::EnhancedCustomShapeSegmentCommand::NOSTROKE : aStrBuffer.append( 'S' ); break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::MOVETO : + case css::drawing::EnhancedCustomShapeSegmentCommand::MOVETO : aStrBuffer.append( 'M' ); nParameter = 1; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LINETO : + case css::drawing::EnhancedCustomShapeSegmentCommand::LINETO : aStrBuffer.append( 'L' ); nParameter = 1; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CURVETO : + case css::drawing::EnhancedCustomShapeSegmentCommand::CURVETO : aStrBuffer.append( 'C' ); nParameter = 3; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO : + case css::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO : aStrBuffer.append( 'T' ); nParameter = 3; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE : + case css::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE : aStrBuffer.append( 'U' ); nParameter = 3; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCTO : + case css::drawing::EnhancedCustomShapeSegmentCommand::ARCTO : aStrBuffer.append( 'A' ); nParameter = 4; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARC : + case css::drawing::EnhancedCustomShapeSegmentCommand::ARC : aStrBuffer.append( 'B' ); nParameter = 4; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO : + case css::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO : aStrBuffer.append( 'W' ); nParameter = 4; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARC : + case css::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARC : aStrBuffer.append( 'V' ); nParameter = 4; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX : + case css::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX : aStrBuffer.append( 'X' ); nParameter = 1; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY : + case css::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY : aStrBuffer.append( 'Y' ); nParameter = 1; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO : + case css::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO : aStrBuffer.append( 'Q' ); nParameter = 2; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO : + case css::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO : if ( bExtended ) { aStrBuffer.append( 'G' ); nParameter = 2; @@ -4119,25 +4119,25 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, i += 2; } break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::DARKEN : + case css::drawing::EnhancedCustomShapeSegmentCommand::DARKEN : if ( bExtended ) aStrBuffer.append( 'H' ); else bNeedExtended = true; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::DARKENLESS : + case css::drawing::EnhancedCustomShapeSegmentCommand::DARKENLESS : if ( bExtended ) aStrBuffer.append( 'I' ); else bNeedExtended = true; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LIGHTEN : + case css::drawing::EnhancedCustomShapeSegmentCommand::LIGHTEN : if ( bExtended ) aStrBuffer.append( 'J' ); else bNeedExtended = true; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LIGHTENLESS : + case css::drawing::EnhancedCustomShapeSegmentCommand::LIGHTENLESS : if ( bExtended ) aStrBuffer.append( 'K' ); else @@ -4146,7 +4146,7 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, default : // ups, seems to be something wrong { aSegment.Count = 1; - aSegment.Command = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LINETO; + aSegment.Command = css::drawing::EnhancedCustomShapeSegmentCommand::LINETO; } break; } @@ -4184,10 +4184,10 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean bool bHandles = false; uno::Sequence< beans::PropertyValues > aHandles; - uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > aSegments; - uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aCoordinates; + uno::Sequence< css::drawing::EnhancedCustomShapeSegment > aSegments; + uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair > aCoordinates; - uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentValues; + uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentValues; OUString aStr; OUStringBuffer aStrBuffer; @@ -4294,7 +4294,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_Depth : { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aDepthParaPair; + css::drawing::EnhancedCustomShapeParameterPair aDepthParaPair; if ( rProp.Value >>= aDepthParaPair ) { double fDepth = 0; @@ -4449,7 +4449,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_RotateAngle : { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aRotateAngleParaPair; + css::drawing::EnhancedCustomShapeParameterPair aRotateAngleParaPair; if ( rProp.Value >>= aRotateAngleParaPair ) { ExportParameter( aStrBuffer, aRotateAngleParaPair.First ); @@ -4491,7 +4491,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_Skew : { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aSkewParaPair; + css::drawing::EnhancedCustomShapeParameterPair aSkewParaPair; if ( rProp.Value >>= aSkewParaPair ) { ExportParameter( aStrBuffer, aSkewParaPair.First ); @@ -4539,7 +4539,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_Origin : { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aOriginParaPair; + css::drawing::EnhancedCustomShapeParameterPair aOriginParaPair; if ( rProp.Value >>= aOriginParaPair ) { ExportParameter( aStrBuffer, aOriginParaPair.First ); @@ -4587,14 +4587,14 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_TextPathMode : { - com::sun::star::drawing::EnhancedCustomShapeTextPathMode eTextPathMode; + css::drawing::EnhancedCustomShapeTextPathMode eTextPathMode; if ( rProp.Value >>= eTextPathMode ) { switch ( eTextPathMode ) { - case com::sun::star::drawing::EnhancedCustomShapeTextPathMode_NORMAL: aStr = GetXMLToken( XML_NORMAL ); break; - case com::sun::star::drawing::EnhancedCustomShapeTextPathMode_PATH : aStr = GetXMLToken( XML_PATH ); break; - case com::sun::star::drawing::EnhancedCustomShapeTextPathMode_SHAPE : aStr = GetXMLToken( XML_SHAPE ); break; + case css::drawing::EnhancedCustomShapeTextPathMode_NORMAL: aStr = GetXMLToken( XML_NORMAL ); break; + case css::drawing::EnhancedCustomShapeTextPathMode_PATH : aStr = GetXMLToken( XML_PATH ); break; + case css::drawing::EnhancedCustomShapeTextPathMode_SHAPE : aStr = GetXMLToken( XML_SHAPE ); break; default: break; } @@ -4683,7 +4683,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_GluePoints : { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> aGluePoints; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair> aGluePoints; if ( rProp.Value >>= aGluePoints ) { sal_Int32 k, nElements = aGluePoints.getLength(); @@ -4707,9 +4707,9 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean { switch ( nGluePointType ) { - case com::sun::star::drawing::EnhancedCustomShapeGluePointType::NONE : aStr = GetXMLToken( XML_NONE ); break; - case com::sun::star::drawing::EnhancedCustomShapeGluePointType::SEGMENTS : aStr = GetXMLToken( XML_SEGMENTS ); break; - case com::sun::star::drawing::EnhancedCustomShapeGluePointType::RECT : aStr = GetXMLToken( XML_RECTANGLE ); break; + case css::drawing::EnhancedCustomShapeGluePointType::NONE : aStr = GetXMLToken( XML_NONE ); break; + case css::drawing::EnhancedCustomShapeGluePointType::SEGMENTS : aStr = GetXMLToken( XML_SEGMENTS ); break; + case css::drawing::EnhancedCustomShapeGluePointType::RECT : aStr = GetXMLToken( XML_RECTANGLE ); break; } if ( !aStr.isEmpty() ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GLUE_POINT_TYPE, aStr ); @@ -4742,7 +4742,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_TextFrames : { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > aPathTextFrames; + css::uno::Sequence< css::drawing::EnhancedCustomShapeTextFrame > aPathTextFrames; if ( rProp.Value >>= aPathTextFrames ) { if ( (sal_uInt16)aPathTextFrames.getLength() ) @@ -4799,7 +4799,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean if ( i ) aStrBuffer.append( ' ' ); - const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue& rAdj = aAdjustmentValues[ i ]; + const css::drawing::EnhancedCustomShapeAdjustmentValue& rAdj = aAdjustmentValues[ i ]; if ( rAdj.State == beans::PropertyState_DIRECT_VALUE ) { if ( rAdj.Value.getValueTypeClass() == uno::TypeClass_DOUBLE ) @@ -4836,7 +4836,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean void XMLShapeExport::ImpExportCustomShape( const uno::Reference< drawing::XShape >& xShape, - XmlShapeType, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint ) + XmlShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint ) { const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if ( xPropSet.is() ) @@ -4872,7 +4872,7 @@ void XMLShapeExport::ImpExportCustomShape( } } -void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint ) +void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint ) { uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); uno::Reference< container::XNamed > xNamed(xShape, uno::UNO_QUERY); diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 2000a4c925dd..4bd6fe67d350 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -57,7 +57,7 @@ struct ltint32 struct ConnectionHint { - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxConnector; + css::uno::Reference< css::drawing::XShape > mxConnector; bool bStart; OUString aDestShapeId; sal_Int32 nDestGlueId; @@ -65,8 +65,8 @@ struct ConnectionHint struct XShapeCompareHelper { - bool operator()(com::sun::star::uno::Reference < com::sun::star::drawing::XShape > x1, - com::sun::star::uno::Reference < com::sun::star::drawing::XShape > x2 ) const + bool operator()(css::uno::Reference < css::drawing::XShape > x1, + css::uno::Reference < css::drawing::XShape > x2 ) const { return x1.get() < x2.get(); } @@ -75,7 +75,7 @@ struct XShapeCompareHelper /** this map store all glue point id mappings for shapes that had user defined glue points. This is needed because on insertion the glue points will get a new and unique id */ typedef std::map<sal_Int32,sal_Int32,ltint32> GluePointIdMap; -typedef std::map< com::sun::star::uno::Reference < com::sun::star::drawing::XShape >, GluePointIdMap, XShapeCompareHelper > ShapeGluePointsMap; +typedef std::map< css::uno::Reference < css::drawing::XShape >, GluePointIdMap, XShapeCompareHelper > ShapeGluePointsMap; /** this struct is created for each startPage() call and stores information that is needed during import of shapes for one page. Since pages could be nested ( notes pages inside impress ) there @@ -95,7 +95,7 @@ struct XMLShapeImportHelperImpl // context for sorting shapes ShapeSortContext* mpSortContext; - std::map<sal_Int32, com::sun::star::uno::Reference< com::sun::star::drawing::XShape >, ltint32> + std::map<sal_Int32, css::uno::Reference< css::drawing::XShape >, ltint32> maShapeIds; std::vector<ConnectionHint> maConnections; @@ -726,16 +726,16 @@ void XMLShapeImportHelper::addShape( uno::Reference< drawing::XShape >& rShape, all properties and styles are set. */ void XMLShapeImportHelper::finishShape( - com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >&, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >&) + css::uno::Reference< css::drawing::XShape >& rShape, + const css::uno::Reference< css::xml::sax::XAttributeList >&, + css::uno::Reference< css::drawing::XShapes >&) { /* Set property <PositionLayoutDir> to <PositionInHoriL2R>, if it exists and the import states that the shape positioning attributes are in horizontal left-to-right layout. This is the case for the OpenOffice.org file format. This setting is done for Writer documents, because the property - only exists at service com::sun::star::text::Shape - the Writer + only exists at service css::text::Shape - the Writer UNO service for shapes. The value indicates that the positioning attributes are given in horizontal left-to-right layout. The property is evaluated @@ -911,7 +911,7 @@ void XMLShapeImportHelper::popGroupAndSort() delete pContext; } -void XMLShapeImportHelper::shapeWithZIndexAdded( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >&, sal_Int32 nZIndex ) +void XMLShapeImportHelper::shapeWithZIndexAdded( css::uno::Reference< css::drawing::XShape >&, sal_Int32 nZIndex ) { if( mpImpl->mpSortContext) { @@ -932,7 +932,7 @@ void XMLShapeImportHelper::shapeWithZIndexAdded( com::sun::star::uno::Reference< } } -void XMLShapeImportHelper::addShapeConnection( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rConnectorShape, +void XMLShapeImportHelper::addShapeConnection( css::uno::Reference< css::drawing::XShape >& rConnectorShape, bool bStart, const OUString& rDestShapeId, sal_Int32 nDestGlueId ) @@ -1008,7 +1008,7 @@ SvXMLImportPropertyMapper* XMLShapeImportHelper::CreateShapePropMapper( const un /** adds a mapping for a glue point identifier from an xml file to the identifier created after inserting the new glue point into the core. The saved mappings can be retrieved by getGluePointId() */ -void XMLShapeImportHelper::addGluePointMapping( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, +void XMLShapeImportHelper::addGluePointMapping( css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nSourceId, sal_Int32 nDestinnationId ) { if( mpPageContext ) @@ -1017,7 +1017,7 @@ void XMLShapeImportHelper::addGluePointMapping( com::sun::star::uno::Reference< /** find mapping for given DestinationID. This allows to extract the original draw:id imported with a draw:glue-point */ sal_Int32 XMLShapeImportHelper::findGluePointMapping( - const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, + const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nDestinnationId ) const { if( mpPageContext ) @@ -1045,7 +1045,7 @@ sal_Int32 XMLShapeImportHelper::findGluePointMapping( } /** moves all current DestinationId's by n */ -void XMLShapeImportHelper::moveGluePointMapping( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, const sal_Int32 n ) +void XMLShapeImportHelper::moveGluePointMapping( const css::uno::Reference< css::drawing::XShape >& xShape, const sal_Int32 n ) { if( mpPageContext ) { @@ -1066,7 +1066,7 @@ void XMLShapeImportHelper::moveGluePointMapping( const com::sun::star::uno::Refe /** retrieves a mapping for a glue point identifier from the current xml file to the identifier created after inserting the new glue point into the core. The mapping must be initialized first with addGluePointMapping() */ -sal_Int32 XMLShapeImportHelper::getGluePointId( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, sal_Int32 nSourceId ) +sal_Int32 XMLShapeImportHelper::getGluePointId( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nSourceId ) { if( mpPageContext ) { @@ -1083,7 +1083,7 @@ sal_Int32 XMLShapeImportHelper::getGluePointId( const com::sun::star::uno::Refer } /** this method must be calling before the first shape is imported for the given page */ -void XMLShapeImportHelper::startPage( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) +void XMLShapeImportHelper::startPage( css::uno::Reference< css::drawing::XShapes >& rShapes ) { XMLShapeImportPageContextImpl* pOldContext = mpPageContext; mpPageContext = new XMLShapeImportPageContextImpl(); @@ -1092,7 +1092,7 @@ void XMLShapeImportHelper::startPage( com::sun::star::uno::Reference< com::sun:: } /** this method must be calling after the last shape is imported for the given page */ -void XMLShapeImportHelper::endPage( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) +void XMLShapeImportHelper::endPage( css::uno::Reference< css::drawing::XShapes >& rShapes ) { DBG_ASSERT( mpPageContext && (mpPageContext->mxShapes == rShapes), "wrong call to endPage(), no startPage called or wrong page" ); if( nullptr == mpPageContext ) diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index 8d0e7b55c1fc..3f64864c3be4 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -1025,7 +1025,7 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver } } -bool SdXMLImExTransform3D::GetFullHomogenTransform(com::sun::star::drawing::HomogenMatrix& xHomMat) +bool SdXMLImExTransform3D::GetFullHomogenTransform(css::drawing::HomogenMatrix& xHomMat) { ::basegfx::B3DHomMatrix aFullTransform; GetFullTransform(aFullTransform); diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 105b29004d96..baf1aebd24cd 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -43,7 +43,7 @@ SdXML3DObjectContext::SdXML3DObjectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -109,7 +109,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -210,7 +210,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -308,7 +308,7 @@ SdXML3DPolygonBasedShapeContext::SdXML3DPolygonBasedShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) @@ -394,7 +394,7 @@ SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) @@ -428,7 +428,7 @@ SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx index dc4080f6ce6d..f8d40969c4f2 100644 --- a/xmloff/source/draw/ximp3dobject.hxx +++ b/xmloff/source/draw/ximp3dobject.hxx @@ -36,7 +36,7 @@ class SdXML3DObjectContext : public SdXMLShapeContext protected: // the shape group this object should be created inside - com::sun::star::drawing::HomogenMatrix mxHomMat; + css::drawing::HomogenMatrix mxHomMat; bool mbSetTransform; public: @@ -44,12 +44,12 @@ public: SdXML3DObjectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXML3DObjectContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; }; @@ -66,12 +66,12 @@ public: SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXML3DCubeObjectShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; }; @@ -88,12 +88,12 @@ public: SdXML3DSphereObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXML3DSphereObjectShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; }; @@ -108,12 +108,12 @@ public: SdXML3DPolygonBasedShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXML3DPolygonBasedShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; }; @@ -125,12 +125,12 @@ public: SdXML3DLatheObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXML3DLatheObjectShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; }; @@ -142,12 +142,12 @@ public: SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXML3DExtrudeObjectShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; }; diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 83c20330bfb1..5cf205f1da9b 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -38,7 +38,7 @@ SdXML3DLightContext::SdXML3DLightContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList) + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName), maDiffuseColor(0x00000000), maDirection(0.0, 0.0, 1.0), @@ -99,7 +99,7 @@ SdXML3DSceneShapeContext::SdXML3DSceneShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShapes) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShapes ), SdXML3DSceneAttributesHelper( rImport ) @@ -234,7 +234,7 @@ SdXML3DSceneAttributesHelper::~SdXML3DSceneAttributesHelper() } /** creates a 3d light context and adds it to the internal list for later processing */ -SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList) +SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList) { SvXMLImportContext* pContext = new SdXML3DLightContext(mrImport, nPrfx, rLName, xAttrList); @@ -344,7 +344,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co } /** this sets the scene attributes at this propertyset */ -void SdXML3DSceneAttributesHelper::setSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ) +void SdXML3DSceneAttributesHelper::setSceneAttributes( const css::uno::Reference< css::beans::XPropertySet >& xPropSet ) { uno::Any aAny; diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index 8c120acad652..18c89b385c09 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -32,7 +32,7 @@ class SdXML3DSceneShapeContext : public SdXMLShapeContext, public SdXML3DSceneAt { // the shape group this group is working on // this is the scene at the same time - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxChildren; + css::uno::Reference< css::drawing::XShapes > mxChildren; public: @@ -40,17 +40,17 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXML3DSceneShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMP3DSCENE_HXX diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index 2fea4682020f..97814fc16a64 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star; SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes) : SdXMLGenericPageContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ) , mbHadSMILNodes( false ) @@ -212,7 +212,7 @@ SdXMLDrawPageContext::~SdXMLDrawPageContext() SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetSdImport().GetDrawPageElemTokenMap(); diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx index da659e12e32c..d7ebb8b6bd72 100644 --- a/xmloff/source/draw/ximpbody.hxx +++ b/xmloff/source/draw/ximpbody.hxx @@ -38,13 +38,13 @@ class SdXMLDrawPageContext : public SdXMLGenericPageContext public: SdXMLDrawPageContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes); virtual ~SdXMLDrawPageContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -62,7 +62,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPBODY_HXX diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 21f0029f2033..bf76b5969ede 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -54,9 +54,9 @@ using namespace ::xmloff::EnhancedCustomShapeToken; XMLEnhancedCustomShapeContext::XMLEnhancedCustomShapeContext( SvXMLImport& rImport, - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, - sal_uInt16 nPrefix, const OUString& rLocalName, - std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ) : + css::uno::Reference< css::drawing::XShape >& rxShape, + sal_uInt16 nPrefix, const OUString& rLocalName, + std::vector< css::beans::PropertyValue >& rCustomShapeGeometry ) : SvXMLImportContext( rImport, nPrefix, rLocalName ), mrUnitConverter( rImport.GetMM100UnitConverter() ), mrxShape( rxShape ), @@ -72,7 +72,7 @@ const SvXMLEnumMapEntry aXML_GluePointEnumMap[] = { XML_RECTANGLE, 3 }, { XML_TOKEN_INVALID, 0 } }; -void GetBool( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetBool( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { bool bAttrBool; @@ -85,7 +85,7 @@ void GetBool( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -void GetInt32( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetInt32( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int32 nAttrNumber; @@ -98,7 +98,7 @@ void GetInt32( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -void GetDouble( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetDouble( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { double fAttrDouble; @@ -111,7 +111,7 @@ void GetDouble( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -void GetString( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetString( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { beans::PropertyValue aProp; @@ -120,7 +120,7 @@ void GetString( std::vector< com::sun::star::beans::PropertyValue >& rDest, rDest.push_back( aProp ); } -void GetEnum( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetEnum( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, const SvXMLEnumMapEntry& rMap ) { @@ -135,7 +135,7 @@ void GetEnum( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetDoublePercentage( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int16 const eSrcUnit = ::sax::Converter::GetUnitFromString( @@ -155,7 +155,7 @@ void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& r } } -void GetB3DVector( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetB3DVector( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { ::basegfx::B3DVector aB3DVector; @@ -192,7 +192,7 @@ bool GetEquationName( const OUString& rEquation, const sal_Int32 nStart, OUStrin return bValid; } -bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32& nIndex, const OUString& rParaString ) +bool GetNextParameter( css::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32& nIndex, const OUString& rParaString ) { if ( nIndex >= rParaString.getLength() ) return false; @@ -201,10 +201,10 @@ bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rP bool bNumberRequired = true; bool bMustBePositiveWholeNumbered = false; - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::NORMAL; if ( rParaString[ nIndex ] == '$' ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT; bMustBePositiveWholeNumbered = true; nIndex++; } @@ -216,7 +216,7 @@ bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rP bValid = GetEquationName( rParaString, nIndex, aEquationName ); if ( bValid ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::EQUATION; rParameter.Value <<= aEquationName; nIndex += aEquationName.getLength(); } @@ -226,62 +226,62 @@ bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rP bNumberRequired = false; if ( rParaString.matchIgnoreAsciiCase( "left", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::LEFT; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::LEFT; nIndex += 4; } else if ( rParaString.matchIgnoreAsciiCase( "top", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::TOP; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::TOP; nIndex += 3; } else if ( rParaString.matchIgnoreAsciiCase( "right", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::RIGHT; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::RIGHT; nIndex += 5; } else if ( rParaString.matchIgnoreAsciiCase( "bottom", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::BOTTOM; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::BOTTOM; nIndex += 6; } else if ( rParaString.matchIgnoreAsciiCase( "xstretch", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::XSTRETCH; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::XSTRETCH; nIndex += 8; } else if ( rParaString.matchIgnoreAsciiCase( "ystretch", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::YSTRETCH; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::YSTRETCH; nIndex += 8; } else if ( rParaString.matchIgnoreAsciiCase( "hasstroke", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::HASSTROKE; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::HASSTROKE; nIndex += 9; } else if ( rParaString.matchIgnoreAsciiCase( "hasfill", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::HASFILL; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::HASFILL; nIndex += 7; } else if ( rParaString.matchIgnoreAsciiCase( "width", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::WIDTH; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::WIDTH; nIndex += 5; } else if ( rParaString.matchIgnoreAsciiCase( "height", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::HEIGHT; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::HEIGHT; nIndex += 6; } else if ( rParaString.matchIgnoreAsciiCase( "logwidth", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::LOGWIDTH; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::LOGWIDTH; nIndex += 8; } else if ( rParaString.matchIgnoreAsciiCase( "logheight", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::LOGHEIGHT; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::LOGHEIGHT; nIndex += 9; } else @@ -424,7 +424,7 @@ bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rP return bValid; } -void GetPosition3D( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:extrusion-viewpoint +void GetPosition3D( std::vector< css::beans::PropertyValue >& rDest, // e.g. draw:extrusion-viewpoint const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, SvXMLUnitConverter& rUnitConverter ) { @@ -438,7 +438,7 @@ void GetPosition3D( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -void GetDoubleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:glue-point-leaving-directions +void GetDoubleSequence( std::vector< css::beans::PropertyValue >& rDest, // e.g. draw:glue-point-leaving-directions const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< double > vDirection; @@ -463,7 +463,7 @@ void GetDoubleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDe } } -void GetSizeSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetSizeSequence( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< sal_Int32 > vNum; @@ -500,11 +500,11 @@ void GetSizeSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest } } -void GetEnhancedParameter( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:handle-position +void GetEnhancedParameter( std::vector< css::beans::PropertyValue >& rDest, // e.g. draw:handle-position const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int32 nIndex = 0; - com::sun::star::drawing::EnhancedCustomShapeParameter aParameter; + css::drawing::EnhancedCustomShapeParameter aParameter; if ( GetNextParameter( aParameter, nIndex, rValue ) ) { beans::PropertyValue aProp; @@ -514,11 +514,11 @@ void GetEnhancedParameter( std::vector< com::sun::star::beans::PropertyValue >& } } -void GetEnhancedParameterPair( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:handle-position +void GetEnhancedParameterPair( std::vector< css::beans::PropertyValue >& rDest, // e.g. draw:handle-position const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int32 nIndex = 0; - com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameterPair; + css::drawing::EnhancedCustomShapeParameterPair aParameterPair; if ( GetNextParameter( aParameterPair.First, nIndex, rValue ) && GetNextParameter( aParameterPair.Second, nIndex, rValue ) ) { @@ -529,11 +529,11 @@ void GetEnhancedParameterPair( std::vector< com::sun::star::beans::PropertyValue } } -sal_Int32 GetEnhancedParameterPairSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:glue-points +sal_Int32 GetEnhancedParameterPairSequence( std::vector< css::beans::PropertyValue >& rDest, // e.g. draw:glue-points const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { - std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > vParameter; - com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameter; + std::vector< css::drawing::EnhancedCustomShapeParameterPair > vParameter; + css::drawing::EnhancedCustomShapeParameterPair aParameter; sal_Int32 nIndex = 0; while ( GetNextParameter( aParameter.First, nIndex, rValue ) @@ -551,11 +551,11 @@ sal_Int32 GetEnhancedParameterPairSequence( std::vector< com::sun::star::beans:: return vParameter.size(); } -void GetEnhancedRectangleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:text-areas +void GetEnhancedRectangleSequence( std::vector< css::beans::PropertyValue >& rDest, // e.g. draw:text-areas const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { - std::vector< com::sun::star::drawing::EnhancedCustomShapeTextFrame > vTextFrame; - com::sun::star::drawing::EnhancedCustomShapeTextFrame aParameter; + std::vector< css::drawing::EnhancedCustomShapeTextFrame > vTextFrame; + css::drawing::EnhancedCustomShapeTextFrame aParameter; sal_Int32 nIndex = 0; @@ -575,17 +575,17 @@ void GetEnhancedRectangleSequence( std::vector< com::sun::star::beans::PropertyV } } -void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:enhanced-path +void GetEnhancedPath( std::vector< css::beans::PropertyValue >& rDest, // e.g. draw:enhanced-path const OUString& rValue ) { - std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > vCoordinates; - std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment > vSegments; + std::vector< css::drawing::EnhancedCustomShapeParameterPair > vCoordinates; + std::vector< css::drawing::EnhancedCustomShapeSegment > vSegments; sal_Int32 nIndex = 0; sal_Int32 nParameterCount = 0; sal_Int32 nParametersNeeded = 1; - sal_Int16 nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::MOVETO; + sal_Int16 nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::MOVETO; bool bValid = true; @@ -595,147 +595,147 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest { case 'M' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::MOVETO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::MOVETO; nParametersNeeded = 1; nIndex++; } break; case 'L' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LINETO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::LINETO; nParametersNeeded = 1; nIndex++; } break; case 'C' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CURVETO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::CURVETO; nParametersNeeded = 3; nIndex++; } break; case 'Z' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; nParametersNeeded = 0; nIndex++; } break; case 'N' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH; nParametersNeeded = 0; nIndex++; } break; case 'F' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::NOFILL; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::NOFILL; nParametersNeeded = 0; nIndex++; } break; case 'S' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::NOSTROKE; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::NOSTROKE; nParametersNeeded = 0; nIndex++; } break; case 'T' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO; nParametersNeeded = 3; nIndex++; } break; case 'U' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE; nParametersNeeded = 3; nIndex++; } break; case 'A' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCTO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ARCTO; nParametersNeeded = 4; nIndex++; } break; case 'B' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARC; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ARC; nParametersNeeded = 4; nIndex++; } break; case 'G' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO; nParametersNeeded = 2; nIndex++; } break; case 'H' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::DARKEN; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::DARKEN; nParametersNeeded = 0; nIndex++; } break; case 'I' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::DARKENLESS; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::DARKENLESS; nParametersNeeded = 0; nIndex++; } break; case 'J' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LIGHTEN; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::LIGHTEN; nParametersNeeded = 0; nIndex++; } break; case 'K' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LIGHTENLESS; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::LIGHTENLESS; nParametersNeeded = 0; nIndex++; } break; case 'W' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO; nParametersNeeded = 4; nIndex++; } break; case 'V' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARC; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARC; nParametersNeeded = 4; nIndex++; } break; case 'X' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX; nParametersNeeded = 1; nIndex++; } break; case 'Y' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY; nParametersNeeded = 1; nIndex++; } break; case 'Q' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO; nParametersNeeded = 2; nIndex++; } @@ -761,7 +761,7 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest case '.' : case '-' : { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aPair; + css::drawing::EnhancedCustomShapeParameterPair aPair; if ( GetNextParameter( aPair.First, nIndex, rValue ) && GetNextParameter( aPair.Second, nIndex, rValue ) ) { @@ -778,7 +778,7 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest } if ( !nParameterCount && !nParametersNeeded ) { - com::sun::star::drawing::EnhancedCustomShapeSegment aSegment; + css::drawing::EnhancedCustomShapeSegment aSegment; aSegment.Command = nLatestSegmentCommand; aSegment.Count = 0; vSegments.push_back( aSegment ); @@ -792,7 +792,7 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest vSegments[ vSegments.size() -1 ].Count++; else { - com::sun::star::drawing::EnhancedCustomShapeSegment aSegment; + css::drawing::EnhancedCustomShapeSegment aSegment; aSegment.Command = nLatestSegmentCommand; aSegment.Count = 1; vSegments.push_back( aSegment ); @@ -813,16 +813,16 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest rDest.push_back( aProp ); } -void GetAdjustmentValues( std::vector< com::sun::star::beans::PropertyValue >& rDest, // draw:adjustments +void GetAdjustmentValues( std::vector< css::beans::PropertyValue >& rDest, // draw:adjustments const OUString& rValue ) { - std::vector< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > vAdjustmentValue; - com::sun::star::drawing::EnhancedCustomShapeParameter aParameter; + std::vector< css::drawing::EnhancedCustomShapeAdjustmentValue > vAdjustmentValue; + css::drawing::EnhancedCustomShapeParameter aParameter; sal_Int32 nIndex = 0; while ( GetNextParameter( aParameter, nIndex, rValue ) ) { - com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue aAdj; - if ( aParameter.Type == com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL ) + css::drawing::EnhancedCustomShapeAdjustmentValue aAdj; + if ( aParameter.Type == css::drawing::EnhancedCustomShapeParameterType::NORMAL ) { aAdj.Value <<= aParameter.Value; aAdj.State = beans::PropertyState_DIRECT_VALUE; @@ -900,9 +900,9 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax case EAS_extrusion_depth : { sal_Int32 nIndex = 0; - com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameterPair; - com::sun::star::drawing::EnhancedCustomShapeParameter& rDepth = aParameterPair.First; - com::sun::star::drawing::EnhancedCustomShapeParameter& rFraction = aParameterPair.Second; + css::drawing::EnhancedCustomShapeParameterPair aParameterPair; + css::drawing::EnhancedCustomShapeParameter& rDepth = aParameterPair.First; + css::drawing::EnhancedCustomShapeParameter& rFraction = aParameterPair.Second; if ( GetNextParameter( rDepth, nIndex, rValue ) ) { // try to catch the unit for the depth @@ -1068,11 +1068,11 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax break; case EAS_text_path_mode : { - com::sun::star::drawing::EnhancedCustomShapeTextPathMode eTextPathMode( com::sun::star::drawing::EnhancedCustomShapeTextPathMode_NORMAL ); + css::drawing::EnhancedCustomShapeTextPathMode eTextPathMode( css::drawing::EnhancedCustomShapeTextPathMode_NORMAL ); if( IsXMLToken( rValue, XML_PATH ) ) - eTextPathMode = com::sun::star::drawing::EnhancedCustomShapeTextPathMode_PATH; + eTextPathMode = css::drawing::EnhancedCustomShapeTextPathMode_PATH; else if ( IsXMLToken( rValue, XML_SHAPE ) ) - eTextPathMode = com::sun::star::drawing::EnhancedCustomShapeTextPathMode_SHAPE; + eTextPathMode = css::drawing::EnhancedCustomShapeTextPathMode_SHAPE; beans::PropertyValue aProp; aProp.Name = EASGet( EAS_TextPathMode ); @@ -1102,7 +1102,7 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax } } -void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec, +void SdXMLCustomShapePropertyMerge( std::vector< css::beans::PropertyValue >& rPropVec, const std::vector< beans::PropertyValues >& rElement, const OUString& rElementName ) { @@ -1115,7 +1115,7 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property } } -void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec, +void SdXMLCustomShapePropertyMerge( std::vector< css::beans::PropertyValue >& rPropVec, const std::vector< OUString >& rElement, const OUString& rElementName ) { @@ -1128,8 +1128,8 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property } } -void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec, - const std::vector< com::sun::star::beans::PropertyValue >& rElement, +void SdXMLCustomShapePropertyMerge( std::vector< css::beans::PropertyValue >& rPropVec, + const std::vector< css::beans::PropertyValue >& rElement, const OUString& rElementName ) { if ( !rElement.empty() ) @@ -1145,9 +1145,9 @@ typedef std::unordered_map< OUString, sal_Int32, OUStringHash > EquationHashMap; /* if rPara.Type is from type EnhancedCustomShapeParameterType::EQUATION, the name of the equation will be converted from OUString to index */ -void CheckAndResolveEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rPara, EquationHashMap* pH ) +void CheckAndResolveEquationParameter( css::drawing::EnhancedCustomShapeParameter& rPara, EquationHashMap* pH ) { - if ( rPara.Type == com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION ) + if ( rPara.Type == css::drawing::EnhancedCustomShapeParameterType::EQUATION ) { OUString aEquationName; if ( rPara.Value >>= aEquationName ) @@ -1218,8 +1218,8 @@ void XMLEnhancedCustomShapeContext::EndElement() case EAS_Coordinates : case EAS_GluePoints : { - uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > const & rSeq = - *static_cast<uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > const *>( + uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair > const & rSeq = + *static_cast<uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair > const *>( aPathIter->Value.getValue()); for ( i = 0; i < rSeq.getLength(); i++ ) { @@ -1230,8 +1230,8 @@ void XMLEnhancedCustomShapeContext::EndElement() break; case EAS_TextFrames : { - uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > const & rSeq = - *static_cast<uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > const *>( + uno::Sequence< css::drawing::EnhancedCustomShapeTextFrame > const & rSeq = + *static_cast<uno::Sequence< css::drawing::EnhancedCustomShapeTextFrame > const *>( aPathIter->Value.getValue()); for ( i = 0; i < rSeq.getLength(); i++ ) { @@ -1263,7 +1263,7 @@ void XMLEnhancedCustomShapeContext::EndElement() case EAS_RadiusRangeMinimum : case EAS_RadiusRangeMaximum : { - CheckAndResolveEquationParameter( *const_cast<css::drawing::EnhancedCustomShapeParameter *>(static_cast<com::sun::star::drawing::EnhancedCustomShapeParameter const *>( + CheckAndResolveEquationParameter( *const_cast<css::drawing::EnhancedCustomShapeParameter *>(static_cast<css::drawing::EnhancedCustomShapeParameter const *>( pValues->Value.getValue())), pH ); } break; @@ -1271,9 +1271,9 @@ void XMLEnhancedCustomShapeContext::EndElement() case EAS_Position : case EAS_Polar : { - CheckAndResolveEquationParameter( const_cast<css::drawing::EnhancedCustomShapeParameter &>((*static_cast<com::sun::star::drawing::EnhancedCustomShapeParameterPair const *>( + CheckAndResolveEquationParameter( const_cast<css::drawing::EnhancedCustomShapeParameter &>((*static_cast<css::drawing::EnhancedCustomShapeParameterPair const *>( pValues->Value.getValue())).First), pH ); - CheckAndResolveEquationParameter( const_cast<css::drawing::EnhancedCustomShapeParameter &>((*static_cast<com::sun::star::drawing::EnhancedCustomShapeParameterPair const *>( + CheckAndResolveEquationParameter( const_cast<css::drawing::EnhancedCustomShapeParameter &>((*static_cast<css::drawing::EnhancedCustomShapeParameterPair const *>( pValues->Value.getValue())).Second), pH ); } break; @@ -1333,7 +1333,7 @@ SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt1 } else if ( aTokenEnum == EAS_handle ) { - std::vector< com::sun::star::beans::PropertyValue > aHandle; + std::vector< css::beans::PropertyValue > aHandle; const sal_Int16 nLength = xAttrList->getLength(); for( sal_Int16 nAttr = 0; nAttr < nLength; nAttr++ ) { diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx index cdc6c4f83a3e..74318059d52a 100644 --- a/xmloff/source/draw/ximpcustomshape.hxx +++ b/xmloff/source/draw/ximpcustomshape.hxx @@ -39,27 +39,27 @@ namespace com { namespace sun { namespace star { class XMLEnhancedCustomShapeContext : public SvXMLImportContext { SvXMLUnitConverter& mrUnitConverter; - com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& mrxShape; - std::vector< com::sun::star::beans::PropertyValue >& mrCustomShapeGeometry; + css::uno::Reference< css::drawing::XShape >& mrxShape; + std::vector< css::beans::PropertyValue >& mrCustomShapeGeometry; - std::vector< com::sun::star::beans::PropertyValue > maExtrusion; - std::vector< com::sun::star::beans::PropertyValue > maPath; - std::vector< com::sun::star::beans::PropertyValue > maTextPath; - std::vector< com::sun::star::beans::PropertyValues > maHandles; + std::vector< css::beans::PropertyValue > maExtrusion; + std::vector< css::beans::PropertyValue > maPath; + std::vector< css::beans::PropertyValue > maTextPath; + std::vector< css::beans::PropertyValues > maHandles; std::vector< OUString > maEquations; std::vector< OUString > maEquationNames; public: - XMLEnhancedCustomShapeContext( SvXMLImport& rImport, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &, sal_uInt16 nPrefix, - const OUString& rLocalName, std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ); + XMLEnhancedCustomShapeContext( SvXMLImport& rImport, css::uno::Reference< css::drawing::XShape > &, sal_uInt16 nPrefix, + const OUString& rLocalName, std::vector< css::beans::PropertyValue >& rCustomShapeGeometry ); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx index 2ac189c85d59..5e8442909319 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -31,20 +31,20 @@ class SdXMLGroupShapeContext : public SdXMLShapeContext { // the shape group this group is working on - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxChildren; + css::uno::Reference< css::drawing::XShapes > mxChildren; public: SdXMLGroupShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLGroupShapeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; }; diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx index e1efa062b8ae..fac6b99382be 100644 --- a/xmloff/source/draw/ximplink.hxx +++ b/xmloff/source/draw/ximplink.hxx @@ -34,20 +34,20 @@ class SdXMLShapeLinkContext : public SvXMLShapeContext { // the parent shape group this link is placed in - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxParent; + css::uno::Reference< css::drawing::XShapes > mxParent; OUString msHyperlink; public: SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes); virtual ~SdXMLShapeLinkContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; }; diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx index d144f7e668a5..7f82c1f51173 100644 --- a/xmloff/source/draw/ximpnote.cxx +++ b/xmloff/source/draw/ximpnote.cxx @@ -24,7 +24,7 @@ using namespace ::com::sun::star; SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes) : SdXMLGenericPageContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ) { diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx index 55c797508ab5..a27e33e52907 100644 --- a/xmloff/source/draw/ximpnote.hxx +++ b/xmloff/source/draw/ximpnote.hxx @@ -34,14 +34,14 @@ private: public: SdXMLNotesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); + const OUString& rLocalName, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes); virtual ~SdXMLNotesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 404fa163c20f..891276165390 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -59,7 +59,7 @@ class DrawAnnotationContext : public SvXMLImportContext public: DrawAnnotationContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,const Reference< xml::sax::XAttributeList>& xAttrList, const Reference< XAnnotationAccess >& xAnnotationAccess ); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; private: @@ -227,7 +227,7 @@ SdXMLGenericPageContext::~SdXMLGenericPageContext() { } -void SdXMLGenericPageContext::StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& ) +void SdXMLGenericPageContext::StartElement( const Reference< css::xml::sax::XAttributeList >& ) { GetImport().GetShapeImport()->pushGroupForSorting( mxShapes ); diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx index 8f09146431c8..a3bebae61f0d 100644 --- a/xmloff/source/draw/ximppage.hxx +++ b/xmloff/source/draw/ximppage.hxx @@ -32,8 +32,8 @@ class SdXMLGenericPageContext : public SvXMLImportContext { // the shape group this group is working on - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxShapes; - ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotationAccess > mxAnnotationAccess; + css::uno::Reference< css::drawing::XShapes > mxShapes; + css::uno::Reference< css::office::XAnnotationAccess > mxAnnotationAccess; protected: OUString maPageLayoutName; @@ -62,19 +62,19 @@ protected: public: SdXMLGenericPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes); virtual ~SdXMLGenericPageContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; - const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& GetLocalShapesContext() const + const css::uno::Reference< css::drawing::XShapes >& GetLocalShapesContext() const { return mxShapes; } - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& GetLocalShapesContext() + css::uno::Reference< css::drawing::XShapes >& GetLocalShapesContext() { return mxShapes; } }; diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 91af3ee57478..41454f109489 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -140,7 +140,7 @@ SdXMLShapeContext::SdXMLShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SvXMLShapeContext( rImport, nPrfx, rLocalName, bTemporaryShape ) @@ -382,7 +382,7 @@ void SdXMLShapeContext::EndElement() aProperties[1].Name = "ClickAction"; aProperties[1].Handle = -1; - aProperties[1].Value <<= ::com::sun::star::presentation::ClickAction_DOCUMENT; + aProperties[1].Value <<= css::presentation::ClickAction_DOCUMENT; aProperties[1].State = beans::PropertyState_DIRECT_VALUE; aProperties[2].Name = "Bookmark"; @@ -397,7 +397,7 @@ void SdXMLShapeContext::EndElement() // in draw use the Bookmark property Reference< beans::XPropertySet > xSet( mxShape, UNO_QUERY_THROW ); xSet->setPropertyValue( "Bookmark", Any( msHyperlink ) ); - xSet->setPropertyValue("OnClick", Any( ::com::sun::star::presentation::ClickAction_DOCUMENT ) ); + xSet->setPropertyValue("OnClick", Any( css::presentation::ClickAction_DOCUMENT ) ); } } catch(const Exception&) @@ -1011,7 +1011,7 @@ SdXMLRectShapeContext::SdXMLRectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -1076,7 +1076,7 @@ SdXMLLineShapeContext::SdXMLLineShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -1191,7 +1191,7 @@ SdXMLEllipseShapeContext::SdXMLEllipseShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -1325,7 +1325,7 @@ SdXMLPolygonShapeContext::SdXMLPolygonShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bClosed, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mbClosed( bClosed ) @@ -1410,7 +1410,7 @@ void SdXMLPolygonShapeContext::StartElement(const uno::Reference< xml::sax::XAtt aTargetRange)); } - com::sun::star::drawing::PointSequenceSequence aPointSequenceSequence; + css::drawing::PointSequenceSequence aPointSequenceSequence; uno::Any aAny; basegfx::tools::B2DPolyPolygonToUnoPointSequenceSequence(basegfx::B2DPolyPolygon(aPolygon), aPointSequenceSequence); @@ -1433,7 +1433,7 @@ SdXMLPathShapeContext::SdXMLPathShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) @@ -1582,7 +1582,7 @@ SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -1772,7 +1772,7 @@ SdXMLControlShapeContext::SdXMLControlShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) @@ -1836,7 +1836,7 @@ SdXMLConnectorShapeContext::SdXMLConnectorShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -2104,7 +2104,7 @@ SdXMLMeasureShapeContext::SdXMLMeasureShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -2215,7 +2215,7 @@ SdXMLPageShapeContext::SdXMLPageShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mnPageNumber(0) @@ -2302,7 +2302,7 @@ SdXMLCaptionShapeContext::SdXMLCaptionShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -2402,7 +2402,7 @@ SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -2425,7 +2425,7 @@ void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) +void SdXMLGraphicObjectShapeContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& ) { // create graphic object shape OUString service; @@ -2567,7 +2567,7 @@ SdXMLChartShapeContext::SdXMLChartShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -2658,7 +2658,7 @@ void SdXMLChartShapeContext::Characters( const OUString& rChars ) } SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { if( mpChartContext ) return mpChartContext->CreateChildContext( nPrefix, rLocalName, xAttrList ); @@ -2669,8 +2669,8 @@ SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPre SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { @@ -2680,7 +2680,7 @@ SdXMLObjectShapeContext::~SdXMLObjectShapeContext() { } -void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) +void SdXMLObjectShapeContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& ) { // #96717# in theorie, if we don't have a url we shouldn't even // export this ole shape. But practical its to risky right now @@ -2881,8 +2881,8 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext( SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mbIsScript( false ) @@ -2893,7 +2893,7 @@ SdXMLAppletShapeContext::~SdXMLAppletShapeContext() { } -void SdXMLAppletShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) +void SdXMLAppletShapeContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& ) { AddShape("com.sun.star.drawing.AppletShape"); @@ -2996,7 +2996,7 @@ void SdXMLAppletShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) ) { @@ -3042,8 +3042,8 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_n SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mbMedia( false ) @@ -3054,7 +3054,7 @@ SdXMLPluginShapeContext::~SdXMLPluginShapeContext() { } -void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList) +void SdXMLPluginShapeContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList) { // watch for MimeType attribute to see if we have a media object @@ -3273,7 +3273,7 @@ void SdXMLPluginShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) ) { @@ -3319,8 +3319,8 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_n SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { @@ -3330,7 +3330,7 @@ SdXMLFloatingFrameShapeContext::~SdXMLFloatingFrameShapeContext() { } -void SdXMLFloatingFrameShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) +void SdXMLFloatingFrameShapeContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& ) { AddShape("com.sun.star.drawing.FrameShape"); @@ -3412,8 +3412,8 @@ void SdXMLFloatingFrameShapeContext::EndElement() SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), MultiImageImportHelper(), @@ -3706,7 +3706,7 @@ SdXMLCustomShapeContext::SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) @@ -3922,7 +3922,7 @@ SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext( } -SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) +SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes ) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false ) { memset( &maTemplateStylesUsed, 0, sizeof( maTemplateStylesUsed ) ); @@ -3932,7 +3932,7 @@ SdXMLTableShapeContext::~SdXMLTableShapeContext() { } -void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) +void SdXMLTableShapeContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) { OUString service("com.sun.star.drawing.TableShape"); diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 2e11cf1e06b9..b8883e56cb6e 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -43,12 +43,12 @@ class SdXMLShapeContext : public SvXMLShapeContext { protected: // the shape group this object should be created inside - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxShapes; - com::sun::star::uno::Reference< com::sun::star::text::XTextCursor > mxCursor; - com::sun::star::uno::Reference< com::sun::star::text::XTextCursor > mxOldCursor; - com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList> mxAttrList; - com::sun::star::uno::Reference< com::sun::star::container::XIdentifierContainer > mxGluePoints; - com::sun::star::uno::Reference< com::sun::star::document::XActionLockable > mxLockable; + css::uno::Reference< css::drawing::XShapes > mxShapes; + css::uno::Reference< css::text::XTextCursor > mxCursor; + css::uno::Reference< css::text::XTextCursor > mxOldCursor; + css::uno::Reference< css::xml::sax::XAttributeList> mxAttrList; + css::uno::Reference< css::container::XIdentifierContainer > mxGluePoints; + css::uno::Reference< css::document::XActionLockable > mxLockable; OUString maDrawStyleName; OUString maTextStyleName; @@ -72,10 +72,10 @@ protected: OUString maShapeDescription; SdXMLImExTransform2D mnTransform; - com::sun::star::awt::Size maSize; + css::awt::Size maSize; sal_Int16 mnRelWidth; sal_Int16 mnRelHeight; - com::sun::star::awt::Point maPosition; + css::awt::Point maPosition; basegfx::B2DHomMatrix maUsedTransformation; bool mbVisible; @@ -88,14 +88,14 @@ protected: void SetLayer(); void SetThumbnail(); - void AddShape(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape); + void AddShape(css::uno::Reference< css::drawing::XShape >& xShape); void AddShape(OUString const & serviceName); void SetTransformation(); SvXMLImport& GetImport() { return SvXMLImportContext::GetImport(); } const SvXMLImport& GetImport() const { return SvXMLImportContext::GetImport(); } - void addGluePoint( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); + void addGluePoint( const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ); bool isPresentationShape() const; @@ -104,16 +104,16 @@ public: SdXMLShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); @@ -133,11 +133,11 @@ public: SdXMLRectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLRectShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -156,11 +156,11 @@ public: SdXMLLineShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLLineShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -182,11 +182,11 @@ public: SdXMLEllipseShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLEllipseShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -204,10 +204,10 @@ public: SdXMLPolygonShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, bool bClosed, bool bTemporaryShape); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bClosed, bool bTemporaryShape); virtual ~SdXMLPolygonShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -224,11 +224,11 @@ public: SdXMLPathShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLPathShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -245,11 +245,11 @@ public: SdXMLTextBoxShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLTextBoxShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -266,11 +266,11 @@ public: SdXMLControlShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLControlShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -281,31 +281,31 @@ public: class SdXMLConnectorShapeContext : public SdXMLShapeContext { private: - ::com::sun::star::awt::Point maStart; - ::com::sun::star::awt::Point maEnd; + css::awt::Point maStart; + css::awt::Point maEnd; sal_uInt16 mnType; - OUString maStartShapeId; + OUString maStartShapeId; sal_Int32 mnStartGlueId; - OUString maEndShapeId; + OUString maEndShapeId; sal_Int32 mnEndGlueId; sal_Int32 mnDelta1; sal_Int32 mnDelta2; sal_Int32 mnDelta3; - com::sun::star::uno::Any maPath; + css::uno::Any maPath; public: SdXMLConnectorShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLConnectorShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -316,18 +316,18 @@ public: class SdXMLMeasureShapeContext : public SdXMLShapeContext { private: - ::com::sun::star::awt::Point maStart; - ::com::sun::star::awt::Point maEnd; + css::awt::Point maStart; + css::awt::Point maEnd; public: SdXMLMeasureShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLMeasureShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -344,11 +344,11 @@ public: SdXMLPageShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLPageShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -359,18 +359,18 @@ public: class SdXMLCaptionShapeContext : public SdXMLShapeContext { private: - com::sun::star::awt::Point maCaptionPoint; + css::awt::Point maCaptionPoint; sal_Int32 mnRadius; public: SdXMLCaptionShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLCaptionShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -382,21 +382,21 @@ class SdXMLGraphicObjectShapeContext : public SdXMLShapeContext { private: OUString maURL; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; + css::uno::Reference < css::io::XOutputStream > mxBase64Stream; public: SdXMLGraphicObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLGraphicObjectShapeContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -412,16 +412,16 @@ public: SdXMLChartShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLChartShapeContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual void Characters( const OUString& rChars ) override; virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; // draw:object and draw:object_ole context @@ -432,22 +432,22 @@ private: OUString maCLSID; OUString maHref; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; + css::uno::Reference < css::io::XOutputStream > mxBase64Stream; public: SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLObjectShapeContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -463,22 +463,22 @@ private: OUString maHref; bool mbIsScript; - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; + css::uno::Sequence< css::beans::PropertyValue > maParams; public: SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLAppletShapeContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -493,22 +493,22 @@ private: OUString maHref; bool mbMedia; - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; + css::uno::Sequence< css::beans::PropertyValue > maParams; public: SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLPluginShapeContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -530,12 +530,12 @@ public: SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLFloatingFrameShapeContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -560,15 +560,15 @@ public: SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLFrameShapeContext(); virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -582,22 +582,22 @@ protected: OUString maCustomShapeEngine; OUString maCustomShapeData; - std::vector< com::sun::star::beans::PropertyValue > maCustomShapeGeometry; + std::vector< css::beans::PropertyValue > maCustomShapeGeometry; public: SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLCustomShapeContext(); - virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -611,14 +611,14 @@ public: SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes ); virtual ~SdXMLTableShapeContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx index c186206e1c7f..865c508129c8 100644 --- a/xmloff/source/draw/ximpshow.hxx +++ b/xmloff/source/draw/ximpshow.hxx @@ -37,11 +37,11 @@ public: SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList); virtual ~SdXMLShowsContext(); virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSHOW_HXX diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index a45d36af00e1..9a8396dd66d9 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -58,8 +58,7 @@ public: SdXMLDrawingPagePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProps, const rtl::Reference < SvXMLImportPropertyMapper > &rMap ); @@ -68,7 +67,7 @@ public: using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp) override; }; @@ -135,7 +134,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily = XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID); virtual ~SdXMLDrawingPageStyleContext(); @@ -143,14 +142,12 @@ public: SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void Finish( bool bOverwrite ) override; // #i35918# - virtual void FillPropertySet( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ) override; + virtual void FillPropertySet( const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override; }; @@ -1030,7 +1027,7 @@ SvXMLStyleContext* SdXMLStylesContext::CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList) + const uno::Reference< css::xml::sax::XAttributeList >& xAttrList) { SvXMLStyleContext* pContext = nullptr; @@ -1548,7 +1545,7 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext( SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList) + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList) : SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList) , mbFixed(false) { diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index dc19de9db795..c82cb06302e2 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -40,7 +40,7 @@ class SdXMLPageMasterStyleContext: public SvXMLStyleContext sal_Int32 mnBorderTop; sal_Int32 mnWidth; sal_Int32 mnHeight; - com::sun::star::view::PaperOrientation meOrientation; + css::view::PaperOrientation meOrientation; const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); } SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); } @@ -51,7 +51,7 @@ public: SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPageMasterStyleContext(); sal_Int32 GetBorderBottom() const { return mnBorderBottom; } @@ -60,7 +60,7 @@ public: sal_Int32 GetBorderTop() const { return mnBorderTop; } sal_Int32 GetWidth() const { return mnWidth; } sal_Int32 GetHeight() const { return mnHeight; } - com::sun::star::view::PaperOrientation GetOrientation() const { return meOrientation; } + css::view::PaperOrientation GetOrientation() const { return meOrientation; } }; // style:page-master context @@ -79,12 +79,12 @@ public: SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPageMasterContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; const SdXMLPageMasterStyleContext* GetPageMasterStyle() const { return mpPageMasterStyle; } }; @@ -104,13 +104,13 @@ public: SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes); virtual ~SdXMLMasterPageContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; @@ -136,7 +136,7 @@ public: SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPresentationPlaceholderContext(); const OUString& GetName() const { return msName; } @@ -161,12 +161,12 @@ public: SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPresentationPageLayoutContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; sal_uInt16 GetTypeId() const { return mnTypeId; } @@ -186,33 +186,33 @@ class SdXMLStylesContext : public SvXMLStylesContext void ImpSetGraphicStyles() const; void ImpSetCellStyles() const; - void ImpSetGraphicStyles( com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xPageStyles, + void ImpSetGraphicStyles( css::uno::Reference< css::container::XNameAccess >& xPageStyles, sal_uInt16 nFamily, const OUString& rPrefix) const; protected: virtual SvXMLStyleContext* CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList) override; virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList) override; virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList ) override; public: SdXMLStylesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, bool bIsAutoStyle); virtual ~SdXMLStylesContext(); @@ -222,7 +222,7 @@ public: void SetMasterPageStyles(SdXMLMasterPageContext& rMaster) const; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getPageLayouts() const; + css::uno::Reference< css::container::XNameAccess > getPageLayouts() const; }; // office:master-styles context @@ -245,7 +245,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; // <pres:header-decl>, <pres:footer-decl> and <pres:date-time-decl> @@ -255,7 +255,7 @@ class SdXMLHeaderFooterDeclContext : public SvXMLStyleContext public: SdXMLHeaderFooterDeclContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual bool IsTransient() const override; virtual void EndElement() override; diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx index fbe3fb80915c..03f6d0f00860 100644 --- a/xmloff/source/forms/attriblistmerge.hxx +++ b/xmloff/source/forms/attriblistmerge.hxx @@ -32,7 +32,7 @@ namespace xmloff { //= OAttribListMerger - typedef ::cppu::WeakImplHelper < ::com::sun::star::xml::sax::XAttributeList + typedef ::cppu::WeakImplHelper < css::xml::sax::XAttributeList > OAttribListMerger_Base; /** implements the XAttributeList list by merging different source attribute lists @@ -42,7 +42,7 @@ namespace xmloff { protected: ::osl::Mutex m_aMutex; - typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > > AttributeListArray; + typedef std::vector< css::uno::Reference< css::xml::sax::XAttributeList > > AttributeListArray; AttributeListArray m_aLists; virtual ~OAttribListMerger() { } @@ -52,19 +52,19 @@ namespace xmloff // attribute list handling // (very thin at the moment... only adding lists is allowed... add more if you need it :) - void addList(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rList); + void addList(const css::uno::Reference< css::xml::sax::XAttributeList >& _rList); // XAttributeList - virtual sal_Int16 SAL_CALL getLength( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNameByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTypeByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTypeByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getValueByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getValueByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getLength( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNameByIndex( sal_Int16 i ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTypeByIndex( sal_Int16 i ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTypeByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getValueByIndex( sal_Int16 i ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getValueByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; protected: - bool seekToIndex(sal_Int16 _nGlobalIndex, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); - bool seekToName(const OUString& _rName, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); + bool seekToIndex(sal_Int16 _nGlobalIndex, css::uno::Reference< css::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); + bool seekToName(const OUString& _rName, css::uno::Reference< css::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); }; } // namespace xmloff diff --git a/xmloff/source/forms/callbacks.hxx b/xmloff/source/forms/callbacks.hxx index 21b9224bed16..afd36ba9b632 100644 --- a/xmloff/source/forms/callbacks.hxx +++ b/xmloff/source/forms/callbacks.hxx @@ -42,10 +42,10 @@ namespace xmloff /** steps through a collection and exports all children of this collection */ virtual void exportCollectionElements( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxCollection) = 0; + const css::uno::Reference< css::container::XIndexAccess >& _rxCollection) = 0; virtual OUString getObjectStyleName( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) = 0; + const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) = 0; protected: ~IFormsExportContext() {} @@ -56,8 +56,8 @@ namespace xmloff { public: virtual void registerEvents( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxElement, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents + const css::uno::Reference< css::beans::XPropertySet >& _rxElement, + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents ) = 0; protected: @@ -69,7 +69,7 @@ namespace xmloff { public: virtual void registerEvents( - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents ) = 0; protected: diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx index 9be1cfd511aa..9f956e3558f0 100644 --- a/xmloff/source/forms/elementexport.hxx +++ b/xmloff/source/forms/elementexport.hxx @@ -40,15 +40,15 @@ namespace xmloff class OElementExport : public OPropertyExport { protected: - ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor > + css::uno::Sequence< css::script::ScriptEventDescriptor > m_aEvents; SvXMLElementExport* m_pXMLElement; // XML element doing the concrete startElement etc. public: OElementExport(IFormsExportContext& _rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents); + const css::uno::Reference< css::beans::XPropertySet >& _rxProps, + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents); virtual ~OElementExport(); void doExport(); @@ -115,10 +115,10 @@ namespace xmloff the comma-separated list of control-ids of all the controls referring to this one as LabelControl */ OControlExport(IFormsExportContext& _rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, + const css::uno::Reference< css::beans::XPropertySet >& _rxControl, const OUString& _rControlId, const OUString& _rReferringControls, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rxEvents); + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rxEvents); virtual ~OControlExport(); protected: @@ -235,7 +235,7 @@ namespace xmloff Bindings which count here are: <ul><li>an established connection to a database field</li> - <li>a binding to an external value supplier (<type scope="com::sun::star::form::binding">XValueBinding</type>)</li> + <li>a binding to an external value supplier (<type scope="css::form::binding">XValueBinding</type>)</li> </ul> */ bool controlHasActiveDataBinding() const; @@ -248,7 +248,7 @@ namespace xmloff List entries may be <ul><li>specified by the user</li> - <li>specified by an external list source (<type scope="com::sun::star::form::binding">XListEntrySource</type>)</li> + <li>specified by an external list source (<type scope="css::form::binding">XListEntrySource</type>)</li> <li>obtained from a database query (in various ways)</li> </ul> @@ -267,9 +267,9 @@ namespace xmloff @see OColumnExport::OColumnExport */ OColumnExport(IFormsExportContext& _rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, + const css::uno::Reference< css::beans::XPropertySet >& _rxControl, const OUString& _rControlId, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rxEvents); + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rxEvents); virtual ~OColumnExport(); @@ -298,8 +298,8 @@ namespace xmloff /** constructs an object capable of exporting controls */ OFormExport(IFormsExportContext& _rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rxEvents + const css::uno::Reference< css::beans::XPropertySet >& _rxForm, + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rxEvents ); protected: diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 1ecf02e38706..e63739088f6a 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -800,7 +800,7 @@ namespace xmloff void OControlImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > xAttributes; + css::uno::Reference< css::xml::sax::XAttributeList > xAttributes; if( m_xOuterAttributes.is() ) { // merge the attribute lists @@ -2036,8 +2036,8 @@ namespace xmloff SvXMLImport& _rImport ,sal_uInt16 nPrfx , const OUString& _sLocalName - ,const Reference< ::com::sun::star::xml::sax::XAttributeList > & _xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xElement) : + ,const Reference< css::xml::sax::XAttributeList > & _xAttrList + ,const css::uno::Reference< css::beans::XPropertySet >& _xElement) : SvXMLImportContext( _rImport, nPrfx, _sLocalName ) { OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index d8e11f1e2caa..86ed4ed9566a 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -79,13 +79,13 @@ namespace xmloff // while reading our element /// the parent container to insert the new element into - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > m_xParentContainer; /// the element we're creating. Valid after StartElement - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xElement; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo; bool m_bImplicitGenericAttributeHandling; @@ -108,17 +108,17 @@ namespace xmloff OElementImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer ); virtual ~OElementImport(); protected: // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void EndElement() override; // OPropertyImport overridables @@ -128,14 +128,14 @@ namespace xmloff // IEventAttacher virtual void registerEvents( - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents ) override; /** create the (uninitialized) element which is to represent the read data <p>The default implementation uses <member>m_xORB</member> to create a object with <member>m_sServiceName</member>. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + virtual css::uno::Reference< css::beans::XPropertySet > createElement(); protected: @@ -185,7 +185,7 @@ namespace xmloff // we fake the attributes our base class gets: we add the attributes of the outer wrapper // element which encloses us - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > + css::uno::Reference< css::xml::sax::XAttributeList > m_xOuterAttributes; /** the address of the calc cell which the control model should be bound to, @@ -207,20 +207,20 @@ namespace xmloff OControlImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer ); public: OControlImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void EndElement() override; // OPropertyImport overridables @@ -228,15 +228,15 @@ namespace xmloff const OUString& _rLocalName, const OUString& _rValue) override; - void addOuterAttributes(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxOuterAttribs); + void addOuterAttributes(const css::uno::Reference< css::xml::sax::XAttributeList >& _rxOuterAttribs); protected: void setElementType(OControlElement::ElementType _eType) { m_eElementType = _eType; } protected: static void implTranslateValueProperty( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, - ::com::sun::star::beans::PropertyValue& /* [in/out] */ _rPropValue); + const css::uno::Reference< css::beans::XPropertySetInfo >& _rxPropInfo, + css::beans::PropertyValue& /* [in/out] */ _rPropValue); virtual OUString determineDefaultServiceName() const override; @@ -264,7 +264,7 @@ namespace xmloff protected: // OElementImport overridables - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + virtual css::uno::Reference< css::beans::XPropertySet > createElement() override; }; @@ -283,14 +283,14 @@ namespace xmloff public: OImagePositionImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); protected: // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; // OPropertyImport overridables virtual bool handleAttribute( sal_uInt16 _nNamespaceKey, @@ -308,13 +308,13 @@ namespace xmloff public: OReferredControlImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, @@ -328,7 +328,7 @@ namespace xmloff public: OPasswordImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -344,7 +344,7 @@ namespace xmloff public: ORadioImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -364,7 +364,7 @@ namespace xmloff public: OURLReferenceImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -384,14 +384,14 @@ namespace xmloff public: OButtonImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); protected: // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; }; //= OValueRangeImport @@ -406,14 +406,14 @@ namespace xmloff public: OValueRangeImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); protected: // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList ) override; // OPropertyImport overridables virtual bool handleAttribute( sal_uInt16 _nNamespaceKey, @@ -428,23 +428,23 @@ namespace xmloff class OTextLikeImport : public OControlImport { private: - ::com::sun::star::uno::Reference< com::sun::star::text::XTextCursor > m_xCursor; - ::com::sun::star::uno::Reference< com::sun::star::text::XTextCursor > m_xOldCursor; + css::uno::Reference< css::text::XTextCursor > m_xCursor; + css::uno::Reference< css::text::XTextCursor > m_xOldCursor; bool m_bEncounteredTextPara; public: OTextLikeImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void EndElement() override; private: @@ -462,14 +462,14 @@ namespace xmloff friend class OComboItemImport; protected: - ::com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > m_aListSource; - ::com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > m_aValueList; - ::com::sun::star::uno::Sequence< sal_Int16 > + css::uno::Sequence< sal_Int16 > m_aSelectedSeq; - ::com::sun::star::uno::Sequence< sal_Int16 > + css::uno::Sequence< sal_Int16 > m_aDefaultSelectedSeq; OUString m_sCellListSource; /// the cell range which acts as list source for the control @@ -485,16 +485,16 @@ namespace xmloff public: OListAndComboImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void EndElement() override; // OPropertyImport overridables @@ -530,7 +530,7 @@ namespace xmloff const OListAndComboImportRef& _rListBox); virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; }; //= OComboItemImport @@ -548,7 +548,7 @@ namespace xmloff protected: // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; }; //= OContainerImport @@ -559,13 +559,13 @@ namespace xmloff ,public ODefaultEventAttacherManager { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > m_xMeAsContainer; OUString m_sWrapperElementName; protected: OContainerImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, const sal_Char* _pWrapperElementName) :BASE(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) ,m_sWrapperElementName(OUString::createFromAscii(_pWrapperElementName)) @@ -575,12 +575,12 @@ namespace xmloff // SvXMLImportContext overridables virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) SAL_OVERRIDE; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) SAL_OVERRIDE; virtual void EndElement() SAL_OVERRIDE; protected: // OElementImport overridables - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + virtual css::uno::Reference< css::beans::XPropertySet > createElement() SAL_OVERRIDE; // create the child context for the given control type @@ -598,17 +598,17 @@ namespace xmloff class OColumnImport : public BASE { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::form::XGridColumnFactory > + css::uno::Reference< css::form::XGridColumnFactory > m_xColumnFactory; public: OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType); protected: // OElementImport overridables - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + virtual css::uno::Reference< css::beans::XPropertySet > createElement() SAL_OVERRIDE; }; @@ -616,23 +616,23 @@ namespace xmloff class OColumnWrapperImport : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > + css::uno::Reference< css::xml::sax::XAttributeList > m_xOwnAttributes; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > m_xParentContainer; OFormLayerXMLImport_Impl& m_rFormImport; IEventAttacherManager& m_rEventManager; public: OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer); + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer); // SvXMLImportContext overridables virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; protected: OControlImport* implCreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, @@ -648,7 +648,7 @@ namespace xmloff public: OGridImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType); protected: @@ -666,16 +666,16 @@ namespace xmloff public: OFormImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer ); protected: // SvXMLImportContext overridables virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void EndElement() override; // OContainerImport overridables @@ -702,8 +702,8 @@ namespace xmloff OXMLDataSourceImport( SvXMLImport& _rImport ,sal_uInt16 nPrfx ,const OUString& rLName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xElement); + ,const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList + ,const css::uno::Reference< css::beans::XPropertySet >& _xElement); }; #define _INCLUDING_FROM_ELEMENTIMPORT_HXX_ diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx index 3677f230a281..bd100642833e 100644 --- a/xmloff/source/forms/elementimport_impl.hxx +++ b/xmloff/source/forms/elementimport_impl.hxx @@ -32,7 +32,7 @@ template <class BASE> inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) { // maybe it's a sub control if (_rLocalName == m_sWrapperElementName) @@ -50,16 +50,16 @@ inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( } template <class BASE> -inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > +inline css::uno::Reference< css::beans::XPropertySet > OContainerImport< BASE >::createElement() { // let the base class create the object - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xReturn = BASE::createElement(); + css::uno::Reference< css::beans::XPropertySet > xReturn = BASE::createElement(); if (!xReturn.is()) return xReturn; // ensure that the object is a XNameContainer (we strongly need this for inserting child elements) - m_xMeAsContainer.set(xReturn, ::com::sun::star::uno::UNO_QUERY); + m_xMeAsContainer.set(xReturn, css::uno::UNO_QUERY); if (!m_xMeAsContainer.is()) { OSL_FAIL("OContainerImport::createElement: invalid element (no XNameContainer) created!"); @@ -75,7 +75,7 @@ inline void OContainerImport< BASE >::EndElement() BASE::EndElement(); // now that we have all children, attach the events - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > xIndexContainer(m_xMeAsContainer, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::container::XIndexAccess > xIndexContainer(m_xMeAsContainer, css::uno::UNO_QUERY); if (xIndexContainer.is()) ODefaultEventAttacherManager::setEvents(xIndexContainer); } @@ -83,19 +83,19 @@ inline void OContainerImport< BASE >::EndElement() //= OColumnImport template <class BASE> OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :BASE(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) - ,m_xColumnFactory(_rxParentContainer, ::com::sun::star::uno::UNO_QUERY) + ,m_xColumnFactory(_rxParentContainer, css::uno::UNO_QUERY) { OSL_ENSURE(m_xColumnFactory.is(), "OColumnImport::OColumnImport: invalid parent container (no factory)!"); } // OElementImport overridables template <class BASE> -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > OColumnImport< BASE >::createElement() +css::uno::Reference< css::beans::XPropertySet > OColumnImport< BASE >::createElement() { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xReturn; + css::uno::Reference< css::beans::XPropertySet > xReturn; // no call to the base class' method. We have to use the grid column factory if (m_xColumnFactory.is()) { diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx index 0f15371bb29b..40d239358542 100644 --- a/xmloff/source/forms/eventexport.hxx +++ b/xmloff/source/forms/eventexport.hxx @@ -34,7 +34,7 @@ namespace xmloff { //= OEventDescriptorMapper - typedef ::cppu::WeakImplHelper < ::com::sun::star::container::XNameReplace + typedef ::cppu::WeakImplHelper < css::container::XNameReplace > OEventDescriptorMapper_Base; /** helper class wrapping different script event representations @@ -48,24 +48,24 @@ namespace xmloff class OEventDescriptorMapper : public OEventDescriptorMapper_Base { protected: - typedef std::map< OUString, ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > MapString2PropertyValueSequence; + typedef std::map< OUString, css::uno::Sequence < css::beans::PropertyValue > > MapString2PropertyValueSequence; MapString2PropertyValueSequence m_aMappedEvents; public: explicit OEventDescriptorMapper( - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents); + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents); // XNameReplace - 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, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; }; } // namespace xmloff diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx index d75b68bf1e6f..cf1f2fbcb6c1 100644 --- a/xmloff/source/forms/eventimport.hxx +++ b/xmloff/source/forms/eventimport.hxx @@ -52,8 +52,8 @@ namespace xmloff { protected: typedef std::map< - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, - ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >, + css::uno::Reference< css::beans::XPropertySet >, + css::uno::Sequence< css::script::ScriptEventDescriptor >, OPropertySetCompare> MapPropertySet2ScriptSequence; // usually an event attacher manager will need to collect all script events registered, 'cause @@ -65,13 +65,13 @@ namespace xmloff public: // IEventAttacherManager virtual void registerEvents( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxElement, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents + const css::uno::Reference< css::beans::XPropertySet >& _rxElement, + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents ) override; protected: void setEvents( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer + const css::uno::Reference< css::container::XIndexAccess >& _rxContainer ); virtual ~ODefaultEventAttacherManager(); diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index 98a1c595c80a..14b22232b151 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -259,7 +259,7 @@ namespace xmloff void OAttribute2Property::addEnumProperty( const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_uInt16 _nAttributeDefault, const SvXMLEnumMapEntry* _pValueMap, - const ::com::sun::star::uno::Type* _pType) + const css::uno::Type* _pType) { OUStringBuffer aDefault; SvXMLUnitConverter::convertEnum(aDefault, _nAttributeDefault, _pValueMap); @@ -272,7 +272,7 @@ namespace xmloff OAttribute2Property::AttributeAssignment& OAttribute2Property::implAdd( const sal_Char* _pAttributeName, const OUString& _rPropertyName, - const ::com::sun::star::uno::Type& _rType, const OUString& /*_rDefaultString*/) + const css::uno::Type& _rType, const OUString& /*_rDefaultString*/) { OSL_ENSURE(m_aKnownProperties.end() == m_aKnownProperties.find(OUString::createFromAscii(_pAttributeName)), "OAttribute2Property::implAdd: already have this attribute!"); diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx index 4897f7d103a0..10b80b788df5 100644 --- a/xmloff/source/forms/formattributes.hxx +++ b/xmloff/source/forms/formattributes.hxx @@ -248,7 +248,7 @@ namespace xmloff { OUString sAttributeName; // the attribute name OUString sPropertyName; // the property name - ::com::sun::star::uno::Type aPropertyType; // the property type + css::uno::Type aPropertyType; // the property type OUString sAttributeDefault; // the default if the attribute is not present // entries which are special to some value types @@ -348,13 +348,13 @@ namespace xmloff void addEnumProperty( const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_uInt16 _nAttributeDefault, const SvXMLEnumMapEntry* _pValueMap, - const ::com::sun::star::uno::Type* _pType = nullptr); + const css::uno::Type* _pType = nullptr); protected: /// some common code for the various add*Property methods AttributeAssignment& implAdd( const sal_Char* _pAttributeName, const OUString& _rPropertyName, - const ::com::sun::star::uno::Type& _rType, const OUString& _rDefaultString); + const css::uno::Type& _rType, const OUString& _rDefaultString); }; } // namespace xmloff diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx index e58205e98a41..98cfd206b0bc 100644 --- a/xmloff/source/forms/formcellbinding.hxx +++ b/xmloff/source/forms/formcellbinding.hxx @@ -38,9 +38,9 @@ namespace xmloff class FormCellBindingHelper { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xControlModel; // the model we work for - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > + css::uno::Reference< css::sheet::XSpreadsheetDocument > m_xDocument; // the document where the model lives public: @@ -49,7 +49,7 @@ namespace xmloff this model, since then no of it's functionality will be available.</p> */ static bool livesInSpreadsheetDocument( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel ); /** ctor @@ -62,8 +62,8 @@ namespace xmloff model. */ FormCellBindingHelper( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::frame::XModel >& _rxDocument ); public: @@ -71,7 +71,7 @@ namespace xmloff @precond isCellBindingAllowed returns <TRUE/> */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > + css::uno::Reference< css::form::binding::XValueBinding > createCellBindingFromStringAddress( const OUString& _rAddress, bool _bUseIntegerBinding @@ -79,7 +79,7 @@ namespace xmloff /** gets a cell range list source binding for the given address */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > + css::uno::Reference< css::form::binding::XListEntrySource > createCellListSourceFromStringAddress( const OUString& _rAddress ) const; /** creates a string representation for the given value binding's address @@ -92,7 +92,7 @@ namespace xmloff @see isCellBinding */ OUString getStringAddressFromCellBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ) const; /** creates a string representation for the given list source's range address @@ -106,17 +106,17 @@ namespace xmloff @see isCellRangeListSource */ OUString getStringAddressFromCellListSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource + const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource ) const; /** returns the current binding of our control model, if any. */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > + css::uno::Reference< css::form::binding::XValueBinding > getCurrentBinding( ) const; /** returns the current external list source of the control model, if any */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > + css::uno::Reference< css::form::binding::XListEntrySource > getCurrentListSource( ) const; /** sets a new binding for our control model @@ -125,7 +125,7 @@ namespace xmloff returning <TRUE/>) */ void setBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ); /** sets a list source for our control model @@ -134,7 +134,7 @@ namespace xmloff returning <TRUE/>) */ void setListSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource + const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource ); /** checks whether it's possible to bind the control model to a spreadsheet cell @@ -144,7 +144,7 @@ namespace xmloff /** checks whether within the given document, it's possible to bind control models to spreadsheet cells */ static bool isCellBindingAllowed( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument + const css::uno::Reference< css::frame::XModel >& _rxDocument ); /** checks whether it's possible to bind the control model to a range of spreadsheet cells @@ -156,26 +156,26 @@ namespace xmloff spreadsheet cells supplying the list entries */ static bool isListCellRangeAllowed( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument + const css::uno::Reference< css::frame::XModel >& _rxDocument ); /** checks whether a given binding is a spreadsheet cell binding */ static bool isCellBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ); /** checks whether a given binding is a spreadsheet cell binding, exchanging integer values */ static bool isCellIntegerBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ); /** checks whether a given list source is a spreadsheet cell list source */ static bool isCellRangeListSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource + const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource ); protected: @@ -183,7 +183,7 @@ namespace xmloff */ bool convertStringAddress( const OUString& _rAddressDescription, - ::com::sun::star::table::CellAddress& /* [out] */ _rAddress, + css::table::CellAddress& /* [out] */ _rAddress, sal_Int16 _nAssumeSheet = -1 ) const; @@ -191,7 +191,7 @@ namespace xmloff */ bool convertStringAddress( const OUString& _rAddressDescription, - ::com::sun::star::table::CellRangeAddress& /* [out] */ _rAddress + css::table::CellRangeAddress& /* [out] */ _rAddress ) const; /** determines if our document is a spreadsheet document, *and* can supply @@ -203,14 +203,14 @@ namespace xmloff the given service */ static bool isSpreadsheetDocumentWhichSupplies( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >& _rxDocument, + const css::uno::Reference< css::sheet::XSpreadsheetDocument >& _rxDocument, const OUString& _rService ); /** checkes whether a given component supports a given servive */ static bool doesComponentSupport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent, + const css::uno::Reference< css::uno::XInterface >& _rxComponent, const OUString& _rService ); @@ -224,11 +224,11 @@ namespace xmloff the value of the instantiation argument. Not evaluated if <arg>_rArgumentName</arg> is empty. */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > createDocumentDependentInstance( const OUString& _rService, const OUString& _rArgumentName, - const ::com::sun::star::uno::Any& _rArgumentValue + const css::uno::Any& _rArgumentValue ) const; /** converts an address representation into another one @@ -248,14 +248,14 @@ namespace xmloff @return <TRUE/> if any only if the conversion was successful - @see com::sun::star::table::CellAddressConversion - @see com::sun::star::table::CellRangeAddressConversion + @see css::table::CellAddressConversion + @see css::table::CellRangeAddressConversion */ bool doConvertAddressRepresentations( const OUString& _rInputProperty, - const ::com::sun::star::uno::Any& _rInputValue, + const css::uno::Any& _rInputValue, const OUString& _rOutputProperty, - ::com::sun::star::uno::Any& _rOutputValue, + css::uno::Any& _rOutputValue, bool _bIsRange ) const; }; diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx index 3110e21b9a6e..c5b1c7d8c5d9 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.cxx +++ b/xmloff/source/forms/gridcolumnproptranslator.cxx @@ -127,9 +127,9 @@ namespace xmloff virtual ~OMergedPropertySetInfo(); // XPropertySetInfo - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override; }; OMergedPropertySetInfo::OMergedPropertySetInfo( const Reference< XPropertySetInfo >& _rxMasterInfo ) diff --git a/xmloff/source/forms/gridcolumnproptranslator.hxx b/xmloff/source/forms/gridcolumnproptranslator.hxx index 6d79377f1374..b0aad99af99a 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.hxx +++ b/xmloff/source/forms/gridcolumnproptranslator.hxx @@ -28,38 +28,38 @@ namespace xmloff { //= OGridColumnPropertyTranslator - typedef ::cppu::WeakImplHelper < ::com::sun::star::beans::XPropertySet - , ::com::sun::star::beans::XMultiPropertySet + typedef ::cppu::WeakImplHelper < css::beans::XPropertySet + , css::beans::XMultiPropertySet > OGridColumnPropertyTranslator_Base; class OGridColumnPropertyTranslator : public OGridColumnPropertyTranslator_Base { private: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > + css::uno::Reference< css::beans::XMultiPropertySet > m_xGridColumn; public: explicit OGridColumnPropertyTranslator( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet >& _rxGridColumn + const css::uno::Reference< css::beans::XMultiPropertySet >& _rxGridColumn ); protected: virtual ~OGridColumnPropertyTranslator(); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; }; } // namespace xmloff diff --git a/xmloff/source/forms/handler/vcl_date_handler.hxx b/xmloff/source/forms/handler/vcl_date_handler.hxx index 300ef640539d..028e2c12f435 100644 --- a/xmloff/source/forms/handler/vcl_date_handler.hxx +++ b/xmloff/source/forms/handler/vcl_date_handler.hxx @@ -33,7 +33,7 @@ namespace xmloff // IPropertyHandler virtual OUString getAttributeValue( const PropertyValues& i_propertyValues ) const override; - virtual OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const override; + virtual OUString getAttributeValue( const css::uno::Any& i_propertyValue ) const override; virtual bool getPropertyValues( const OUString& i_attributeValue, PropertyValues& o_propertyValues ) const override; }; diff --git a/xmloff/source/forms/handler/vcl_time_handler.hxx b/xmloff/source/forms/handler/vcl_time_handler.hxx index 7c1a0cdd7fd3..262ed942db95 100644 --- a/xmloff/source/forms/handler/vcl_time_handler.hxx +++ b/xmloff/source/forms/handler/vcl_time_handler.hxx @@ -33,7 +33,7 @@ namespace xmloff // IPropertyHandler virtual OUString getAttributeValue( const PropertyValues& i_propertyValues ) const override; - virtual OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const override; + virtual OUString getAttributeValue( const css::uno::Any& i_propertyValue ) const override; virtual bool getPropertyValues( const OUString& i_attributeValue, PropertyValues& o_propertyValues ) const override; }; diff --git a/xmloff/source/forms/ifacecompare.hxx b/xmloff/source/forms/ifacecompare.hxx index 455c6219ec1c..9eab7abfb655 100644 --- a/xmloff/source/forms/ifacecompare.hxx +++ b/xmloff/source/forms/ifacecompare.hxx @@ -32,12 +32,12 @@ namespace xmloff */ template < class IAFCE > struct OInterfaceCompare - :public ::std::binary_function < ::com::sun::star::uno::Reference< IAFCE > - , ::com::sun::star::uno::Reference< IAFCE > + :public ::std::binary_function < css::uno::Reference< IAFCE > + , css::uno::Reference< IAFCE > , bool > { - bool operator() (const ::com::sun::star::uno::Reference< IAFCE >& lhs, const ::com::sun::star::uno::Reference< IAFCE >& rhs) const + bool operator() (const css::uno::Reference< IAFCE >& lhs, const css::uno::Reference< IAFCE >& rhs) const { return lhs.get() < rhs.get(); // this does not make any sense if you see the semantics of the pointer returned by get: @@ -47,8 +47,8 @@ namespace xmloff } }; - typedef OInterfaceCompare< ::com::sun::star::beans::XPropertySet > OPropertySetCompare; - typedef OInterfaceCompare< ::com::sun::star::drawing::XDrawPage > ODrawPageCompare; + typedef OInterfaceCompare< css::beans::XPropertySet > OPropertySetCompare; + typedef OInterfaceCompare< css::drawing::XDrawPage > ODrawPageCompare; } // namespace xmloff diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx index fa2042623453..9aa4d881122c 100644 --- a/xmloff/source/forms/layerexport.hxx +++ b/xmloff/source/forms/layerexport.hxx @@ -41,18 +41,18 @@ class SvXMLExportPropertyMapper; namespace xmloff { - typedef ::std::set < ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + typedef ::std::set < css::uno::Reference< css::beans::XPropertySet > , OPropertySetCompare > PropertySetBag; // maps objects (property sets) to strings, e.g. control ids. - typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + typedef ::std::map < css::uno::Reference< css::beans::XPropertySet > , OUString , OPropertySetCompare > MapPropertySet2String; // map pages to maps (of property sets to strings) - typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > + typedef ::std::map < css::uno::Reference< css::drawing::XDrawPage > , MapPropertySet2String , ODrawPageCompare > MapPropertySet2Map; @@ -92,7 +92,7 @@ namespace xmloff // chance, as (if other user-defined formats exist in the document as well) we can't distinguish // between user-defined formats really needed for the doc (i.e. in a calc cell) and formats only added // to the supplier because the controls needed it. - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > + css::uno::Reference< css::util::XNumberFormats > m_xControlNumberFormats; MapPropertySet2Map m_aControlIds; @@ -127,21 +127,21 @@ namespace xmloff /** exports one single grid column */ void exportGridColumn( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents + const css::uno::Reference< css::beans::XPropertySet >& _rxColumn, + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents ); /** exports one single control */ void exportControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents + const css::uno::Reference< css::beans::XPropertySet >& _rxControl, + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents ); /** exports one single form */ - void exportForm(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents + void exportForm(const css::uno::Reference< css::beans::XPropertySet >& _rxProps, + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents ); /** seek to the page given. @@ -152,14 +152,14 @@ namespace xmloff getControlId */ bool seekPage( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage); + const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage); /** get the id of the given control. <p>You must have sought to the page of the control before calling this.</p> */ OUString - getControlId(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl); + getControlId(const css::uno::Reference< css::beans::XPropertySet >& _rxControl); /** retrieves the style name for the control's number style. @@ -167,13 +167,13 @@ namespace xmloff do not have a number style. In this case, an empty string is returned.</p> */ OUString - getControlNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl ); + getControlNumberStyle( const css::uno::Reference< css::beans::XPropertySet >& _rxControl ); // IFormsExportContext - virtual void exportCollectionElements(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxCollection) override; + virtual void exportCollectionElements(const css::uno::Reference< css::container::XIndexAccess >& _rxCollection) override; virtual SvXMLExport& getGlobalContext() override; virtual OUString getObjectStyleName( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) override; + const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) override; virtual ::rtl::Reference< SvXMLExportPropertyMapper > getStylePropertyMapper() override; /** clear any structures which have been build in the recent <method>examine</method> calls. @@ -201,7 +201,7 @@ namespace xmloff @see exportForms */ void examineForms( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage); + const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage); /** export a forms collection of a draw page @@ -209,7 +209,7 @@ namespace xmloff <method>exportCollectionElements</method>.</p> */ void exportForms( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage); + const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage); /** exports the XForms model data */ @@ -217,7 +217,7 @@ namespace xmloff /** determines whether the given page contains logical forms */ - static bool pageContainsForms( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage ); + static bool pageContainsForms( const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage ); /** determines whether the given page contains XForm instances */ @@ -233,37 +233,37 @@ namespace xmloff protected: static bool impl_isFormPageContainingForms( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxForms); + const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage, + css::uno::Reference< css::container::XIndexAccess >& _rxForms); /** moves the m_aCurrentPage* members to the positions specifying the given page. @return <TRUE/> if there already were structures for the given page */ bool implMoveIterators( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage, + const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage, bool _bClear); /** check the object given if it's a control, if so, examine it. @return <TRUE/> if the object has been handled */ - bool checkExamineControl(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject); + bool checkExamineControl(const css::uno::Reference< css::beans::XPropertySet >& _rxObject); /** examines the control's number format, so later the format style can be referred <p>remembers the format key for the control, so it can later be asked for in getControlNumberStyle</p> */ - void examineControlNumberFormat(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl); + void examineControlNumberFormat(const css::uno::Reference< css::beans::XPropertySet >& _rxControl); /** examines the control's number format, so later the format style can be referred <p>does not remember the information returned in any way</p> */ - sal_Int32 implExamineControlNumberFormat( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ); + sal_Int32 implExamineControlNumberFormat( const css::uno::Reference< css::beans::XPropertySet >& _rxObject ); /** collects AutoStyles for grid columns */ - void collectGridColumnStylesAndIds( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl ); + void collectGridColumnStylesAndIds( const css::uno::Reference< css::beans::XPropertySet >& _rxControl ); /** ensures that the number format of the given control exist in our own formats supplier. @@ -274,7 +274,7 @@ namespace xmloff the format key of the control's format relative to our own formats supplier */ - sal_Int32 ensureTranslateFormat(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxFormattedControl); + sal_Int32 ensureTranslateFormat(const css::uno::Reference< css::beans::XPropertySet >& _rxFormattedControl); /// returns the instance exporting our control's number styles SvXMLNumFmtExport* getControlNumberStyleExport(); @@ -285,7 +285,7 @@ namespace xmloff /** determines the number format style for the given object without remembering it */ OUString - getImmediateNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ); + getImmediateNumberStyle( const css::uno::Reference< css::beans::XPropertySet >& _rxObject ); /** returns the prefix to be used for control number styles */ @@ -298,7 +298,7 @@ namespace xmloff to the form layer exporter.<br/> Of course you have to do this before calling <member>exportForms</member></p> */ - void excludeFromExport( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxControl ); + void excludeFromExport( const css::uno::Reference< css::awt::XControlModel >& _rxControl ); }; } // namespace xmloff diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx index 641380cafe99..be8dddf8bdfd 100644 --- a/xmloff/source/forms/layerimport.hxx +++ b/xmloff/source/forms/layerimport.hxx @@ -56,18 +56,18 @@ namespace xmloff OAttribute2Property m_aAttributeMetaData; /// the supplier for the forms of the currently imported page - ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormsSupplier2 > + css::uno::Reference< css::form::XFormsSupplier2 > m_xCurrentPageFormsSupp; SvXMLStylesContext* m_pAutoStyles; protected: - typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > MapString2PropertySet; + typedef std::map< OUString, css::uno::Reference< css::beans::XPropertySet > > MapString2PropertySet; typedef std::map<css::uno::Reference<css::drawing::XDrawPage>, MapString2PropertySet, ODrawPageCompare> MapDrawPage2Map; MapDrawPage2Map m_aControlIds; // ids of the controls on all known page MapDrawPage2Map::iterator m_aCurrentPageIds; // ifs of the controls on the current page - typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, OUString > + typedef ::std::pair< css::uno::Reference< css::beans::XPropertySet >, OUString > ModelStringPair; ::std::vector< ModelStringPair > m_aControlReferences; // control reference descriptions for current page @@ -88,10 +88,10 @@ namespace xmloff public: // IControlIdMap void registerControlId( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, + const css::uno::Reference< css::beans::XPropertySet >& _rxControl, const OUString& _rId); void registerControlReferences( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, + const css::uno::Reference< css::beans::XPropertySet >& _rxControl, const OUString& _rReferringControls); // OFormLayerXMLImport_Impl @@ -101,31 +101,31 @@ namespace xmloff void enterEventContext(); void leaveEventContext(); void applyControlNumberStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName ); void registerCellValueBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, const OUString& _rCellAddress ); void registerCellRangeListSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, const OUString& _rCellRangeAddress ); void registerXFormsValueBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, const OUString& _rBindingID ); void registerXFormsListBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, const OUString& _rBindingID ); void registerXFormsSubmission( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, const OUString& _rSubmissionID ); @@ -136,7 +136,7 @@ namespace xmloff /** start importing the forms of the given page */ void startPage( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage); + const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage); /** end importing the forms of the current page */ @@ -155,11 +155,11 @@ namespace xmloff SvXMLImportContext* createContext( const sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttribs); + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttribs); /** get the control with the given id */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > lookupControlId(const OUString& _rControlId); /** announces the auto-style context to the form importer diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx index e672d71e905e..eccf2003e1d8 100644 --- a/xmloff/source/forms/officeforms.hxx +++ b/xmloff/source/forms/officeforms.hxx @@ -42,16 +42,16 @@ namespace xmloff // SvXMLImportContext overriabled virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList ) override; virtual void EndElement() override; protected: void implImportBool( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttributes, + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttributes, OfficeFormsAttributes _eAttribute, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, + const css::uno::Reference< css::beans::XPropertySet >& _rxProps, + const css::uno::Reference< css::beans::XPropertySetInfo >& _rxPropInfo, const OUString& _rPropName, bool _bDefault ); @@ -73,8 +73,8 @@ namespace xmloff static void implExportBool( SvXMLExport& _rExp, OfficeFormsAttributes _eAttribute, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, + const css::uno::Reference< css::beans::XPropertySet >& _rxProps, + const css::uno::Reference< css::beans::XPropertySetInfo >& _rxPropInfo, const OUString& _rPropName, bool _bDefault ); diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index a78c8c6bd97d..a06823d3b47f 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -146,7 +146,7 @@ namespace xmloff bool bIsEmptyValue = TypeClass_VOID == aValue.getValueType().getTypeClass(); if ( bIsEmptyValue ) { - com::sun::star::beans::Property aPropDesc; + css::beans::Property aPropDesc; aPropDesc = m_xPropertyInfo->getPropertyByName( *aProperty ); aExportType = aPropDesc.Type; } @@ -562,9 +562,9 @@ namespace xmloff default: { // hmmm .... what else do we know? double fValue = 0; - ::com::sun::star::util::Date aDate; - ::com::sun::star::util::Time aTime; - ::com::sun::star::util::DateTime aDateTime; + css::util::Date aDate; + css::util::Time aTime; + css::util::DateTime aDateTime; if (_rValue >>= aDate) { Date aToolsDate( Date::EMPTY ); @@ -607,7 +607,7 @@ namespace xmloff return aBuffer.makeStringAndClear(); } - token::XMLTokenEnum OPropertyExport::implGetPropertyXMLType(const ::com::sun::star::uno::Type& _rType) + token::XMLTokenEnum OPropertyExport::implGetPropertyXMLType(const css::uno::Type& _rType) { // handle the type description switch (_rType.getTypeClass()) diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx index c8f545ef140e..4af543b5251d 100644 --- a/xmloff/source/forms/propertyexport.hxx +++ b/xmloff/source/forms/propertyexport.hxx @@ -65,11 +65,11 @@ namespace xmloff protected: IFormsExportContext& m_rContext; - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + const css::uno::Reference< css::beans::XPropertySet > m_xProps; - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + const css::uno::Reference< css::beans::XPropertySetInfo > m_xPropertyInfo; - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > + const css::uno::Reference< css::beans::XPropertyState > m_xPropertyState; // caching @@ -84,7 +84,7 @@ namespace xmloff the property set to be exported */ OPropertyExport(IFormsExportContext& _rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps); + const css::uno::Reference< css::beans::XPropertySet >& _rxProps); protected: /** examines a property set given for all properties which's value are to made persistent @@ -95,7 +95,7 @@ namespace xmloff void examinePersistence(); template< typename T > void exportRemainingPropertiesSequence( - com::sun::star::uno::Any const & value, + css::uno::Any const & value, token::XMLTokenEnum eValueAttName); void exportRemainingProperties(); @@ -325,7 +325,7 @@ namespace xmloff the value to convert */ OUString implConvertAny( - const ::com::sun::star::uno::Any& _rValue); + const css::uno::Any& _rValue); /** @return @@ -341,7 +341,7 @@ namespace xmloff </ul> If the type is not convertible, float is returned */ - static ::xmloff::token::XMLTokenEnum implGetPropertyXMLType(const ::com::sun::star::uno::Type& _rType); + static ::xmloff::token::XMLTokenEnum implGetPropertyXMLType(const css::uno::Type& _rType); #ifdef DBG_UTIL void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue); @@ -377,11 +377,11 @@ namespace xmloff */ void dbg_implCheckProperty( const OUString& _rPropertyName, - const ::com::sun::star::uno::Type* _pType); + const css::uno::Type* _pType); // void dbg_implCheckProperty( // const sal_Char* _rPropertyName, -// const ::com::sun::star::uno::Type* _pType) +// const css::uno::Type* _pType) // { // dbg_implCheckProperty(OUString::createFromAscii(_rPropertyName), _pType); // } diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 7ea93ac919b2..b9fdc78f652e 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -58,9 +58,9 @@ namespace xmloff //= PropertyConversion namespace { - ::com::sun::star::util::Time lcl_getTime(double _nValue) + css::util::Time lcl_getTime(double _nValue) { - ::com::sun::star::util::Time aTime; + css::util::Time aTime; sal_uInt64 nIntValue = static_cast<sal_uInt64>(_nValue * ::tools::Time::nanoSecPerDay); aTime.NanoSeconds = nIntValue % ::tools::Time::nanoSecPerSec; nIntValue /= ::tools::Time::nanoSecPerSec; @@ -74,16 +74,16 @@ namespace return aTime; } - static ::com::sun::star::util::Date lcl_getDate( double _nValue ) + static css::util::Date lcl_getDate( double _nValue ) { Date aToolsDate((sal_uInt32)_nValue); - ::com::sun::star::util::Date aDate; + css::util::Date aDate; ::utl::typeConvert(aToolsDate, aDate); return aDate; } } -Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpectedType, +Any PropertyConversion::convertString( const css::uno::Type& _rExpectedType, const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap, const bool _bInvertBoolean ) { Any aReturn; @@ -160,11 +160,11 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe case TypeClass_STRUCT: { sal_Int32 nType = 0; - if ( _rExpectedType.equals( ::cppu::UnoType< ::com::sun::star::util::Date >::get() ) ) + if ( _rExpectedType.equals( ::cppu::UnoType< css::util::Date >::get() ) ) nType = TYPE_DATE; - else if ( _rExpectedType.equals( ::cppu::UnoType< ::com::sun::star::util::Time >::get() ) ) + else if ( _rExpectedType.equals( ::cppu::UnoType< css::util::Time >::get() ) ) nType = TYPE_TIME; - else if ( _rExpectedType.equals( ::cppu::UnoType< ::com::sun::star::util::DateTime >::get() ) ) + else if ( _rExpectedType.equals( ::cppu::UnoType< css::util::DateTime >::get() ) ) nType = TYPE_DATETIME; if ( nType ) @@ -197,10 +197,10 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe break; case TYPE_DATETIME: { - ::com::sun::star::util::Time aTime = lcl_getTime(nValue); - ::com::sun::star::util::Date aDate = lcl_getDate(nValue); + css::util::Time aTime = lcl_getTime(nValue); + css::util::Date aDate = lcl_getDate(nValue); - ::com::sun::star::util::DateTime aDateTime; + css::util::DateTime aDateTime; aDateTime.NanoSeconds = aTime.NanoSeconds; aDateTime.Seconds = aTime.Seconds; aDateTime.Minutes = aTime.Minutes; @@ -404,8 +404,8 @@ SvXMLImportContext* OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPref void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rxAttrList) { - ::com::sun::star::beans::PropertyValue aPropValue; // the property the instance imports currently - ::com::sun::star::uno::Type aPropType; // the type of the property the instance imports currently + css::beans::PropertyValue aPropValue; // the property the instance imports currently + css::uno::Type aPropType; // the type of the property the instance imports currently OUString sType, sValue; const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); @@ -441,7 +441,7 @@ void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rx // the name of the property OSL_ENSURE(!aPropValue.Name.isEmpty(), "OSinglePropertyContext::StartElement: invalid property name!"); - // needs to be translated into a ::com::sun::star::uno::Type + // needs to be translated into a css::uno::Type aPropType = PropertyConversion::xmlTypeToUnoType( sType ); if( TypeClass_VOID == aPropType.getTypeClass() ) { @@ -508,7 +508,7 @@ void OListPropertyContext::EndElement() Sequence< Any > aListElements( m_aListValues.size() ); Any* pListElement = aListElements.getArray(); - com::sun::star::uno::Type aType = PropertyConversion::xmlTypeToUnoType( m_sPropertyType ); + css::uno::Type aType = PropertyConversion::xmlTypeToUnoType( m_sPropertyType ); for ( ::std::vector< OUString >::const_iterator values = m_aListValues.begin(); values != m_aListValues.end(); ++values, ++pListElement diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index f31defc2bad9..23d2b4c64c77 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -42,14 +42,14 @@ namespace xmloff class PropertyConversion { public: - static ::com::sun::star::uno::Any convertString( - const ::com::sun::star::uno::Type& _rExpectedType, + static css::uno::Any convertString( + const css::uno::Type& _rExpectedType, const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap = nullptr, const bool _bInvertBoolean = false ); - static ::com::sun::star::uno::Type xmlTypeToUnoType( const OUString& _rType ); + static css::uno::Type xmlTypeToUnoType( const OUString& _rType ); }; class OFormLayerXMLImport_Impl; @@ -65,7 +65,7 @@ namespace xmloff friend class OListPropertyContext; protected: - typedef ::std::vector< ::com::sun::star::beans::PropertyValue > PropertyValueArray; + typedef ::std::vector< css::beans::PropertyValue > PropertyValueArray; PropertyValueArray m_aValues; PropertyValueArray m_aGenericValues; // the values which the instance collects between StartElement and EndElement @@ -86,10 +86,10 @@ namespace xmloff virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void Characters(const OUString& _rChars) override; protected: @@ -123,18 +123,18 @@ namespace xmloff */ void enableTrackAttributes() { m_bTrackAttributes = true; } - inline void implPushBackPropertyValue(const ::com::sun::star::beans::PropertyValue& _rProp) + inline void implPushBackPropertyValue(const css::beans::PropertyValue& _rProp) { m_aValues.push_back(_rProp); } - inline void implPushBackPropertyValue( const OUString& _rName, const ::com::sun::star::uno::Any& _rValue ) + inline void implPushBackPropertyValue( const OUString& _rName, const css::uno::Any& _rValue ) { - m_aValues.push_back( ::com::sun::star::beans::PropertyValue( - _rName, -1, _rValue, ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) ); + m_aValues.push_back( css::beans::PropertyValue( + _rName, -1, _rValue, css::beans::PropertyState_DIRECT_VALUE ) ); } - inline void implPushBackGenericPropertyValue(const ::com::sun::star::beans::PropertyValue& _rProp) + inline void implPushBackGenericPropertyValue(const css::beans::PropertyValue& _rProp) { m_aGenericValues.push_back(_rProp); } @@ -155,11 +155,11 @@ namespace xmloff virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; #if OSL_DEBUG_LEVEL > 0 virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void Characters(const OUString& _rChars) override; #endif }; @@ -177,10 +177,10 @@ namespace xmloff virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; }; //= OListPropertyContext @@ -196,13 +196,13 @@ namespace xmloff const OPropertyImportRef& _rPropertyImporter ); virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList ) override; virtual void EndElement() override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; }; //= OListValueContext @@ -215,7 +215,7 @@ namespace xmloff OUString& _rListValueHolder ); virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList ) override; }; } // namespace xmloff diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 7b6481109f20..53ce1d651473 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; XMLMetaExportComponent::XMLMetaExportComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLExportFlags nFlags ) : SvXMLExport( util::MeasureUnit::CM, xContext, implementationName, XML_TEXT, nFlags ) { @@ -53,7 +53,7 @@ XMLMetaExportComponent::~XMLMetaExportComponent() { } -void SAL_CALL XMLMetaExportComponent::setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL XMLMetaExportComponent::setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { try { @@ -113,7 +113,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) SetDocHandler( xDocHandler ); } - catch( com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL( "Cannot instantiate com.sun.star.comp.Oasis2OOoTransformer!\n"); } diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx index 326b84a1fd9b..ed544443ae99 100644 --- a/xmloff/source/meta/MetaImportComponent.cxx +++ b/xmloff/source/meta/MetaImportComponent.cxx @@ -33,13 +33,12 @@ using namespace ::xmloff::token; class XMLMetaImportComponent : public SvXMLImport { private: - ::com::sun::star::uno::Reference< - ::com::sun::star::document::XDocumentProperties> mxDocProps; + css::uno::Reference< css::document::XDocumentProperties> mxDocProps; public: // XMLMetaImportComponent() throw(); XMLMetaImportComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext + const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw(); virtual ~XMLMetaImportComponent() throw(); @@ -49,12 +48,11 @@ protected: virtual SvXMLImportContext* CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) + throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; }; // global functions to support the component diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index a9bb477d6ac6..e9e90bde5a34 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -346,7 +346,7 @@ void SvXMLMetaExport::Export() } } -// ::com::sun::star::xml::sax::XDocumentHandler: +// css::xml::sax::XDocumentHandler: void SAL_CALL SvXMLMetaExport::startDocument() throw (uno::RuntimeException, xml::sax::SAXException, std::exception) diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx index c6b6f6dc5ad0..5ad8aafca01e 100644 --- a/xmloff/source/meta/xmlmetai.cxx +++ b/xmloff/source/meta/xmlmetai.cxx @@ -37,26 +37,21 @@ using namespace ::xmloff::token; class XMLDocumentBuilderContext : public SvXMLImportContext { private: - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::dom::XSAXDocumentBuilder2> mxDocBuilder; + css::uno::Reference< css::xml::dom::XSAXDocumentBuilder2> mxDocBuilder; public: XMLDocumentBuilderContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::dom::XSAXDocumentBuilder2>& rDocBuilder); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::dom::XSAXDocumentBuilder2>& rDocBuilder); virtual ~XMLDocumentBuilderContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void Characters( const OUString& rChars ) override; diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index de6fdec8bdfb..1e3eb896505d 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -40,8 +40,8 @@ using namespace ::com::sun::star; const char XMLN_VERSIONSLIST[] = "VersionList.xml"; XMLVersionListExport::XMLVersionListExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, - const com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& rVersions, + const css::uno::Reference< css::uno::XComponentContext >& rContext, + const css::uno::Sequence < css::util::RevisionTag >& rVersions, const OUString &rFileName, Reference< XDocumentHandler > &rHandler ) : SvXMLExport( rContext, "", rFileName, util::MeasureUnit::CM, rHandler ), @@ -99,8 +99,8 @@ sal_uInt32 XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum ) } XMLVersionListImport::XMLVersionListImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, - com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& rVersions ) + const css::uno::Reference< css::uno::XComponentContext >& rContext, + css::uno::Sequence < css::util::RevisionTag >& rVersions ) : SvXMLImport(rContext, ""), maVersions( rVersions ) { @@ -318,7 +318,7 @@ bool XMLVersionContext::ParseISODateTimeString( } void SAL_CALL XMLVersionListPersistence::store( const uno::Reference< embed::XStorage >& xRoot, const uno::Sequence< util::RevisionTag >& rVersions ) - throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) { // no storage, no version list! if ( xRoot.is() ) @@ -364,9 +364,9 @@ void SAL_CALL XMLVersionListPersistence::store( const uno::Reference< embed::XSt } uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( const uno::Reference< embed::XStorage >& xRoot ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::container::NoSuchElementException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) { - com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag > aVersions; + css::uno::Sequence < css::util::RevisionTag > aVersions; const OUString sDocName( XMLN_VERSIONSLIST ); uno::Reference< container::XNameAccess > xRootNames( xRoot, uno::UNO_QUERY ); diff --git a/xmloff/source/script/xmlbasici.hxx b/xmloff/source/script/xmlbasici.hxx index 95ae8e05fabe..50e86d8a843d 100644 --- a/xmloff/source/script/xmlbasici.hxx +++ b/xmloff/source/script/xmlbasici.hxx @@ -29,19 +29,19 @@ class XMLBasicImportContext : public SvXMLImportContext { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - ::com::sun::star::uno::Reference< ::com::sun::star::document::XXMLOasisBasicImporter > m_xHandler; + css::uno::Reference< css::frame::XModel > m_xModel; + css::uno::Reference< css::document::XXMLOasisBasicImporter > m_xHandler; public: XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel ); + const css::uno::Reference< css::frame::XModel >& rxModel ); virtual ~XMLBasicImportContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rxAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& rxAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rxAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& rxAttrList ) override; virtual void EndElement() override; @@ -53,18 +53,18 @@ public: class XMLBasicImportChildContext : public SvXMLImportContext { private: - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler; + css::uno::Reference< css::xml::sax::XDocumentHandler > m_xHandler; public: XMLBasicImportChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rxHandler ); + const css::uno::Reference< css::xml::sax::XDocumentHandler >& rxHandler ); virtual ~XMLBasicImportChildContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx index 378dad89ed2d..cd2f88d0cf6f 100644 --- a/xmloff/source/script/xmlscripti.cxx +++ b/xmloff/source/script/xmlscripti.cxx @@ -41,18 +41,18 @@ using namespace ::xmloff::token; class XMLScriptChildContext : public SvXMLImportContext { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > m_xDocumentScripts; + css::uno::Reference< css::frame::XModel > m_xModel; + css::uno::Reference< css::document::XEmbeddedScripts > m_xDocumentScripts; OUString m_aLanguage; public: XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& rxModel, + const css::uno::Reference< css::frame::XModel>& rxModel, const OUString& rLanguage ); virtual ~XMLScriptChildContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/style/DrawAspectHdl.hxx b/xmloff/source/style/DrawAspectHdl.hxx index d2922c41f08a..8a6045321ddb 100644 --- a/xmloff/source/style/DrawAspectHdl.hxx +++ b/xmloff/source/style/DrawAspectHdl.hxx @@ -30,8 +30,8 @@ class DrawAspectHdl : public XMLPropertyHandler public: virtual ~DrawAspectHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_DRAWASPECTHDL_HXX diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx index 67e883a08250..3c8dd438ee23 100644 --- a/xmloff/source/style/FillStyleContext.cxx +++ b/xmloff/source/style/FillStyleContext.cxx @@ -133,7 +133,7 @@ XMLBitmapStyleContext::~XMLBitmapStyleContext() { } -SvXMLImportContext* XMLBitmapStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) +SvXMLImportContext* XMLBitmapStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = nullptr; if( (XML_NAMESPACE_OFFICE == nPrefix) && xmloff::token::IsXMLToken( rLocalName, xmloff::token::XML_BINARY_DATA ) ) diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx index afb8ac3c311c..bc851f0bd5a3 100644 --- a/xmloff/source/style/FillStyleContext.hxx +++ b/xmloff/source/style/FillStyleContext.hxx @@ -29,13 +29,13 @@ class XMLGradientStyleContext: public SvXMLStyleContext { private: - ::com::sun::star::uno::Any maAny; + css::uno::Any maAny; OUString maStrName; public: XMLGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLGradientStyleContext(); virtual void EndElement() override; @@ -48,13 +48,13 @@ public: class XMLHatchStyleContext: public SvXMLStyleContext { private: - ::com::sun::star::uno::Any maAny; + css::uno::Any maAny; OUString maStrName; public: XMLHatchStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLHatchStyleContext(); virtual void EndElement() override; @@ -67,20 +67,20 @@ public: class XMLBitmapStyleContext: public SvXMLStyleContext { private: - ::com::sun::star::uno::Any maAny; + css::uno::Any maAny; OUString maStrName; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; + css::uno::Reference < css::io::XOutputStream > mxBase64Stream; public: XMLBitmapStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLBitmapStyleContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void EndElement() override; @@ -92,13 +92,13 @@ public: class XMLTransGradientStyleContext: public SvXMLStyleContext { private: - ::com::sun::star::uno::Any maAny; + css::uno::Any maAny; OUString maStrName; public: XMLTransGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLTransGradientStyleContext(); virtual void EndElement() override; @@ -111,13 +111,13 @@ public: class XMLMarkerStyleContext: public SvXMLStyleContext { private: - ::com::sun::star::uno::Any maAny; + css::uno::Any maAny; OUString maStrName; public: XMLMarkerStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLMarkerStyleContext(); virtual void EndElement() override; @@ -130,13 +130,13 @@ public: class XMLDashStyleContext: public SvXMLStyleContext { private: - ::com::sun::star::uno::Any maAny; + css::uno::Any maAny; OUString maStrName; public: XMLDashStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLDashStyleContext(); virtual void EndElement() override; diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx index ec0a53ef3a3c..4be9fa06d041 100644 --- a/xmloff/source/style/ImageStyle.cxx +++ b/xmloff/source/style/ImageStyle.cxx @@ -55,7 +55,7 @@ XMLImageStyle::~XMLImageStyle() { } -void XMLImageStyle::exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SvXMLExport& rExport ) +void XMLImageStyle::exportXML( const OUString& rStrName, const css::uno::Any& rValue, SvXMLExport& rExport ) { ImpExportXML( rStrName, rValue, rExport ); } diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx index 3a0526eeea07..45309e0691f9 100644 --- a/xmloff/source/style/PageHeaderFooterContext.cxx +++ b/xmloff/source/style/PageHeaderFooterContext.cxx @@ -30,8 +30,7 @@ using ::xmloff::token::XML_HEADER_FOOTER_PROPERTIES; PageHeaderFooterContext::PageHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>&, + const css::uno::Reference< css::xml::sax::XAttributeList>&, ::std::vector< XMLPropertyState > & rTempProperties, const rtl::Reference < SvXMLImportPropertyMapper > &rTempMap, sal_Int32 nStart, sal_Int32 nEnd, @@ -51,8 +50,7 @@ PageHeaderFooterContext::~PageHeaderFooterContext() SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = nullptr; diff --git a/xmloff/source/style/PageHeaderFooterContext.hxx b/xmloff/source/style/PageHeaderFooterContext.hxx index a57979260339..bff9387cd2c3 100644 --- a/xmloff/source/style/PageHeaderFooterContext.hxx +++ b/xmloff/source/style/PageHeaderFooterContext.hxx @@ -33,8 +33,7 @@ public: PageHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ::std::vector< XMLPropertyState > & rProperties, const rtl::Reference < SvXMLImportPropertyMapper > &rMap, sal_Int32 nStartIndex, sal_Int32 nEndIndex, @@ -44,8 +43,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx index bee90cb2b2ff..f3312493f63e 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.hxx +++ b/xmloff/source/style/PageMasterExportPropMapper.hxx @@ -35,7 +35,7 @@ protected: virtual void ContextFilter( bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rPropSet + css::uno::Reference< css::beans::XPropertySet > rPropSet ) const override; public: diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index b8b0f93197ab..7934a17e556e 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -278,7 +278,7 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet rPropSet->setPropertyValue(rPropertyName,Any(sStyleName)); } } - catch(::com::sun::star::lang::IllegalArgumentException& e) + catch(css::lang::IllegalArgumentException& e) { Sequence<OUString> aSeq { sStyleName }; GetImport().SetError( diff --git a/xmloff/source/style/PageMasterPropHdl.hxx b/xmloff/source/style/PageMasterPropHdl.hxx index 6613f8036704..fa74cdbe0865 100644 --- a/xmloff/source/style/PageMasterPropHdl.hxx +++ b/xmloff/source/style/PageMasterPropHdl.hxx @@ -31,17 +31,17 @@ class XMLPMPropHdl_PageStyleLayout : public XMLPropertyHandler public: virtual ~XMLPMPropHdl_PageStyleLayout(); virtual bool equals( - const ::com::sun::star::uno::Any& rAny1, - const ::com::sun::star::uno::Any& rAny2 + const css::uno::Any& rAny1, + const css::uno::Any& rAny2 ) const override; virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; @@ -54,12 +54,12 @@ public: virtual ~XMLPMPropHdl_NumFormat(); virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; @@ -72,12 +72,12 @@ public: virtual ~XMLPMPropHdl_NumLetterSync(); virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; @@ -90,12 +90,12 @@ public: virtual ~XMLPMPropHdl_PaperTrayNumber(); virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; @@ -113,12 +113,12 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; @@ -131,12 +131,12 @@ public: virtual ~XMLPMPropHdl_CenterHorizontal(); virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; @@ -147,12 +147,12 @@ public: virtual ~XMLPMPropHdl_CenterVertical(); virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; diff --git a/xmloff/source/style/PagePropertySetContext.hxx b/xmloff/source/style/PagePropertySetContext.hxx index 8d82eeddae83..be61998a79ec 100644 --- a/xmloff/source/style/PagePropertySetContext.hxx +++ b/xmloff/source/style/PagePropertySetContext.hxx @@ -36,8 +36,7 @@ class PagePropertySetContext : public SvXMLPropertySetContext public: PagePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFam, ::std::vector< XMLPropertyState > &rProps, const rtl::Reference < SvXMLImportPropertyMapper > &rMap, @@ -49,7 +48,7 @@ public: using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp) override; }; diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index 75f48c595739..3d8f24accb6f 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -177,7 +177,7 @@ void XMLFontStyleContextFontFace::FillProperties( SvXMLImportContext * XMLFontStyleContextFontFace::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) { if( nPrefix == XML_NAMESPACE_SVG && IsXMLToken( rLocalName, XML_FONT_FACE_SRC )) return new XMLFontStyleContextFontFaceSrc( GetImport(), nPrefix, rLocalName, *this ); @@ -194,8 +194,7 @@ OUString XMLFontStyleContextFontFace::familyName() const XMLFontStyleContextFontFaceFormat::XMLFontStyleContextFontFaceFormat( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > &xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > &xAttrList, XMLFontStyleContextFontFaceUri& _uri ) : SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList) , uri(_uri) @@ -223,7 +222,7 @@ XMLFontStyleContextFontFaceSrc::XMLFontStyleContextFontFaceSrc( SvXMLImport& rIm SvXMLImportContext * XMLFontStyleContextFontFaceSrc::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) { if( nPrefix == XML_NAMESPACE_SVG && IsXMLToken( rLocalName, XML_FONT_FACE_URI )) return new XMLFontStyleContextFontFaceUri( GetImport(), nPrefix, rLocalName, xAttrList, font ); @@ -234,8 +233,7 @@ SvXMLImportContext * XMLFontStyleContextFontFaceSrc::CreateChildContext( XMLFontStyleContextFontFaceUri::XMLFontStyleContextFontFaceUri( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, const XMLFontStyleContextFontFace& _font ) : SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList ) , font( _font ) @@ -245,7 +243,7 @@ XMLFontStyleContextFontFaceUri::XMLFontStyleContextFontFaceUri( SvXMLImport& rIm SvXMLImportContext * XMLFontStyleContextFontFaceUri::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) { if( nPrefix == XML_NAMESPACE_SVG && IsXMLToken( rLocalName, XML_FONT_FACE_FORMAT )) return new XMLFontStyleContextFontFaceFormat( GetImport(), nPrefix, rLocalName, xAttrList, *this ); @@ -347,8 +345,7 @@ void XMLFontStyleContextFontFaceUri::handleEmbeddedFont( const ::css::uno::Seque SvXMLStyleContext *XMLFontStylesContext::CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) { SvXMLStyleContext *pStyle; if( XML_NAMESPACE_STYLE == nPrefix && diff --git a/xmloff/source/style/XMLFontStylesContext_impl.hxx b/xmloff/source/style/XMLFontStylesContext_impl.hxx index c5e562537b44..35c2aa4cdb1c 100644 --- a/xmloff/source/style/XMLFontStylesContext_impl.hxx +++ b/xmloff/source/style/XMLFontStylesContext_impl.hxx @@ -29,11 +29,11 @@ namespace com { namespace sun { namespace star { namespace io { /// Handles <style:font-face> class XMLFontStyleContextFontFace : public SvXMLStyleContext { - ::com::sun::star::uno::Any aFamilyName; - ::com::sun::star::uno::Any aStyleName; - ::com::sun::star::uno::Any aFamily; - ::com::sun::star::uno::Any aPitch; - ::com::sun::star::uno::Any aEnc; + css::uno::Any aFamilyName; + css::uno::Any aStyleName; + css::uno::Any aFamily; + css::uno::Any aPitch; + css::uno::Any aEnc; SvXMLImportContextRef xStyles; @@ -47,8 +47,8 @@ public: XMLFontStyleContextFontFace( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList, XMLFontStylesContext& rStyles ); virtual ~XMLFontStyleContextFontFace(); @@ -67,7 +67,7 @@ public: SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; }; /// Handles <style:font-face-src> @@ -84,7 +84,7 @@ public: virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; }; /// Handles <style:font-face-uri> @@ -103,8 +103,8 @@ public: XMLFontStyleContextFontFaceUri( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList, const XMLFontStyleContextFontFace& font ); virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, @@ -114,7 +114,7 @@ public: SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; }; /// Handles <svg:font-face-format> @@ -125,8 +125,8 @@ public: XMLFontStyleContextFontFaceFormat( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList, XMLFontStyleContextFontFaceUri& uri ); void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx index 744b9a4a9402..373faef6766f 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx @@ -57,8 +57,7 @@ public: virtual ~XMLFootnoteSeparatorImport(); virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx index 08b3ed8949b6..bc1ec1a551df 100644 --- a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx +++ b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx @@ -23,7 +23,7 @@ #include "XMLIsPercentagePropertyHandler.hxx" using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; +using namespace css::uno; XMLIsPercentagePropertyHandler::~XMLIsPercentagePropertyHandler() diff --git a/xmloff/source/style/adjushdl.hxx b/xmloff/source/style/adjushdl.hxx index ccd181c57fe0..23318751a518 100644 --- a/xmloff/source/style/adjushdl.hxx +++ b/xmloff/source/style/adjushdl.hxx @@ -30,8 +30,8 @@ class XMLParaAdjustPropHdl : public XMLPropertyHandler public: virtual ~XMLParaAdjustPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -42,8 +42,8 @@ class XMLLastLineAdjustPropHdl : public XMLPropertyHandler public: virtual ~XMLLastLineAdjustPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_ADJUSHDL_HXX diff --git a/xmloff/source/style/backhdl.hxx b/xmloff/source/style/backhdl.hxx index f72bc773b62c..70adf90ecadb 100644 --- a/xmloff/source/style/backhdl.hxx +++ b/xmloff/source/style/backhdl.hxx @@ -33,12 +33,12 @@ public: /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. using XMLPropertyHandler::importXML; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; private: - static void MergeXMLHoriPos( ::com::sun::star::style::GraphicLocation& ePos, ::com::sun::star::style::GraphicLocation eHori ); - static void MergeXMLVertPos( ::com::sun::star::style::GraphicLocation& ePos, ::com::sun::star::style::GraphicLocation eVert ); + static void MergeXMLHoriPos( css::style::GraphicLocation& ePos, css::style::GraphicLocation eHori ); + static void MergeXMLVertPos( css::style::GraphicLocation& ePos, css::style::GraphicLocation eVert ); }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_BACKHDL_HXX diff --git a/xmloff/source/style/bordrhdl.hxx b/xmloff/source/style/bordrhdl.hxx index 604bff1db7fa..6d3960f78077 100644 --- a/xmloff/source/style/bordrhdl.hxx +++ b/xmloff/source/style/bordrhdl.hxx @@ -30,8 +30,8 @@ class XMLBorderWidthHdl : public XMLPropertyHandler public: virtual ~XMLBorderWidthHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLBorderHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLBorderHdl : public XMLPropertyHandler public: virtual ~XMLBorderHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_BORDRHDL_HXX diff --git a/xmloff/source/style/breakhdl.hxx b/xmloff/source/style/breakhdl.hxx index ffa8d3cc8262..7495d025e768 100644 --- a/xmloff/source/style/breakhdl.hxx +++ b/xmloff/source/style/breakhdl.hxx @@ -30,8 +30,8 @@ class XMLFmtBreakBeforePropHdl : public XMLPropertyHandler public: virtual ~XMLFmtBreakBeforePropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -42,8 +42,8 @@ class XMLFmtBreakAfterPropHdl : public XMLPropertyHandler public: virtual ~XMLFmtBreakAfterPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_BREAKHDL_HXX diff --git a/xmloff/source/style/cdouthdl.hxx b/xmloff/source/style/cdouthdl.hxx index 0ca6e9f61fb1..d62fc3152ca8 100644 --- a/xmloff/source/style/cdouthdl.hxx +++ b/xmloff/source/style/cdouthdl.hxx @@ -30,8 +30,8 @@ class XMLCrossedOutTypePropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutTypePropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLCrossedOutStylePropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLCrossedOutStylePropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutStylePropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLCrossedOutWidthPropHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLCrossedOutWidthPropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutWidthPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLCrossedOutTextPropHdl : public XMLPropertyHandler @@ -57,8 +57,8 @@ class XMLCrossedOutTextPropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutTextPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_CDOUTHDL_HXX diff --git a/xmloff/source/style/chrhghdl.hxx b/xmloff/source/style/chrhghdl.hxx index 5632f8bdbb97..15bd9c2e3668 100644 --- a/xmloff/source/style/chrhghdl.hxx +++ b/xmloff/source/style/chrhghdl.hxx @@ -30,8 +30,8 @@ class XMLCharHeightHdl : public XMLPropertyHandler public: virtual ~XMLCharHeightHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLCharHeightPropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLCharHeightPropHdl : public XMLPropertyHandler public: virtual ~XMLCharHeightPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLCharHeightDiffHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLCharHeightDiffHdl : public XMLPropertyHandler public: virtual ~XMLCharHeightDiffHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_CHRHGHDL_HXX diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx index b580a2a20226..ceef4c0a6b48 100644 --- a/xmloff/source/style/chrlohdl.cxx +++ b/xmloff/source/style/chrlohdl.cxx @@ -35,7 +35,7 @@ using namespace ::xmloff::token; * => make LanguageTagODF (unpublished) API? */ // For runtime performance, instead of converting back and forth between -// com::sun::star::Locale and LanguageTag to decide if script or tag are +// css::Locale and LanguageTag to decide if script or tag are // needed, this code takes advantage of knowledge about the internal // representation of BCP 47 language tags in a Locale if present as done in a // LanguageTag. @@ -45,7 +45,7 @@ XMLCharLanguageHdl::~XMLCharLanguageHdl() // nothing to do } -bool XMLCharLanguageHdl::equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const +bool XMLCharLanguageHdl::equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const { bool bRet = false; lang::Locale aLocale1, aLocale2; @@ -135,7 +135,7 @@ XMLCharScriptHdl::~XMLCharScriptHdl() // nothing to do } -bool XMLCharScriptHdl::equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const +bool XMLCharScriptHdl::equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const { bool bRet = false; lang::Locale aLocale1, aLocale2; @@ -252,7 +252,7 @@ XMLCharCountryHdl::~XMLCharCountryHdl() // nothing to do } -bool XMLCharCountryHdl::equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const +bool XMLCharCountryHdl::equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const { bool bRet = false; lang::Locale aLocale1, aLocale2; @@ -323,7 +323,7 @@ XMLCharRfcLanguageTagHdl::~XMLCharRfcLanguageTagHdl() // nothing to do } -bool XMLCharRfcLanguageTagHdl::equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const +bool XMLCharRfcLanguageTagHdl::equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const { bool bRet = false; lang::Locale aLocale1, aLocale2; diff --git a/xmloff/source/style/chrlohdl.hxx b/xmloff/source/style/chrlohdl.hxx index 5b456c857259..b0fbdeeedc02 100644 --- a/xmloff/source/style/chrlohdl.hxx +++ b/xmloff/source/style/chrlohdl.hxx @@ -30,10 +30,10 @@ class XMLCharLanguageHdl : public XMLPropertyHandler public: virtual ~XMLCharLanguageHdl(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLCharScriptHdl : public XMLPropertyHandler @@ -41,10 +41,10 @@ class XMLCharScriptHdl : public XMLPropertyHandler public: virtual ~XMLCharScriptHdl(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLCharCountryHdl : public XMLPropertyHandler @@ -52,10 +52,10 @@ class XMLCharCountryHdl : public XMLPropertyHandler public: virtual ~XMLCharCountryHdl(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLCharRfcLanguageTagHdl : public XMLPropertyHandler @@ -63,10 +63,10 @@ class XMLCharRfcLanguageTagHdl : public XMLPropertyHandler public: virtual ~XMLCharRfcLanguageTagHdl(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_CHRLOHDL_HXX diff --git a/xmloff/source/style/csmaphdl.hxx b/xmloff/source/style/csmaphdl.hxx index 5ca3061da7c7..aa391f66b098 100644 --- a/xmloff/source/style/csmaphdl.hxx +++ b/xmloff/source/style/csmaphdl.hxx @@ -30,8 +30,8 @@ class XMLCaseMapPropHdl : public XMLPropertyHandler public: virtual ~XMLCaseMapPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLCaseMapVariantHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLCaseMapVariantHdl : public XMLPropertyHandler public: virtual ~XMLCaseMapVariantHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_CSMAPHDL_HXX diff --git a/xmloff/source/style/durationhdl.hxx b/xmloff/source/style/durationhdl.hxx index 0458a83ca7f4..d6db5b32e5fc 100644 --- a/xmloff/source/style/durationhdl.hxx +++ b/xmloff/source/style/durationhdl.hxx @@ -30,8 +30,8 @@ class XMLDurationMS16PropHdl_Impl : public XMLPropertyHandler public: virtual ~XMLDurationMS16PropHdl_Impl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // _XMLOFF_PROPERTYHANDLER_FMTSPLITTYPES_HXX diff --git a/xmloff/source/style/escphdl.hxx b/xmloff/source/style/escphdl.hxx index e9cb3a698ad3..d775b3c7e54b 100644 --- a/xmloff/source/style/escphdl.hxx +++ b/xmloff/source/style/escphdl.hxx @@ -30,8 +30,8 @@ class XMLEscapementPropHdl : public XMLPropertyHandler public: virtual ~XMLEscapementPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLEscapementHeightPropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLEscapementHeightPropHdl : public XMLPropertyHandler public: virtual ~XMLEscapementHeightPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_ESCPHDL_HXX diff --git a/xmloff/source/style/fonthdl.hxx b/xmloff/source/style/fonthdl.hxx index 36aaeb5be74c..3a20827fc9e7 100644 --- a/xmloff/source/style/fonthdl.hxx +++ b/xmloff/source/style/fonthdl.hxx @@ -30,8 +30,8 @@ class XMLFontFamilyNamePropHdl : public XMLPropertyHandler public: virtual ~XMLFontFamilyNamePropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -42,8 +42,8 @@ class XMLFontFamilyPropHdl : public XMLPropertyHandler public: virtual ~XMLFontFamilyPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -54,8 +54,8 @@ class XMLFontEncodingPropHdl : public XMLPropertyHandler public: virtual ~XMLFontEncodingPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -66,8 +66,8 @@ class XMLFontPitchPropHdl : public XMLPropertyHandler public: virtual ~XMLFontPitchPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx index 8e6fe7c35c13..69e535b9a82c 100644 --- a/xmloff/source/style/impastpl.cxx +++ b/xmloff/source/style/impastpl.cxx @@ -610,7 +610,7 @@ struct StyleComparator void SvXMLAutoStylePoolP_Impl::exportXML( sal_Int32 nFamily, - const uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > &, + const uno::Reference< css::xml::sax::XDocumentHandler > &, const SvXMLUnitConverter&, const SvXMLNamespaceMap&, const SvXMLAutoStylePoolP *pAntiImpl) const diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index c9113d47d569..803e93fa4428 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -156,8 +156,8 @@ public: const rtl::Reference < SvXMLExportPropertyMapper > & rMapper ); void RegisterName( sal_Int32 nFamily, const OUString& rName ); void GetRegisteredNames( - com::sun::star::uno::Sequence<sal_Int32>& aFamilies, - com::sun::star::uno::Sequence<OUString>& aNames ); + css::uno::Sequence<sal_Int32>& aFamilies, + css::uno::Sequence<OUString>& aNames ); bool Add( OUString& rName, sal_Int32 nFamily, @@ -174,7 +174,7 @@ public: const ::std::vector< XMLPropertyState >& rProperties ) const; void exportXML( sal_Int32 nFamily, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, + const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, const SvXMLAutoStylePoolP *pAntiImpl) const; diff --git a/xmloff/source/style/kernihdl.hxx b/xmloff/source/style/kernihdl.hxx index 8e14c14fd76a..0443e2b0b7e9 100644 --- a/xmloff/source/style/kernihdl.hxx +++ b/xmloff/source/style/kernihdl.hxx @@ -30,8 +30,8 @@ class XMLKerningPropHdl : public XMLPropertyHandler public: virtual ~XMLKerningPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_KERNIHDL_HXX diff --git a/xmloff/source/style/lspachdl.hxx b/xmloff/source/style/lspachdl.hxx index 430b4b69363f..b0c676444b22 100644 --- a/xmloff/source/style/lspachdl.hxx +++ b/xmloff/source/style/lspachdl.hxx @@ -30,8 +30,8 @@ class XMLLineHeightHdl : public XMLPropertyHandler public: virtual ~XMLLineHeightHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLLineHeightAtLeastHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLLineHeightAtLeastHdl : public XMLPropertyHandler public: virtual ~XMLLineHeightAtLeastHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLLineSpacingHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLLineSpacingHdl : public XMLPropertyHandler public: virtual ~XMLLineSpacingHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_LSPACHDL_HXX diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index e6b025a984f4..22d62d61eadf 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -42,8 +42,8 @@ using namespace xmloff::token; #define XML_STANDARDFORMAT "StandardFormat" XMLNumberFormatAttributesExportHelper::XMLNumberFormatAttributesExportHelper( - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xTempNumberFormatsSupplier) - : xNumberFormats(xTempNumberFormatsSupplier.is() ? xTempNumberFormatsSupplier->getNumberFormats() : ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > ()), + css::uno::Reference< css::util::XNumberFormatsSupplier >& xTempNumberFormatsSupplier) + : xNumberFormats(xTempNumberFormatsSupplier.is() ? xTempNumberFormatsSupplier->getNumberFormats() : css::uno::Reference< css::util::XNumberFormats > ()), pExport(nullptr), sStandardFormat(XML_STANDARDFORMAT), sType(XML_TYPE), @@ -54,9 +54,9 @@ XMLNumberFormatAttributesExportHelper::XMLNumberFormatAttributesExportHelper( } XMLNumberFormatAttributesExportHelper::XMLNumberFormatAttributesExportHelper( - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xTempNumberFormatsSupplier, + css::uno::Reference< css::util::XNumberFormatsSupplier >& xTempNumberFormatsSupplier, SvXMLExport& rTempExport ) -: xNumberFormats(xTempNumberFormatsSupplier.is() ? xTempNumberFormatsSupplier->getNumberFormats() : ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > ()), +: xNumberFormats(xTempNumberFormatsSupplier.is() ? xTempNumberFormatsSupplier->getNumberFormats() : css::uno::Reference< css::util::XNumberFormats > ()), pExport(&rTempExport), sStandardFormat(XML_STANDARDFORMAT), sType(XML_TYPE), diff --git a/xmloff/source/style/opaquhdl.hxx b/xmloff/source/style/opaquhdl.hxx index 63c4d1bde8a4..1877ebc33a23 100644 --- a/xmloff/source/style/opaquhdl.hxx +++ b/xmloff/source/style/opaquhdl.hxx @@ -30,8 +30,8 @@ class XMLOpaquePropHdl : public XMLPropertyHandler public: virtual ~XMLOpaquePropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_OPAQUHDL_HXX diff --git a/xmloff/source/style/postuhdl.hxx b/xmloff/source/style/postuhdl.hxx index 3fe5f3f21b59..3c01dcded581 100644 --- a/xmloff/source/style/postuhdl.hxx +++ b/xmloff/source/style/postuhdl.hxx @@ -30,8 +30,8 @@ class XMLPosturePropHdl : public XMLPropertyHandler public: virtual ~XMLPosturePropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_POSTUHDL_HXX diff --git a/xmloff/source/style/shadwhdl.hxx b/xmloff/source/style/shadwhdl.hxx index f49ed183afa4..b43245373e15 100644 --- a/xmloff/source/style/shadwhdl.hxx +++ b/xmloff/source/style/shadwhdl.hxx @@ -30,8 +30,8 @@ class XMLShadowPropHdl : public XMLPropertyHandler public: virtual ~XMLShadowPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_SHADWHDL_HXX diff --git a/xmloff/source/style/shdwdhdl.hxx b/xmloff/source/style/shdwdhdl.hxx index 5d25e2648d97..4287e5a0c730 100644 --- a/xmloff/source/style/shdwdhdl.hxx +++ b/xmloff/source/style/shdwdhdl.hxx @@ -30,8 +30,8 @@ class XMLShadowedPropHdl : public XMLPropertyHandler public: virtual ~XMLShadowedPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_SHDWDHDL_HXX diff --git a/xmloff/source/style/tabsthdl.cxx b/xmloff/source/style/tabsthdl.cxx index e4ec357eecf5..b763a00c31c2 100644 --- a/xmloff/source/style/tabsthdl.cxx +++ b/xmloff/source/style/tabsthdl.cxx @@ -69,12 +69,12 @@ bool XMLTabStopPropHdl::equals( const uno::Any& r1, const uno::Any& r2 ) const return bEqual; } -bool XMLTabStopPropHdl::importXML( const OUString&, ::com::sun::star::uno::Any&, const SvXMLUnitConverter& ) const +bool XMLTabStopPropHdl::importXML( const OUString&, css::uno::Any&, const SvXMLUnitConverter& ) const { return false; } -bool XMLTabStopPropHdl::exportXML( OUString&, const ::com::sun::star::uno::Any&, const SvXMLUnitConverter& ) const +bool XMLTabStopPropHdl::exportXML( OUString&, const css::uno::Any&, const SvXMLUnitConverter& ) const { return false; } diff --git a/xmloff/source/style/tabsthdl.hxx b/xmloff/source/style/tabsthdl.hxx index b7c6b8de2034..33e833d8e441 100644 --- a/xmloff/source/style/tabsthdl.hxx +++ b/xmloff/source/style/tabsthdl.hxx @@ -30,11 +30,11 @@ class XMLTabStopPropHdl : public XMLPropertyHandler public: virtual ~XMLTabStopPropHdl(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_TABSTHDL_HXX diff --git a/xmloff/source/style/undlihdl.hxx b/xmloff/source/style/undlihdl.hxx index 67ee48730e3b..3cfacd59a7d3 100644 --- a/xmloff/source/style/undlihdl.hxx +++ b/xmloff/source/style/undlihdl.hxx @@ -30,8 +30,8 @@ class XMLUnderlineTypePropHdl : public XMLPropertyHandler public: virtual ~XMLUnderlineTypePropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLUnderlineStylePropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLUnderlineStylePropHdl : public XMLPropertyHandler public: virtual ~XMLUnderlineStylePropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLUnderlineWidthPropHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLUnderlineWidthPropHdl : public XMLPropertyHandler public: virtual ~XMLUnderlineWidthPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_UNDLIHDL_HXX diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx index a53caff50c75..3182291806a5 100644 --- a/xmloff/source/style/weighhdl.cxx +++ b/xmloff/source/style/weighhdl.cxx @@ -42,18 +42,18 @@ struct FontWeightMapper FontWeightMapper const aFontWeightMap[] = { - { ::com::sun::star::awt::FontWeight::DONTKNOW, 0 }, - { ::com::sun::star::awt::FontWeight::THIN, 100 }, - { ::com::sun::star::awt::FontWeight::ULTRALIGHT, 150 }, - { ::com::sun::star::awt::FontWeight::LIGHT, 250 }, - { ::com::sun::star::awt::FontWeight::SEMILIGHT, 350 }, - { ::com::sun::star::awt::FontWeight::NORMAL, 400 }, - { ::com::sun::star::awt::FontWeight::NORMAL, 450 }, - { ::com::sun::star::awt::FontWeight::SEMIBOLD, 600 }, - { ::com::sun::star::awt::FontWeight::BOLD, 700 }, - { ::com::sun::star::awt::FontWeight::ULTRABOLD, 800 }, - { ::com::sun::star::awt::FontWeight::BLACK, 900 }, - { ::com::sun::star::awt::FontWeight::DONTKNOW, 1000 } + { css::awt::FontWeight::DONTKNOW, 0 }, + { css::awt::FontWeight::THIN, 100 }, + { css::awt::FontWeight::ULTRALIGHT, 150 }, + { css::awt::FontWeight::LIGHT, 250 }, + { css::awt::FontWeight::SEMILIGHT, 350 }, + { css::awt::FontWeight::NORMAL, 400 }, + { css::awt::FontWeight::NORMAL, 450 }, + { css::awt::FontWeight::SEMIBOLD, 600 }, + { css::awt::FontWeight::BOLD, 700 }, + { css::awt::FontWeight::ULTRABOLD, 800 }, + { css::awt::FontWeight::BLACK, 900 }, + { css::awt::FontWeight::DONTKNOW, 1000 } }; // class XMLFmtBreakBeforePropHdl diff --git a/xmloff/source/style/weighhdl.hxx b/xmloff/source/style/weighhdl.hxx index d19b2ba51409..4b0e4ae4a4eb 100644 --- a/xmloff/source/style/weighhdl.hxx +++ b/xmloff/source/style/weighhdl.hxx @@ -30,8 +30,8 @@ class XMLFontWeightPropHdl : public XMLPropertyHandler public: virtual ~XMLFontWeightPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index c5d0cbcd129f..4e7d1adeda26 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -175,7 +175,7 @@ void SvXMLAutoStylePoolP::exportStyleAttributes( } void SvXMLAutoStylePoolP::exportStyleContent( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > &, + const css::uno::Reference< css::xml::sax::XDocumentHandler > &, sal_Int32 nFamily, const vector< XMLPropertyState >& rProperties, const SvXMLExportPropertyMapper& rPropExp, @@ -368,7 +368,7 @@ OUString SvXMLAutoStylePoolP::Find( sal_Int32 nFamily, } void SvXMLAutoStylePoolP::exportXML( sal_Int32 nFamily, - const uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > &, + const uno::Reference< css::xml::sax::XDocumentHandler > &, const SvXMLUnitConverter&, const SvXMLNamespaceMap& ) const diff --git a/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx index fc3e5816d2df..a84f4d872a17 100644 --- a/xmloff/source/style/xmlbahdl.hxx +++ b/xmloff/source/style/xmlbahdl.hxx @@ -36,8 +36,8 @@ public: explicit XMLNumberPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLNumberPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -52,8 +52,8 @@ public: XMLNumberNonePropHdl( enum ::xmloff::token::XMLTokenEnum eZeroString, sal_Int8 nB = 4 ); virtual ~XMLNumberNonePropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -66,8 +66,8 @@ public: explicit XMLMeasurePropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLMeasurePropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -80,8 +80,8 @@ public: explicit XMLPercentPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLPercentPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -90,8 +90,8 @@ public: */ class XMLDoublePercentPropHdl : public XMLPropertyHandler { - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -104,8 +104,8 @@ public: explicit XMLNegPercentPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLNegPercentPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -118,8 +118,8 @@ public: explicit XMLMeasurePxPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLMeasurePxPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -130,8 +130,8 @@ class XMLBoolPropHdl : public XMLPropertyHandler public: virtual ~XMLBoolPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XMLBoolFalsePropHdl : public XMLBoolPropHdl @@ -139,8 +139,8 @@ class XMLBoolFalsePropHdl : public XMLBoolPropHdl public: virtual ~XMLBoolFalsePropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; @@ -152,8 +152,8 @@ class XMLColorPropHdl : public XMLPropertyHandler public: virtual ~XMLColorPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -164,8 +164,8 @@ class XMLHexPropHdl : public XMLPropertyHandler public: virtual ~XMLHexPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -176,8 +176,8 @@ class XMLStringPropHdl : public XMLPropertyHandler public: virtual ~XMLStringPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -188,7 +188,7 @@ class XMLStyleNamePropHdl : public XMLStringPropHdl public: virtual ~XMLStyleNamePropHdl(); - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; @@ -200,8 +200,8 @@ class XMLDoublePropHdl : public XMLPropertyHandler public: virtual ~XMLDoublePropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -212,8 +212,8 @@ class XMLNBoolPropHdl : public XMLPropertyHandler public: virtual ~XMLNBoolPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -227,8 +227,8 @@ public: explicit XMLColorTransparentPropHdl( enum ::xmloff::token::XMLTokenEnum eTransparent = xmloff::token::XML_TOKEN_INVALID ); virtual ~XMLColorTransparentPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -244,8 +244,8 @@ public: bool bTransPropValue = true ); virtual ~XMLIsTransparentPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -257,8 +257,8 @@ public: XMLColorAutoPropHdl(); virtual ~XMLColorAutoPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -270,8 +270,8 @@ public: XMLIsAutoColorPropHdl(); virtual ~XMLIsAutoColorPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; @@ -284,8 +284,8 @@ class XMLCompareOnlyPropHdl : public XMLPropertyHandler public: virtual ~XMLCompareOnlyPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -300,8 +300,8 @@ public: explicit XMLNumberWithoutZeroPropHdl( sal_Int8 nB = 4 ); virtual ~XMLNumberWithoutZeroPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; /** @@ -314,8 +314,8 @@ class XMLNumberWithAutoInsteadZeroPropHdl : public XMLNumberWithoutZeroPropHdl public: virtual ~XMLNumberWithAutoInsteadZeroPropHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_XMLBAHDL_HXX diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 3dc9de47a54b..91b167e58169 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -338,7 +338,7 @@ bool SvXMLImportPropertyMapper::handleSpecialItem( void SvXMLImportPropertyMapper::FillPropertySequence( const ::std::vector< XMLPropertyState >& rProperties, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rValues ) + css::uno::Sequence< css::beans::PropertyValue >& rValues ) const { sal_Int32 nCount = rProperties.size(); @@ -365,8 +365,7 @@ void SvXMLImportPropertyMapper::FillPropertySequence( void SvXMLImportPropertyMapper::CheckSpecialContext( const ::std::vector< XMLPropertyState >& aProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& rPropSet, + const css::uno::Reference< css::beans::XPropertySet >& rPropSet, _ContextID_Index_Pair* pSpecialContextIds ) const { OSL_ENSURE( rPropSet.is(), "need an XPropertySet" ); diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 8f86372d954d..54ab42c079b5 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -59,7 +59,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using namespace ::xmloff::token; -void SvxXMLNumRuleExport::exportLevelStyles( const uno::Reference< ::com::sun::star::container::XIndexReplace > & xNumRule, +void SvxXMLNumRuleExport::exportLevelStyles( const uno::Reference< css::container::XIndexReplace > & xNumRule, bool bOutline ) { sal_Int32 nCount = xNumRule ->getCount(); @@ -96,7 +96,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel, rtl_TextEncoding eBulletFontEncoding = RTL_TEXTENCODING_DONTKNOW; OUString sImageURL; - uno::Reference< ::com::sun::star::awt::XBitmap > xBitmap; + uno::Reference< css::awt::XBitmap > xBitmap; sal_Int32 nImageWidth = 0, nImageHeight = 0; sal_Int16 eImageVertOrient = VertOrientation::LINE_CENTER; diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 136c3d24bf2e..0895a94f303f 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -259,8 +259,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport( SvXMLNumFmtExport::SvXMLNumFmtExport( SvXMLExport& rExp, - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XNumberFormatsSupplier >& rSupp, + const css::uno::Reference< css::util::XNumberFormatsSupplier >& rSupp, const OUString& rPrefix ) : rExport( rExp ), sPrefix( rPrefix ), @@ -827,7 +826,7 @@ sal_Int32 lcl_FindSymbol( const OUString& sUpperStr, const OUString& sCurString } bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString, - const ::com::sun::star::lang::Locale& rLocale ) + const css::lang::Locale& rLocale ) { // returns true if currency element was written @@ -1122,7 +1121,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt } // Native number transliteration - ::com::sun::star::i18n::NativeNumberXmlAttributes aAttr; + css::i18n::NativeNumberXmlAttributes aAttr; rFormat.GetNatNumXml( aAttr, nPart ); if ( !aAttr.Format.isEmpty() ) { diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index db1edc7ce07a..b4a79ea63cb4 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -130,14 +130,12 @@ public: SvXMLNumFmtElementContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, SvXMLNumFormatContext& rParentContext, sal_uInt16 nNewType, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtElementContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void Characters( const OUString& rChars ) override; virtual void EndElement() override; @@ -154,14 +152,12 @@ public: SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, SvXMLNumFmtElementContext& rParentContext, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtEmbeddedTextContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void Characters( const OUString& rChars ) override; virtual void EndElement() override; }; @@ -176,14 +172,12 @@ public: SvXMLNumFmtMapContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, SvXMLNumFormatContext& rParentContext, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtMapContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void Characters( const OUString& rChars ) override; virtual void EndElement() override; }; @@ -198,14 +192,12 @@ public: SvXMLNumFmtPropContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, SvXMLNumFormatContext& rParentContext, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtPropContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void Characters( const OUString& rChars ) override; virtual void EndElement() override; }; @@ -1315,7 +1307,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, { LanguageTagODF aLanguageTagODF; OUString sNatNumAttrScript, sNatNumAttrRfcLanguageTag; - ::com::sun::star::i18n::NativeNumberXmlAttributes aNatNumAttr; + css::i18n::NativeNumberXmlAttributes aNatNumAttr; bool bAttrBool(false); sal_uInt16 nAttrEnum; @@ -1550,7 +1542,7 @@ sal_Int32 SvXMLNumFormatContext::PrivateGetKey() } } -sal_Int32 SvXMLNumFormatContext::CreateAndInsert( com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >& xFormatsSupplier ) +sal_Int32 SvXMLNumFormatContext::CreateAndInsert( css::uno::Reference< css::util::XNumberFormatsSupplier >& xFormatsSupplier ) { if (nKey <= -1) { diff --git a/xmloff/source/style/xmlprhdl.cxx b/xmloff/source/style/xmlprhdl.cxx index c47acf82c893..2b9d7b6558e7 100644 --- a/xmloff/source/style/xmlprhdl.cxx +++ b/xmloff/source/style/xmlprhdl.cxx @@ -25,7 +25,7 @@ XMLPropertyHandler::~XMLPropertyHandler() // does nothing } -bool XMLPropertyHandler::equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const +bool XMLPropertyHandler::equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const { return (r1 == r2); } diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx index d1c92f23ad94..9501afc85688 100644 --- a/xmloff/source/style/xmltabe.cxx +++ b/xmloff/source/style/xmltabe.cxx @@ -42,7 +42,7 @@ SvXMLEnumMapEntry pXML_tabstop_style[] = { XML_TOKEN_INVALID, 0 } }; -void SvxXMLTabStopExport::exportTabStop( const ::com::sun::star::style::TabStop* pTabStop ) +void SvxXMLTabStopExport::exportTabStop( const css::style::TabStop* pTabStop ) { SvXMLUnitConverter& rUnitConv = rExport.GetMM100UnitConverter(); @@ -101,14 +101,14 @@ SvxXMLTabStopExport::~SvxXMLTabStopExport() void SvxXMLTabStopExport::Export( const uno::Any& rAny ) { - uno::Sequence< ::com::sun::star::style::TabStop> aSeq; + uno::Sequence< css::style::TabStop> aSeq; if(!(rAny >>= aSeq)) { - OSL_FAIL( "SvxXMLTabStopExport needs a Sequence ::com::sun::star::style::TabStop>" ); + OSL_FAIL( "SvxXMLTabStopExport needs a Sequence css::style::TabStop>" ); } else { - const ::com::sun::star::style::TabStop* pTabs = aSeq.getConstArray(); + const css::style::TabStop* pTabs = aSeq.getConstArray(); const sal_Int32 nTabs = aSeq.getLength(); SvXMLElementExport rElem( rExport, XML_NAMESPACE_STYLE, XML_TAB_STOPS, diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index d60c3af208f5..c621e19dd4b7 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -109,7 +109,7 @@ public: OUString GetDefaultCellStyleName() const; rtl::Reference< XMLTableImport > mxTableImporter; - ::com::sun::star::uno::Reference< ::com::sun::star::table::XTable > mxTable; + css::uno::Reference< css::table::XTable > mxTable; Reference< XTableColumns > mxColumns; Reference< XTableRows > mxRows; @@ -130,7 +130,7 @@ public: const Reference< XMergeableCell >& xCell, const OUString& sDefaultCellStyleName, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLCellImportContext(); @@ -548,7 +548,7 @@ OUString XMLTableImportContext::GetDefaultCellStyleName() const // XMLCellImportContext -XMLCellImportContext::XMLCellImportContext( SvXMLImport& rImport, const Reference< XMergeableCell >& xCell, const OUString& sDefaultCellStyleName, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) +XMLCellImportContext::XMLCellImportContext( SvXMLImport& rImport, const Reference< XMergeableCell >& xCell, const OUString& sDefaultCellStyleName, sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ) , mxCell( xCell ) , mbListContextPushed( false ) diff --git a/xmloff/source/text/XMLAnchorTypePropHdl.hxx b/xmloff/source/text/XMLAnchorTypePropHdl.hxx index 019b0e95eb38..f08cf2563c56 100644 --- a/xmloff/source/text/XMLAnchorTypePropHdl.hxx +++ b/xmloff/source/text/XMLAnchorTypePropHdl.hxx @@ -31,14 +31,14 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; static bool convert( const OUString& rStrImpValue, - ::com::sun::star::text::TextContentAnchorType& rType ); + css::text::TextContentAnchorType& rType ); }; #endif // INCLUDED_XMLOFF_SOURCE_TEXT_XMLANCHORTYPEPROPHDL_HXX diff --git a/xmloff/source/text/XMLAutoMarkFileContext.hxx b/xmloff/source/text/XMLAutoMarkFileContext.hxx index c98a8eec656b..2ed06823fcad 100644 --- a/xmloff/source/text/XMLAutoMarkFileContext.hxx +++ b/xmloff/source/text/XMLAutoMarkFileContext.hxx @@ -47,8 +47,7 @@ public: protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; }; #endif diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx index 382e558625d6..1f30f00e513d 100644 --- a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx +++ b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx @@ -37,8 +37,7 @@ namespace com { namespace sun { namespace star { class XMLAutoTextContainerEventImport : public SvXMLImportContext { /// the parent auto text container - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameReplace> & rEvents; + const css::uno::Reference<css::container::XNameReplace> & rEvents; public: @@ -47,8 +46,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameReplace > & rEvents ); + const css::uno::Reference<css::container::XNameReplace > & rEvents ); virtual ~XMLAutoTextContainerEventImport(); @@ -58,8 +56,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index 69c793650e56..e1a9a71d72ae 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -60,7 +60,7 @@ using ::com::sun::star::xml::sax::XDocumentHandler; XMLAutoTextEventExport::XMLAutoTextEventExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLExportFlags nFlags ) : SvXMLExport(util::MeasureUnit::INCH, xContext, implementationName, XML_AUTO_TEXT, nFlags) @@ -129,7 +129,7 @@ sal_uInt32 XMLAutoTextEventExport::exportDoc( enum XMLTokenEnum ) SetDocHandler( xTmpDocHandler ); } } - catch( com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { } } diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx index 3c1a84eb8070..4ee3b518f212 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.hxx +++ b/xmloff/source/text/XMLAutoTextEventExport.hxx @@ -46,24 +46,22 @@ namespace com { namespace sun { namespace star { */ class XMLAutoTextEventExport : public SvXMLExport { - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameAccess> xEvents; + css::uno::Reference<css::container::XNameAccess> xEvents; public: XMLAutoTextEventExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLExportFlags nFlags + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLExportFlags nFlags ); virtual ~XMLAutoTextEventExport(); // XInitialization virtual void SAL_CALL initialize( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any> & rArguments ) + const css::uno::Sequence<css::uno::Any> & rArguments ) throw( - ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Exception, + css::uno::RuntimeException, std::exception) override; protected: diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx index 2f84a86708d4..64682909af88 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextEventImport.cxx @@ -46,7 +46,7 @@ using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_AUTO_TEXT_EVENTS; XMLAutoTextEventImport::XMLAutoTextEventImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext) throw() + const css::uno::Reference< css::uno::XComponentContext >& xContext) throw() : SvXMLImport(xContext, "") { } diff --git a/xmloff/source/text/XMLAutoTextEventImport.hxx b/xmloff/source/text/XMLAutoTextEventImport.hxx index 1a20c8c964f2..e94bbdf3c14b 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.hxx +++ b/xmloff/source/text/XMLAutoTextEventImport.hxx @@ -40,49 +40,45 @@ namespace com { namespace sun { namespace star { class XMLAutoTextEventImport : public SvXMLImport { - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameReplace> xEvents; + css::uno::Reference<css::container::XNameReplace> xEvents; public: explicit XMLAutoTextEventImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext + const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw(); virtual ~XMLAutoTextEventImport() throw(); // XInitialization virtual void SAL_CALL initialize( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any> & rArguments ) + const css::uno::Sequence<css::uno::Any> & rArguments ) throw( - ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Exception, + css::uno::RuntimeException, std::exception) override; protected: virtual SvXMLImportContext* CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; }; // global functions to support the component -::com::sun::star::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > SAL_CALL XMLAutoTextEventImport_getSupportedServiceNames() throw(); OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() throw(); -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > SAL_CALL XMLAutoTextEventImport_createInstance( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & ) - throw( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::lang::XMultiServiceFactory > & ) + throw( css::uno::Exception ); #endif diff --git a/xmloff/source/text/XMLCalculationSettingsContext.cxx b/xmloff/source/text/XMLCalculationSettingsContext.cxx index 1a2a588af874..d699313d2e2c 100644 --- a/xmloff/source/text/XMLCalculationSettingsContext.cxx +++ b/xmloff/source/text/XMLCalculationSettingsContext.cxx @@ -40,8 +40,7 @@ using namespace ::xmloff::token; XMLCalculationSettingsContext::XMLCalculationSettingsContext( SvXMLImport& rImport, sal_uInt16 p_nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) : SvXMLImportContext ( rImport, p_nPrefix, rLocalName ) , nYear( 1930 ) { diff --git a/xmloff/source/text/XMLCalculationSettingsContext.hxx b/xmloff/source/text/XMLCalculationSettingsContext.hxx index 2df6250ebfcd..425f5270b006 100644 --- a/xmloff/source/text/XMLCalculationSettingsContext.hxx +++ b/xmloff/source/text/XMLCalculationSettingsContext.hxx @@ -29,8 +29,7 @@ public: XMLCalculationSettingsContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLCalculationSettingsContext(); virtual void EndElement() override; diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx index 3ee0bd4e7f58..5e6967edba46 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.hxx +++ b/xmloff/source/text/XMLChangeElementImportContext.hxx @@ -72,12 +72,11 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; // Start- and EndElement are needed here to set the inside_deleted_section // flag at the corresponding TextImportHelper - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/text/XMLChangeImportContext.hxx b/xmloff/source/text/XMLChangeImportContext.hxx index da97ddf420a3..3c0afa1e0106 100644 --- a/xmloff/source/text/XMLChangeImportContext.hxx +++ b/xmloff/source/text/XMLChangeImportContext.hxx @@ -66,8 +66,7 @@ public: virtual ~XMLChangeImportContext(); virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; }; #endif diff --git a/xmloff/source/text/XMLChangeInfoContext.hxx b/xmloff/source/text/XMLChangeInfoContext.hxx index 729aa7a810b8..e58a6dc34038 100644 --- a/xmloff/source/text/XMLChangeInfoContext.hxx +++ b/xmloff/source/text/XMLChangeInfoContext.hxx @@ -62,14 +62,12 @@ public: virtual ~XMLChangeInfoContext(); virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; diff --git a/xmloff/source/text/XMLChangedRegionImportContext.hxx b/xmloff/source/text/XMLChangedRegionImportContext.hxx index 6a81cf0d0f45..d858118f5256 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.hxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.hxx @@ -42,8 +42,7 @@ class XMLChangedRegionImportContext : public SvXMLImportContext { /// if we replace the current XTextCursor/XText by the ones for /// the redline, we remember the old cursor here. - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor> xOldCursor; + css::uno::Reference<css::text::XTextCursor> xOldCursor; /// redline-ID OUString sID; @@ -62,14 +61,12 @@ public: virtual ~XMLChangedRegionImportContext(); virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; virtual void EndElement() override; diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx index bdfcb73749e5..0d800b61f1ef 100644 --- a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx +++ b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx @@ -48,8 +48,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; diff --git a/xmloff/source/text/XMLFootnoteImportContext.hxx b/xmloff/source/text/XMLFootnoteImportContext.hxx index 49aa57b868f5..49b0f23beb7c 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.hxx +++ b/xmloff/source/text/XMLFootnoteImportContext.hxx @@ -41,8 +41,7 @@ class XMLFootnoteImportContext : public SvXMLImportContext const OUString sPropertyReferenceId; /// old document cursor - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor> xOldCursor; + css::uno::Reference<css::text::XTextCursor> xOldCursor; /// old list item and block (#89891#) bool mbListContextPushed; @@ -51,8 +50,7 @@ class XMLFootnoteImportContext : public SvXMLImportContext XMLTextImportHelper& rHelper; /// the footnote - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XFootnote> xFootnote; + css::uno::Reference<css::text::XFootnote> xFootnote; public: @@ -66,8 +64,7 @@ public: protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; virtual void Characters( const OUString& rChars) override; @@ -77,8 +74,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx index 71620c156cfb..b194a2fd6f16 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx @@ -107,7 +107,7 @@ void XMLIndexAlphabeticalSourceContext::ProcessAttribute( sMainEntryStyleName = rValue; OUString sDisplayStyleName = GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_TEXT_TEXT, sMainEntryStyleName ); - const Reference < ::com::sun::star::container::XNameContainer >& + const Reference < css::container::XNameContainer >& rStyles = GetImport().GetTextImport()->GetTextStyles(); bMainEntryStyleNameOK = rStyles.is() && rStyles->hasByName( sDisplayStyleName ); } diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx index 042e1054eb48..730c6f99ad3e 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx @@ -71,8 +71,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + css::uno::Reference<css::beans::XPropertySet> & rPropSet); virtual ~XMLIndexAlphabeticalSourceContext(); @@ -87,8 +86,7 @@ protected: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx index f775857c77fe..1ad8c07315c4 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx @@ -148,8 +148,7 @@ void XMLIndexBibliographyEntryContext::EndElement() } void XMLIndexBibliographyEntryContext::FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues) + css::uno::Sequence<css::beans::PropertyValue> & rValues) { // entry name and (optionally) style name in parent class XMLIndexSimpleEntryContext::FillPropertyValues(rValues); diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx index 3c44bd3ea5f1..f30b7135cfb6 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx @@ -58,16 +58,14 @@ protected: /** process parameters */ virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; /** call FillPropertyValues and insert into template */ virtual void EndElement() override; /** fill property values for this template entry */ virtual void FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues) override; + css::uno::Sequence<css::beans::PropertyValue> & rValues) override; }; diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx index 2d648093242f..4cf6ee1e047c 100644 --- a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx +++ b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx @@ -43,8 +43,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + css::uno::Reference<css::beans::XPropertySet> & rPropSet); virtual ~XMLIndexBibliographySourceContext(); @@ -59,8 +58,7 @@ protected: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/text/XMLIndexBodyContext.hxx b/xmloff/source/text/XMLIndexBodyContext.hxx index 94364694092e..81771086311a 100644 --- a/xmloff/source/text/XMLIndexBodyContext.hxx +++ b/xmloff/source/text/XMLIndexBodyContext.hxx @@ -57,8 +57,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; inline bool XMLIndexBodyContext::HasContent() diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx index 9124d142df6c..50c02bcf1a83 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx @@ -169,8 +169,7 @@ void XMLIndexChapterInfoEntryContext::StartElement( } void XMLIndexChapterInfoEntryContext::FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues) + css::uno::Sequence<css::beans::PropertyValue> & rValues) { // entry name and (optionally) style name in parent class XMLIndexSimpleEntryContext::FillPropertyValues(rValues); diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx index a1e8a655ebcb..efa29ed3a5c0 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx @@ -59,13 +59,11 @@ protected: /** process parameters */ virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; /** fill property values for this template entry */ virtual void FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues) override; + css::uno::Sequence<css::beans::PropertyValue> & rValues) override; }; #endif diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx index 1d0d47377a24..d43bc2c4648c 100644 --- a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx +++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx @@ -45,8 +45,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + css::uno::Reference<css::beans::XPropertySet> & rPropSet); virtual ~XMLIndexIllustrationSourceContext(); @@ -55,8 +54,7 @@ protected: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx index b4060212ed1e..6ea0376d9e06 100644 --- a/xmloff/source/text/XMLIndexMarkExport.hxx +++ b/xmloff/source/text/XMLIndexMarkExport.hxx @@ -69,33 +69,28 @@ public: * collapsed. */ void ExportIndexMark( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + const css::uno::Reference<css::beans::XPropertySet> & rPropSet, bool bAutoStyles); protected: /// export attributes of table-of-content index marks void ExportTOCMarkAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// export attributes of user index marks void ExportUserIndexMarkAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// export attributes of alphabetical index marks void ExportAlphabeticalIndexMarkAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// create a numerical ID for this index mark /// (represented by its properties) static void GetID( OUStringBuffer& sBuffer, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); }; diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.hxx b/xmloff/source/text/XMLIndexObjectSourceContext.hxx index 71273e4808c9..da3333c76858 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.hxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.hxx @@ -54,8 +54,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + css::uno::Reference<css::beans::XPropertySet> & rPropSet); virtual ~XMLIndexObjectSourceContext(); @@ -70,8 +69,7 @@ protected: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx index 3267404f54ba..74622065b1b8 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx @@ -73,7 +73,7 @@ void XMLIndexSimpleEntryContext::StartElement( OUString sDisplayStyleName = GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_TEXT_TEXT, sCharStyleName ); // #142494#: Check if style exists - const Reference < ::com::sun::star::container::XNameContainer > & rStyles = + const Reference < css::container::XNameContainer > & rStyles = GetImport().GetTextImport()->GetTextStyles(); if( rStyles.is() && rStyles->hasByName( sDisplayStyleName ) ) bCharStyleNameOK = true; @@ -99,8 +99,7 @@ void XMLIndexSimpleEntryContext::EndElement() } void XMLIndexSimpleEntryContext::FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues) + css::uno::Sequence<css::beans::PropertyValue> & rValues) { // due to the limited number of subclasses, we fill the values // directly into the slots. Subclasses will have to know they can diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx index 2bc713c7e8d2..820f493e9632 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx @@ -67,16 +67,14 @@ protected: /** process parameters */ virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; /** call FillPropertyValues and insert into template */ virtual void EndElement() override; /** fill property values for this template entry */ virtual void FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues); + css::uno::Sequence<css::beans::PropertyValue> & rValues); }; diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.hxx b/xmloff/source/text/XMLIndexSourceBaseContext.hxx index 2e80e476a94b..455ef7b67f5c 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx @@ -86,8 +86,7 @@ class XMLIndexSourceBaseContext : public SvXMLImportContext protected: /// property set of index; must be accessible to subclasses - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rIndexPropertySet; + css::uno::Reference<css::beans::XPropertySet> & rIndexPropertySet; public: @@ -96,8 +95,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + css::uno::Reference<css::beans::XPropertySet> & rPropSet, bool bLevelFormats); virtual ~XMLIndexSourceBaseContext(); @@ -105,8 +103,7 @@ public: protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; virtual void ProcessAttribute( enum IndexSourceParamEnum eParam, @@ -117,8 +114,7 @@ protected: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.hxx b/xmloff/source/text/XMLIndexSpanEntryContext.hxx index a3010e117818..ac9936e377ae 100644 --- a/xmloff/source/text/XMLIndexSpanEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSpanEntryContext.hxx @@ -55,8 +55,7 @@ protected: /// add Text PropertyValue virtual void FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues) override; + css::uno::Sequence<css::beans::PropertyValue> & rValues) override; }; #endif diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx b/xmloff/source/text/XMLIndexTOCContext.hxx index 0c4cba2479a3..78a5f0f56258 100644 --- a/xmloff/source/text/XMLIndexTOCContext.hxx +++ b/xmloff/source/text/XMLIndexTOCContext.hxx @@ -58,8 +58,7 @@ class XMLIndexTOCContext : public SvXMLImportContext const OUString sName; /** XPropertySet of the index */ - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> xTOCPropertySet; + css::uno::Reference<css::beans::XPropertySet> xTOCPropertySet; enum IndexTypeEnum eIndexType; @@ -80,16 +79,14 @@ public: protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; virtual void EndElement() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.hxx b/xmloff/source/text/XMLIndexTOCSourceContext.hxx index 12f7b81f0e41..10aa610b5f18 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx @@ -52,8 +52,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + css::uno::Reference<css::beans::XPropertySet> & rPropSet); virtual ~XMLIndexTOCSourceContext(); @@ -68,8 +67,7 @@ protected: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.hxx b/xmloff/source/text/XMLIndexTOCStylesContext.hxx index ae9654b73c05..8131d03a0f4b 100644 --- a/xmloff/source/text/XMLIndexTOCStylesContext.hxx +++ b/xmloff/source/text/XMLIndexTOCStylesContext.hxx @@ -45,8 +45,7 @@ class XMLIndexTOCStylesContext : public SvXMLImportContext const OUString sLevelParagraphStyles; /// XPropertySet of the index - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rTOCPropertySet; + css::uno::Reference<css::beans::XPropertySet> & rTOCPropertySet; /// style names for this level ::std::vector< OUString > aStyleNames; @@ -59,8 +58,7 @@ public: XMLIndexTOCStylesContext( SvXMLImport& rImport, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + css::uno::Reference<css::beans::XPropertySet> & rPropSet, sal_uInt16 nPrfx, const OUString& rLocalName ); @@ -69,16 +67,14 @@ public: protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; virtual void EndElement() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx index 6960c6b97bf6..fe0f0b41b09c 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx @@ -58,13 +58,11 @@ public: protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; /** fill property values for this template entry */ virtual void FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues) override; + css::uno::Sequence<css::beans::PropertyValue> & rValues) override; }; #endif diff --git a/xmloff/source/text/XMLIndexTableSourceContext.hxx b/xmloff/source/text/XMLIndexTableSourceContext.hxx index fe42e7fb64aa..a4f407dbbfc0 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.hxx @@ -53,8 +53,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + css::uno::Reference<css::beans::XPropertySet> & rPropSet); virtual ~XMLIndexTableSourceContext(); @@ -69,8 +68,7 @@ protected: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index 0e47d86ccc9b..c94a753a5f12 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -205,7 +205,7 @@ void XMLIndexTemplateContext::EndElement() XML_STYLE_FAMILY_TEXT_PARAGRAPH, sStyleName ); // #i50288#: Check if style exists - const Reference < ::com::sun::star::container::XNameContainer > & rStyles = + const Reference < css::container::XNameContainer > & rStyles = GetImport().GetTextImport()->GetParaStyles(); if( rStyles.is() && rStyles->hasByName( sDisplayStyleName ) ) diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx index 31b7f690fccd..208f66b36094 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTemplateContext.hxx @@ -66,7 +66,7 @@ extern const sal_Bool aAllowedTokenTypesTable[]; class XMLIndexTemplateContext : public SvXMLImportContext { // pick up PropertyValues to be turned into a sequence. - ::std::vector< ::com::sun::star::beans::PropertyValues > aValueVector; + ::std::vector< css::beans::PropertyValues > aValueVector; OUString sStyleName; @@ -81,8 +81,7 @@ class XMLIndexTemplateContext : public SvXMLImportContext bool bTOC; // PropertySet of current index - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet; + css::uno::Reference<css::beans::XPropertySet> & rPropertySet; public: @@ -114,8 +113,7 @@ public: XMLIndexTemplateContext( SvXMLImport& rImport, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + css::uno::Reference<css::beans::XPropertySet> & rPropSet, sal_uInt16 nPrfx, const OUString& rLocalName, const SvXMLEnumMapEntry* aLevelNameMap, @@ -128,21 +126,19 @@ public: /** add template; to be called by child template entry contexts */ void addTemplateEntry( - const ::com::sun::star::beans::PropertyValues& aValues); + const css::beans::PropertyValues& aValues); protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; virtual void EndElement() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx index 4a7e2267d585..9233e1380334 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx @@ -69,7 +69,7 @@ void XMLIndexTitleTemplateContext::StartElement( sStyleName = xAttrList->getValueByIndex(nAttr); OUString sDisplayStyleName = GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_TEXT_PARAGRAPH, sStyleName ); - const Reference < ::com::sun::star::container::XNameContainer >& + const Reference < css::container::XNameContainer >& rStyles = GetImport().GetTextImport()->GetParaStyles(); bStyleNameOK = rStyles.is() && rStyles->hasByName( sDisplayStyleName ); } diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx index 612c3306922e..266d671bc660 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx @@ -49,16 +49,14 @@ class XMLIndexTitleTemplateContext : public SvXMLImportContext OUStringBuffer sContent; // TOC property set - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rTOCPropertySet; + css::uno::Reference<css::beans::XPropertySet> & rTOCPropertySet; public: XMLIndexTitleTemplateContext( SvXMLImport& rImport, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + css::uno::Reference<css::beans::XPropertySet> & rPropSet, sal_uInt16 nPrfx, const OUString& rLocalName); @@ -68,8 +66,7 @@ protected: /** process parameters */ virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; /** set values */ virtual void EndElement() override; diff --git a/xmloff/source/text/XMLIndexUserSourceContext.hxx b/xmloff/source/text/XMLIndexUserSourceContext.hxx index 2cf1a6e5de2c..00d5b8bc2fb1 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.hxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.hxx @@ -60,8 +60,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + css::uno::Reference<css::beans::XPropertySet> & rPropSet); virtual ~XMLIndexUserSourceContext(); @@ -76,8 +75,7 @@ protected: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx index 406b38b79ad4..a668ec68214c 100644 --- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx +++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx @@ -52,8 +52,8 @@ public: protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference< + css::xml::sax::XAttributeList> & xAttrList) override; virtual void Characters( const OUString& rChars ) override; diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx index 9396ade5999e..aaa641deff76 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.hxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx @@ -72,8 +72,7 @@ class XMLPropertyBackpatcher /// backpatch list type typedef ::std::vector< - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> > BackpatchListType; + css::uno::Reference<css::beans::XPropertySet> > BackpatchListType; /* use void* instead of BackpatchListType to avoid linker problems with long typenames. The real typename (commented out) contains @@ -104,14 +103,12 @@ public: /// Use this whenever the value should be set, even if it is not yet known. /// const version void SetProperty( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropSet, + const css::uno::Reference<css::beans::XPropertySet> & xPropSet, const OUString& sName); /// non-const version of SetProperty void SetProperty( - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropSet, + css::uno::Reference<css::beans::XPropertySet> & xPropSet, const OUString& sName); /// set default (if bDefaultHandling) for unresolved names diff --git a/xmloff/source/text/XMLRedlineExport.hxx b/xmloff/source/text/XMLRedlineExport.hxx index eccbff1b8c6e..5ef3d2e9de24 100644 --- a/xmloff/source/text/XMLRedlineExport.hxx +++ b/xmloff/source/text/XMLRedlineExport.hxx @@ -38,12 +38,11 @@ namespace com { namespace sun { namespace star { // store a list of redline properties typedef ::std::list< - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> > ChangesListType; + css::uno::Reference<css::beans::XPropertySet> > ChangesListType; // store a list of redline properties for each XText typedef ::std::map< - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText>, + css::uno::Reference< css::text::XText>, ChangesListType* > ChangesMapType; @@ -102,8 +101,7 @@ public: /// export a change void ExportChange( /// PropertySet of RedlinePortion - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + const css::uno::Reference<css::beans::XPropertySet> & rPropSet, bool bAutoStyle); /// export the list of changes (complete list minus recorded changed) @@ -111,15 +109,13 @@ public: /// export the list of changes (recorded changes for this XText only) void ExportChangesList( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XText> & rText, + const css::uno::Reference<css::text::XText> & rText, bool bAutoStyles); /// set the current XText for which changes should be recorded. /// An empty XText means: don't record changes void SetCurrentXText( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XText> & rText); + const css::uno::Reference<css::text::XText> & rText); /// Do not record changes. /// Same as SetCurrentXText(Reference<XText>) with empty argument. @@ -128,22 +124,20 @@ public: /// export redline marks which start or end at start nodes, /// i.e. that include the complete paragraph/table/section void ExportStartOrEndRedline( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + const css::uno::Reference< + css::beans::XPropertySet> & rPropSet, bool bStart); /// start or end of text entity (e.g. paragraph)? /// convenience method, calls XPropertySet-version of this method void ExportStartOrEndRedline( /// XTextContent; must also be an XPropertySet - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent> & rContent, + const css::uno::Reference<css::text::XTextContent> & rContent, bool bStart); /// convenience method, calls XPropertySet-version of this method void ExportStartOrEndRedline( /// XTextSection; must also be an XPropertySet - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextSection> & rSection, + const css::uno::Reference<css::text::XTextSection> & rSection, bool bStart); private: @@ -151,14 +145,12 @@ private: /// export the change mark contained in the text body void ExportChangeInline( /// PropertySet of RedlinePortion - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// export the auto styles used in this change void ExportChangeAutoStyle( /// PropertySet of RedlinePortion - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// export the changes list (<text:tracked-changes>) void ExportChangesListElements(); @@ -168,26 +160,22 @@ private: /// export the changed-region element void ExportChangedRegion( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// export an change-info element (from a PropertySet) void ExportChangeInfo( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// export an change-info element (from PropertyValues) void ExportChangeInfo( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues); + const css::uno::Sequence<css::beans::PropertyValue> & rValues); /// convert the change type from API to XML names const OUString ConvertTypeName(const OUString& sApiName); /// Get ID string! const OUString GetRedlineID( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// write a comment string as sequence of <text:p> elements void WriteComment(const OUString& rComment); diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx index 5a4d47bba2f7..012e8a551507 100644 --- a/xmloff/source/text/XMLSectionExport.hxx +++ b/xmloff/source/text/XMLSectionExport.hxx @@ -145,16 +145,14 @@ public: * appropriate section or index method. */ void ExportSectionStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rSection, + const css::uno::Reference < css::text::XTextSection > & rSection, bool bAutoStyles); /** * export section or index end elements */ void ExportSectionEnd( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rSection, + const css::uno::Reference < css::text::XTextSection > & rSection, bool bAutoStyles); /** @@ -162,16 +160,14 @@ public: * (E.g. linked sections in global documents are not always exported) */ bool IsMuteSection( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rSection) const; + const css::uno::Reference < css::text::XTextSection > & rSection) const; /** * XTextContent-version of IsMuteSection(Reference<XTextSection>&) * returns *true* for all non-section elements */ bool IsMuteSection( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rSection, + const css::uno::Reference < css::text::XTextContent > & rSection, /// return value if this content doesn't support the section property bool bDefault) const; @@ -180,10 +176,8 @@ public: * current section of rContent can not be determined, return bDefault. */ bool IsInSection( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rEnclosingSection, - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rContent, + const css::uno::Reference < css::text::XTextSection > & rEnclosingSection, + const css::uno::Reference < css::text::XTextContent > & rContent, /// return value if this content doesn't support the section property bool bDefault); @@ -212,53 +206,43 @@ protected: /// export an index start element. void ExportIndexStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XDocumentIndex > & rSection); + const css::uno::Reference < css::text::XDocumentIndex > & rSection); /// export an index header start element. void ExportIndexHeaderStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rSection); + const css::uno::Reference < css::text::XTextSection > & rSection); /// export a proper section (and source elements) void ExportRegularSectionStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rSection); + const css::uno::Reference < css::text::XTextSection > & rSection); /// export a table of content (and source element) void ExportTableOfContentStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /// export a table index (and source element) void ExportTableIndexStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /// export an object index (and source element) void ExportObjectIndexStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /// export an illustration index (and source element) void ExportIllustrationIndexStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /// export an alphabetical/keyword index (and source element) void ExportAlphabeticalIndexStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /// export a user index (and source element) void ExportUserIndexStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /// export the bibliography (and source element) void ExportBibliographyStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rIndex); + const css::uno::Reference < css::beans::XPropertySet > & rIndex); // helper methods: @@ -272,10 +256,8 @@ protected: * return sal_True, xIndex is empty: index header section * return sal_True, xIndex is set: index section */ bool GetIndex( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rSection, - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XDocumentIndex > & rIndex) const; + const css::uno::Reference < css::text::XTextSection > & rSection, + css::uno::Reference < css::text::XDocumentIndex > & rIndex) const; /// map service name to section type static enum SectionTypeEnum MapSectionType(const OUString& rSectionName); @@ -288,8 +270,7 @@ protected: */ void ExportBaseIndexStart( ::xmloff::token::XMLTokenEnum eElement, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /** * Export the index source element (common for all index types). @@ -299,16 +280,15 @@ protected: */ void ExportBaseIndexSource( SectionTypeEnum eType, /// index type - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < + css::beans::XPropertySet > & rSection); /** * Export the index body (common for all index types). */ void ExportBaseIndexBody( SectionTypeEnum eType, /// index type - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /** @@ -316,35 +296,30 @@ protected: * illustration indices */ void ExportTableAndIllustrationIndexSourceAttributes( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /// export one template for the specific index type bool ExportIndexTemplate( SectionTypeEnum eType, /// index type sal_Int32 nLevel, /// outline level (if applicable) - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> > & rValues); + const css::uno::Reference< css::beans::XPropertySet> & rPropSet, + css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue> > & rValues); /// export a single template element (e.g. span or tab-stop) void ExportIndexTemplateElement( SectionTypeEnum eType, //i90246, needed for ODF 1.0, 1.0 and 1.2 management - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues); + css::uno::Sequence< + css::beans::PropertyValue> & rValues); /// export level paragraph styles void ExportLevelParagraphStyles( - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexReplace> & xStyles); + css::uno::Reference< + css::container::XIndexReplace> & xStyles); /// helper to export boolean properties void ExportBoolean( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + const css::uno::Reference<css::beans::XPropertySet> & rPropSet, const OUString& sPropertyName, enum ::xmloff::token::XMLTokenEnum eAttributeName, bool bDefault, diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx index 9b878ef3ebd7..2248f612ae82 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx @@ -40,7 +40,7 @@ using namespace ::xmloff::token; using ::std::vector; -using ::com::sun::star::style::NumberingType::ARABIC; +using css::style::NumberingType::ARABIC; void XMLSectionFootnoteConfigExport::exportXML( diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx index d00d5259065c..342844b4fd7a 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx @@ -56,8 +56,7 @@ public: virtual ~XMLSectionFootnoteConfigImport(); virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx index 838a0ecac027..0a1a2de53154 100644 --- a/xmloff/source/text/XMLSectionImportContext.hxx +++ b/xmloff/source/text/XMLSectionImportContext.hxx @@ -40,16 +40,13 @@ namespace com { namespace sun { namespace star { class XMLSectionImportContext : public SvXMLImportContext { /// start position; ranges acquired via getStart(),getEnd() don't move - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange> xStartRange; + css::uno::Reference<css::text::XTextRange> xStartRange; /// end position - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange> xEndRange; + css::uno::Reference<css::text::XTextRange> xEndRange; /// TextSection (as XPropertySet) for passing down to data source elements - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> xSectionPropertySet; + css::uno::Reference<css::beans::XPropertySet> xSectionPropertySet; const OUString sTextSection; const OUString sIndexHeaderSection; @@ -63,7 +60,7 @@ class XMLSectionImportContext : public SvXMLImportContext OUString sStyleName; OUString sName; OUString sCond; - ::com::sun::star::uno::Sequence<sal_Int8> aSequence; + css::uno::Sequence<sal_Int8> aSequence; bool bProtect; bool bCondOK; bool bIsVisible; @@ -87,20 +84,17 @@ public: protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; virtual void EndElement() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; void ProcessAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ); }; #endif diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx index 7f090083c015..be7ee1887cc0 100644 --- a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx +++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx @@ -30,8 +30,7 @@ namespace com { namespace sun { namespace star { class XMLSectionSourceDDEImportContext : public SvXMLImportContext { - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rSectionPropertySet; + css::uno::Reference<css::beans::XPropertySet> & rSectionPropertySet; const OUString sDdeCommandFile; const OUString sDdeCommandType; @@ -45,24 +44,21 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rSectPropSet); + css::uno::Reference<css::beans::XPropertySet> & rSectPropSet); virtual ~XMLSectionSourceDDEImportContext(); protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; virtual void EndElement() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/text/XMLSectionSourceImportContext.hxx b/xmloff/source/text/XMLSectionSourceImportContext.hxx index 21f9e148286c..859dfce412bb 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.hxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx @@ -30,8 +30,7 @@ namespace com { namespace sun { namespace star { class XMLSectionSourceImportContext : public SvXMLImportContext { - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rSectionPropertySet; + css::uno::Reference<css::beans::XPropertySet> & rSectionPropertySet; public: @@ -40,24 +39,21 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rSectPropSet); + css::uno::Reference<css::beans::XPropertySet> & rSectPropSet); virtual ~XMLSectionSourceImportContext(); protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; virtual void EndElement() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx index 96b9d3088b6d..4c41d9db361d 100644 --- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx +++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx @@ -39,9 +39,8 @@ public: XMLTextCharStyleNamesElementExport( SvXMLExport& rExp, bool bDoSomething, bool bAllStyles, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, - const OUString& rPropName ); + const css::uno::Reference < css::beans::XPropertySet > & rPropSet, + const OUString& rPropName ); ~XMLTextCharStyleNamesElementExport(); }; diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 2b4727e0c218..81b3b185d1e6 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -152,9 +152,8 @@ public: XMLTextFrameParam_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const OUString& rLName, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, sal_uInt16 nType, ParamMap &rParamMap); virtual ~XMLTextFrameParam_Impl(); @@ -167,9 +166,8 @@ XMLTextFrameParam_Impl::~XMLTextFrameParam_Impl() XMLTextFrameParam_Impl::XMLTextFrameParam_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const OUString& rLName, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, sal_uInt16 /*nType*/, ParamMap &rParamMap): SvXMLImportContext( rImport, nPrfx, rLName ) @@ -208,9 +206,8 @@ public: XMLTextFrameContourContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const OUString& rLName, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, const Reference < XPropertySet >& rPropSet, bool bPath ); virtual ~XMLTextFrameContourContext_Impl(); @@ -318,7 +315,7 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl( aTargetRange)); } - com::sun::star::drawing::PointSequenceSequence aPointSequenceSequence; + css::drawing::PointSequenceSequence aPointSequenceSequence; basegfx::tools::B2DPolyPolygonToUnoPointSequenceSequence(aPolyPolygon, aPointSequenceSequence); aAny <<= aPointSequenceSequence; xPropSet->setPropertyValue( sContourPolyPolygon, aAny ); @@ -348,12 +345,9 @@ XMLTextFrameContourContext_Impl::~XMLTextFrameContourContext_Impl() class XMLTextFrameContext_Impl : public SvXMLImportContext { - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor > xOldTextCursor; - ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > xPropSet; - ::com::sun::star::uno::Reference < - ::com::sun::star::io::XOutputStream > xBase64Stream; + css::uno::Reference < css::text::XTextCursor > xOldTextCursor; + css::uno::Reference < css::beans::XPropertySet > xPropSet; + css::uno::Reference < css::io::XOutputStream > xBase64Stream; /// old list item and block (#89891#) bool mbListContextPushed; @@ -410,7 +404,7 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext sal_Int16 nRelHeight; sal_uInt16 nType; - ::com::sun::star::text::TextContentAnchorType eAnchorType; + css::text::TextContentAnchorType eAnchorType; bool bMayScript : 1; bool bMinWidth : 1; @@ -431,12 +425,10 @@ public: XMLTextFrameContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & rAttrList, - ::com::sun::star::text::TextContentAnchorType eAnchorType, + const css::uno::Reference<css::xml::sax::XAttributeList > & rAttrList, + css::text::TextContentAnchorType eAnchorType, sal_uInt16 nType, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & rFrameAttrList ); + const css::uno::Reference<css::xml::sax::XAttributeList > & rFrameAttrList ); virtual ~XMLTextFrameContext_Impl(); virtual void EndElement() override; @@ -445,8 +437,7 @@ public: SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; void SetHyperlink( const OUString& rHRef, const OUString& rName, @@ -460,10 +451,9 @@ public: void SetName(); - ::com::sun::star::text::TextContentAnchorType GetAnchorType() const { return eAnchorType; } + css::text::TextContentAnchorType GetAnchorType() const { return eAnchorType; } - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet >& GetPropSet() const { return xPropSet; } + const css::uno::Reference < css::beans::XPropertySet >& GetPropSet() const { return xPropSet; } }; @@ -1201,7 +1191,7 @@ SvXMLImportContext *XMLTextFrameContext_Impl::CreateChildContext( UNO_QUERY ); OSL_ENSURE( xEOS.is(), "no embedded object supplier for own object" ); - Reference<com::sun::star::lang::XComponent> aXComponent(xEOS->getEmbeddedObject()); + Reference<css::lang::XComponent> aXComponent(xEOS->getEmbeddedObject()); pEContext->SetComponent( aXComponent ); } } @@ -1356,8 +1346,7 @@ void XMLTextFrameContext_Impl::SetDesc( const OUString& rDesc ) } -bool XMLTextFrameContext::CreateIfNotThere( ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet >& rPropSet ) +bool XMLTextFrameContext::CreateIfNotThere( css::uno::Reference < css::beans::XPropertySet >& rPropSet ) { SvXMLImportContext *pContext = &m_xImplContext; XMLTextFrameContext_Impl *pImpl = dynamic_cast< XMLTextFrameContext_Impl*>( pContext ); diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx index fea47ae5423d..4e297abfafa8 100644 --- a/xmloff/source/text/XMLTextFrameContext.hxx +++ b/xmloff/source/text/XMLTextFrameContext.hxx @@ -32,8 +32,7 @@ class XMLTextFrameContextHyperlink_Impl; class XMLTextFrameContext : public SvXMLImportContext, public MultiImageImportHelper { - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; + css::uno::Reference< css::xml::sax::XAttributeList > m_xAttrList; SvXMLImportContextRef m_xImplContext; SvXMLImportContextRef m_xReplImplContext; @@ -43,7 +42,7 @@ class XMLTextFrameContext : public SvXMLImportContext, public MultiImageImportHe OUString m_sTitle; OUString m_sDesc; - ::com::sun::star::text::TextContentAnchorType m_eDefaultAnchorType; + css::text::TextContentAnchorType m_eDefaultAnchorType; /* The <draw:name> can longer be used to distinguish Writer graphic/text box objects and Draw graphic/text box objects. @@ -54,8 +53,7 @@ class XMLTextFrameContext : public SvXMLImportContext, public MultiImageImportHe bool m_HasAutomaticStyleWithoutParentStyle; bool m_bSupportsReplacement; - bool CreateIfNotThere( ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet >& rPropSet ); + bool CreateIfNotThere( css::uno::Reference < css::beans::XPropertySet >& rPropSet ); protected: /// helper to get the created xShape instance, needs to be overridden @@ -68,31 +66,28 @@ public: XMLTextFrameContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - ::com::sun::star::text::TextContentAnchorType eDfltAnchorType ); + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList, + css::text::TextContentAnchorType eDfltAnchorType ); virtual ~XMLTextFrameContext(); virtual void EndElement() override; SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; void SetHyperlink( const OUString& rHRef, const OUString& rName, const OUString& rTargetFrameName, bool bMap ); - ::com::sun::star::text::TextContentAnchorType GetAnchorType() const; + css::text::TextContentAnchorType GetAnchorType() const; - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > GetTextContent() const; + css::uno::Reference < css::text::XTextContent > GetTextContent() const; // Frame "to character": anchor moves from first to last char after saving (#i33242#) - ::com::sun::star::uno::Reference < - ::com::sun::star::drawing::XShape > GetShape() const; + css::uno::Reference < css::drawing::XShape > GetShape() const; }; diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx index bbc091bdd0c7..5a265ad07e4f 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx @@ -34,8 +34,8 @@ class XMLTextFrameHyperlinkContext : public SvXMLImportContext OUString sHRef; OUString sName; OUString sTargetFrameName; - ::com::sun::star::text::TextContentAnchorType eDefaultAnchorType; - SvXMLImportContextRef xFrameContext; + css::text::TextContentAnchorType eDefaultAnchorType; + SvXMLImportContextRef xFrameContext; bool bMap; public: @@ -44,26 +44,22 @@ public: XMLTextFrameHyperlinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - ::com::sun::star::text::TextContentAnchorType eDefaultAnchorType ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, + css::text::TextContentAnchorType eDefaultAnchorType ); virtual ~XMLTextFrameHyperlinkContext(); virtual void EndElement() override; SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; - ::com::sun::star::text::TextContentAnchorType GetAnchorType() const; + css::text::TextContentAnchorType GetAnchorType() const; - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > GetTextContent() const; + css::uno::Reference < css::text::XTextContent > GetTextContent() const; // Frame "to character": anchor moves from first to last char after saving (#i33242#) - ::com::sun::star::uno::Reference < - ::com::sun::star::drawing::XShape > GetShape() const; + css::uno::Reference < css::drawing::XShape > GetShape() const; }; diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx index 2f01606ebfca..d3fbbc8b8d44 100644 --- a/xmloff/source/text/XMLTextListBlockContext.hxx +++ b/xmloff/source/text/XMLTextListBlockContext.hxx @@ -29,8 +29,7 @@ class XMLTextListBlockContext : public SvXMLImportContext { XMLTextImportHelper& mrTxtImport; - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexReplace > mxNumRules; + css::uno::Reference< css::container::XIndexReplace > mxNumRules; // text:style-name property of <list> element OUString msListStyleName; @@ -56,8 +55,7 @@ public: XMLTextImportHelper& rTxtImp, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, const bool bRestartNumberingAtSubList = false ); virtual ~XMLTextListBlockContext(); @@ -65,16 +63,14 @@ public: SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; const OUString& GetListStyleName() const { return msListStyleName; } sal_Int16 GetLevel() const { return mnLevel; } bool IsRestartNumbering() const { return mbRestartNumbering; } void ResetRestartNumbering() { mbRestartNumbering = false; } - const ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace >& GetNumRules() const + const css::uno::Reference < css::container::XIndexReplace >& GetNumRules() const { return mxNumRules; } const OUString& GetListId() const { return msListId;} diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx index f52e4c40082f..97b4bb11d5eb 100644 --- a/xmloff/source/text/XMLTextListItemContext.hxx +++ b/xmloff/source/text/XMLTextListItemContext.hxx @@ -33,8 +33,7 @@ class XMLTextListItemContext : public SvXMLImportContext // quantity of <text:list> child elements sal_Int16 mnSubListCount; // list style instance for text::style-override property - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexReplace > mxNumRulesOverride; + css::uno::Reference< css::container::XIndexReplace > mxNumRulesOverride; public: @@ -44,8 +43,7 @@ public: XMLTextImportHelper& rTxtImp, const sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, const bool bIsHeader = false ); virtual ~XMLTextListItemContext(); @@ -53,8 +51,7 @@ public: SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; bool HasStartValue() const { return -1 != nStartValue; } sal_Int16 GetStartValue() const { return nStartValue; } @@ -63,8 +60,7 @@ public: { return mxNumRulesOverride.is(); } - inline const ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace >& GetNumRulesOverride() const + inline const css::uno::Reference < css::container::XIndexReplace >& GetNumRulesOverride() const { return mxNumRulesOverride; } diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index e28170c1ee71..2ebef98d77d6 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -64,7 +64,7 @@ XMLFieldParamImportContext::XMLFieldParamImportContext( } -void XMLFieldParamImportContext::StartElement(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList) +void XMLFieldParamImportContext::StartElement(const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) { SvXMLImport& rImport = GetImport(); OUString sName; @@ -217,7 +217,7 @@ void XMLTextMarkImportContext::EndElement() if ((lcl_MarkType)nTmp==TypeFieldmark) { if (xContent.is() && bImportAsField) { // setup fieldmark... - Reference< ::com::sun::star::text::XFormField> xFormField(xContent, UNO_QUERY); + Reference< css::text::XFormField> xFormField(xContent, UNO_QUERY); xFormField->setFieldType(OUString::createFromAscii(formFieldmarkName)); if (xFormField.is() && m_rHelper.hasCurrentFieldCtx()) { m_rHelper.setCurrentFieldParamsTo(xFormField); @@ -324,7 +324,7 @@ void XMLTextMarkImportContext::EndElement() if ((lcl_MarkType)nTmp==TypeFieldmarkEnd) { if (xContent.is() && bImportAsField) { // setup fieldmark... - Reference< ::com::sun::star::text::XFormField> xFormField(xContent, UNO_QUERY); + Reference< css::text::XFormField> xFormField(xContent, UNO_QUERY); if (xFormField.is() && m_rHelper.hasCurrentFieldCtx()) { xFormField->setFieldType(fieldmarkTypeName); @@ -355,7 +355,7 @@ void XMLTextMarkImportContext::EndElement() SvXMLImportContext *XMLTextMarkImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) + const css::uno::Reference< css::xml::sax::XAttributeList >& ) { return new XMLFieldParamImportContext(GetImport(), m_rHelper, nPrefix, rLocalName); @@ -415,7 +415,7 @@ Reference<XTextContent> XMLTextMarkImportContext::CreateAndInsertMark( return xTextContent; } - catch (com::sun::star::lang::IllegalArgumentException &) + catch (css::lang::IllegalArgumentException &) { OSL_FAIL("CreateAndInsertMark: cannot insert?"); return nullptr; diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx index faa963feed28..b768c3567221 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.hxx +++ b/xmloff/source/text/XMLTextMarkImportContext.hxx @@ -47,8 +47,7 @@ public: const OUString& rLocalName ); virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; }; @@ -85,28 +84,24 @@ public: protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; virtual void EndElement() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; public: - static ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent > CreateAndInsertMark( + static css::uno::Reference< css::text::XTextContent > CreateAndInsertMark( SvXMLImport& rImport, const OUString& sServiceName, const OUString& sMarkName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange> & rRange, + const css::uno::Reference<css::text::XTextRange> & rRange, const OUString& i_rXmlId = OUString()); bool FindName( SvXMLImport& rImport, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList); + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList); }; #endif diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 4d09587f1aa6..f98001fdec6d 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -235,7 +235,7 @@ SvXMLImportContext *XMLTextMasterPageContext::CreateChildContext( SvXMLImportContext *XMLTextMasterPageContext::CreateHeaderFooterContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, const bool bFooter, const bool bLeft, const bool bFirst ) diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx index 571c59d181ed..a31f13dc2a8f 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.cxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx @@ -61,8 +61,7 @@ XMLTextNumRuleInfo::XMLTextNumRuleInfo() // Written OpenDocument file format doesn't fit to the created text document (#i69627#) void XMLTextNumRuleInfo::Set( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & xTextContent, + const css::uno::Reference < css::text::XTextContent > & xTextContent, const bool bOutlineStyleAsNormalListStyle, const XMLTextListAutoStylePool& rListAutoPool, const bool bExportTextNumberElement ) diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx index e5cbeaef175a..b898bb9f4191 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.hxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx @@ -50,8 +50,7 @@ class XMLTextNumRuleInfo const OUString msListLabelStringProp; // numbering rules instance and its name - ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace > mxNumRules; + css::uno::Reference < css::container::XIndexReplace > mxNumRules; OUString msNumRulesName; // paragraph's list attributes @@ -76,8 +75,7 @@ public: inline XMLTextNumRuleInfo& operator=( const XMLTextNumRuleInfo& rInfo ); - void Set( const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rTextContnt, + void Set( const css::uno::Reference < css::text::XTextContent > & rTextContnt, const bool bOutlineStyleAsNormalListStyle, const XMLTextListAutoStylePool& rListAutoPool, const bool bExportTextNumberElement ); diff --git a/xmloff/source/text/XMLTextPropertySetContext.hxx b/xmloff/source/text/XMLTextPropertySetContext.hxx index 2ee7fcf1b42c..411df93cdd04 100644 --- a/xmloff/source/text/XMLTextPropertySetContext.hxx +++ b/xmloff/source/text/XMLTextPropertySetContext.hxx @@ -33,11 +33,10 @@ class XMLTextPropertySetContext : public SvXMLPropertySetContext public: XMLTextPropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFamily, - ::std::vector< XMLPropertyState > &rProps, - const rtl::Reference < SvXMLImportPropertyMapper > &rMap, + ::std::vector< XMLPropertyState > &rProps, + const rtl::Reference < SvXMLImportPropertyMapper > &rMap, OUString& rDopCapTextStyleName ); virtual ~XMLTextPropertySetContext(); @@ -45,7 +44,7 @@ public: using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp) override; }; diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.hxx b/xmloff/source/text/XMLTrackedChangesImportContext.hxx index b47d1a296012..e553d40290ba 100644 --- a/xmloff/source/text/XMLTrackedChangesImportContext.hxx +++ b/xmloff/source/text/XMLTrackedChangesImportContext.hxx @@ -46,14 +46,12 @@ public: virtual ~XMLTrackedChangesImportContext(); virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; }; #endif diff --git a/xmloff/source/text/txtdrope.hxx b/xmloff/source/text/txtdrope.hxx index 10cdcbf7afc4..a921a82e3bc1 100644 --- a/xmloff/source/text/txtdrope.hxx +++ b/xmloff/source/text/txtdrope.hxx @@ -33,7 +33,7 @@ public: explicit XMLTextDropCapExport( SvXMLExport& rExport ); ~XMLTextDropCapExport(); - void exportXML( const ::com::sun::star::uno::Any& rAny, + void exportXML( const css::uno::Any& rAny, bool bWholeWord, const OUString& rStyleName ); }; diff --git a/xmloff/source/text/txtdropi.hxx b/xmloff/source/text/txtdropi.hxx index 0ea6bd3ad67b..5aa29dfe070b 100644 --- a/xmloff/source/text/txtdropi.hxx +++ b/xmloff/source/text/txtdropi.hxx @@ -31,16 +31,14 @@ class XMLTextDropCapImportContext :public XMLElementPropertyContext private: void ProcessAttrs( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); public: XMLTextDropCapImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, const XMLPropertyState& rProp, sal_Int32 nWholeWOrdIdx, ::std::vector< XMLPropertyState > &rProps ); diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx index 9ebd8825fc44..f89dd022cb74 100644 --- a/xmloff/source/text/txtexppr.hxx +++ b/xmloff/source/text/txtexppr.hxx @@ -59,8 +59,7 @@ protected: virtual void ContextFilter( bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const override; + css::uno::Reference< css::beans::XPropertySet > rPropSet ) const override; const SvXMLExport& GetExport() const { return rExport; } public: diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 1b41b6b4fd2c..af5c290c6114 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -1773,13 +1773,13 @@ void XMLTextFieldExport::ExportFieldHelper( } } - com::sun::star::uno::Reference < com::sun::star::text::XText > xText; + css::uno::Reference < css::text::XText > xText; try { - com::sun::star::uno::Any aRet = rPropSet->getPropertyValue(sPropertyTextRange); + css::uno::Any aRet = rPropSet->getPropertyValue(sPropertyTextRange); aRet >>= xText; } - catch ( com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) {} if ( xText.is() ) diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 002fee83985b..f26039b2843b 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -1962,8 +1962,7 @@ void XMLUserDocInfoImportContext::ProcessAttribute( } void XMLUserDocInfoImportContext::PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) { uno::Any aAny; if ( !aName.isEmpty() ) @@ -3259,8 +3258,7 @@ void XMLPageNameFieldImportContext::ProcessAttribute( sal_uInt16, /// prepare XTextField for insertion into document void XMLPageNameFieldImportContext::PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> &) + const css::uno::Reference<css::beans::XPropertySet> &) { } @@ -4136,8 +4134,8 @@ void XMLDateTimeFieldImportContext::ProcessAttribute( sal_uInt16, /// prepare XTextField for insertion into document void XMLDateTimeFieldImportContext::PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> &) + const css::uno::Reference< + css::beans::XPropertySet> &) { } diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 8de29693ec40..9000846aa927 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -2575,7 +2575,7 @@ bool XMLTextImportHelper::hasCurrentFieldCtx() return !m_xImpl->m_FieldStack.empty(); } -void XMLTextImportHelper::setCurrentFieldParamsTo(::com::sun::star::uno::Reference< ::com::sun::star::text::XFormField> &xFormField) +void XMLTextImportHelper::setCurrentFieldParamsTo(css::uno::Reference< css::text::XFormField> &xFormField) { assert(!m_xImpl->m_FieldStack.empty()); if (!m_xImpl->m_FieldStack.empty() && xFormField.is()) diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index 4472cbac24aa..2e0139d3fecc 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -206,7 +206,7 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck( if( !pFontFamily ) { - aAny <<= (sal_Int16)com::sun::star::awt::FontFamily::DONTKNOW; + aAny <<= (sal_Int16)css::awt::FontFamily::DONTKNOW; #if OSL_DEBUG_LEVEL > 0 sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId( @@ -219,7 +219,7 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck( if( !pFontPitch ) { - aAny <<= (sal_Int16)com::sun::star::awt::FontPitch::DONTKNOW; + aAny <<= (sal_Int16)css::awt::FontPitch::DONTKNOW; #if OSL_DEBUG_LEVEL > 0 sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId( pFontFamilyName->mnIndex + 3 ); diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index ce9e90bd1485..895c0f08802a 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -2271,7 +2271,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( } else if (sType.equals(sTextFieldStart)) { - Reference< ::com::sun::star::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY); + Reference< css::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY); /* As of now, textmarks are a proposed extension to the OpenDocument standard. */ if (!bAutoStyles) @@ -2302,7 +2302,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( if (xFormField.is()) { OUString sName; - Reference< ::com::sun::star::container::XNameAccess > xParameters(xFormField->getParameters(), UNO_QUERY); + Reference< css::container::XNameAccess > xParameters(xFormField->getParameters(), UNO_QUERY); if (xParameters.is() && xParameters->hasByName("Name")) { const Any aValue = xParameters->getByName("Name"); @@ -2340,7 +2340,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( { if (!bAutoStyles) { - Reference< ::com::sun::star::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY); + Reference< css::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY); if ( GetExport().getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) { @@ -2353,7 +2353,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( if (xFormField.is()) { OUString sName; - Reference< ::com::sun::star::container::XNameAccess > xParameters(xFormField->getParameters(), UNO_QUERY); + Reference< css::container::XNameAccess > xParameters(xFormField->getParameters(), UNO_QUERY); if (xParameters.is() && xParameters->hasByName("Name")) { const Any aValue = xParameters->getByName("Name"); @@ -2385,7 +2385,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( { GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME, xBookmark->getName()); } - Reference< ::com::sun::star::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY); + Reference< css::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY); if (xFormField.is()) { GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, xFormField->getFieldType()); @@ -3315,7 +3315,7 @@ bool XMLTextParagraphExport::addHyperlinkAttributes( } void XMLTextParagraphExport::exportTextRangeSpan( - const com::sun::star::uno::Reference< com::sun::star::text::XTextRange > & rTextRange, + const css::uno::Reference< css::text::XTextRange > & rTextRange, Reference< XPropertySet > & xPropSet, Reference < XPropertySetInfo > & xPropSetInfo, const bool bIsUICharStyle, diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx index efbb8d69dea5..7c59418cfba7 100644 --- a/xmloff/source/text/txtparai.hxx +++ b/xmloff/source/text/txtparai.hxx @@ -35,25 +35,24 @@ namespace xml { namespace sax { class XAttributeList; } } class XMLParaContext : public SvXMLImportContext { - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextRange > xStart; + css::uno::Reference < css::text::XTextRange > xStart; OUString sStyleName; OUString m_sXmlId; OUString m_sAbout; OUString m_sProperty; OUString m_sContent; OUString m_sDatatype; - bool m_bHaveAbout; - sal_Int8 nOutlineLevel; - XMLHints_Impl *pHints; + bool m_bHaveAbout; + sal_Int8 nOutlineLevel; + XMLHints_Impl *pHints; // Lost outline numbering in master document (#i73509#) - bool mbOutlineLevelAttrFound; - bool bIgnoreLeadingSpace; - bool bHeading; - bool bIsListHeader; - bool bIsRestart; - sal_Int16 nStartValue; - sal_uInt8 nStarFontsConvFlags; + bool mbOutlineLevelAttrFound; + bool bIgnoreLeadingSpace; + bool bHeading; + bool bIsListHeader; + bool bIsRestart; + sal_Int16 nStartValue; + sal_uInt8 nStarFontsConvFlags; public: @@ -61,16 +60,14 @@ public: XMLParaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, bool bHeading ); virtual ~XMLParaContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void Characters( const OUString& rChars ) override; @@ -87,8 +84,7 @@ class XMLNumberedParaContext : public SvXMLImportContext /// text:list-id OUString m_ListId; /// text:style-name - ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace > m_xNumRules; + css::uno::Reference< css::container::XIndexReplace > m_xNumRules; public: @@ -96,8 +92,7 @@ public: XMLNumberedParaContext( SvXMLImport& i_rImport, sal_uInt16 i_nPrefix, const OUString& i_rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & i_xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList > & i_xAttrList ); virtual ~XMLNumberedParaContext(); @@ -105,12 +100,10 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & i_xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & i_xAttrList ) override; sal_Int16 GetLevel() const { return m_Level; } - const ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace >& GetNumRules() const + const css::uno::Reference< css::container::XIndexReplace >& GetNumRules() const { return m_xNumRules; } const OUString& GetListId() const { return m_ListId; } sal_Int16 GetStartValue() const { return m_StartValue; } diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index e3430fe6721d..88562059ed2a 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -263,17 +263,17 @@ public: virtual ~XMLDropCapPropHdl_Impl (); virtual bool equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const override; + const css::uno::Any& r1, + const css::uno::Any& r2 ) const override; /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -320,11 +320,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -370,11 +370,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -420,11 +420,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -484,11 +484,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -538,11 +538,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -727,11 +727,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -780,11 +780,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -874,11 +874,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -975,11 +975,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -1019,11 +1019,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -1074,11 +1074,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -1121,11 +1121,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -1184,11 +1184,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx index 877efefc2d82..ef5282da8c4d 100644 --- a/xmloff/source/text/txtstyle.cxx +++ b/xmloff/source/text/txtstyle.cxx @@ -44,8 +44,7 @@ using namespace ::com::sun::star::beans; using namespace ::xmloff::token; void XMLTextParagraphExport::exportStyleAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ) + const css::uno::Reference< css::style::XStyle > & rStyle ) { OUString sName; Reference< XPropertySet > xPropSet( rStyle, UNO_QUERY ); diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 17a4b0ce5e14..148e85390dce 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -588,7 +588,7 @@ void XMLTextStyleContext::FillPropertySet( rPropSet->setPropertyValue(rPropertyName,Any(sStyleName)); } } - catch(::com::sun::star::lang::IllegalArgumentException& e) + catch(css::lang::IllegalArgumentException& e) { Sequence<OUString> aSeq { sStyleName }; GetImport().SetError(XMLERROR_STYLE_PROP_VALUE | XMLERROR_FLAG_WARNING, aSeq, e.Message, nullptr); diff --git a/xmloff/source/transform/ChartOASISTContext.hxx b/xmloff/source/transform/ChartOASISTContext.hxx index ecd4f8e7bd59..b66078e99f7f 100644 --- a/xmloff/source/transform/ChartOASISTContext.hxx +++ b/xmloff/source/transform/ChartOASISTContext.hxx @@ -29,7 +29,7 @@ public: const OUString& rQName ); virtual ~XMLChartOASISTransformerContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTOASISTCONTEXT_HXX diff --git a/xmloff/source/transform/ChartOOoTContext.hxx b/xmloff/source/transform/ChartOOoTContext.hxx index 4874bed8d8e6..ec9096134e79 100644 --- a/xmloff/source/transform/ChartOOoTContext.hxx +++ b/xmloff/source/transform/ChartOOoTContext.hxx @@ -29,7 +29,7 @@ public: const OUString& rQName ); virtual ~XMLChartOOoTransformerContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTOOOTCONTEXT_HXX diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx index e4f72d90c6ba..e42f10f79129 100644 --- a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx +++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx @@ -33,7 +33,7 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; void ExportCategories(); diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx index 4bba5b169beb..e2ddd635458a 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx @@ -39,7 +39,7 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual void ExportContent() override; diff --git a/xmloff/source/transform/ControlOASISTContext.hxx b/xmloff/source/transform/ControlOASISTContext.hxx index e721f1c77f75..6e4eac2aaf5d 100644 --- a/xmloff/source/transform/ControlOASISTContext.hxx +++ b/xmloff/source/transform/ControlOASISTContext.hxx @@ -34,7 +34,7 @@ public: virtual ~XMLControlOASISTransformerContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/transform/ControlOOoTContext.hxx b/xmloff/source/transform/ControlOOoTContext.hxx index 6a4f14621d7f..350e2946a846 100644 --- a/xmloff/source/transform/ControlOOoTContext.hxx +++ b/xmloff/source/transform/ControlOOoTContext.hxx @@ -24,8 +24,7 @@ class XMLControlOOoTransformerContext : public XMLTransformerContext { - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; + css::uno::Reference< css::xml::sax::XAttributeList > m_xAttrList; OUString m_aElemQName; @@ -38,9 +37,9 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; diff --git a/xmloff/source/transform/CreateElemTContext.hxx b/xmloff/source/transform/CreateElemTContext.hxx index 4e8cb483e14e..51628e218ffd 100644 --- a/xmloff/source/transform/CreateElemTContext.hxx +++ b/xmloff/source/transform/CreateElemTContext.hxx @@ -34,7 +34,7 @@ public: virtual ~XMLCreateElemTransformerContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; #endif // _XMLOFF_CREATEELEMCONTEXT_HXX diff --git a/xmloff/source/transform/DeepTContext.hxx b/xmloff/source/transform/DeepTContext.hxx index 57623fea9aa0..39660381b4f7 100644 --- a/xmloff/source/transform/DeepTContext.hxx +++ b/xmloff/source/transform/DeepTContext.hxx @@ -58,7 +58,7 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; void AddContent( XMLTransformerContext *pContent ); diff --git a/xmloff/source/transform/DlgOASISTContext.hxx b/xmloff/source/transform/DlgOASISTContext.hxx index c47098f50e9a..e50dd31c2c95 100644 --- a/xmloff/source/transform/DlgOASISTContext.hxx +++ b/xmloff/source/transform/DlgOASISTContext.hxx @@ -29,7 +29,7 @@ public: const OUString& rQName ); virtual ~XMLDlgOASISTransformerContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_DLGOASISTCONTEXT_HXX diff --git a/xmloff/source/transform/DocumentTContext.hxx b/xmloff/source/transform/DocumentTContext.hxx index e42c7dee1ba9..f204d48328be 100644 --- a/xmloff/source/transform/DocumentTContext.hxx +++ b/xmloff/source/transform/DocumentTContext.hxx @@ -41,7 +41,7 @@ public: // StartElement is called after a context has been constructed and // before a elements context is parsed. It may be used for actions that // require virtual methods. The default is to do nothing. - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_DOCUMENTTCONTEXT_HXX diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index 723fb671051a..cb529c34f6da 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -130,14 +130,11 @@ bool ParseURL( const OUString& rAttrValue, OUString* pName, OUString* pLocation ) { - Reference< com::sun::star::uno::XComponentContext > - xContext = ::comphelper::getProcessComponentContext(); + Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - Reference< com::sun::star::uri::XUriReferenceFactory > xFactory = - com::sun::star::uri::UriReferenceFactory::create(xContext); + Reference< css::uri::XUriReferenceFactory > xFactory = css::uri::UriReferenceFactory::create(xContext); - Reference< com::sun::star::uri::XVndSunStarScriptUrl > xUrl ( - xFactory->parse( rAttrValue ), UNO_QUERY ); + Reference< css::uri::XVndSunStarScriptUrl > xUrl ( xFactory->parse( rAttrValue ), UNO_QUERY ); if ( xUrl.is() ) { diff --git a/xmloff/source/transform/EventOASISTContext.hxx b/xmloff/source/transform/EventOASISTContext.hxx index 8bcd87eb32ab..502cd905aa36 100644 --- a/xmloff/source/transform/EventOASISTContext.hxx +++ b/xmloff/source/transform/EventOASISTContext.hxx @@ -39,7 +39,7 @@ public: XMLTransformerOASISEventMap_Impl& rMap, XMLTransformerOASISEventMap_Impl* pMap2 ); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTOASISTCONTEXT_HXX diff --git a/xmloff/source/transform/EventOOoTContext.hxx b/xmloff/source/transform/EventOOoTContext.hxx index 4af2a3940af9..fa7a7e210cbd 100644 --- a/xmloff/source/transform/EventOOoTContext.hxx +++ b/xmloff/source/transform/EventOOoTContext.hxx @@ -40,12 +40,12 @@ public: OUString& rNewName, XMLTransformerOOoEventMap_Impl& rMap ); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual bool IsPersistent() const override; }; diff --git a/xmloff/source/transform/FormPropOASISTContext.hxx b/xmloff/source/transform/FormPropOASISTContext.hxx index d92d4e14bbb8..8666f0044e01 100644 --- a/xmloff/source/transform/FormPropOASISTContext.hxx +++ b/xmloff/source/transform/FormPropOASISTContext.hxx @@ -37,7 +37,7 @@ public: virtual ~XMLFormPropOASISTransformerContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx index 01b7aca2586f..0aea00928cd8 100644 --- a/xmloff/source/transform/FormPropOOoTContext.cxx +++ b/xmloff/source/transform/FormPropOOoTContext.cxx @@ -50,7 +50,7 @@ public: virtual ~XMLFormPropValueTContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; diff --git a/xmloff/source/transform/FormPropOOoTContext.hxx b/xmloff/source/transform/FormPropOOoTContext.hxx index 8dbd5cf02f09..54111ef581bb 100644 --- a/xmloff/source/transform/FormPropOOoTContext.hxx +++ b/xmloff/source/transform/FormPropOOoTContext.hxx @@ -27,8 +27,7 @@ class XMLFormPropValueTContext_Impl; class XMLFormPropOOoTransformerContext : public XMLTransformerContext { - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; + css::uno::Reference< css::xml::sax::XAttributeList > m_xAttrList; ::rtl::Reference< XMLFormPropValueTContext_Impl > m_xValueContext; @@ -50,9 +49,9 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/transform/FrameOASISTContext.hxx b/xmloff/source/transform/FrameOASISTContext.hxx index a96b9f16ea04..26b641f2663e 100644 --- a/xmloff/source/transform/FrameOASISTContext.hxx +++ b/xmloff/source/transform/FrameOASISTContext.hxx @@ -24,8 +24,7 @@ class XMLFrameOASISTransformerContext : public XMLTransformerContext { - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; + css::uno::Reference< css::xml::sax::XAttributeList > m_xAttrList; OUString m_aElemQName; @@ -33,8 +32,7 @@ class XMLFrameOASISTransformerContext : public XMLTransformerContext bool IsLinkedEmbeddedObject( const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& rAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& rAttrList ); public: XMLFrameOASISTransformerContext( XMLTransformerBase& rTransformer, @@ -45,9 +43,9 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; diff --git a/xmloff/source/transform/FrameOOoTContext.hxx b/xmloff/source/transform/FrameOOoTContext.hxx index 9b8ebab9767b..9c8f753132f1 100644 --- a/xmloff/source/transform/FrameOOoTContext.hxx +++ b/xmloff/source/transform/FrameOOoTContext.hxx @@ -35,9 +35,9 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; diff --git a/xmloff/source/transform/IgnoreTContext.hxx b/xmloff/source/transform/IgnoreTContext.hxx index 3b22ec379c38..aae5bf2c2c09 100644 --- a/xmloff/source/transform/IgnoreTContext.hxx +++ b/xmloff/source/transform/IgnoreTContext.hxx @@ -58,12 +58,12 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; // StartElement is called after a context has been constructed and // before a elements context is parsed. It may be used for actions that // require virtual methods. The default is to do nothing. - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; // EndElement is called before a context will be destructed, but // after a elements context has been parsed. It may be used for actions diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index 4b7d65417927..3e1a79da7376 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -44,12 +44,12 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; // StartElement is called after a context has been constructed and // before a elements context is parsed. It may be used for actions that // require virtual methods. The default is to do nothing. - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; // EndElement is called before a context will be destructed, but // after a elements context has been parsed. It may be used for actions diff --git a/xmloff/source/transform/MergeElemTContext.hxx b/xmloff/source/transform/MergeElemTContext.hxx index e2d43f2442ef..39cc3b174e0e 100644 --- a/xmloff/source/transform/MergeElemTContext.hxx +++ b/xmloff/source/transform/MergeElemTContext.hxx @@ -29,8 +29,7 @@ typedef ::std::vector< ::rtl::Reference< XMLPersTextContentTContext> > class XMLMergeElemTransformerContext : public XMLTransformerContext { - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; + css::uno::Reference< css::xml::sax::XAttributeList > m_xAttrList; XMLPersTextContentTContextVector m_aChildContexts; sal_uInt16 m_nActionMap; bool m_bStartElementExported; @@ -47,9 +46,9 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx index 5189037c9ef8..a8788fa8c4d3 100644 --- a/xmloff/source/transform/MetaTContext.hxx +++ b/xmloff/source/transform/MetaTContext.hxx @@ -52,7 +52,7 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; // EndElement is called before a context will be destructed, but // after a elements context has been parsed. It may be used for actions diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx index 815585e01f95..d6b98295b5b3 100644 --- a/xmloff/source/transform/MutableAttrList.cxx +++ b/xmloff/source/transform/MutableAttrList.cxx @@ -161,7 +161,7 @@ void XMLMutableAttributeList::RenameAttributeByIndex( sal_Int16 i, } void XMLMutableAttributeList::AppendAttributeList( - const Reference< ::com::sun::star::xml::sax::XAttributeList >& r ) + const Reference< css::xml::sax::XAttributeList >& r ) { GetMutableAttrList()->AppendAttributeList( r ); } diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx index 10fc28674596..540f4c4d8cb8 100644 --- a/xmloff/source/transform/MutableAttrList.hxx +++ b/xmloff/source/transform/MutableAttrList.hxx @@ -29,12 +29,11 @@ class SvXMLAttributeList; class XMLMutableAttributeList : public ::cppu::WeakImplHelper< - ::com::sun::star::xml::sax::XAttributeList, - ::com::sun::star::util::XCloneable, - ::com::sun::star::lang::XUnoTunnel> + css::xml::sax::XAttributeList, + css::util::XCloneable, + css::lang::XUnoTunnel> { - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> m_xAttrList; + css::uno::Reference< css::xml::sax::XAttributeList> m_xAttrList; SvXMLAttributeList *m_pMutableAttrList; @@ -42,26 +41,26 @@ class XMLMutableAttributeList : public ::cppu::WeakImplHelper< public: XMLMutableAttributeList(); - XMLMutableAttributeList( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & rAttrList, + XMLMutableAttributeList( const css::uno::Reference< + css::xml::sax::XAttributeList> & rAttrList, bool bClone=false ); virtual ~XMLMutableAttributeList(); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::xml::sax::XAttributeList - virtual sal_Int16 SAL_CALL getLength() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::xml::sax::XAttributeList + virtual sal_Int16 SAL_CALL getLength() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override; - // ::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, std::exception ) override; + // css::util::XCloneable + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw( css::uno::RuntimeException, std::exception ) override; // methods that are not contained in any interface void SetValueByIndex( sal_Int16 i, const OUString& rValue ); @@ -69,7 +68,7 @@ public: // void Clear(); void RemoveAttributeByIndex( sal_Int16 i ); void RenameAttributeByIndex( sal_Int16 i, const OUString& rNewName ); - void AppendAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & ); + void AppendAttributeList( const css::uno::Reference< css::xml::sax::XAttributeList > & ); sal_Int16 GetIndexByName( const OUString& rName ) const; }; diff --git a/xmloff/source/transform/NotesTContext.hxx b/xmloff/source/transform/NotesTContext.hxx index e86b9bfd72ff..1a49c4a94c47 100644 --- a/xmloff/source/transform/NotesTContext.hxx +++ b/xmloff/source/transform/NotesTContext.hxx @@ -39,9 +39,9 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual bool IsPersistent() const override; diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 928fe4aca463..d444f3c938e3 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1098,7 +1098,7 @@ public: virtual ~XMLDocumentTransformerContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; @@ -1239,7 +1239,7 @@ public: virtual ~XMLBodyTransformerContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; @@ -1297,7 +1297,7 @@ public: virtual ~XMLTabStopOOoTContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; XMLTabStopOOoTContext_Impl::XMLTabStopOOoTContext_Impl( @@ -1395,7 +1395,7 @@ public: virtual ~XMLTrackedChangesOOoTContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; XMLTrackedChangesOOoTContext_Impl::XMLTrackedChangesOOoTContext_Impl( @@ -1465,7 +1465,7 @@ public: virtual ~XMLTableOOoTransformerContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; @@ -2016,16 +2016,15 @@ Sequence< OUString > SAL_CALL OOo2OasisTransformer::getSupportedServiceNames( ) } // XTypeProvider -Sequence< ::com::sun::star::uno::Type > SAL_CALL +Sequence< css::uno::Type > SAL_CALL OOo2OasisTransformer::getTypes() throw(RuntimeException, std::exception) { - Sequence< ::com::sun::star::uno::Type > aTypes( - XMLTransformerBase::getTypes() ); + Sequence< css::uno::Type > aTypes( XMLTransformerBase::getTypes() ); sal_Int32 nIndex = aTypes.getLength(); aTypes.realloc( nIndex + 2 ); - ::com::sun::star::uno::Type* pTypes = aTypes.getArray(); + css::uno::Type* pTypes = aTypes.getArray(); pTypes[nIndex++] = cppu::UnoType<XImporter>::get(); pTypes[nIndex++] = cppu::UnoType<XFilter>::get(); diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx index 80a6a62d48f8..cab422e77175 100644 --- a/xmloff/source/transform/OOo2Oasis.hxx +++ b/xmloff/source/transform/OOo2Oasis.hxx @@ -29,8 +29,8 @@ class XMLTransformerOOoEventMap_Impl; class OOo2OasisTransformer : public XMLTransformerBase, - public ::com::sun::star::document::XImporter, - public ::com::sun::star::document::XFilter + public css::document::XImporter, + public css::document::XFilter { OUString m_aImplName; OUString m_aSubServiceName; @@ -51,7 +51,7 @@ public: const sal_Char *pSubServiceName=nullptr ) throw(); virtual ~OOo2OasisTransformer() throw(); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); // XInterface @@ -59,9 +59,9 @@ public: // between those inherited through XMLTransformerBase and // the new interfaces). - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( ) throw () override { XMLTransformerBase::acquire(); }; @@ -70,32 +70,32 @@ public: { XMLTransformerBase::release(); }; // 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, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XFilter - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancel( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) throw (css::uno::RuntimeException, std::exception) override; - 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); + void SAL_CALL Initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException); - // ::com::sun::star::xml::sax::XDocumentHandler + // css::xml::sax::XDocumentHandler virtual void SAL_CALL startDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual OUString GetEventName( const OUString& rName, bool bForm = false ) override; diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index 83fa687e19e6..9ab36090f3a6 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -1152,7 +1152,7 @@ public: virtual ~XMLTableTransformerContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; @@ -1250,12 +1250,12 @@ public: virtual ~XMLBodyOASISTransformerContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; @@ -1279,7 +1279,7 @@ void XMLBodyOASISTransformerContext_Impl::StartElement( XMLTransformerContext* XMLBodyOASISTransformerContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) { if (!m_bFirstChild) { @@ -1306,7 +1306,7 @@ public: virtual ~XMLTabStopOASISTContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; XMLTabStopOASISTContext_Impl::XMLTabStopOASISTContext_Impl( @@ -1436,7 +1436,7 @@ public: virtual ~XMLConfigItemTContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual void Characters( const OUString& rChars ) override; @@ -1546,7 +1546,7 @@ public: virtual ~XMLTrackedChangesOASISTContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; XMLTrackedChangesOASISTContext_Impl::XMLTrackedChangesOASISTContext_Impl( diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx index 5f5acf8f91c7..9ad05296e5ad 100644 --- a/xmloff/source/transform/Oasis2OOo.hxx +++ b/xmloff/source/transform/Oasis2OOo.hxx @@ -44,15 +44,15 @@ public: Oasis2OOoTransformer () throw(); virtual ~Oasis2OOoTransformer() throw(); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; virtual OUString GetEventName( const OUString& rName, bool bForm ) override; diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx index 61b26bd2ed4d..5f4942c204d1 100644 --- a/xmloff/source/transform/PersAttrListTContext.hxx +++ b/xmloff/source/transform/PersAttrListTContext.hxx @@ -27,8 +27,7 @@ class XMLPersAttrListTContext : public XMLTransformerContext { - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; + css::uno::Reference< css::xml::sax::XAttributeList > m_xAttrList; OUString m_aElemQName; sal_uInt16 m_nActionMap; @@ -73,12 +72,12 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; // StartElement is called after a context has been constructed and // before a elements context is parsed. It may be used for actions that // require virtual methods. The default is to do nothing. - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; // EndElement is called before a context will be destructed, but // after a elements context has been parsed. It may be used for actions @@ -103,8 +102,7 @@ public: ::xmloff::token::XMLTokenEnum eAToken, const OUString & rValue ); - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > + css::uno::Reference< css::xml::sax::XAttributeList > GetAttrList() const { return m_xAttrList; } }; diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx index 4e33a254ea1b..3a4696a9e9c6 100644 --- a/xmloff/source/transform/PersMixedContentTContext.cxx +++ b/xmloff/source/transform/PersMixedContentTContext.cxx @@ -37,8 +37,8 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual void Characters( const OUString& rChars ) override; diff --git a/xmloff/source/transform/ProcAddAttrTContext.hxx b/xmloff/source/transform/ProcAddAttrTContext.hxx index d366884a5901..2ccf6e067355 100644 --- a/xmloff/source/transform/ProcAddAttrTContext.hxx +++ b/xmloff/source/transform/ProcAddAttrTContext.hxx @@ -39,7 +39,7 @@ public: virtual ~XMLProcAddAttrTransformerContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; #endif // _XMLOFF_PROCADDATTRCONTEXT_HXX diff --git a/xmloff/source/transform/ProcAttrTContext.hxx b/xmloff/source/transform/ProcAttrTContext.hxx index d9049a965595..5263d6d34470 100644 --- a/xmloff/source/transform/ProcAttrTContext.hxx +++ b/xmloff/source/transform/ProcAttrTContext.hxx @@ -46,7 +46,7 @@ public: virtual ~XMLProcAttrTransformerContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/transform/RenameElemTContext.hxx b/xmloff/source/transform/RenameElemTContext.hxx index 75889b516388..c5d1751e35a8 100644 --- a/xmloff/source/transform/RenameElemTContext.hxx +++ b/xmloff/source/transform/RenameElemTContext.hxx @@ -55,7 +55,7 @@ public: // EndElement instead if this is required. virtual ~XMLRenameElemTransformerContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 0edd0710efa4..6a4163ce74fa 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -62,8 +62,7 @@ static const sal_uInt16 aAttrActionMaps[XML_PROP_TYPE_END] = class XMLPropertiesTContext_Impl : public XMLPersElemContentTContext { - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; + css::uno::Reference< css::xml::sax::XAttributeList > m_xAttrList; XMLPropType m_ePropType; bool m_bControlStyle; @@ -86,7 +85,7 @@ public: virtual ~XMLPropertiesTContext_Impl(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void Export() override; diff --git a/xmloff/source/transform/StyleOASISTContext.hxx b/xmloff/source/transform/StyleOASISTContext.hxx index de207fcba04c..ae46ba624f5f 100644 --- a/xmloff/source/transform/StyleOASISTContext.hxx +++ b/xmloff/source/transform/StyleOASISTContext.hxx @@ -49,9 +49,9 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual void Characters( const OUString& rChars ) override; diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index 63cac8910c35..24d0234a3b27 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -144,8 +144,7 @@ static const sal_uInt16 aElemActionMaps[XML_PROP_TYPE_END] = class XMLTypedPropertiesOOoTContext_Impl : public XMLPersElemContentTContext { - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; + css::uno::Reference< css::xml::sax::XAttributeList > m_xAttrList; public: XMLTypedPropertiesOOoTContext_Impl( XMLTransformerBase& rTransformer, @@ -159,7 +158,7 @@ public: void AddAttribute( sal_uInt16 nPrefix, XMLTokenEnum eToken, const OUString &sValue ); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& rAttrList ) override; virtual void Export() override; }; @@ -244,7 +243,7 @@ public: const OUString& rQName, const Reference< XAttributeList >& rAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& rAttrList ) override; virtual void EndElement() override; diff --git a/xmloff/source/transform/StyleOOoTContext.hxx b/xmloff/source/transform/StyleOOoTContext.hxx index e59595eaaa2e..5a716a5387d7 100644 --- a/xmloff/source/transform/StyleOOoTContext.hxx +++ b/xmloff/source/transform/StyleOOoTContext.hxx @@ -50,9 +50,9 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual void Characters( const OUString& rChars ) override; virtual bool IsPersistent() const override; diff --git a/xmloff/source/transform/Transformer.hxx b/xmloff/source/transform/Transformer.hxx index cf589ea991c2..1b04aa44c0d1 100644 --- a/xmloff/source/transform/Transformer.hxx +++ b/xmloff/source/transform/Transformer.hxx @@ -27,10 +27,10 @@ #include <cppuhelper/implbase.hxx> class XMLTransformer : public ::cppu::WeakImplHelper< - ::com::sun::star::xml::sax::XExtendedDocumentHandler, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::lang::XUnoTunnel> + css::xml::sax::XExtendedDocumentHandler, + css::lang::XServiceInfo, + css::lang::XInitialization, + css::lang::XUnoTunnel> { }; diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 63c8b2b207ad..4b4341fd2fec 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -439,7 +439,7 @@ void SAL_CALL XMLTransformerBase::initialize( const Sequence< Any >& aArguments m_xPropSet.set( *pAny, UNO_QUERY ); // xmodel - if( cppu::UnoType<com::sun::star::frame::XModel>::get().isAssignableFrom( pAny->getValueType() ) ) + if( cppu::UnoType<css::frame::XModel>::get().isAssignableFrom( pAny->getValueType() ) ) mxModel.set( *pAny, UNO_QUERY ); } diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx index 71b2ed3c971e..18ccf6b71d86 100644 --- a/xmloff/source/transform/TransformerBase.hxx +++ b/xmloff/source/transform/TransformerBase.hxx @@ -49,14 +49,11 @@ class XMLTransformerBase : public XMLTransformer { friend class XMLTransformerContext; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > - m_xLocator; - - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler; // the handlers - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler > m_xExtHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xPropSet; - ::com::sun::star::uno::Reference< - ::com::sun::star::i18n::XCharacterClassification > xCharClass; + css::uno::Reference< css::xml::sax::XLocator > m_xLocator; + css::uno::Reference< css::xml::sax::XDocumentHandler > m_xHandler; // the handlers + css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > m_xExtHandler; + css::uno::Reference< css::beans::XPropertySet > m_xPropSet; + css::uno::Reference< css::i18n::XCharacterClassification > xCharClass; OUString m_aExtPathPrefix; OUString m_aClass; @@ -68,7 +65,7 @@ class XMLTransformerBase : public XMLTransformer XMLTransformerTokenMap *m_pTokenMap; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; + css::uno::Reference< css::frame::XModel > mxModel; // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. @@ -81,43 +78,43 @@ public: ::xmloff::token::XMLTokenEnum *pTKMapInit=nullptr ) throw(); virtual ~XMLTransformerBase() throw(); - // ::com::sun::star::xml::sax::XDocumentHandler + // css::xml::sax::XDocumentHandler virtual void SAL_CALL startDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; 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, std::exception ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endElement(const OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - 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, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; - // ::com::sun::star::xml::sax::XExtendedDocumentHandler - virtual void SAL_CALL startCDATA() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL endCDATA() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::xml::sax::XExtendedDocumentHandler + virtual void SAL_CALL startCDATA() throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL endCDATA() throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL comment(const OUString& sComment) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL allowLineBreak() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL unknown(const OUString& sString) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; // 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, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; // C++ - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & GetDocHandler() { return m_xHandler; } + const css::uno::Reference< css::xml::sax::XDocumentHandler > & GetDocHandler() { return m_xHandler; } - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & GetPropertySet() { return m_xPropSet; } + const css::uno::Reference< css::beans::XPropertySet > & GetPropertySet() { return m_xPropSet; } SvXMLNamespaceMap& GetNamespaceMap() { return *m_pNamespaceMap; } @@ -134,8 +131,7 @@ public: bool bForm = false ) = 0; - XMLMutableAttributeList *ProcessAttrList( ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& rAttrList, + XMLMutableAttributeList *ProcessAttrList( css::uno::Reference< css::xml::sax::XAttributeList >& rAttrList, sal_uInt16 nActionMap, bool bClone ); static bool ReplaceSingleInchWithIn( OUString& rValue ); diff --git a/xmloff/source/transform/TransformerContext.hxx b/xmloff/source/transform/TransformerContext.hxx index 3b8dd90ec1b8..449c3e144f98 100644 --- a/xmloff/source/transform/TransformerContext.hxx +++ b/xmloff/source/transform/TransformerContext.hxx @@ -72,12 +72,12 @@ public: virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); // StartElement is called after a context has been constructed and // before a elements context is parsed. It may be used for actions that // require virtual methods. The default is to do nothing. - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); // EndElement is called before a context will be destructed, but // after a elements context has been parsed. It may be used for actions diff --git a/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx index 7baa5c6840d8..20c3eb6e6121 100644 --- a/xmloff/source/xforms/SchemaContext.hxx +++ b/xmloff/source/xforms/SchemaContext.hxx @@ -35,13 +35,13 @@ class SvXMLImportContext; /** import the data type declarations from an xsd:schema element */ class SchemaContext : public TokenContext { - com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository> mxRepository; + css::uno::Reference<css::xforms::XDataTypeRepository> mxRepository; public: SchemaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository ); + const css::uno::Reference<css::xforms::XDataTypeRepository>& rRepository ); virtual ~SchemaContext(); // implement TokenContext methods: @@ -55,7 +55,7 @@ protected: sal_uInt16 nToken, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; }; #endif diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx index b7ab05eee0e5..91d480588767 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.cxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx @@ -87,7 +87,7 @@ SchemaRestrictionContext::SchemaRestrictionContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository, + Reference<css::xforms::XDataTypeRepository>& rRepository, const OUString& sTypeName ) : TokenContext( rImport, nPrefix, rLocalName, aAttributes, aChildren ), mxRepository( rRepository ), @@ -163,11 +163,11 @@ Any xforms_whitespace( const OUString& rValue ) { Any aValue; if( IsXMLToken( rValue, XML_PRESERVE ) ) - aValue <<= com::sun::star::xsd::WhiteSpaceTreatment::Preserve; + aValue <<= css::xsd::WhiteSpaceTreatment::Preserve; else if( IsXMLToken( rValue, XML_REPLACE ) ) - aValue <<= com::sun::star::xsd::WhiteSpaceTreatment::Replace; + aValue <<= css::xsd::WhiteSpaceTreatment::Replace; else if( IsXMLToken( rValue, XML_COLLAPSE ) ) - aValue <<= com::sun::star::xsd::WhiteSpaceTreatment::Collapse; + aValue <<= css::xsd::WhiteSpaceTreatment::Collapse; return aValue; } @@ -212,7 +212,7 @@ Any xforms_time( const OUString& rValue ) Duration aDuration; if (::sax::Converter::convertDuration( aDuration, rValue )) { - com::sun::star::util::Time aTime; + css::util::Time aTime; aTime.Hours = aDuration.Hours; aTime.Minutes = aDuration.Minutes; aTime.Seconds = aDuration.Seconds; @@ -303,45 +303,45 @@ SvXMLImportContext* SchemaRestrictionContext::HandleChild( GetImport().GetNamespaceMap(), msBaseName ) ) { - case com::sun::star::xsd::DataTypeClass::DECIMAL: - case com::sun::star::xsd::DataTypeClass::DOUBLE: - case com::sun::star::xsd::DataTypeClass::FLOAT: + case css::xsd::DataTypeClass::DECIMAL: + case css::xsd::DataTypeClass::DOUBLE: + case css::xsd::DataTypeClass::FLOAT: sPropertyName += "Double"; pConvert = &xforms_double; break; - case com::sun::star::xsd::DataTypeClass::DATETIME: + case css::xsd::DataTypeClass::DATETIME: sPropertyName += "DateTime"; pConvert = &xforms_dateTime; break; - case com::sun::star::xsd::DataTypeClass::DATE: + case css::xsd::DataTypeClass::DATE: sPropertyName += "Date"; pConvert = &xforms_date; break; - case com::sun::star::xsd::DataTypeClass::TIME: + case css::xsd::DataTypeClass::TIME: sPropertyName += "Time"; pConvert = &xforms_time; break; - case com::sun::star::xsd::DataTypeClass::gYear: - case com::sun::star::xsd::DataTypeClass::gDay: - case com::sun::star::xsd::DataTypeClass::gMonth: + case css::xsd::DataTypeClass::gYear: + case css::xsd::DataTypeClass::gDay: + case css::xsd::DataTypeClass::gMonth: sPropertyName += "Int"; pConvert = &xforms_int16; break; - case com::sun::star::xsd::DataTypeClass::STRING: - case com::sun::star::xsd::DataTypeClass::anyURI: - case com::sun::star::xsd::DataTypeClass::BOOLEAN: + case css::xsd::DataTypeClass::STRING: + case css::xsd::DataTypeClass::anyURI: + case css::xsd::DataTypeClass::BOOLEAN: // invalid: These shouldn't have min/max-inclusive break; /* data types not yet supported: - case com::sun::star::xsd::DataTypeClass::DURATION: - case com::sun::star::xsd::DataTypeClass::gYearMonth: - case com::sun::star::xsd::DataTypeClass::gMonthDay: - case com::sun::star::xsd::DataTypeClass::hexBinary: - case com::sun::star::xsd::DataTypeClass::base64Binary: - case com::sun::star::xsd::DataTypeClass::QName: - case com::sun::star::xsd::DataTypeClass::NOTATION: + case css::xsd::DataTypeClass::DURATION: + case css::xsd::DataTypeClass::gYearMonth: + case css::xsd::DataTypeClass::gMonthDay: + case css::xsd::DataTypeClass::hexBinary: + case css::xsd::DataTypeClass::base64Binary: + case css::xsd::DataTypeClass::QName: + case css::xsd::DataTypeClass::NOTATION: */ } } diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx index 6bbb7a4e67aa..0382714fc34e 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.hxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx @@ -35,8 +35,8 @@ class SvXMLImportContext; /** import the xsd:restriction element */ class SchemaRestrictionContext : public TokenContext { - com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository> mxRepository; - com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> mxDataType; + css::uno::Reference<css::xforms::XDataTypeRepository> mxRepository; + css::uno::Reference<css::beans::XPropertySet> mxDataType; OUString msTypeName; OUString msBaseName; @@ -44,7 +44,7 @@ public: SchemaRestrictionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository, + css::uno::Reference<css::xforms::XDataTypeRepository>& rRepository, const OUString& sTypeName ); virtual ~SchemaRestrictionContext(); @@ -62,7 +62,7 @@ protected: sal_uInt16 nToken, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; }; #endif diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx index ea89b39ed837..4f13868db99d 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx @@ -35,14 +35,14 @@ class SvXMLImportContext; /** import the xsd:simpleType element */ class SchemaSimpleTypeContext : public TokenContext { - com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository> mxRepository; + css::uno::Reference<css::xforms::XDataTypeRepository> mxRepository; OUString msTypeName; public: SchemaSimpleTypeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository ); + const css::uno::Reference<css::xforms::XDataTypeRepository>& rRepository ); virtual ~SchemaSimpleTypeContext(); @@ -57,7 +57,7 @@ protected: sal_uInt16 nToken, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; }; #endif diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx index 8a8531063556..eab8ae63aa54 100644 --- a/xmloff/source/xforms/TokenContext.hxx +++ b/xmloff/source/xforms/TokenContext.hxx @@ -55,7 +55,7 @@ public: * create a warning for all others. Classes that wish to override * StartElement need to call the parent method. */ virtual void StartElement( - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; /** call HandleChild for each child element in the token map; * create a warning for all others. Classes that wish to override @@ -64,7 +64,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; /** Create a warning for all non-namespace character * content. Classes that wish to deal with character content have @@ -86,7 +86,7 @@ protected: // context creation sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) = 0; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) = 0; }; #endif diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx index 8bda8309ad89..a0e0b7468771 100644 --- a/xmloff/source/xforms/XFormsBindContext.hxx +++ b/xmloff/source/xforms/XFormsBindContext.hxx @@ -35,20 +35,20 @@ class SvXMLImportContext; /** import the xforms:binding element */ class XFormsBindContext : public TokenContext { - const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> mxModel; - com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> mxBinding; + const css::uno::Reference<css::xforms::XModel2> mxModel; + css::uno::Reference<css::beans::XPropertySet> mxBinding; public: XFormsBindContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel ); + const css::uno::Reference<css::xforms::XModel2>& xModel ); virtual ~XFormsBindContext(); // implement SvXMLImportContext & TokenContext methods: virtual void StartElement( - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; protected: virtual void HandleAttribute( sal_uInt16 nToken, @@ -58,7 +58,7 @@ protected: sal_uInt16 nToken, sal_uInt16 nNamespace, const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; }; diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx index 6c480bac1f49..44dc04b7130d 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.hxx +++ b/xmloff/source/xforms/XFormsInstanceContext.hxx @@ -36,8 +36,8 @@ class SvXMLImportContext; /** import the xforms:instance element */ class XFormsInstanceContext : public TokenContext { - com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> mxModel; - com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument> mxInstance; + css::uno::Reference<css::xforms::XModel2> mxModel; + css::uno::Reference<css::xml::dom::XDocument> mxInstance; OUString msId; OUString msURL; @@ -45,7 +45,7 @@ public: XFormsInstanceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> & xModel ); + const css::uno::Reference<css::xforms::XModel2> & xModel ); virtual ~XFormsInstanceContext(); // implement SvXMLImportContext & TokenContext methods: @@ -56,7 +56,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; @@ -69,7 +69,7 @@ protected: sal_uInt16 nToken, sal_uInt16 nNamespace, const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; }; #endif diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx index fc8e04be6dd0..2ec6bcb0e878 100644 --- a/xmloff/source/xforms/XFormsModelContext.hxx +++ b/xmloff/source/xforms/XFormsModelContext.hxx @@ -35,7 +35,7 @@ class SvXMLImportContext; /** import the xforms:model element */ class XFormsModelContext : public TokenContext { - com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> mxModel; + css::uno::Reference<css::xforms::XModel2> mxModel; public: XFormsModelContext( SvXMLImport& rImport, @@ -43,7 +43,7 @@ public: const OUString& rLName ); virtual ~XFormsModelContext(); - com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> getModel() { return mxModel;} + css::uno::Reference<css::xforms::XModel2> getModel() { return mxModel;} // implement SvXMLImportContext & TokenContext methods: @@ -58,7 +58,7 @@ protected: sal_uInt16 nToken, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; }; #endif diff --git a/xmloff/source/xforms/XFormsModelExport.hxx b/xmloff/source/xforms/XFormsModelExport.hxx index c00ec871e84a..42187b74450d 100644 --- a/xmloff/source/xforms/XFormsModelExport.hxx +++ b/xmloff/source/xforms/XFormsModelExport.hxx @@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star { } } } void exportXFormsModel( SvXMLExport&, - const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& ); + const css::uno::Reference<css::beans::XPropertySet>& ); #endif diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx index a570ab56e887..a171ec834cf0 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.hxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx @@ -35,13 +35,13 @@ class SvXMLImportContext; /** import the xforms:submission element */ class XFormsSubmissionContext : public TokenContext { - com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> mxSubmission; + css::uno::Reference<css::beans::XPropertySet> mxSubmission; public: XFormsSubmissionContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel ); + const css::uno::Reference<css::xforms::XModel2>& xModel ); virtual ~XFormsSubmissionContext(); // implement TokenContext methods: @@ -54,7 +54,7 @@ protected: sal_uInt16 nToken, sal_uInt16 nNamespace, const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; }; diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index 20c9a96a6369..9a1e630c8433 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -201,7 +201,7 @@ sal_uInt16 xforms_getTypeClass( SvXMLTokenMap aMap( aTypes ); sal_uInt16 mnToken = aMap.Get( nPrefix, sLocalName ); - sal_uInt16 nTypeClass = com::sun::star::xsd::DataTypeClass::STRING; + sal_uInt16 nTypeClass = css::xsd::DataTypeClass::STRING; if( mnToken != XML_TOK_UNKNOWN ) { // we found an XSD name: then get the proper API name for it @@ -209,50 +209,50 @@ sal_uInt16 xforms_getTypeClass( switch( mnToken ) { case XML_STRING: - nTypeClass = com::sun::star::xsd::DataTypeClass::STRING; + nTypeClass = css::xsd::DataTypeClass::STRING; break; case XML_ANYURI: - nTypeClass = com::sun::star::xsd::DataTypeClass::anyURI; + nTypeClass = css::xsd::DataTypeClass::anyURI; break; case XML_DECIMAL: - nTypeClass = com::sun::star::xsd::DataTypeClass::DECIMAL; + nTypeClass = css::xsd::DataTypeClass::DECIMAL; break; case XML_DOUBLE: - nTypeClass = com::sun::star::xsd::DataTypeClass::DOUBLE; + nTypeClass = css::xsd::DataTypeClass::DOUBLE; break; case XML_FLOAT: - nTypeClass = com::sun::star::xsd::DataTypeClass::FLOAT; + nTypeClass = css::xsd::DataTypeClass::FLOAT; break; case XML_BOOLEAN: - nTypeClass = com::sun::star::xsd::DataTypeClass::BOOLEAN; + nTypeClass = css::xsd::DataTypeClass::BOOLEAN; break; case XML_DATETIME_XSD: - nTypeClass = com::sun::star::xsd::DataTypeClass::DATETIME; + nTypeClass = css::xsd::DataTypeClass::DATETIME; break; case XML_DATE: - nTypeClass = com::sun::star::xsd::DataTypeClass::DATE; + nTypeClass = css::xsd::DataTypeClass::DATE; break; case XML_TIME: - nTypeClass = com::sun::star::xsd::DataTypeClass::TIME; + nTypeClass = css::xsd::DataTypeClass::TIME; break; case XML_YEAR: - nTypeClass = com::sun::star::xsd::DataTypeClass::gYear; + nTypeClass = css::xsd::DataTypeClass::gYear; break; case XML_DAY: - nTypeClass = com::sun::star::xsd::DataTypeClass::gDay; + nTypeClass = css::xsd::DataTypeClass::gDay; break; case XML_MONTH: - nTypeClass = com::sun::star::xsd::DataTypeClass::gMonth; + nTypeClass = css::xsd::DataTypeClass::gMonth; break; /* data types not yet supported: - nTypeClass = com::sun::star::xsd::DataTypeClass::DURATION; - nTypeClass = com::sun::star::xsd::DataTypeClass::gYearMonth; - nTypeClass = com::sun::star::xsd::DataTypeClass::gMonthDay; - nTypeClass = com::sun::star::xsd::DataTypeClass::hexBinary; - nTypeClass = com::sun::star::xsd::DataTypeClass::base64Binary; - nTypeClass = com::sun::star::xsd::DataTypeClass::QName; - nTypeClass = com::sun::star::xsd::DataTypeClass::NOTATION; + nTypeClass = css::xsd::DataTypeClass::DURATION; + nTypeClass = css::xsd::DataTypeClass::gYearMonth; + nTypeClass = css::xsd::DataTypeClass::gMonthDay; + nTypeClass = css::xsd::DataTypeClass::hexBinary; + nTypeClass = css::xsd::DataTypeClass::base64Binary; + nTypeClass = css::xsd::DataTypeClass::QName; + nTypeClass = css::xsd::DataTypeClass::NOTATION; */ } } diff --git a/xmloff/source/xforms/xformsapi.hxx b/xmloff/source/xforms/xformsapi.hxx index e4e8aaff04fc..b24caf77e349 100644 --- a/xmloff/source/xforms/xformsapi.hxx +++ b/xmloff/source/xforms/xformsapi.hxx @@ -34,42 +34,42 @@ namespace com { namespace sun { namespace star { } } } class SvXMLNamespaceMap; -com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> xforms_createXFormsModel(); +css::uno::Reference<css::xforms::XModel2> xforms_createXFormsModel(); void xforms_addXFormsModel( - const com::sun::star::uno::Reference<com::sun::star::frame::XModel>& xDocument, - const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel ); + const css::uno::Reference<css::frame::XModel>& xDocument, + const css::uno::Reference<css::xforms::XModel2>& xModel ); -com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xforms_findXFormsBinding( com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, const OUString& ); +css::uno::Reference<css::beans::XPropertySet> xforms_findXFormsBinding( css::uno::Reference<css::frame::XModel>&, const OUString& ); -com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xforms_findXFormsSubmission( com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, const OUString& ); +css::uno::Reference<css::beans::XPropertySet> xforms_findXFormsSubmission( css::uno::Reference<css::frame::XModel>&, const OUString& ); void xforms_setValue( - com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xPropSet, + css::uno::Reference<css::beans::XPropertySet>& xPropSet, const OUString& rName, - const com::sun::star::uno::Any& rAny ); + const css::uno::Any& rAny ); template<typename T> void xforms_setValue( - com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xPropSet, + css::uno::Reference<css::beans::XPropertySet>& xPropSet, const OUString& rName, T& aValue ) { - xforms_setValue( xPropSet, rName, com::sun::star::uno::makeAny( aValue ) ); + xforms_setValue( xPropSet, rName, css::uno::makeAny( aValue ) ); } sal_uInt16 xforms_getTypeClass( - const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& xRepository, + const css::uno::Reference<css::xforms::XDataTypeRepository>& xRepository, const SvXMLNamespaceMap& rNamespaceMap, const OUString& rXMLName ); OUString xforms_getTypeName( - const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& xRepository, + const css::uno::Reference<css::xforms::XDataTypeRepository>& xRepository, const SvXMLNamespaceMap& rNamespaceMap, const OUString& rXMLName ); OUString xforms_getBasicTypeName( - const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& xRepository, + const css::uno::Reference<css::xforms::XDataTypeRepository>& xRepository, const SvXMLNamespaceMap& rNamespaceMap, const OUString& rXMLName ); diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx index af419af8364b..d45518e4e57a 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -107,7 +107,7 @@ void exportXForms( SvXMLExport& rExport ) void exportXFormsInstance( SvXMLExport&, const Sequence<PropertyValue>& ); void exportXFormsBinding( SvXMLExport&, const Reference<XPropertySet>& ); void exportXFormsSubmission( SvXMLExport&, const Reference<XPropertySet>& ); -void exportXFormsSchemas( SvXMLExport&, const Reference<com::sun::star::xforms::XModel>& ); +void exportXFormsSchemas( SvXMLExport&, const Reference<css::xforms::XModel>& ); typedef OUString (*convert_t)( const Any& ); @@ -133,14 +133,14 @@ template<typename T, void (*FUNC)( OUStringBuffer&, T )> OUString xforms_convert template<typename T, void (*FUNC)( OUStringBuffer&, const T& )> OUString xforms_convertRef( const Any& ); void xforms_formatDate( OUStringBuffer& aBuffer, const util::Date& aDate ); -void xforms_formatTime( OUStringBuffer& aBuffer, const com::sun::star::util::Time& aTime ); +void xforms_formatTime( OUStringBuffer& aBuffer, const css::util::Time& aTime ); void xforms_formatDateTime( OUStringBuffer& aBuffer, const util::DateTime& aDateTime ); convert_t xforms_int32 = &xforms_convert<sal_Int32,&::sax::Converter::convertNumber>; convert_t xforms_double = &xforms_convert<double,&::sax::Converter::convertDouble>; convert_t xforms_dateTime = &xforms_convertRef<util::DateTime,&xforms_formatDateTime>; convert_t xforms_date = &xforms_convertRef<util::Date,&xforms_formatDate>; -convert_t xforms_time = &xforms_convertRef<com::sun::star::util::Time,&xforms_formatTime>; +convert_t xforms_time = &xforms_convertRef<css::util::Time,&xforms_formatTime>; // other functions static OUString lcl_getXSDType( SvXMLExport& rExport, @@ -162,7 +162,7 @@ void exportXFormsModel( SvXMLExport& rExport, const Reference<XPropertySet>& xModelPropSet ) { // no model -> don't do anything! - Reference<com::sun::star::xforms::XModel> xModel( xModelPropSet, UNO_QUERY ); + Reference<css::xforms::XModel> xModel( xModelPropSet, UNO_QUERY ); if( ! xModel.is() || ! xModelPropSet.is() ) return; @@ -297,7 +297,7 @@ void exportXFormsBinding( SvXMLExport& rExport, { // now get type, and determine whether it's a standard type. If // so, export the XSD name - Reference<com::sun::star::xforms::XModel> xModel( + Reference<css::xforms::XModel> xModel( xBinding->getPropertyValue( "Model" ), UNO_QUERY ); Reference<XDataTypeRepository> xRepository( @@ -473,49 +473,49 @@ static OUString lcl_getXSDType( SvXMLExport& rExport, xType->getPropertyValue( "TypeClass" ) >>= nDataTypeClass; switch( nDataTypeClass ) { - case com::sun::star::xsd::DataTypeClass::STRING: + case css::xsd::DataTypeClass::STRING: eToken = XML_STRING; break; - case com::sun::star::xsd::DataTypeClass::anyURI: + case css::xsd::DataTypeClass::anyURI: eToken = XML_ANYURI; break; - case com::sun::star::xsd::DataTypeClass::DECIMAL: + case css::xsd::DataTypeClass::DECIMAL: eToken = XML_DECIMAL; break; - case com::sun::star::xsd::DataTypeClass::DOUBLE: + case css::xsd::DataTypeClass::DOUBLE: eToken = XML_DOUBLE; break; - case com::sun::star::xsd::DataTypeClass::FLOAT: + case css::xsd::DataTypeClass::FLOAT: eToken = XML_FLOAT; break; - case com::sun::star::xsd::DataTypeClass::BOOLEAN: + case css::xsd::DataTypeClass::BOOLEAN: eToken = XML_BOOLEAN; break; - case com::sun::star::xsd::DataTypeClass::DATETIME: + case css::xsd::DataTypeClass::DATETIME: eToken = XML_DATETIME_XSD; break; - case com::sun::star::xsd::DataTypeClass::TIME: + case css::xsd::DataTypeClass::TIME: eToken = XML_TIME; break; - case com::sun::star::xsd::DataTypeClass::DATE: + case css::xsd::DataTypeClass::DATE: eToken = XML_DATE; break; - case com::sun::star::xsd::DataTypeClass::gYear: + case css::xsd::DataTypeClass::gYear: eToken = XML_YEAR; break; - case com::sun::star::xsd::DataTypeClass::gDay: + case css::xsd::DataTypeClass::gDay: eToken = XML_DAY; break; - case com::sun::star::xsd::DataTypeClass::gMonth: + case css::xsd::DataTypeClass::gMonth: eToken = XML_MONTH; break; - case com::sun::star::xsd::DataTypeClass::DURATION: - case com::sun::star::xsd::DataTypeClass::gYearMonth: - case com::sun::star::xsd::DataTypeClass::gMonthDay: - case com::sun::star::xsd::DataTypeClass::hexBinary: - case com::sun::star::xsd::DataTypeClass::base64Binary: - case com::sun::star::xsd::DataTypeClass::QName: - case com::sun::star::xsd::DataTypeClass::NOTATION: + case css::xsd::DataTypeClass::DURATION: + case css::xsd::DataTypeClass::gYearMonth: + case css::xsd::DataTypeClass::gMonthDay: + case css::xsd::DataTypeClass::hexBinary: + case css::xsd::DataTypeClass::base64Binary: + case css::xsd::DataTypeClass::QName: + case css::xsd::DataTypeClass::NOTATION: default: OSL_FAIL( "unknown data type" ); } @@ -558,7 +558,7 @@ static void lcl_exportDataType( SvXMLExport& rExport, } void exportXFormsSchemas( SvXMLExport& rExport, - const Reference<com::sun::star::xforms::XModel>& xModel ) + const Reference<css::xforms::XModel>& xModel ) { // TODO: for now, we'll fake this... { @@ -672,7 +672,7 @@ void xforms_formatDate( OUStringBuffer& aBuffer, const util::Date& rDate ) + "-" + OUString::number(static_cast<sal_Int32>( rDate.Day )) ); } -void xforms_formatTime( OUStringBuffer& aBuffer, const com::sun::star::util::Time& rTime ) +void xforms_formatTime( OUStringBuffer& aBuffer, const css::util::Time& rTime ) { Duration aDuration; aDuration.Hours = rTime.Hours; @@ -695,13 +695,13 @@ OUString xforms_whitespace( const Any& rAny ) { switch( n ) { - case com::sun::star::xsd::WhiteSpaceTreatment::Preserve: + case css::xsd::WhiteSpaceTreatment::Preserve: sResult = GetXMLToken( XML_PRESERVE ); break; - case com::sun::star::xsd::WhiteSpaceTreatment::Replace: + case css::xsd::WhiteSpaceTreatment::Replace: sResult = GetXMLToken( XML_REPLACE ); break; - case com::sun::star::xsd::WhiteSpaceTreatment::Collapse: + case css::xsd::WhiteSpaceTreatment::Collapse: sResult = GetXMLToken( XML_COLLAPSE ); break; } |