diff options
Diffstat (limited to 'unoxml/source/dom')
-rw-r--r-- | unoxml/source/dom/documentbuilder.cxx | 10 | ||||
-rw-r--r-- | unoxml/source/dom/documentbuilder.hxx | 6 | ||||
-rw-r--r-- | unoxml/source/dom/documenttype.cxx | 4 | ||||
-rw-r--r-- | unoxml/source/dom/entitiesmap.cxx | 3 | ||||
-rw-r--r-- | unoxml/source/dom/entitiesmap.hxx | 5 | ||||
-rw-r--r-- | unoxml/source/dom/notationsmap.cxx | 4 | ||||
-rw-r--r-- | unoxml/source/dom/notationsmap.hxx | 5 |
7 files changed, 11 insertions, 26 deletions
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index b48344cf4130..eafab7e2bf9f 100644 --- a/unoxml/source/dom/documentbuilder.cxx +++ b/unoxml/source/dom/documentbuilder.cxx @@ -87,10 +87,8 @@ namespace DOM }; - CDocumentBuilder::CDocumentBuilder( - Reference< XMultiServiceFactory > const& xFactory) - : m_xFactory(xFactory) - , m_xEntityResolver(new CDefaultEntityResolver()) + CDocumentBuilder::CDocumentBuilder() + : m_xEntityResolver(new CDefaultEntityResolver()) { // init libxml. libxml will protect itself against multiple // initializations so there is no problem here if this gets @@ -98,9 +96,9 @@ namespace DOM xmlInitParser(); } - Reference< XInterface > CDocumentBuilder::_getInstance(const Reference< XMultiServiceFactory >& rSMgr) + Reference< XInterface > CDocumentBuilder::_getInstance(const Reference< XMultiServiceFactory >& ) { - return static_cast< XDocumentBuilder* >(new CDocumentBuilder(rSMgr)); + return static_cast< XDocumentBuilder* >(new CDocumentBuilder); } const char* CDocumentBuilder::aImplementationName = "com.sun.star.comp.xml.dom.DocumentBuilder"; diff --git a/unoxml/source/dom/documentbuilder.hxx b/unoxml/source/dom/documentbuilder.hxx index 441b5dd58eb2..045a19ef455e 100644 --- a/unoxml/source/dom/documentbuilder.hxx +++ b/unoxml/source/dom/documentbuilder.hxx @@ -51,17 +51,13 @@ namespace DOM { private: ::osl::Mutex m_Mutex; - css::uno::Reference< css::lang::XMultiServiceFactory > const - m_xFactory; css::uno::Reference< css::xml::sax::XEntityResolver > m_xEntityResolver; css::uno::Reference< css::xml::sax::XErrorHandler > m_xErrorHandler; public: // ctor - explicit CDocumentBuilder( - css::uno::Reference< css::lang::XMultiServiceFactory > const& - xFactory); + explicit CDocumentBuilder(); // static helpers for service info and component management static const char* aImplementationName; diff --git a/unoxml/source/dom/documenttype.cxx b/unoxml/source/dom/documenttype.cxx index af63d89d79cb..ddc32016dbe6 100644 --- a/unoxml/source/dom/documenttype.cxx +++ b/unoxml/source/dom/documenttype.cxx @@ -52,7 +52,7 @@ namespace DOM css::uno::Reference< XNamedNodeMap > aMap; if (m_aDtdPtr != nullptr) { - aMap.set(new CEntitiesMap(this)); + aMap.set(new CEntitiesMap); } return aMap; } @@ -93,7 +93,7 @@ namespace DOM css::uno::Reference< XNamedNodeMap > aMap; if (m_aDtdPtr != nullptr) { - aMap.set(new CNotationsMap(this)); + aMap.set(new CNotationsMap); } return aMap; } diff --git a/unoxml/source/dom/entitiesmap.cxx b/unoxml/source/dom/entitiesmap.cxx index 08dfb35fef2b..a281fa1b07ce 100644 --- a/unoxml/source/dom/entitiesmap.cxx +++ b/unoxml/source/dom/entitiesmap.cxx @@ -28,8 +28,7 @@ using namespace css::xml::dom; namespace DOM { - CEntitiesMap::CEntitiesMap(::rtl::Reference<CDocumentType> const& pDocType) - : m_pDocType(pDocType) + CEntitiesMap::CEntitiesMap() { } diff --git a/unoxml/source/dom/entitiesmap.hxx b/unoxml/source/dom/entitiesmap.hxx index 1a3f1e387c77..b358ae6795a7 100644 --- a/unoxml/source/dom/entitiesmap.hxx +++ b/unoxml/source/dom/entitiesmap.hxx @@ -36,11 +36,8 @@ namespace DOM class CEntitiesMap : public cppu::WeakImplHelper< css::xml::dom::XNamedNodeMap > { - private: - ::rtl::Reference<CDocumentType> const m_pDocType; - public: - CEntitiesMap(::rtl::Reference<CDocumentType> const& pDocType); + CEntitiesMap(); /** The number of nodes in this map. diff --git a/unoxml/source/dom/notationsmap.cxx b/unoxml/source/dom/notationsmap.cxx index 6e84d07982f0..d2fc182cab8a 100644 --- a/unoxml/source/dom/notationsmap.cxx +++ b/unoxml/source/dom/notationsmap.cxx @@ -28,9 +28,7 @@ using namespace css::xml::dom; namespace DOM { - CNotationsMap::CNotationsMap( - ::rtl::Reference<CDocumentType> const& pDocType) - : m_pDocType(pDocType) + CNotationsMap::CNotationsMap() { } diff --git a/unoxml/source/dom/notationsmap.hxx b/unoxml/source/dom/notationsmap.hxx index d07277e1928f..a68452e44fd8 100644 --- a/unoxml/source/dom/notationsmap.hxx +++ b/unoxml/source/dom/notationsmap.hxx @@ -36,11 +36,8 @@ namespace DOM class CNotationsMap : public cppu::WeakImplHelper< css::xml::dom::XNamedNodeMap > { - private: - ::rtl::Reference<CDocumentType> const m_pDocType; - public: - CNotationsMap(::rtl::Reference<CDocumentType> const& pDocType); + CNotationsMap(); /** The number of nodes in this map. |