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, 26 insertions, 23 deletions

diff --git a/unoxml/source/dom/text.cxx b/unoxml/source/dom/text.cxx
index 520adf3b77e3..198afcb34e3a 100644
--- a/unoxml/source/dom/text.cxx
+++ b/unoxml/source/dom/text.cxx
@@ -26,40 +26,32 @@
  *
  ************************************************************************/
 
-#include "text.hxx"
-namespace DOM
-{
-    CText::CText(const xmlNodePtr aNodePtr)
-    {
-        m_aNodeType = NodeType_TEXT_NODE;
-        init_characterdata(aNodePtr);
-    }
+#include <text.hxx>
 
-    void SAL_CALL CText::saxify(
-            const Reference< XDocumentHandler >& i_xHandler) {
-        if (!i_xHandler.is()) throw RuntimeException();
-        i_xHandler->characters(getData());
-    }
 
-    void CText::init_text(const xmlNodePtr aNodePtr)
+namespace DOM
+{
+    CText::CText(CDocument const& rDocument, ::osl::Mutex const& rMutex,
+            NodeType const& reNodeType, xmlNodePtr const& rpNode)
+        : CText_Base(rDocument, rMutex, reNodeType, rpNode)
     {
-        init_characterdata(aNodePtr);
     }
 
-  Reference< XText > SAL_CALL CText::splitText(sal_Int32 /*offset*/)
-             throw (RuntimeException)
+    CText::CText(CDocument const& rDocument, ::osl::Mutex const& rMutex,
+            xmlNodePtr const pNode)
+        : CText_Base(rDocument, rMutex, NodeType_TEXT_NODE, pNode)
     {
-        return Reference< XText >(this);
     }
 
-    OUString SAL_CALL CText::getNodeName()throw (RuntimeException)
-    {
-        return OUString(RTL_CONSTASCII_USTRINGPARAM("#text"));
+    void CText::saxify(
+            const Reference< XDocumentHandler >& i_xHandler) {
+        if (!i_xHandler.is()) throw RuntimeException();
+        i_xHandler->characters(getData());
     }
 
-    void SAL_CALL CText::fastSaxify( Context& io_rContext )
+    void CText::fastSaxify( Context& io_rContext )
     {
-        if( io_rContext.mxCurrentHandler.is() )
+        if (io_rContext.mxCurrentHandler.is())
         {
             try
             {
@@ -70,6 +62,17 @@ namespace DOM
         }
     }
 
+    OUString SAL_CALL CText::getNodeName() throw (RuntimeException)
+    {
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("#text"));
+    }
+
+    Reference< XText > SAL_CALL CText::splitText(sal_Int32 /*offset*/)
+         throw (RuntimeException)
+    {
+        OSL_FAIL("CText::splitText: not implemented (#i113683#)");
+        return Reference< XText >(this);
+    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */