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>

14 files changed, 0 insertions, 712 deletions

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 76a8bb8c19f8..b7696960d04f 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -449,10 +449,6 @@ excludelist:
     include/svtools/dialogclosedlistener.hxx:
     # base class has to be a complete type
     - com/sun/star/ui/dialogs/XDialogClosedListener.hpp
-    include/svtools/framestatuslistener.hxx:
-    # base class has to be a complete type
-    - com/sun/star/frame/XFrameActionListener.hpp
-    - com/sun/star/frame/XStatusListener.hpp
     include/svtools/genericunodialog.hxx:
     # base class has to be a complete type
     - com/sun/star/lang/XInitialization.hpp
diff --git a/include/sfx2/charmappopup.hxx b/include/sfx2/charmappopup.hxx
deleted file mode 100644
index 28540d58e941..000000000000
--- a/include/sfx2/charmappopup.hxx
+++ /dev/null
@@ -1,44 +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_SFX2_INC_CHARMAPPOPUP_HXX
-#define INCLUDED_SFX2_INC_CHARMAPPOPUP_HXX
-
-#include <svtools/popupwindowcontroller.hxx>
-
-class CharmapPopup final : public svt::PopupWindowController
-{
-public:
-    CharmapPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext);
-    virtual ~CharmapPopup() override;
-
-    virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override;
-    virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
-
-    // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
-
-    // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/emojipopup.hxx b/include/sfx2/emojipopup.hxx
deleted file mode 100644
index 0005c467fe1a..000000000000
--- a/include/sfx2/emojipopup.hxx
+++ /dev/null
@@ -1,44 +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_SFX2_INC_EMOJIPOPUP_HXX
-#define INCLUDED_SFX2_INC_EMOJIPOPUP_HXX
-
-#include <svtools/popupwindowcontroller.hxx>
-
-class EmojiPopup final : public svt::PopupWindowController
-{
-public:
-    EmojiPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext);
-    virtual ~EmojiPopup() override;
-
-    virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override;
-    virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
-
-    // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
-
-    // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx
deleted file mode 100644
index 6b49200399d8..000000000000
--- a/include/svtools/framestatuslistener.hxx
+++ /dev/null
@@ -1,91 +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 .
- */
-
-#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/include/svx/ParaLineSpacingPopup.hxx b/include/svx/ParaLineSpacingPopup.hxx
deleted file mode 100644
index dfbfac9ef2fb..000000000000
--- a/include/svx/ParaLineSpacingPopup.hxx
+++ /dev/null
@@ -1,49 +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_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
-#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
-
-#include <svtools/popupwindowcontroller.hxx>
-
-namespace svx
-{
-class SvxLineSpacingToolBoxControl final : public svt::PopupWindowController
-{
-public:
-    explicit SvxLineSpacingToolBoxControl(
-        const css::uno::Reference<css::uno::XComponentContext>& rContext);
-    virtual ~SvxLineSpacingToolBoxControl() override;
-
-    virtual void SAL_CALL execute(sal_Int16 KeyModifier) override;
-
-    virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override;
-    virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
-
-    // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
-
-    // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
-};
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/TextCharacterSpacingPopup.hxx b/include/svx/TextCharacterSpacingPopup.hxx
deleted file mode 100644
index dbc9ad2fee87..000000000000
--- a/include/svx/TextCharacterSpacingPopup.hxx
+++ /dev/null
@@ -1,47 +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_SVX_TEXTCHARACTERSPACINGPOPUP_HXX
-#define INCLUDED_SVX_TEXTCHARACTERSPACINGPOPUP_HXX
-
-#include <svtools/popupwindowcontroller.hxx>
-
-namespace svx
-{
-class TextCharacterSpacingPopup final : public svt::PopupWindowController
-{
-public:
-    TextCharacterSpacingPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext);
-    virtual ~TextCharacterSpacingPopup() override;
-
-    virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
-    virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override;
-
-    // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
-
-    // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
-};
-
-} // end of namespace svx
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/TextUnderlinePopup.hxx b/include/svx/TextUnderlinePopup.hxx
deleted file mode 100644
index 301052aac823..000000000000
--- a/include/svx/TextUnderlinePopup.hxx
+++ /dev/null
@@ -1,47 +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_SVX_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
-#define INCLUDED_SVX_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
-
-#include <svtools/popupwindowcontroller.hxx>
-
-namespace svx
-{
-class TextUnderlinePopup final : public svt::PopupWindowController
-{
-public:
-    TextUnderlinePopup(const css::uno::Reference<css::uno::XComponentContext>& rContext);
-    virtual ~TextUnderlinePopup() override;
-
-    virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
-    virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override;
-
-    // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
-
-    // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
-};
-
-} // end of namespace svx
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/dstribut_enum.hxx b/include/svx/dstribut_enum.hxx
deleted file mode 100644
index a69e6f10ecb6..000000000000
--- a/include/svx/dstribut_enum.hxx
+++ /dev/null
@@ -1,42 +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_SVX_DSTRIBUT_ENUM_HXX
-#define INCLUDED_SVX_DSTRIBUT_ENUM_HXX
-
-enum class SvxDistributeHorizontal
-{
-    NONE = 0,
-    Left,
-    Center,
-    Distance,
-    Right
-};
-
-enum class SvxDistributeVertical
-{
-    NONE = 0,
-    Top,
-    Center,
-    Distance,
-    Bottom
-};
-
-#endif // INCLUDED_SVX_DSTRIBUT_ENUM_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/galleryobjectbinarystorage.hxx b/include/svx/galleryobjectbinarystorage.hxx
deleted file mode 100644
index 85dd9e22836c..000000000000
--- a/include/svx/galleryobjectbinarystorage.hxx
+++ /dev/null
@@ -1,35 +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 .
- */
-
-#pragma once
-
-#include <tools/urlobj.hxx>
-#include <svx/galleryobjectstorage.hxx>
-
-class GalleryObjectBinaryStorage : public GalleryObjectStorage
-{
-private:
-    INetURLObject m_aURL;
-
-public:
-    void setURL(INetURLObject aURL);
-    const INetURLObject& getURL() const { return m_aURL; }
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/galleryobjectxmlstorage.hxx b/include/svx/galleryobjectxmlstorage.hxx
deleted file mode 100644
index 35a9384524f9..000000000000
--- a/include/svx/galleryobjectxmlstorage.hxx
+++ /dev/null
@@ -1,35 +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 .
- */
-
-#pragma once
-
-#include <tools/urlobj.hxx>
-#include <svx/galleryobjectstorage.hxx>
-
-class GalleryObjectXMLStorage : public GalleryObjectStorage
-{
-private:
-    INetURLObject m_aURL;
-
-public:
-    void setURL(INetURLObject aURL);
-    const INetURLObject& getURL() const { return m_aURL; }
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx
deleted file mode 100644
index 10e870b19b7c..000000000000
--- a/include/svx/layctrl.hxx
+++ /dev/null
@@ -1,65 +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_SVX_LAYCTRL_HXX
-#define INCLUDED_SVX_LAYCTRL_HXX
-
-#include <svtools/popupwindowcontroller.hxx>
-
-class SvxTableToolBoxControl final : public svt::PopupWindowController
-{
-public:
-    SvxTableToolBoxControl(const css::uno::Reference<css::uno::XComponentContext>& rContext);
-    virtual ~SvxTableToolBoxControl() override;
-
-    virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
-    virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override;
-
-    // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
-
-    // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
-
-    void TableDialog(const css::uno::Sequence<css::beans::PropertyValue>& rArgs);
-    void CloseAndShowTableDialog();
-};
-
-class SvxColumnsToolBoxControl final : public svt::PopupWindowController
-{
-public:
-    SvxColumnsToolBoxControl(const css::uno::Reference<css::uno::XComponentContext>& rContext);
-    virtual ~SvxColumnsToolBoxControl() override;
-
-    virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
-    virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override;
-
-    // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
-
-    // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
-
-    void InsertColumns(const css::uno::Sequence<css::beans::PropertyValue>& rArgs);
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx
deleted file mode 100644
index 031115dc65b5..000000000000
--- a/include/svx/lboxctrl.hxx
+++ /dev/null
@@ -1,60 +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_SVX_LBOXCTRL_HXX
-#define INCLUDED_SVX_LBOXCTRL_HXX
-
-#include <rtl/ustring.hxx>
-#include <vector>
-#include <svtools/popupwindowcontroller.hxx>
-
-class ToolBox;
-class SvxPopupWindowListBox;
-
-class SvxUndoRedoControl final : public svt::PopupWindowController
-{
-    std::vector<OUString> aUndoRedoList;
-    OUString aDefaultTooltip;
-
-public:
-    SvxUndoRedoControl(const css::uno::Reference<css::uno::XComponentContext>& rContext);
-    virtual ~SvxUndoRedoControl() override;
-
-    virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
-    virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override;
-
-    // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
-
-    // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
-
-    virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent) override;
-
-    void Do(sal_Int16 nCount);
-
-    void SetText(const OUString& rText);
-
-    void SetInfo(sal_Int32 nCount);
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/verttexttbxctrl.hxx b/include/svx/verttexttbxctrl.hxx
deleted file mode 100644
index 262b7f9267f1..000000000000
--- a/include/svx/verttexttbxctrl.hxx
+++ /dev/null
@@ -1,77 +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_SVX_VERTTEXTTBXCTRL_HXX
-#define INCLUDED_SVX_VERTTEXTTBXCTRL_HXX
-
-#include <com/sun/star/lang/XServiceInfo.hpp>
-
-#include <cppuhelper/implbase.hxx>
-#include <svtools/toolboxcontroller.hxx>
-
-//HACK to avoid duplicate ImplInheritanceHelper symbols with MSVC:
-class SAL_DLLPUBLIC_TEMPLATE SvxVertCTLTextTbxCtrl_Base
-    : public cppu::ImplInheritanceHelper<svt::ToolboxController, css::lang::XServiceInfo>
-{
-    using ImplInheritanceHelper::ImplInheritanceHelper;
-};
-
-/*
-  control to remove/insert cjk settings dependent vertical text toolbox item
- */
-class SvxVertCTLTextTbxCtrl : public SvxVertCTLTextTbxCtrl_Base
-{
-    bool m_bVisible;
-
-public:
-    explicit SvxVertCTLTextTbxCtrl(
-        const css::uno::Reference<css::uno::XComponentContext>& rContext);
-
-    virtual ~SvxVertCTLTextTbxCtrl() override;
-
-    // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
-
-    // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() override = 0;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
-
-    // XStatusListener
-    virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent) override;
-};
-
-class SvxCTLTextTbxCtrl final : public SvxVertCTLTextTbxCtrl
-{
-public:
-    SvxCTLTextTbxCtrl(const css::uno::Reference<css::uno::XComponentContext>& rContext);
-
-    virtual OUString SAL_CALL getImplementationName() override;
-};
-
-class SvxVertTextTbxCtrl final : public SvxVertCTLTextTbxCtrl
-{
-public:
-    SvxVertTextTbxCtrl(const css::uno::Reference<css::uno::XComponentContext>& rContext);
-
-    virtual OUString SAL_CALL getImplementationName() override;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/SwapFile.hxx b/include/vcl/SwapFile.hxx
deleted file mode 100644
index bcfa0232c62c..000000000000
--- a/include/vcl/SwapFile.hxx
+++ /dev/null
@@ -1,72 +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 .
- */
-
-#pragma once
-
-#include <vcl/dllapi.h>
-#include <tools/urlobj.hxx>
-#include <tools/stream.hxx>
-#include <unotools/ucbhelper.hxx>
-#include <unotools/ucbstreamhelper.hxx>
-
-namespace vcl
-{
-class VCL_DLLPUBLIC SwapFile
-{
-private:
-    INetURLObject maSwapURL;
-
-public:
-    SwapFile(INetURLObject const& rSwapURL)
-        : maSwapURL(rSwapURL)
-    {
-    }
-
-    ~SwapFile() COVERITY_NOEXCEPT_FALSE
-    {
-        utl::UCBContentHelper::Kill(maSwapURL.GetMainURL(INetURLObject::DecodeMechanism::NONE));
-    }
-
-    const INetURLObject& getSwapURL() const { return maSwapURL; }
-
-    OUString getSwapURLString() const
-    {
-        return maSwapURL.GetMainURL(INetURLObject::DecodeMechanism::NONE);
-    }
-
-    std::unique_ptr<SvStream> openOutputStream()
-    {
-        OUString sSwapURL = getSwapURLString();
-        if (!sSwapURL.isEmpty())
-        {
-            try
-            {
-                return utl::UcbStreamHelper::CreateStream(
-                    sSwapURL, StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE);
-            }
-            catch (const css::uno::Exception&)
-            {
-            }
-        }
-        return std::unique_ptr<SvStream>();
-    }
-};
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */