diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:02 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:02 +0100 |
| commit | 90087ebb40a6cf12c9464da4e4ea7cc8b5f24bc5 (patch) | |
| tree | bb3d6cb01c18dd12ae7ec77234cd43a6092d5a4b /unoxml/source/dom/documentfragment.hxx | |
| parent | 5d7d145d411c8974ceb12ac08759e7ccf3bb9b27 (diff) | |
| parent | 82c070266d0440348c61c710e0caa89ae1e74b1b (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
binfilter/bf_xmloff/source/forms/formcellbinding.hxx
binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx
binfilter/bf_xmloff/source/forms/xmloff_formcellbinding.cxx
filter/source/xsltfilter/makefile.mk
unoxml/source/dom/characterdata.cxx
unoxml/source/dom/document.cxx
unoxml/source/dom/documentbuilder.cxx
unoxml/source/dom/element.cxx
unoxml/source/dom/elementlist.cxx
unoxml/source/dom/node.cxx
unoxml/source/dom/node.hxx
unoxml/source/dom/text.cxx
unoxml/source/events/event.cxx
unoxml/source/events/event.hxx
unoxml/source/events/eventdispatcher.cxx
unoxml/source/events/eventdispatcher.hxx
unoxml/source/events/mouseevent.cxx
unoxml/source/events/mouseevent.hxx
unoxml/source/events/mutationevent.cxx
unoxml/source/events/mutationevent.hxx
unoxml/source/events/uievent.cxx
unoxml/source/events/uievent.hxx
unoxml/source/xpath/nodelist.cxx
unoxml/source/xpath/nodelist.hxx
unoxml/source/xpath/xpathobject.cxx
Diffstat (limited to 'unoxml/source/dom/documentfragment.hxx')
| -rw-r--r-- | unoxml/source/dom/documentfragment.hxx | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/unoxml/source/dom/documentfragment.hxx b/unoxml/source/dom/documentfragment.hxx index 49b2372c6a4f..7e08150a832e 100644 --- a/unoxml/source/dom/documentfragment.hxx +++ b/unoxml/source/dom/documentfragment.hxx @@ -26,14 +26,14 @@ * ************************************************************************/ -#ifndef _DOCUMENTFRAGMENT_HXX -#define _DOCUMENTFRAGMENT_HXX +#ifndef DOM_DOCUMENTFRAGMENT_HXX +#define DOM_DOCUMENTFRAGMENT_HXX #include <com/sun/star/uno/Reference.h> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/xml/dom/XDocumentFragment.hpp> -#include "node.hxx" +#include <node.hxx> + using ::rtl::OUString; using namespace com::sun::star::uno; @@ -41,13 +41,23 @@ using namespace com::sun::star::xml::dom; namespace DOM { - class CDocumentFragment : public cppu::ImplInheritanceHelper1< CNode, XDocumentFragment > + typedef ::cppu::ImplInheritanceHelper1< CNode, XDocumentFragment > + CDocumentFragment_Base; + + class CDocumentFragment + : public CDocumentFragment_Base { - friend class CNode; + private: + friend class CDocument; + protected: - CDocumentFragment(const xmlNodePtr aNodePtr); + CDocumentFragment( + CDocument const& rDocument, ::osl::Mutex const& rMutex, + xmlNodePtr const pNode); public: + virtual bool IsChildTypeAllowed(NodeType const nodeType); + // ---- resolve uno inheritance problems... // overrides for XNode base virtual OUString SAL_CALL getNodeName() |