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/entityreference.hxx | |
parent | Use SAL_PRIuUINT32 instead of %d (diff) | |
parent | masterfix DEV300: #i10000# drafts removed (diff) | |
download | core-90087ebb40a6cf12c9464da4e4ea7cc8b5f24bc5.tar.gz core-90087ebb40a6cf12c9464da4e4ea7cc8b5f24bc5.zip |
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/entityreference.hxx')
-rw-r--r-- | unoxml/source/dom/entityreference.hxx | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/unoxml/source/dom/entityreference.hxx b/unoxml/source/dom/entityreference.hxx index a7dc7598be43..ff2dc2542fa4 100644 --- a/unoxml/source/dom/entityreference.hxx +++ b/unoxml/source/dom/entityreference.hxx @@ -26,13 +26,16 @@ * ************************************************************************/ -#ifndef _ENTITYREFERENCE_HXX -#define _ENTITYREFERENCE_HXX +#ifndef DOM_ENTITYREFERENCE_HXX +#define DOM_ENTITYREFERENCE_HXX + +#include <libxml/tree.h> + #include <com/sun/star/uno/Reference.h> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/xml/dom/XEntityReference.hpp> -#include "node.hxx" -#include <libxml/tree.h> + +#include <node.hxx> + using ::rtl::OUString; using namespace com::sun::star::uno; @@ -40,13 +43,23 @@ using namespace com::sun::star::xml::dom; namespace DOM { - class CEntityReference : public cppu::ImplInheritanceHelper1< CNode, XEntityReference > + typedef ::cppu::ImplInheritanceHelper1< CNode, XEntityReference > + CEntityReference_Base; + + class CEntityReference + : public CEntityReference_Base { - friend class CNode; + private: + friend class CDocument; + protected: - CEntityReference(const xmlNodePtr aNodePtr); + CEntityReference( + 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() |