diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-26 09:02:49 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-26 12:21:24 +0000 |
commit | 93ca2247212118695d27ec13d6eedc4d3e512960 (patch) | |
tree | 38077d5d9a4b66bd892f6a283d93e8916321ef53 /xmlscript | |
parent | fa17cfd7e006c73f1360a5a974f38d9875f347c5 (diff) |
com::sun::star->css in xmlscript/
Change-Id: I8ead2862ef429a0ac3fc16fe6ca5dfc9e5f549bc
Reviewed-on: https://gerrit.libreoffice.org/20193
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmlscript')
-rw-r--r-- | xmlscript/source/inc/misc.hxx | 10 | ||||
-rw-r--r-- | xmlscript/source/inc/xml_import.hxx | 6 | ||||
-rw-r--r-- | xmlscript/source/xml_helper/xml_impctx.cxx | 2 | ||||
-rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_export.hxx | 50 | ||||
-rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 2 | ||||
-rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_import.hxx | 170 | ||||
-rw-r--r-- | xmlscript/source/xmllib_imexp/xmllib_export.cxx | 2 | ||||
-rw-r--r-- | xmlscript/source/xmllib_imexp/xmllib_import.cxx | 4 |
8 files changed, 123 insertions, 123 deletions
diff --git a/xmlscript/source/inc/misc.hxx b/xmlscript/source/inc/misc.hxx index e8ece5e64d0c..7671deacf989 100644 --- a/xmlscript/source/inc/misc.hxx +++ b/xmlscript/source/inc/misc.hxx @@ -26,19 +26,19 @@ namespace xmlscript { template< typename T > -inline void extract_throw( T * p, ::com::sun::star::uno::Any const & a ) +inline void extract_throw( T * p, css::uno::Any const & a ) { if (! (a >>= *p)) { - throw ::com::sun::star::uno::RuntimeException( + throw css::uno::RuntimeException( "expected " + cppu::UnoType<T>::get().getTypeName(), - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface>() ); + css::uno::Reference< + css::uno::XInterface>() ); } } template< typename T > -inline T extract_throw( ::com::sun::star::uno::Any const & a ) +inline T extract_throw( css::uno::Any const & a ) { T v = T(); extract_throw<T>( &v, a ); diff --git a/xmlscript/source/inc/xml_import.hxx b/xmlscript/source/inc/xml_import.hxx index 6f3cacd2b1cb..f14e3e5d8edc 100644 --- a/xmlscript/source/inc/xml_import.hxx +++ b/xmlscript/source/inc/xml_import.hxx @@ -48,10 +48,10 @@ namespace xmlscript @return document handler for parser */ -::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > +css::uno::Reference< css::xml::sax::XDocumentHandler > SAL_CALL createDocumentHandler( - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::input::XRoot > const & xRoot, + css::uno::Reference< + css::xml::input::XRoot > const & xRoot, bool bSingleThreadedUse = true ); } diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx index a553186093ff..694b8ed83dd7 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -93,7 +93,7 @@ class DocumentHandlerImpl : public ::cppu::WeakImplHelper< xml::sax::XDocumentHandler, xml::input::XNamespaceMapping, lang::XInitialization, - com::sun::star::lang::XServiceInfo > + css::lang::XServiceInfo > { friend class ExtendedAttributes; diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx index 7e75ba501da1..10746ea24b59 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx @@ -35,41 +35,41 @@ namespace xmlscript // class XMLBasicExporterBase typedef ::cppu::WeakImplHelper< - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::document::XXMLBasicExporter > XMLBasicExporterBase_BASE; + css::lang::XServiceInfo, + css::lang::XInitialization, + css::document::XXMLBasicExporter > XMLBasicExporterBase_BASE; class XMLBasicExporterBase : public XMLBasicExporterBase_BASE { private: - ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - bool m_bOasis; + ::osl::Mutex m_aMutex; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::xml::sax::XDocumentHandler > m_xHandler; + css::uno::Reference< css::frame::XModel > m_xModel; + bool m_bOasis; public: XMLBasicExporterBase( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, bool bOasis ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext, bool bOasis ); virtual ~XMLBasicExporterBase(); // XServiceInfo virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (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; // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxDoc ) - 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 >& rxDoc ) + 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 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 (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; // class XMLBasicExporter @@ -78,14 +78,14 @@ namespace xmlscript { public: explicit XMLBasicExporter( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~XMLBasicExporter(); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - 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; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw (css::uno::RuntimeException, std::exception) override; }; // class XMLOasisBasicExporter @@ -94,14 +94,14 @@ namespace xmlscript { public: explicit XMLOasisBasicExporter( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~XMLOasisBasicExporter(); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - 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; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace xmlscript diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx index 8dae8df85c1e..c3f93e728a6a 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx @@ -63,7 +63,7 @@ namespace xmlscript } bool BasicElementBase::getBoolAttr( sal_Bool* pRet, const OUString& rAttrName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes, + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes, sal_Int32 nUid ) { if ( xAttributes.is() ) diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx index 3ec29faf14ca..49292541c8ff 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx @@ -38,7 +38,7 @@ namespace xmlscript class BasicImport; typedef ::cppu::WeakImplHelper< - ::com::sun::star::xml::input::XElement > BasicElementBase_BASE; + css::xml::input::XElement > BasicElementBase_BASE; class BasicElementBase : public BasicElementBase_BASE { @@ -46,41 +46,41 @@ namespace xmlscript BasicImport* m_pImport; BasicElementBase* m_pParent; OUString m_aLocalName; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes > m_xAttributes; + css::uno::Reference< css::xml::input::XAttributes > m_xAttributes; static bool getBoolAttr( sal_Bool* pRet, const OUString& rAttrName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes, + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes, sal_Int32 nUid ); public: BasicElementBase( const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes, + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes, BasicElementBase* pParent, BasicImport* pImport ); virtual ~BasicElementBase(); // XElement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getLocalName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getUid() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes > SAL_CALL getAttributes() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement( + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::input::XAttributes > SAL_CALL getAttributes() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement( sal_Int32 nUid, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) + throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL characters( const OUString& rChars ) - 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& rWhitespaces ) - 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& rTarget, const OUString& rData ) - 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 endElement() - 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; }; // class BasicLibrariesElement @@ -88,21 +88,21 @@ namespace xmlscript class BasicLibrariesElement : public BasicElementBase { private: - ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer2 > m_xLibContainer; + css::uno::Reference< css::script::XLibraryContainer2 > m_xLibContainer; public: BasicLibrariesElement( const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes, + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes, BasicElementBase* pParent, BasicImport* pImport, - const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer2 >& rxLibContainer ); + const css::uno::Reference< css::script::XLibraryContainer2 >& rxLibContainer ); // XElement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement( + virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement( sal_Int32 nUid, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) + throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endElement() - 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; }; // class BasicEmbeddedLibraryElement @@ -110,25 +110,25 @@ namespace xmlscript class BasicEmbeddedLibraryElement : public BasicElementBase { private: - ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer2 > m_xLibContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xLib; + css::uno::Reference< css::script::XLibraryContainer2 > m_xLibContainer; + css::uno::Reference< css::container::XNameContainer > m_xLib; OUString m_aLibName; bool m_bReadOnly; public: BasicEmbeddedLibraryElement( const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes, + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes, BasicElementBase* pParent, BasicImport* pImport, - const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer2 >& rxLibContainer, + const css::uno::Reference< css::script::XLibraryContainer2 >& rxLibContainer, const OUString& rLibName, bool bReadOnly ); // XElement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement( + virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement( sal_Int32 nUid, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) + throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endElement() - 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; }; // class BasicModuleElement @@ -136,23 +136,23 @@ namespace xmlscript class BasicModuleElement : public BasicElementBase { private: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xLib; + css::uno::Reference< css::container::XNameContainer > m_xLib; OUString m_aName; public: BasicModuleElement( const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes, + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes, BasicElementBase* pParent, BasicImport* pImport, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxLib, + const css::uno::Reference< css::container::XNameContainer >& rxLib, const OUString& rName ); // XElement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement( + virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement( sal_Int32 nUid, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) + throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endElement() - 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; }; // class BasicSourceCodeElement @@ -160,28 +160,28 @@ namespace xmlscript class BasicSourceCodeElement : public BasicElementBase { private: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xLib; + css::uno::Reference< css::container::XNameContainer > m_xLib; OUString m_aName; OUStringBuffer m_aBuffer; public: BasicSourceCodeElement( const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes, + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes, BasicElementBase* pParent, BasicImport* pImport, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxLib, + const css::uno::Reference< css::container::XNameContainer >& rxLib, const OUString& rName ); // XElement virtual void SAL_CALL characters( const OUString& rChars ) - 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 endElement() - 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; }; // class BasicImport typedef ::cppu::WeakImplHelper< - ::com::sun::star::xml::input::XRoot > BasicImport_BASE; + css::xml::input::XRoot > BasicImport_BASE; class BasicImport : public BasicImport_BASE { @@ -193,77 +193,77 @@ namespace xmlscript private: sal_Int32 XMLNS_UID; sal_Int32 XMLNS_XLINK_UID; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; + css::uno::Reference< css::frame::XModel > m_xModel; bool m_bOasis; public: - BasicImport( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, bool bOasis ); + BasicImport( const css::uno::Reference< css::frame::XModel >& rxModel, bool bOasis ); virtual ~BasicImport(); // XRoot virtual void SAL_CALL startDocument( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XNamespaceMapping >& xNamespaceMapping ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::input::XNamespaceMapping >& xNamespaceMapping ) + 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 processingInstruction( const OUString& rTarget, const OUString& rData ) - 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 ::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; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startRootElement( + const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) + throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startRootElement( sal_Int32 nUid, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) + throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; }; // class XMLBasicImporterBase typedef ::cppu::WeakImplHelper< - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::document::XXMLOasisBasicImporter > XMLBasicImporterBase_BASE; + css::lang::XServiceInfo, + css::document::XXMLOasisBasicImporter > XMLBasicImporterBase_BASE; class XMLBasicImporterBase : public XMLBasicImporterBase_BASE { private: - ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - bool m_bOasis; + ::osl::Mutex m_aMutex; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::xml::sax::XDocumentHandler > m_xHandler; + css::uno::Reference< css::frame::XModel > m_xModel; + bool m_bOasis; public: XMLBasicImporterBase( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, bool bOasis ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext, bool bOasis ); virtual ~XMLBasicImporterBase(); // XServiceInfo virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxDoc ) - 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 >& rxDoc ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // 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; }; // class XMLBasicImporter @@ -272,14 +272,14 @@ namespace xmlscript { public: explicit XMLBasicImporter( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~XMLBasicImporter(); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - 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; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw (css::uno::RuntimeException, std::exception) override; }; // class XMLOasisBasicImporter @@ -288,14 +288,14 @@ namespace xmlscript { public: explicit XMLOasisBasicImporter( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~XMLOasisBasicImporter(); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - 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; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace xmlscript diff --git a/xmlscript/source/xmllib_imexp/xmllib_export.cxx b/xmlscript/source/xmllib_imexp/xmllib_export.cxx index 1b791ef7c9b1..5f553ddba2b4 100644 --- a/xmlscript/source/xmllib_imexp/xmllib_export.cxx +++ b/xmlscript/source/xmllib_imexp/xmllib_export.cxx @@ -89,7 +89,7 @@ SAL_CALL exportLibraryContainer( void SAL_CALL exportLibrary( - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XWriter > const & xOut, + css::uno::Reference< css::xml::sax::XWriter > const & xOut, const LibDescriptor& rLib ) { xOut->startDocument(); diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx index 24fabb5b54af..0b0e6b19b4ff 100644 --- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx +++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx @@ -265,14 +265,14 @@ void LibraryElement::endElement() pLib->aElementNames = aElementNames; } -Reference< ::com::sun::star::xml::sax::XDocumentHandler > +Reference< css::xml::sax::XDocumentHandler > SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray ) { return ::xmlscript::createDocumentHandler( static_cast< xml::input::XRoot * >( new LibraryImport( pLibArray ) ) ); } -::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > +css::uno::Reference< css::xml::sax::XDocumentHandler > SAL_CALL importLibrary( LibDescriptor& rLib ) { return ::xmlscript::createDocumentHandler( |