diff options
Diffstat (limited to 'unoxml')
-rw-r--r-- | unoxml/inc/eventdispatcher.hxx | 2 | ||||
-rw-r--r-- | unoxml/source/events/eventdispatcher.cxx | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/unoxml/inc/eventdispatcher.hxx b/unoxml/inc/eventdispatcher.hxx index ee8bec567590..be6a7206e7cb 100644 --- a/unoxml/inc/eventdispatcher.hxx +++ b/unoxml/inc/eventdispatcher.hxx @@ -69,7 +69,7 @@ public: const OUString& aType, const css::uno::Reference< css::xml::dom::events::XEvent >& xEvent); - bool dispatchEvent( + void dispatchEvent( DOM::CDocument & rDocument, ::osl::Mutex & rMutex, xmlNodePtr const pNode, diff --git a/unoxml/source/events/eventdispatcher.cxx b/unoxml/source/events/eventdispatcher.cxx index 85f6df5b9c14..ff5ce7aa8889 100644 --- a/unoxml/source/events/eventdispatcher.cxx +++ b/unoxml/source/events/eventdispatcher.cxx @@ -102,7 +102,7 @@ namespace DOM { namespace events { } } - bool CEventDispatcher::dispatchEvent( + void CEventDispatcher::dispatchEvent( DOM::CDocument & rDocument, ::osl::Mutex & rMutex, xmlNodePtr const pNode, Reference<XNode> const& xNode, Reference< XEvent > const& i_xEvent) const @@ -117,7 +117,7 @@ namespace DOM { namespace events { } if (captureListeners.empty() && targetListeners.empty()) - return true; + return; CEvent *pEvent = nullptr; // pointer to internal event representation @@ -222,7 +222,7 @@ namespace DOM { namespace events { { pEvent->m_currentTarget = rinode->first; callListeners(captureListeners, rinode->second, aType, xEvent); - if (pEvent->m_canceled) return true; + if (pEvent->m_canceled) return; ++rinode; } @@ -232,7 +232,7 @@ namespace DOM { namespace events { pEvent->m_phase = PhaseType_AT_TARGET; pEvent->m_currentTarget = inode->first; callListeners(targetListeners, inode->second, aType, xEvent); - if (pEvent->m_canceled) return true; + if (pEvent->m_canceled) return; // bubbeling phase ++inode; if (i_xEvent->getBubbles()) { @@ -242,12 +242,11 @@ namespace DOM { namespace events { pEvent->m_currentTarget = inode->first; callListeners(targetListeners, inode->second, aType, xEvent); - if (pEvent->m_canceled) return true; + if (pEvent->m_canceled) return; ++inode; } } } - return true; } }} |