diff options
55 files changed, 144 insertions, 121 deletions
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index c5560d8e9512..2ab76905c458 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -60,6 +60,7 @@ #include <o3tl/functional.hxx> #include <limits> #include <unordered_map> +#include <set> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 3595286db9e2..2359fb69cbce 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -761,3 +761,41 @@ blacklist: # base class has to be a complete type - com/sun/star/frame/XStatusListener.hpp - com/sun/star/lang/XComponent.hpp + include/sfx2/sidebar/Accessible.hxx: + # base class has to be a complete type + - com/sun/star/accessibility/XAccessible.hpp + include/sfx2/sidebar/Paint.hxx: + # Needed for boost::variant + - vcl/gradient.hxx + include/sfx2/sidebar/SidebarController.hxx: + # base class has to be a complete type + - com/sun/star/ui/XContextChangeEventListener.hpp + - com/sun/star/beans/XPropertyChangeListener.hpp + - com/sun/star/ui/XSidebar.hpp + - com/sun/star/frame/XStatusListener.hpp + - com/sun/star/frame/XFrameActionListener.hpp + include/sfx2/sidebar/SidebarPanelBase.hxx: + # base class has to be a complete type + - com/sun/star/ui/XContextChangeEventListener.hpp + - com/sun/star/ui/XUIElement.hpp + - com/sun/star/ui/XToolPanel.hpp + - com/sun/star/ui/XSidebarPanel.hpp + - com/sun/star/ui/XUpdateModel.hpp + include/sfx2/sidebar/Theme.hxx: + # base class has to be a complete type + - com/sun/star/beans/XPropertySet.hpp + include/sfx2/sidebar/UnoDeck.hxx: + # base class has to be a complete type + - com/sun/star/ui/XDeck.hpp + include/sfx2/sidebar/UnoDecks.hxx: + # base class has to be a complete type + - com/sun/star/ui/XDecks.hpp + include/sfx2/sidebar/UnoPanel.hxx: + # base class has to be a complete type + - com/sun/star/ui/XPanel.hpp + include/sfx2/sidebar/UnoPanels.hxx: + # base class has to be a complete type + - com/sun/star/ui/XPanels.hpp + include/sfx2/sidebar/UnoSidebar.hxx: + # base class has to be a complete type + - com/sun/star/ui/XSidebarProvider.hpp diff --git a/include/sfx2/sidebar/Accessible.hxx b/include/sfx2/sidebar/Accessible.hxx index 34e436972893..a32955812fec 100644 --- a/include/sfx2/sidebar/Accessible.hxx +++ b/include/sfx2/sidebar/Accessible.hxx @@ -20,11 +20,12 @@ #define INCLUDED_SFX2_SOURCE_SIDEBAR_ACCESSIBLE_HXX #include <com/sun/star/accessibility/XAccessible.hpp> -#include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> +namespace com::sun::star::accessibility { class XAccessibleContext; } + typedef cppu::WeakComponentImplHelper < css::accessibility::XAccessible > AccessibleInterfaceBase; diff --git a/include/sfx2/sidebar/AccessibleTitleBar.hxx b/include/sfx2/sidebar/AccessibleTitleBar.hxx index 3ed43ab248b2..6172bb4fd666 100644 --- a/include/sfx2/sidebar/AccessibleTitleBar.hxx +++ b/include/sfx2/sidebar/AccessibleTitleBar.hxx @@ -20,7 +20,8 @@ #define INCLUDED_SFX2_SOURCE_SIDEBAR_ACCESSIBLETITLEBAR_HXX #include <toolkit/awt/vclxaccessiblecomponent.hxx> -#include <com/sun/star/accessibility/XAccessible.hpp> + +namespace com::sun::star::accessibility { class XAccessible; } namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx b/include/sfx2/sidebar/AsynchronousCall.hxx index b42caf50ed19..b05c90dc86db 100644 --- a/include/sfx2/sidebar/AsynchronousCall.hxx +++ b/include/sfx2/sidebar/AsynchronousCall.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_ASYNCHRONOUSCALL_HXX #define INCLUDED_SFX2_SOURCE_SIDEBAR_ASYNCHRONOUSCALL_HXX -#include <tools/solar.h> #include <tools/link.hxx> #include <functional> diff --git a/include/sfx2/sidebar/Context.hxx b/include/sfx2/sidebar/Context.hxx index aa6b2716cdd3..05cdf84e938e 100644 --- a/include/sfx2/sidebar/Context.hxx +++ b/include/sfx2/sidebar/Context.hxx @@ -21,8 +21,6 @@ #include <rtl/ustring.hxx> -#include <vector> - namespace sfx2 { namespace sidebar { class Context diff --git a/include/sfx2/sidebar/ContextList.hxx b/include/sfx2/sidebar/ContextList.hxx index 08ee70cb617a..fc2f6845fbf5 100644 --- a/include/sfx2/sidebar/ContextList.hxx +++ b/include/sfx2/sidebar/ContextList.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SFX2_SOURCE_SIDEBAR_CONTEXTLIST_HXX #include <sfx2/sidebar/Context.hxx> -#include <sal/types.h> #include <rtl/ustring.hxx> #include <vector> diff --git a/include/sfx2/sidebar/ControlFactory.hxx b/include/sfx2/sidebar/ControlFactory.hxx index be010e5076e2..42db1081b5c1 100644 --- a/include/sfx2/sidebar/ControlFactory.hxx +++ b/include/sfx2/sidebar/ControlFactory.hxx @@ -20,16 +20,14 @@ #define INCLUDED_SFX2_SIDEBAR_CONTROLFACTORY_HXX #include <sfx2/dllapi.h> -#include <sfx2/sidebar/SidebarToolBox.hxx> -#include <vcl/button.hxx> #include <vcl/vclptr.hxx> -class ToolBox; +class CheckBox; +class ImageRadioButton; +namespace vcl { class Window; } namespace sfx2 { namespace sidebar { -class ToolBoxBackground; - /** Factory for controls used in sidebar panels. The reason to use this factory instead of creating the controls directly is that this way the sidebar has a little more control diff --git a/include/sfx2/sidebar/ControllerFactory.hxx b/include/sfx2/sidebar/ControllerFactory.hxx index 83d631a1bed8..4dfff756415d 100644 --- a/include/sfx2/sidebar/ControllerFactory.hxx +++ b/include/sfx2/sidebar/ControllerFactory.hxx @@ -20,10 +20,12 @@ #define INCLUDED_SFX2_SIDEBAR_CONTROLLERFACTORY_HXX #include <sfx2/dllapi.h> -#include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XToolbarController.hpp> +#include <com/sun/star/uno/Reference.hxx> +namespace com::sun::star::awt { class XWindow; } +namespace com::sun::star::frame { class XController; } +namespace com::sun::star::frame { class XFrame; } +namespace com::sun::star::frame { class XToolbarController; } class ToolBox; diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx index 23a94487706e..41eec7a9fc51 100644 --- a/include/sfx2/sidebar/ControllerItem.hxx +++ b/include/sfx2/sidebar/ControllerItem.hxx @@ -21,7 +21,7 @@ #include <sfx2/ctrlitem.hxx> -#include <com/sun/star/lang/XComponent.hpp> +namespace com::sun::star::lang { class XComponent; } namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx index c8273c568742..e3a3570f199a 100644 --- a/include/sfx2/sidebar/Deck.hxx +++ b/include/sfx2/sidebar/Deck.hxx @@ -22,8 +22,6 @@ #include <sfx2/sidebar/Panel.hxx> #include <vcl/window.hxx> -#include <vcl/image.hxx> -#include <com/sun/star/ui/LayoutSize.hpp> class ScrollBar; diff --git a/include/sfx2/sidebar/DeckDescriptor.hxx b/include/sfx2/sidebar/DeckDescriptor.hxx index 086de40068b8..9a205335b6e2 100644 --- a/include/sfx2/sidebar/DeckDescriptor.hxx +++ b/include/sfx2/sidebar/DeckDescriptor.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_DECKDESCRIPTOR_HXX #define INCLUDED_SFX2_SOURCE_SIDEBAR_DECKDESCRIPTOR_HXX -#include <vcl/EnumContext.hxx> #include <sfx2/sidebar/ContextList.hxx> #include <sfx2/sidebar/Deck.hxx> diff --git a/include/sfx2/sidebar/DeckLayouter.hxx b/include/sfx2/sidebar/DeckLayouter.hxx index 27a94dd7b3e9..1208fb94c164 100644 --- a/include/sfx2/sidebar/DeckLayouter.hxx +++ b/include/sfx2/sidebar/DeckLayouter.hxx @@ -21,19 +21,12 @@ #include <sfx2/sidebar/Panel.hxx> -#include <tools/gen.hxx> - -#include <com/sun/star/ui/LayoutSize.hpp> - -#include <vector> - class ScrollBar; namespace vcl { class Window; } +namespace tools { class Rectangle; } namespace sfx2 { namespace sidebar { -class Panel; - /** Helper for layouting the direct and indirect children of a deck like title bars, panels, and scroll bars. */ diff --git a/include/sfx2/sidebar/DrawHelper.hxx b/include/sfx2/sidebar/DrawHelper.hxx index f80a0ca12775..6bf6d17756a0 100644 --- a/include/sfx2/sidebar/DrawHelper.hxx +++ b/include/sfx2/sidebar/DrawHelper.hxx @@ -19,11 +19,10 @@ #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_DRAWHELPER_HXX #define INCLUDED_SFX2_SOURCE_SIDEBAR_DRAWHELPER_HXX -#include <vcl/window.hxx> - -#include <tools/svborder.hxx> +#include <vcl/outdev.hxx> class Color; +class SvBorder; namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/FocusManager.hxx b/include/sfx2/sidebar/FocusManager.hxx index a8c52279ad0b..5bbb3b0441fe 100644 --- a/include/sfx2/sidebar/FocusManager.hxx +++ b/include/sfx2/sidebar/FocusManager.hxx @@ -24,7 +24,6 @@ #include <vcl/keycod.hxx> class Button; -class VclSimpleEvent; namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/IContextChangeReceiver.hxx b/include/sfx2/sidebar/IContextChangeReceiver.hxx index b8f65128fff5..a36bb21de4e5 100644 --- a/include/sfx2/sidebar/IContextChangeReceiver.hxx +++ b/include/sfx2/sidebar/IContextChangeReceiver.hxx @@ -19,9 +19,10 @@ #ifndef INCLUDED_SFX2_SIDEBAR_ICONTEXTCHANGERECEIVER_HXX #define INCLUDED_SFX2_SIDEBAR_ICONTEXTCHANGERECEIVER_HXX -#include <vcl/EnumContext.hxx> #include <sfx2/dllapi.h> +namespace vcl { class EnumContext; } + namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx b/include/sfx2/sidebar/ILayoutableWindow.hxx index 957601a84632..ce8b12eccf1c 100644 --- a/include/sfx2/sidebar/ILayoutableWindow.hxx +++ b/include/sfx2/sidebar/ILayoutableWindow.hxx @@ -20,12 +20,9 @@ #define INCLUDED_SFX2_SIDEBAR_ILAYOUTABLEWINDOW_HXX #include <sfx2/dllapi.h> -#include <tools/gen.hxx> #include <sal/types.h> #include <com/sun/star/ui/LayoutSize.hpp> -namespace vcl { class Window; } - namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/Paint.hxx b/include/sfx2/sidebar/Paint.hxx index 3328eb47624b..f693482a6c75 100644 --- a/include/sfx2/sidebar/Paint.hxx +++ b/include/sfx2/sidebar/Paint.hxx @@ -21,12 +21,9 @@ #include <vcl/gradient.hxx> #include <vcl/wall.hxx> -#include <com/sun/star/awt/Gradient.hpp> #include <boost/variant.hpp> -class Color; - namespace sfx2 { namespace sidebar { /** Abstraction of different ways to fill outlines. diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx index 119843cc6c4e..25687459def2 100644 --- a/include/sfx2/sidebar/Panel.hxx +++ b/include/sfx2/sidebar/Panel.hxx @@ -19,22 +19,22 @@ #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_PANEL_HXX #define INCLUDED_SFX2_SOURCE_SIDEBAR_PANEL_HXX -#include <sfx2/sidebar/Context.hxx> #include <sfx2/dllapi.h> #include <vcl/window.hxx> -#include <com/sun/star/ui/XUIElement.hpp> -#include <com/sun/star/ui/XSidebarPanel.hpp> -#include <com/sun/star/frame/XFrame.hpp> - #include <vector> +namespace com::sun::star::frame { class XFrame; } +namespace com::sun::star::ui { class XSidebarPanel; } +namespace com::sun::star::ui { class XUIElement; } +namespace com::sun::star::awt { class XWindow; } + namespace sfx2 { namespace sidebar { class PanelDescriptor; -class TitleBar; class PanelTitleBar; +class Context; class SFX2_DLLPUBLIC Panel : public vcl::Window { diff --git a/include/sfx2/sidebar/PanelDescriptor.hxx b/include/sfx2/sidebar/PanelDescriptor.hxx index ad40f6a42af0..2fdf2b1d4702 100644 --- a/include/sfx2/sidebar/PanelDescriptor.hxx +++ b/include/sfx2/sidebar/PanelDescriptor.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_PANELDESCRIPTOR_HXX #define INCLUDED_SFX2_SOURCE_SIDEBAR_PANELDESCRIPTOR_HXX -#include <vcl/EnumContext.hxx> #include <sfx2/sidebar/ContextList.hxx> namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/PanelTitleBar.hxx b/include/sfx2/sidebar/PanelTitleBar.hxx index 4a5475a98c93..1965caac687d 100644 --- a/include/sfx2/sidebar/PanelTitleBar.hxx +++ b/include/sfx2/sidebar/PanelTitleBar.hxx @@ -21,7 +21,8 @@ #include <sfx2/sidebar/TitleBar.hxx> -#include <com/sun/star/frame/XFrame.hpp> +namespace com::sun::star::frame { class XController; } +namespace com::sun::star::frame { class XFrame; } namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/ResourceManager.hxx b/include/sfx2/sidebar/ResourceManager.hxx index 97c8047d6a13..816aacf5c42f 100644 --- a/include/sfx2/sidebar/ResourceManager.hxx +++ b/include/sfx2/sidebar/ResourceManager.hxx @@ -19,15 +19,16 @@ #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_RESOURCEMANAGER_HXX #define INCLUDED_SFX2_SOURCE_SIDEBAR_RESOURCEMANAGER_HXX -#include <sfx2/sidebar/DeckDescriptor.hxx> -#include <sfx2/sidebar/PanelDescriptor.hxx> -#include <sfx2/sidebar/Context.hxx> #include <unotools/confignode.hxx> -#include <com/sun/star/frame/XController.hpp> #include <map> #include <set> #include <svtools/miscopt.hxx> +namespace com::sun::star::frame { class XController; } +namespace com::sun::star::frame { class XModel; } +namespace sfx2 { namespace sidebar { class DeckDescriptor; } } +namespace sfx2 { namespace sidebar { class PanelDescriptor; } } + namespace sfx2 { namespace sidebar { class Context; diff --git a/include/sfx2/sidebar/Sidebar.hxx b/include/sfx2/sidebar/Sidebar.hxx index b2808dd28b3d..427acf9c6c8b 100644 --- a/include/sfx2/sidebar/Sidebar.hxx +++ b/include/sfx2/sidebar/Sidebar.hxx @@ -21,7 +21,10 @@ #define INCLUDED_SFX2_SIDEBAR_SIDEBAR_HXX #include <sfx2/dllapi.h> -#include <com/sun/star/frame/XFrame.hpp> +#include <rtl/ustring.hxx> + +namespace com::sun::star::frame { class XFrame; } +namespace com::sun::star::uno { template <typename > class Reference; } namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index eaed146d3b47..b4521bd4166c 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -24,24 +24,25 @@ #include <sfx2/sidebar/AsynchronousCall.hxx> #include <sfx2/sidebar/Context.hxx> +#include <sfx2/sidebar/Deck.hxx> #include <sfx2/sidebar/FocusManager.hxx> -#include <sfx2/sidebar/Panel.hxx> #include <sfx2/sidebar/ResourceManager.hxx> #include <sfx2/sidebar/TabBar.hxx> -#include <vcl/menu.hxx> - -#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#include <com/sun/star/frame/XDispatch.hpp> +#include <com/sun/star/frame/XStatusListener.hpp> +#include <com/sun/star/frame/XFrameActionListener.hpp> #include <com/sun/star/ui/XContextChangeEventListener.hpp> -#include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/ui/XSidebar.hpp> #include <boost/optional.hpp> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> +namespace com::sun::star::awt { class XWindowPeer; } +namespace com::sun::star::frame { class XDispatch; } +namespace com::sun::star::ui { class XUIElement; } + typedef cppu::WeakComponentImplHelper < css::ui::XContextChangeEventListener, css::beans::XPropertyChangeListener, @@ -51,16 +52,11 @@ typedef cppu::WeakComponentImplHelper < > SidebarControllerInterfaceBase; class SfxSplitWindow; -class FixedBitmap; namespace sfx2 { namespace sidebar { -class ContentPanelDescriptor; -class Deck; class DeckDescriptor; class SidebarDockingWindow; -class TabBar; -class TabBarConfiguration; class SFX2_DLLPUBLIC SidebarController : private ::cppu::BaseMutex, diff --git a/include/sfx2/sidebar/SidebarDockingWindow.hxx b/include/sfx2/sidebar/SidebarDockingWindow.hxx index 931cb34c5c6b..3c3059b87d7a 100644 --- a/include/sfx2/sidebar/SidebarDockingWindow.hxx +++ b/include/sfx2/sidebar/SidebarDockingWindow.hxx @@ -23,7 +23,7 @@ #include <rtl/ref.hxx> -#include <svtools/acceleratorexecute.hxx> +namespace svt { class AcceleratorExecute; } namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/SidebarModelUpdate.hxx b/include/sfx2/sidebar/SidebarModelUpdate.hxx index 981f7fa5ffd3..3286d7573fe6 100644 --- a/include/sfx2/sidebar/SidebarModelUpdate.hxx +++ b/include/sfx2/sidebar/SidebarModelUpdate.hxx @@ -10,10 +10,11 @@ #ifndef INCLUDED_INCLUDE_SFX2_SIDEBAR_SIDEBARUPDATEMODEL_HXX #define INCLUDED_INCLUDE_SFX2_SIDEBAR_SIDEBARUPDATEMODEL_HXX -#include <com/sun/star/frame/XModel.hpp> - #include <sfx2/dllapi.h> +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno { template <typename > class Reference; } + namespace sfx2 { namespace sidebar { class SFX2_DLLPUBLIC SidebarModelUpdate diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx index 2494be1e0bf5..f1cc0e26b93d 100644 --- a/include/sfx2/sidebar/SidebarPanelBase.hxx +++ b/include/sfx2/sidebar/SidebarPanelBase.hxx @@ -19,8 +19,7 @@ #ifndef INCLUDED_SFX2_SIDEBAR_SIDEBARPANELBASE_HXX #define INCLUDED_SFX2_SIDEBAR_SIDEBARPANELBASE_HXX -#include <vcl/EnumContext.hxx> -#include <sfx2/sidebar/IContextChangeReceiver.hxx> +#include <sfx2/dllapi.h> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index a19c7af4b3b1..75aece3e344d 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -21,11 +21,10 @@ #include <sfx2/dllapi.h> #include <vcl/toolbox.hxx> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XToolbarController.hpp> -#include <com/sun/star/util/URL.hpp> #include <map> +namespace com::sun::star::frame { class XToolbarController; } + namespace sfx2 { namespace sidebar { /** The sidebar tool box has two responsibilities: diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index 1736a478aea2..a6fcf6a33db4 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -20,28 +20,20 @@ #define INCLUDED_SFX2_SOURCE_SIDEBAR_TABBAR_HXX #include <sfx2//dllapi.h> -#include <sfx2/sidebar/DeckDescriptor.hxx> #include <sfx2/sidebar/ResourceManager.hxx> +#include <vcl/button.hxx> #include <vcl/menu.hxx> #include <vcl/window.hxx> -#include <com/sun/star/frame/XFrame.hpp> - #include <functional> -#include <svtools/acceleratorexecute.hxx> - -class Button; -class CheckBox; -class RadioButton; +namespace svt { class AcceleratorExecute; } namespace sfx2 { namespace sidebar { class FocusManager; -class TabBarConfiguration; -class TabItem; class SidebarController; /** The tab bar is the container for the individual tabs. diff --git a/include/sfx2/sidebar/TabItem.hxx b/include/sfx2/sidebar/TabItem.hxx index ff39fb4e9cd6..2f4a3c979538 100644 --- a/include/sfx2/sidebar/TabItem.hxx +++ b/include/sfx2/sidebar/TabItem.hxx @@ -21,8 +21,6 @@ #include <vcl/button.hxx> -#include <sfx2/sidebar/DeckDescriptor.hxx> - namespace vcl { class Window; } namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index be3a7a2db1a7..16a4798cdf9f 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -26,7 +26,6 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <tools/gen.hxx> -#include <rtl/ref.hxx> #include <vcl/wall.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -34,8 +33,6 @@ #include <map> #include <unordered_map> -class SvBorder; - namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/TitleBar.hxx b/include/sfx2/sidebar/TitleBar.hxx index 1812503732fb..2d83637888ae 100644 --- a/include/sfx2/sidebar/TitleBar.hxx +++ b/include/sfx2/sidebar/TitleBar.hxx @@ -21,7 +21,6 @@ #include <sfx2/sidebar/Paint.hxx> -#include <vcl/fixed.hxx> #include <sfx2/sidebar/SidebarToolBox.hxx> namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/Tools.hxx b/include/sfx2/sidebar/Tools.hxx index 854de39e62da..97b26c368dd9 100644 --- a/include/sfx2/sidebar/Tools.hxx +++ b/include/sfx2/sidebar/Tools.hxx @@ -21,15 +21,16 @@ #include <vcl/image.hxx> #include <vcl/gradient.hxx> -#include <tools/svborder.hxx> #include <sfx2/dllapi.h> #include <com/sun/star/awt/Gradient.hpp> -#include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/URL.hpp> +namespace com::sun::star::frame { class XController; } +namespace com::sun::star::frame { class XDispatch; } +namespace com::sun::star::frame { class XFrame; } + namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/UnoDeck.hxx b/include/sfx2/sidebar/UnoDeck.hxx index b0e82e63f1da..bf1865c9e06e 100644 --- a/include/sfx2/sidebar/UnoDeck.hxx +++ b/include/sfx2/sidebar/UnoDeck.hxx @@ -13,14 +13,15 @@ #include <com/sun/star/ui/XDeck.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/ui/XPanels.hpp> -#include <cppuhelper/compbase.hxx> +#include <cppuhelper/implbase.hxx> -#include <sfx2/sidebar/SidebarController.hxx> #include <sfx2/sidebar/ResourceManager.hxx> +namespace com::sun::star::frame { class XFrame; } +namespace com::sun::star::ui { class XPanels; } +namespace sfx2 { namespace sidebar { class SidebarController; } } + /** get the decks */ class SfxUnoDeck : public cppu::WeakImplHelper<css::ui::XDeck> diff --git a/include/sfx2/sidebar/UnoDecks.hxx b/include/sfx2/sidebar/UnoDecks.hxx index 3f7c623283e0..1e93d8d1e07c 100644 --- a/include/sfx2/sidebar/UnoDecks.hxx +++ b/include/sfx2/sidebar/UnoDecks.hxx @@ -14,14 +14,10 @@ #include <com/sun/star/ui/XDecks.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/frame/XFrame.hpp> +#include <cppuhelper/implbase.hxx> -#include <cppuhelper/compbase.hxx> - -#include <sfx2/sidebar/SidebarController.hxx> -#include <sfx2/sidebar/ResourceManager.hxx> +namespace com::sun::star::frame { class XFrame; } +namespace sfx2 { namespace sidebar { class SidebarController; } } /** get the decks */ diff --git a/include/sfx2/sidebar/UnoPanel.hxx b/include/sfx2/sidebar/UnoPanel.hxx index b77a0ab0fcec..17c25b10e6ef 100644 --- a/include/sfx2/sidebar/UnoPanel.hxx +++ b/include/sfx2/sidebar/UnoPanel.hxx @@ -12,17 +12,18 @@ #define INCLUDED_SFX2_SIDEBAR_UNOPANEL_HXX #include <com/sun/star/ui/XPanel.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/awt/XWindow.hpp> -#include <cppuhelper/compbase.hxx> +#include <cppuhelper/implbase.hxx> -#include <sfx2/sidebar/SidebarController.hxx> #include <sfx2/sidebar/Panel.hxx> #include <sfx2/sidebar/Deck.hxx> #include <sfx2/sidebar/ResourceManager.hxx> +namespace com::sun::star::awt { class XWindow; } +namespace com::sun::star::frame { class XFrame; } +namespace sfx2 { namespace sidebar { class SidebarController; } } + /** get the Panel */ diff --git a/include/sfx2/sidebar/UnoPanels.hxx b/include/sfx2/sidebar/UnoPanels.hxx index 71aa7d0431bd..aa2ecaeade10 100644 --- a/include/sfx2/sidebar/UnoPanels.hxx +++ b/include/sfx2/sidebar/UnoPanels.hxx @@ -13,13 +13,10 @@ #include <com/sun/star/ui/XPanels.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/frame/XFrame.hpp> +#include <cppuhelper/implbase.hxx> -#include <cppuhelper/compbase.hxx> - -#include <sfx2/sidebar/SidebarController.hxx> +namespace com::sun::star::frame { class XFrame; } +namespace sfx2 { namespace sidebar { class SidebarController; } } /** get the decks */ diff --git a/include/sfx2/sidebar/UnoSidebar.hxx b/include/sfx2/sidebar/UnoSidebar.hxx index a60143b65f94..5b67554cbf21 100644 --- a/include/sfx2/sidebar/UnoSidebar.hxx +++ b/include/sfx2/sidebar/UnoSidebar.hxx @@ -11,20 +11,14 @@ #ifndef INCLUDED_SFX2_SIDEBAR_SIDEBAR_HXX #define INCLUDED_SFX2_SIDEBAR_SIDEBAR_HXX -#include <sfx2/dllapi.h> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/ui/XSidebarProvider.hpp> -#include <com/sun/star/ui/XSidebar.hpp> -#include <com/sun/star/awt/XWindow2.hpp> +#include <cppuhelper/implbase.hxx> -#include <cppuhelper/compbase.hxx> - -#include <sfx2/sidebar/SidebarController.hxx> -#include <sfx2/sidebar/SidebarDockingWindow.hxx> - -#include <sfx2/sidebar/UnoDecks.hxx> -#include <com/sun/star/ui/XDecks.hpp> +namespace com::sun::star::frame { class XFrame; } +namespace com::sun::star::ui { class XDecks; } +namespace com::sun::star::ui { class XSidebar; } +namespace sfx2 { namespace sidebar { class SidebarController; } } /** get the sidebar for a given frame */ diff --git a/sfx2/source/notebookbar/NotebookbarTabControl.cxx b/sfx2/source/notebookbar/NotebookbarTabControl.cxx index 20c37dc1a297..eb9eaa425f0b 100644 --- a/sfx2/source/notebookbar/NotebookbarTabControl.cxx +++ b/sfx2/source/notebookbar/NotebookbarTabControl.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/frame/ModuleManager.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <sfx2/notebookbar/SfxNotebookBar.hxx> #include <com/sun/star/uno/Reference.h> #include <toolkit/awt/vclxmenu.hxx> diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index c3649aaab106..120906307e9a 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XDesktop2.hpp> #include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/ui/XSidebarPanel.hpp> using namespace css; using namespace css::uno; diff --git a/sfx2/source/sidebar/DrawHelper.cxx b/sfx2/source/sidebar/DrawHelper.cxx index be369c776c17..70c04b6b9bf0 100644 --- a/sfx2/source/sidebar/DrawHelper.cxx +++ b/sfx2/source/sidebar/DrawHelper.cxx @@ -21,6 +21,7 @@ #include <sfx2/sidebar/Paint.hxx> #include <vcl/lineinfo.hxx> +#include <tools/svborder.hxx> namespace sfx2 { namespace sidebar { diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index 028097dfb0c8..9c7c3f3a2b79 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -37,6 +37,8 @@ #include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/ui/XToolPanel.hpp> +#include <com/sun/star/ui/XSidebarPanel.hpp> +#include <com/sun/star/ui/XUIElement.hpp> using namespace css; using namespace css::uno; diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index fd97787c51c7..6071da7da9dd 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -32,6 +32,8 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> +#include <com/sun/star/frame/XDispatch.hpp> + using namespace css; using namespace css::uno; diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index 3ef85d0a09ea..f59efbab5706 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sfx2/sidebar/DeckDescriptor.hxx> +#include <sfx2/sidebar/PanelDescriptor.hxx> #include <sfx2/sidebar/ResourceManager.hxx> #include <sfx2/sidebar/Tools.hxx> @@ -30,6 +32,7 @@ #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> +#include <vcl/EnumContext.hxx> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/ui/XUpdateModel.hpp> diff --git a/sfx2/source/sidebar/Sidebar.cxx b/sfx2/source/sidebar/Sidebar.cxx index 06420d437702..855da3113a36 100644 --- a/sfx2/source/sidebar/Sidebar.cxx +++ b/sfx2/source/sidebar/Sidebar.cxx @@ -20,6 +20,7 @@ #include <sfx2/sidebar/Sidebar.hxx> #include <sfx2/sidebar/SidebarController.hxx> #include <sfx2/sidebar/ResourceManager.hxx> +#include <sfx2/sidebar/PanelDescriptor.hxx> using namespace css; diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index f2fa554fb52c..c9958afbe388 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -18,8 +18,10 @@ */ #include <sfx2/sidebar/SidebarController.hxx> #include <sfx2/sidebar/Deck.hxx> +#include <sfx2/sidebar/DeckDescriptor.hxx> #include <sfx2/sidebar/DeckTitleBar.hxx> #include <sfx2/sidebar/Panel.hxx> +#include <sfx2/sidebar/PanelDescriptor.hxx> #include <sfx2/sidebar/PanelTitleBar.hxx> #include <sfx2/sidebar/TabBar.hxx> #include <sfx2/sidebar/Theme.hxx> @@ -48,6 +50,8 @@ #include <sal/log.hxx> #include <officecfg/Office/UI/Sidebar.hxx> +#include <com/sun/star/awt/XWindowPeer.hpp> +#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp> #include <com/sun/star/ui/ContextChangeEventObject.hpp> diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index 5748edee413e..7e4d98e78d77 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -19,11 +19,13 @@ #include <sfx2/sidebar/SidebarDockingWindow.hxx> #include <sfx2/sidebar/SidebarChildWindow.hxx> #include <sfx2/sidebar/SidebarController.hxx> +#include <sfx2/sidebar/PanelDescriptor.hxx> #include <comphelper/processfactory.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> +#include <svtools/acceleratorexecute.hxx> #include <tools/link.hxx> #include <tools/gen.hxx> #include <vcl/event.hxx> diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 4e9fe7916441..d040fcdba796 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -29,6 +29,9 @@ #include <toolkit/helper/vclunohelper.hxx> #include <svtools/miscopt.hxx> #include <com/sun/star/frame/XSubToolbarController.hpp> +#include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/frame/XToolbarController.hpp> using namespace css; using namespace css::uno; diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index ab258a7ab473..8ca65efbadd7 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -38,6 +38,7 @@ #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <tools/svborder.hxx> +#include <svtools/acceleratorexecute.hxx> #include <com/sun/star/graphic/XGraphicProvider.hpp> diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 90911f159efa..bc6236d34bbd 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -27,6 +27,8 @@ #include <vcl/settings.hxx> #include <tools/diagnose_ex.h> +#include <com/sun/star/awt/Rectangle.hpp> + using namespace css; using namespace css::uno; diff --git a/sfx2/source/sidebar/UnoDeck.cxx b/sfx2/source/sidebar/UnoDeck.cxx index bd6dfe015e23..de5e0c82c372 100644 --- a/sfx2/source/sidebar/UnoDeck.cxx +++ b/sfx2/source/sidebar/UnoDeck.cxx @@ -16,6 +16,7 @@ #include <sfx2/sidebar/SidebarController.hxx> #include <sfx2/sidebar/DeckTitleBar.hxx> #include <sfx2/sidebar/Deck.hxx> +#include <sfx2/sidebar/DeckDescriptor.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/sidebar/UnoPanel.cxx b/sfx2/source/sidebar/UnoPanel.cxx index f4f022ca74c0..83fb45dd7842 100644 --- a/sfx2/source/sidebar/UnoPanel.cxx +++ b/sfx2/source/sidebar/UnoPanel.cxx @@ -13,9 +13,11 @@ #include <sfx2/sidebar/ResourceManager.hxx> #include <sfx2/sidebar/SidebarController.hxx> +#include <sfx2/sidebar/PanelDescriptor.hxx> #include <sfx2/sidebar/PanelTitleBar.hxx> #include <sfx2/sidebar/Panel.hxx> #include <sfx2/sidebar/Deck.hxx> +#include <sfx2/sidebar/DeckDescriptor.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/sidebar/UnoSidebar.cxx b/sfx2/source/sidebar/UnoSidebar.cxx index abf4d420f975..20b3ed6cc6f8 100644 --- a/sfx2/source/sidebar/UnoSidebar.cxx +++ b/sfx2/source/sidebar/UnoSidebar.cxx @@ -12,7 +12,7 @@ #include <sfx2/sidebar/Tools.hxx> #include <sfx2/sidebar/ResourceManager.hxx> - +#include <sfx2/sidebar/SidebarController.hxx> #include <sfx2/sidebar/UnoDecks.hxx> #include <com/sun/star/frame/XDispatch.hpp> diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 5f21530637e4..0a8c3fc999ae 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -20,6 +20,7 @@ #include <memory> #include <sfx2/sidebar/ControlFactory.hxx> #include <svx/sidebar/LinePropertyPanelBase.hxx> +#include <sfx2/sidebar/SidebarToolBox.hxx> #include <svx/strings.hrc> #include <svx/svxids.hrc> #include <svx/dialmgr.hxx> diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 97059186a510..0e0d35b893f3 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -37,6 +37,7 @@ class MetricField; class CheckBox; class MetricBox; class Edit; +class ToolBox; namespace svx { class DialControl; |