INTEGRATION: CWS eforms2 (1.2.2); FILE MERGED

2004/04/21 10:46:48 lo 1.2.2.1: fix in listener removal

unoxml/source/events/uievent.cxx

-#include "event.hxx"
-#include "uievent.hxx"
-
-namespace DOM { namespace events
-{    
-
+#include "event.hxx"
+#include "uievent.hxx"
+
+namespace DOM { namespace events
+{
+
     Reference< XAbstractView > SAL_CALL CUIEvent::getView() throw(RuntimeException)
     {
         return m_view;
@@ -18,64 +18,64 @@ namespace DOM { namespace events
                      sal_Bool canBubbleArg,
                      sal_Bool cancelableArg,
                      const Reference< XAbstractView >& viewArg,
-                     sal_Int32 detailArg) throw(RuntimeException)
-    {
-        initEvent(typeArg, canBubbleArg, cancelableArg);
-        m_view = viewArg;
-        m_detail = detailArg;
-    }
-
-
-    // delegate to CEvent, since we are inheriting from CEvent and XEvent
-    OUString SAL_CALL CUIEvent::getType() throw (RuntimeException)
-    {
-        return CEvent::getType();
-    }
-
-    Reference< XEventTarget > SAL_CALL CUIEvent::getTarget() throw (RuntimeException)
-    {
-        return CEvent::getTarget();
-    }
-
-    Reference< XEventTarget > SAL_CALL CUIEvent::getCurrentTarget() throw (RuntimeException)
-    {
-        return CEvent::getCurrentTarget();
-    }
-
-    PhaseType SAL_CALL CUIEvent::getEventPhase() throw (RuntimeException)
-    {
-        return CEvent::getEventPhase();
-    }
-
-    sal_Bool SAL_CALL CUIEvent::getBubbles() throw (RuntimeException)
-    {
-        return CEvent::getBubbles();
-    }
-
-    sal_Bool SAL_CALL CUIEvent::getCancelable() throw (RuntimeException)
-    {
-        // mutation events cannot be canceled
-        return sal_False;
-    }
-
-    com::sun::star::util::Time SAL_CALL CUIEvent::getTimeStamp() throw (RuntimeException)
-    {
-        return CEvent::getTimeStamp();
-    }
-
-    void SAL_CALL CUIEvent::stopPropagation() throw (RuntimeException)
-    {
-        CEvent::stopPropagation();
-    }
-    void SAL_CALL CUIEvent::preventDefault() throw (RuntimeException)
-    {
-        CEvent::preventDefault();
-    }
-
-    void SAL_CALL CUIEvent::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg, 
-        sal_Bool cancelableArg) throw (RuntimeException)
-    {
-        // base initializer
-        CEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg);
-    }
+                     sal_Int32 detailArg) throw(RuntimeException)
+    {
+        initEvent(typeArg, canBubbleArg, cancelableArg);
+        m_view = viewArg;
+        m_detail = detailArg;
+    }
+
+
+    // delegate to CEvent, since we are inheriting from CEvent and XEvent
+    OUString SAL_CALL CUIEvent::getType() throw (RuntimeException)
+    {
+        return CEvent::getType();
+    }
+
+    Reference< XEventTarget > SAL_CALL CUIEvent::getTarget() throw (RuntimeException)
+    {
+        return CEvent::getTarget();
+    }
+
+    Reference< XEventTarget > SAL_CALL CUIEvent::getCurrentTarget() throw (RuntimeException)
+    {
+        return CEvent::getCurrentTarget();
+    }
+
+    PhaseType SAL_CALL CUIEvent::getEventPhase() throw (RuntimeException)
+    {
+        return CEvent::getEventPhase();
+    }
+
+    sal_Bool SAL_CALL CUIEvent::getBubbles() throw (RuntimeException)
+    {
+        return CEvent::getBubbles();
+    }
+
+    sal_Bool SAL_CALL CUIEvent::getCancelable() throw (RuntimeException)
+    {
+        // mutation events cannot be canceled
+        return sal_False;
+    }
+
+    com::sun::star::util::Time SAL_CALL CUIEvent::getTimeStamp() throw (RuntimeException)
+    {
+        return CEvent::getTimeStamp();
+    }
+
+    void SAL_CALL CUIEvent::stopPropagation() throw (RuntimeException)
+    {
+        CEvent::stopPropagation();
+    }
+    void SAL_CALL CUIEvent::preventDefault() throw (RuntimeException)
+    {
+        CEvent::preventDefault();
+    }
+
+    void SAL_CALL CUIEvent::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg,
+        sal_Bool cancelableArg) throw (RuntimeException)
+    {
+        // base initializer
+        CEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg);
+    }
 }}

unoxml/source/events/uievent.hxx

-#ifndef __UIEVENT_HXX
-#define __UIEVENT_HXX
-
-#include <sal/types.h>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/xml/dom/events/EventType.hpp>
-#include <com/sun/star/xml/dom/events/PhaseType.hpp>
-#include <com/sun/star/xml/dom/events/AttrChangeType.hpp>
-#include <com/sun/star/xml/dom/events/XEvent.hpp>
-#include <com/sun/star/xml/dom/events/XUIEvent.hpp>
-#include <com/sun/star/xml/dom/views/XAbstractView.hpp>
-#include "event.hxx"
-
-using namespace rtl;
-using namespace com::sun::star::xml::dom::views;
-
-namespace DOM { namespace events {
-
-class CUIEvent : public cppu::ImplInheritanceHelper1< CEvent, XUIEvent >
-{
-    friend class CEventDispatcher;
-protected:
-    sal_Int32 m_detail;
-    Reference< XAbstractView > m_view;
-
-public:
+#ifndef __UIEVENT_HXX
+#define __UIEVENT_HXX
+
+#include <sal/types.h>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase3.hxx>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/xml/dom/events/EventType.hpp>
+#include <com/sun/star/xml/dom/events/PhaseType.hpp>
+#include <com/sun/star/xml/dom/events/AttrChangeType.hpp>
+#include <com/sun/star/xml/dom/events/XEvent.hpp>
+#include <com/sun/star/xml/dom/events/XUIEvent.hpp>
+#include <com/sun/star/xml/dom/views/XAbstractView.hpp>
+#include "event.hxx"
+
+using namespace rtl;
+using namespace com::sun::star::xml::dom::views;
+
+namespace DOM { namespace events {
+
+class CUIEvent : public cppu::ImplInheritanceHelper1< CEvent, XUIEvent >
+{
+    friend class CEventDispatcher;
+protected:
+    sal_Int32 m_detail;
+    Reference< XAbstractView > m_view;
+
+public:
     virtual Reference< XAbstractView > SAL_CALL getView() throw(RuntimeException);
     virtual sal_Int32 SAL_CALL getDetail() throw(RuntimeException);
     virtual void SAL_CALL initUIEvent(const OUString& typeArg,
                      sal_Bool canBubbleArg,
                      sal_Bool cancelableArg,
                      const Reference< XAbstractView >& viewArg,
-                     sal_Int32 detailArg) throw(RuntimeException);
-
-    // delegate to CEvent, since we are inheriting from CEvent and XEvent
-    virtual OUString SAL_CALL getType() throw (RuntimeException);
-    virtual Reference< XEventTarget > SAL_CALL getTarget() throw (RuntimeException);
-    virtual Reference< XEventTarget > SAL_CALL getCurrentTarget() throw (RuntimeException);
-    virtual PhaseType SAL_CALL getEventPhase() throw (RuntimeException);
-    virtual sal_Bool SAL_CALL getBubbles() throw (RuntimeException);
-    virtual sal_Bool SAL_CALL getCancelable() throw (RuntimeException);
-    virtual com::sun::star::util::Time SAL_CALL getTimeStamp() throw (RuntimeException);
-    virtual void SAL_CALL stopPropagation() throw (RuntimeException);
-    virtual void SAL_CALL preventDefault() throw (RuntimeException);
-    virtual void SAL_CALL initEvent(
-        const OUString& eventTypeArg, 
-        sal_Bool canBubbleArg, 
-        sal_Bool cancelableArg) 
-        throw (RuntimeException);    
-};
-}}
-#endif
+                     sal_Int32 detailArg) throw(RuntimeException);
+
+    // delegate to CEvent, since we are inheriting from CEvent and XEvent
+    virtual OUString SAL_CALL getType() throw (RuntimeException);
+    virtual Reference< XEventTarget > SAL_CALL getTarget() throw (RuntimeException);
+    virtual Reference< XEventTarget > SAL_CALL getCurrentTarget() throw (RuntimeException);
+    virtual PhaseType SAL_CALL getEventPhase() throw (RuntimeException);
+    virtual sal_Bool SAL_CALL getBubbles() throw (RuntimeException);
+    virtual sal_Bool SAL_CALL getCancelable() throw (RuntimeException);
+    virtual com::sun::star::util::Time SAL_CALL getTimeStamp() throw (RuntimeException);
+    virtual void SAL_CALL stopPropagation() throw (RuntimeException);
+    virtual void SAL_CALL preventDefault() throw (RuntimeException);
+    virtual void SAL_CALL initEvent(
+        const OUString& eventTypeArg,
+        sal_Bool canBubbleArg,
+        sal_Bool cancelableArg)
+        throw (RuntimeException);
+};
+}}
+#endif