summaryrefslogtreecommitdiffstats
path: root/unoxml/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-10-16 23:42:34 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-10-17 09:05:55 +0200
commitacfdfdf28a98b5841e4f8f669d9b6efe195926d9 (patch)
treec2acd30ad81561ee135de1acfaee3fd7194959d7 /unoxml/source
parentSimplify ScCompressedArray constructor (diff)
downloadcore-acfdfdf28a98b5841e4f8f669d9b6efe195926d9.tar.gz
core-acfdfdf28a98b5841e4f8f669d9b6efe195926d9.zip
Move unoxml/source/events include files to common include directory
...that are included from various source directories. Change done in preparation of loplugin:includeform. Change-Id: I186ab7581ee7896c54a600e5cde8721a97b26425 Reviewed-on: https://gerrit.libreoffice.org/43444 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'unoxml/source')
-rw-r--r--unoxml/source/dom/characterdata.cxx2
-rw-r--r--unoxml/source/dom/document.cxx10
-rw-r--r--unoxml/source/dom/element.cxx2
-rw-r--r--unoxml/source/dom/node.cxx4
-rw-r--r--unoxml/source/events/event.hxx73
-rw-r--r--unoxml/source/events/eventdispatcher.hxx86
-rw-r--r--unoxml/source/events/mouseevent.hxx104
-rw-r--r--unoxml/source/events/mutationevent.hxx87
-rw-r--r--unoxml/source/events/uievent.hxx73
9 files changed, 9 insertions, 432 deletions
diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx
index e8ac2aee7c23..0e929522546b 100644
--- a/unoxml/source/dom/characterdata.cxx
+++ b/unoxml/source/dom/characterdata.cxx
@@ -27,7 +27,7 @@
#include <com/sun/star/xml/dom/events/XDocumentEvent.hpp>
-#include "../events/mutationevent.hxx"
+#include "mutationevent.hxx"
using namespace css::uno;
using namespace css::xml::dom;
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index bc2969c7abec..580926273758 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -34,11 +34,11 @@
#include <entity.hxx>
#include <notation.hxx>
-#include "../events/event.hxx"
-#include "../events/mutationevent.hxx"
-#include "../events/uievent.hxx"
-#include "../events/mouseevent.hxx"
-#include "../events/eventdispatcher.hxx"
+#include "event.hxx"
+#include "mutationevent.hxx"
+#include "uievent.hxx"
+#include "mouseevent.hxx"
+#include "eventdispatcher.hxx"
#include <string.h>
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index b14890fa29d7..8e415f74eadb 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -36,7 +36,7 @@
#include <attributesmap.hxx>
#include <document.hxx>
-#include "../events/mutationevent.hxx"
+#include "mutationevent.hxx"
using namespace css::uno;
using namespace css::xml::dom;
diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index aeb77cfcd0a5..4386cfdd0637 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -39,8 +39,8 @@
#include <attr.hxx>
#include <childlist.hxx>
-#include "../events/eventdispatcher.hxx"
-#include "../events/mutationevent.hxx"
+#include "eventdispatcher.hxx"
+#include "mutationevent.hxx"
using namespace css;
using namespace css::uno;
diff --git a/unoxml/source/events/event.hxx b/unoxml/source/events/event.hxx
deleted file mode 100644
index ed07d59f2639..000000000000
--- a/unoxml/source/events/event.hxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_EVENT_HXX
-#define INCLUDED_UNOXML_SOURCE_EVENTS_EVENT_HXX
-
-#include <sal/types.h>
-
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/xml/dom/events/XEvent.hpp>
-#include <com/sun/star/xml/dom/events/XEventTarget.hpp>
-#include <com/sun/star/util/Time.hpp>
-
-#include <cppuhelper/implbase.hxx>
-
-#include "node.hxx"
-
-namespace DOM {namespace events
-{
-class CEvent : public cppu::WeakImplHelper< css::xml::dom::events::XEvent >
-{
-friend class CEventDispatcher;
-
-protected:
- ::osl::Mutex m_Mutex;
- bool m_canceled;
- OUString m_eventType;
- css::uno::Reference< css::xml::dom::events::XEventTarget > m_target;
- css::uno::Reference< css::xml::dom::events::XEventTarget > m_currentTarget;
- css::xml::dom::events::PhaseType m_phase;
- bool m_bubbles;
- bool m_cancelable;
- css::util::Time m_time;
-
-public:
-
- explicit CEvent();
-
- virtual ~CEvent() override;
- virtual OUString SAL_CALL getType() override;
- virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() override;
- virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() override;
- virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() override;
- virtual sal_Bool SAL_CALL getBubbles() override;
- virtual sal_Bool SAL_CALL getCancelable() override;
- virtual css::util::Time SAL_CALL getTimeStamp() override;
- virtual void SAL_CALL stopPropagation() override;
- virtual void SAL_CALL preventDefault() override;
- virtual void SAL_CALL initEvent(
- const OUString& eventTypeArg,
- sal_Bool canBubbleArg,
- sal_Bool cancelableArg) override;
-};
-}}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/source/events/eventdispatcher.hxx b/unoxml/source/events/eventdispatcher.hxx
deleted file mode 100644
index d992ff30d8d3..000000000000
--- a/unoxml/source/events/eventdispatcher.hxx
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_EVENTDISPATCHER_HXX
-#define INCLUDED_UNOXML_SOURCE_EVENTS_EVENTDISPATCHER_HXX
-
-#include <map>
-#include <vector>
-
-#include <libxml/tree.h>
-
-#include <rtl/ustring.hxx>
-
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/xml/dom/XNode.hpp>
-#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/XEvent.hpp>
-
-namespace osl { class Mutex; }
-
-namespace DOM {
-
-class CDocument;
-
-namespace events {
-
-typedef std::multimap< xmlNodePtr, css::uno::Reference< css::xml::dom::events::XEventListener> > ListenerMap;
-typedef std::map<OUString, ListenerMap> TypeListenerMap;
-
-class CEventDispatcher
-{
-private:
- TypeListenerMap m_CaptureListeners;
- TypeListenerMap m_TargetListeners;
-
-public:
- void addListener(
- xmlNodePtr pNode,
- const OUString& aType,
- const css::uno::Reference<css::xml::dom::events::XEventListener>& aListener,
- bool bCapture);
-
- void removeListener(
- xmlNodePtr pNode,
- const OUString& aType,
- const css::uno::Reference<css::xml::dom::events::XEventListener>& aListener,
- bool bCapture);
-
- static void callListeners(
- TypeListenerMap const& rTMap,
- xmlNodePtr const pNode,
- const OUString& aType,
- const css::uno::Reference< css::xml::dom::events::XEvent >& xEvent);
-
- bool dispatchEvent(
- DOM::CDocument & rDocument,
- ::osl::Mutex & rMutex,
- xmlNodePtr const pNode,
- css::uno::Reference<css::xml::dom::XNode> const& xNode,
- css::uno::Reference< css::xml::dom::events::XEvent > const& xEvent) const;
-
- ~CEventDispatcher();
-};
-
-}}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/source/events/mouseevent.hxx b/unoxml/source/events/mouseevent.hxx
deleted file mode 100644
index 87ea75a2bb66..000000000000
--- a/unoxml/source/events/mouseevent.hxx
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_MOUSEEVENT_HXX
-#define INCLUDED_UNOXML_SOURCE_EVENTS_MOUSEEVENT_HXX
-
-#include <com/sun/star/xml/dom/events/PhaseType.hpp>
-#include <com/sun/star/xml/dom/events/XMouseEvent.hpp>
-
-#include <cppuhelper/implbase.hxx>
-
-#include "uievent.hxx"
-
-namespace DOM { namespace events {
-
-typedef ::cppu::ImplInheritanceHelper< CUIEvent, css::xml::dom::events::XMouseEvent >
- CMouseEvent_Base;
-
-class CMouseEvent
- : public CMouseEvent_Base
-{
- sal_Int32 m_screenX;
- sal_Int32 m_screenY;
- sal_Int32 m_clientX;
- sal_Int32 m_clientY;
- bool m_ctrlKey;
- bool m_shiftKey;
- bool m_altKey;
- bool m_metaKey;
- sal_Int16 m_button;
-
-public:
- explicit CMouseEvent();
-
- virtual sal_Int32 SAL_CALL getScreenX() override;
- virtual sal_Int32 SAL_CALL getScreenY() override;
- virtual sal_Int32 SAL_CALL getClientX() override;
- virtual sal_Int32 SAL_CALL getClientY() override;
- virtual sal_Bool SAL_CALL getCtrlKey() override;
- virtual sal_Bool SAL_CALL getShiftKey() override;
- virtual sal_Bool SAL_CALL getAltKey() override;
- virtual sal_Bool SAL_CALL getMetaKey() override;
- virtual sal_Int16 SAL_CALL getButton() override;
- virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getRelatedTarget() override;
-
- virtual void SAL_CALL initMouseEvent(
- const OUString& typeArg,
- sal_Bool canBubbleArg,
- sal_Bool cancelableArg,
- const css::uno::Reference< css::xml::dom::views::XAbstractView >& viewArg,
- sal_Int32 detailArg,
- sal_Int32 screenXArg,
- sal_Int32 screenYArg,
- sal_Int32 clientXArg,
- sal_Int32 clientYArg,
- sal_Bool ctrlKeyArg,
- sal_Bool altKeyArg,
- sal_Bool shiftKeyArg,
- sal_Bool metaKeyArg,
- sal_Int16 buttonArg,
- const css::uno::Reference< css::xml::dom::events::XEventTarget >& relatedTargetArg) override;
-
- // delegate to CUIevent
- virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() override;
- virtual sal_Int32 SAL_CALL getDetail() override;
- virtual void SAL_CALL initUIEvent(const OUString& typeArg,
- sal_Bool canBubbleArg,
- sal_Bool cancelableArg,
- const css::uno::Reference< css::xml::dom::views::XAbstractView >& viewArg,
- sal_Int32 detailArg) override;
- virtual OUString SAL_CALL getType() override;
- virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() override;
- virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() override;
- virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() override;
- virtual sal_Bool SAL_CALL getBubbles() override;
- virtual sal_Bool SAL_CALL getCancelable() override;
- virtual css::util::Time SAL_CALL getTimeStamp() override;
- virtual void SAL_CALL stopPropagation() override;
- virtual void SAL_CALL preventDefault() override;
- virtual void SAL_CALL initEvent(
- const OUString& eventTypeArg,
- sal_Bool canBubbleArg,
- sal_Bool cancelableArg) override;
-};
-}}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/source/events/mutationevent.hxx b/unoxml/source/events/mutationevent.hxx
deleted file mode 100644
index c8dfc3aed1a0..000000000000
--- a/unoxml/source/events/mutationevent.hxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_MUTATIONEVENT_HXX
-#define INCLUDED_UNOXML_SOURCE_EVENTS_MUTATIONEVENT_HXX
-
-#include <sal/types.h>
-
-#include <com/sun/star/uno/Reference.h>
-
-#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/XMutationEvent.hpp>
-
-#include <cppuhelper/implbase.hxx>
-
-#include "event.hxx"
-
-namespace DOM { namespace events {
-
-typedef ::cppu::ImplInheritanceHelper< CEvent, css::xml::dom::events::XMutationEvent >
- CMutationEvent_Base;
-
-class CMutationEvent
- : public CMutationEvent_Base
-{
- css::uno::Reference< css::xml::dom::XNode > m_relatedNode;
- OUString m_prevValue;
- OUString m_newValue;
- OUString m_attrName;
- css::xml::dom::events::AttrChangeType m_attrChangeType;
-
-public:
- explicit CMutationEvent();
-
- virtual ~CMutationEvent() override;
-
- virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getRelatedNode() override;
- virtual OUString SAL_CALL getPrevValue() override;
- virtual OUString SAL_CALL getNewValue() override;
- virtual OUString SAL_CALL getAttrName() override;
- virtual css::xml::dom::events::AttrChangeType SAL_CALL getAttrChange() override;
- virtual void SAL_CALL initMutationEvent(
- const OUString& typeArg,
- sal_Bool canBubbleArg,
- sal_Bool cancelableArg,
- const css::uno::Reference< css::xml::dom::XNode >& relatedNodeArg,
- const OUString& prevValueArg,
- const OUString& newValueArg,
- const OUString& attrNameArg,
- css::xml::dom::events::AttrChangeType attrChangeArg) override;
-
- // delegate to CEvent, since we are inheriting from CEvent and XEvent
- virtual OUString SAL_CALL getType() override;
- virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() override;
- virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() override;
- virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() override;
- virtual sal_Bool SAL_CALL getBubbles() override;
- virtual sal_Bool SAL_CALL getCancelable() override;
- virtual css::util::Time SAL_CALL getTimeStamp() override;
- virtual void SAL_CALL stopPropagation() override;
- virtual void SAL_CALL preventDefault() override;
- virtual void SAL_CALL initEvent(
- const OUString& eventTypeArg,
- sal_Bool canBubbleArg,
- sal_Bool cancelableArg) override;
-};
-}}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/source/events/uievent.hxx b/unoxml/source/events/uievent.hxx
deleted file mode 100644
index c82e600c24c6..000000000000
--- a/unoxml/source/events/uievent.hxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_UIEVENT_HXX
-#define INCLUDED_UNOXML_SOURCE_EVENTS_UIEVENT_HXX
-
-#include <sal/types.h>
-
-#include <com/sun/star/xml/dom/events/PhaseType.hpp>
-#include <com/sun/star/xml/dom/events/XUIEvent.hpp>
-#include <com/sun/star/xml/dom/views/XAbstractView.hpp>
-
-#include <cppuhelper/implbase.hxx>
-
-#include "event.hxx"
-
-namespace DOM { namespace events {
-
-typedef ::cppu::ImplInheritanceHelper< CEvent, css::xml::dom::events::XUIEvent > CUIEvent_Base;
-
-class CUIEvent
- : public CUIEvent_Base
-{
-protected:
- sal_Int32 m_detail;
- css::uno::Reference< css::xml::dom::views::XAbstractView > m_view;
-
-public:
- explicit CUIEvent();
-
- virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() override;
- virtual sal_Int32 SAL_CALL getDetail() override;
- virtual void SAL_CALL initUIEvent(const OUString& typeArg,
- sal_Bool canBubbleArg,
- sal_Bool cancelableArg,
- const css::uno::Reference< css::xml::dom::views::XAbstractView >& viewArg,
- sal_Int32 detailArg) override;
-
- // delegate to CEvent, since we are inheriting from CEvent and XEvent
- virtual OUString SAL_CALL getType() override;
- virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() override;
- virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() override;
- virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() override;
- virtual sal_Bool SAL_CALL getBubbles() override;
- virtual sal_Bool SAL_CALL getCancelable() override;
- virtual css::util::Time SAL_CALL getTimeStamp() override;
- virtual void SAL_CALL stopPropagation() override;
- virtual void SAL_CALL preventDefault() override;
- virtual void SAL_CALL initEvent(
- const OUString& eventTypeArg,
- sal_Bool canBubbleArg,
- sal_Bool cancelableArg) override;
-};
-}}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */