diff options
Diffstat (limited to 'xmloff/source/transform')
42 files changed, 148 insertions, 166 deletions
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 |