move some headers inside modules

Change-Id: I2baa9e9334850cf72e8ea1e96a2177a1c052e589
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115868
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 97 insertions, 2 deletions

diff --git a/svtools/IwyuFilter_svtools.yaml b/svtools/IwyuFilter_svtools.yaml
index 19ad784bc3ef..be8ac06407fa 100644
--- a/svtools/IwyuFilter_svtools.yaml
+++ b/svtools/IwyuFilter_svtools.yaml
@@ -1,6 +1,10 @@
 ---
 assumeFilename: svtools/source/control/ruler.cxx
 excludelist:
+    svtools/inc/framestatuslistener.hxx:
+    # base class has to be a complete type
+    - com/sun/star/frame/XFrameActionListener.hpp
+    - com/sun/star/frame/XStatusListener.hpp
     svtools/source/control/accessibleruler.hxx:
     # base class has to be a complete type
     - com/sun/star/accessibility/XAccessible.hpp
diff --git a/svtools/inc/framestatuslistener.hxx b/svtools/inc/framestatuslistener.hxx
new file mode 100644
index 000000000000..6b49200399d8
--- /dev/null
+++ b/svtools/inc/framestatuslistener.hxx
@@ -0,0 +1,91 @@
+/* -*- 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 .
+ */
+
+#pragma once
+
+#include <com/sun/star/frame/XFrameActionListener.hpp>
+#include <com/sun/star/frame/XStatusListener.hpp>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/basemutex.hxx>
+
+#include <unordered_map>
+
+namespace com :: sun :: star :: frame { class XDispatch; }
+namespace com :: sun :: star :: frame { class XFrame; }
+namespace com :: sun :: star :: uno { class XComponentContext; }
+
+namespace svt
+{
+
+class FrameStatusListener : public css::frame::XStatusListener,
+                            public css::frame::XFrameActionListener,
+                            public css::lang::XComponent,
+                            public ::cppu::BaseMutex,
+                            public ::cppu::OWeakObject
+{
+    public:
+        FrameStatusListener( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                             const css::uno::Reference< css::frame::XFrame >& xFrame );
+        virtual ~FrameStatusListener() override;
+
+        // methods to support status forwarder, known by the old sfx2 toolbox controller implementation
+        void addStatusListener( const OUString& aCommandURL );
+        void bindListener();
+
+        // XInterface
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
+        virtual void SAL_CALL acquire() noexcept override;
+        virtual void SAL_CALL release() noexcept override;
+
+        // XComponent
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
+
+        // XEventListener
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+
+        // XStatusListener
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override = 0;
+
+        // XFrameActionListener
+        virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) override;
+
+    protected:
+        struct Listener
+        {
+            Listener( const css::util::URL& rURL, const css::uno::Reference< css::frame::XDispatch >& rDispatch ) :
+                aURL( rURL ), xDispatch( rDispatch ) {}
+
+            css::util::URL aURL;
+            css::uno::Reference< css::frame::XDispatch > xDispatch;
+        };
+
+        typedef std::unordered_map< OUString,
+                                    css::uno::Reference< css::frame::XDispatch > > URLToDispatchMap;
+
+        bool                                                      m_bDisposed : 1;
+        css::uno::Reference< css::frame::XFrame >                 m_xFrame;
+        css::uno::Reference< css::uno::XComponentContext >        m_xContext;
+        URLToDispatchMap                                          m_aListenerMap;
+};
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 949cd747b2a1..e3234184e533 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -24,7 +24,7 @@
 #include <vcl/taskpanelist.hxx>
 #include <vcl/svapp.hxx>
 
-#include <svtools/framestatuslistener.hxx>
+#include <framestatuslistener.hxx>
 #include <svtools/toolbarmenu.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx
index 33c475e25dae..0ad4271a1987 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/framestatuslistener.hxx>
+#include <framestatuslistener.hxx>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>