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

1 files changed, 22 insertions, 13 deletions

diff --git a/unoxml/source/dom/element.hxx b/unoxml/source/dom/element.hxx
index 71d005ba97a2..a425becb131e 100644
--- a/unoxml/source/dom/element.hxx
+++ b/unoxml/source/dom/element.hxx
@@ -26,16 +26,19 @@
  *
  ************************************************************************/
 
-#ifndef _ELEMENT_HXX
-#define _ELEMENT_HXX
+#ifndef DOM_ELEMENT_HXX
+#define DOM_ELEMENT_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/XNode.hpp>
 #include <com/sun/star/xml/dom/XNodeList.hpp>
 #include <com/sun/star/xml/dom/XNamedNodeMap.hpp>
 #include <com/sun/star/xml/dom/NodeType.hpp>
-#include <libxml/tree.h>
-#include "node.hxx"
+
+#include <node.hxx>
+
 
 using ::rtl::OUString;
 using namespace com::sun::star::uno;
@@ -43,22 +46,28 @@ using namespace com::sun::star::xml::dom;
 
 namespace DOM
 {
-    class CElement : public cppu::ImplInheritanceHelper1<CNode, XElement >
+    typedef ::cppu::ImplInheritanceHelper1<CNode, XElement > CElement_Base;
+
+    class CElement
+        : public CElement_Base
     {
-        friend class CNode;
     private:
-        Reference< XAttr > _setAttributeNode(const Reference< XAttr >& newAttr, sal_Bool bNS)
-            throw (RuntimeException);
+        friend class CDocument;
+
+        Reference< XAttr > setAttributeNode_Impl_Lock(
+                Reference< XAttr > const& xNewAttr, bool const bNS);
 
     protected:
-        CElement(const xmlNodePtr aNodePtr);
+        CElement(CDocument const& rDocument, ::osl::Mutex const& rMutex,
+                xmlNodePtr const pNode);
 
     public:
 
-        virtual void SAL_CALL saxify(
-            const Reference< XDocumentHandler >& i_xHandler);
+        virtual void saxify(const Reference< XDocumentHandler >& i_xHandler);
+
+        virtual void fastSaxify( Context& i_rContext );
 
-        virtual void SAL_CALL fastSaxify( Context& i_rContext );
+        virtual bool IsChildTypeAllowed(NodeType const nodeType);
 
         /**
         Retrieves an attribute value by name.