diff options
-rw-r--r-- | include/sfx2/sidebar/IContextChangeReceiver.hxx | 7 | ||||
-rw-r--r-- | include/sfx2/sidebar/ILayoutableWindow.hxx | 5 | ||||
-rw-r--r-- | include/sfx2/sidebar/SidebarPanelBase.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 1 | ||||
-rw-r--r-- | sfx2/Library_sfx.mk | 2 |
7 files changed, 11 insertions, 9 deletions
diff --git a/include/sfx2/sidebar/IContextChangeReceiver.hxx b/include/sfx2/sidebar/IContextChangeReceiver.hxx index 2b9d57cb1473..64d9e665e60b 100644 --- a/include/sfx2/sidebar/IContextChangeReceiver.hxx +++ b/include/sfx2/sidebar/IContextChangeReceiver.hxx @@ -19,6 +19,7 @@ #define SFX_SIDEBAR_CONTEXT_CHANGE_RECEIVER_INTERFACE_HXX #include "EnumContext.hxx" +#include "sfx2/dllapi.h" namespace sfx2 { namespace sidebar { @@ -27,9 +28,9 @@ namespace sfx2 { namespace sidebar { class SFX2_DLLPUBLIC IContextChangeReceiver { public: - virtual void HandleContextChange ( - const EnumContext aContext) = 0; - virtual ~IContextChangeReceiver(); + virtual ~IContextChangeReceiver (); + + virtual void HandleContextChange (const EnumContext aContext) = 0; }; } } // end of namespace ::sd::sidebar diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx b/include/sfx2/sidebar/ILayoutableWindow.hxx index 8dc67457e966..49872374b1d6 100644 --- a/include/sfx2/sidebar/ILayoutableWindow.hxx +++ b/include/sfx2/sidebar/ILayoutableWindow.hxx @@ -18,9 +18,9 @@ #ifndef SFX_SIDEBAR_LAYOUTABLE_WINDOW_INTERFACE_HXX #define SFX_SIDEBAR_LAYOUTABLE_WINDOW_INTERFACE_HXX +#include "sfx2/dllapi.h" #include <tools/gen.hxx> #include <sal/types.h> -#include <sfx2/dllapi.h> #include <com/sun/star/ui/LayoutSize.hpp> class Window; @@ -31,11 +31,12 @@ namespace sfx2 { namespace sidebar { class SFX2_DLLPUBLIC ILayoutableWindow { public: + virtual ~ILayoutableWindow(); + /** Return the preferred height with the constraint, that the window will be set to the given width. */ virtual ::com::sun::star::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) = 0; - virtual ~ILayoutableWindow(); }; diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx index 7117505ad710..330533a4947e 100644 --- a/include/sfx2/sidebar/SidebarPanelBase.hxx +++ b/include/sfx2/sidebar/SidebarPanelBase.hxx @@ -19,6 +19,7 @@ #define SFX_SIDEBAR_PANEL_BASE_HXX #include "EnumContext.hxx" +#include "IContextChangeReceiver.hxx" #include <cppuhelper/compbase4.hxx> #include <cppuhelper/basemutex.hxx> @@ -63,7 +64,7 @@ public: static cssu::Reference<css::ui::XUIElement> Create ( const ::rtl::OUString& rsResourceURL, const cssu::Reference<css::frame::XFrame>& rxFrame, - Window* mpWindow, + Window* pControl, const css::ui::LayoutSize& rLayoutSize); // XContextChangeEventListener diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index a5a0a58f533a..13742aa9c2e5 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -18,7 +18,6 @@ #ifndef SC_PROPERTYPANEL_ALIGNMENT_HXX #define SC_PROPERTYPANEL_ALIGNMENT_HXX -#include <sfx2/sidebar/SidebarPanelBase.hxx> #include <sfx2/sidebar/ControllerItem.hxx> #include <sfx2/sidebar/IContextChangeReceiver.hxx> #include <vcl/fixed.hxx> diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index 00b747ef0990..30efdca2cfc2 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -18,7 +18,6 @@ #ifndef SC_PROPERTYPANEL_APPEARANCE_HXX #define SC_PROPERTYPANEL_APPEARANCE_HXX -#include <sfx2/sidebar/SidebarPanelBase.hxx> #include <sfx2/sidebar/ControllerItem.hxx> #include <sfx2/sidebar/IContextChangeReceiver.hxx> #include <boost/scoped_ptr.hpp> diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index 8fc3f023e600..0d1efe62b161 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -18,7 +18,6 @@ #ifndef SC_PROPERTYPANEL_NUMFORMAT_HXX #define SC_PROPERTYPANEL_NUMFORMAT_HXX -#include <sfx2/sidebar/SidebarPanelBase.hxx> #include <sfx2/sidebar/ControllerItem.hxx> #include <sfx2/sidebar/IContextChangeReceiver.hxx> #include <boost/scoped_ptr.hpp> diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 40d42832c517..09ddbe1fd736 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -249,6 +249,8 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/sidebar/EnumContext \ sfx2/source/sidebar/FocusManager \ sfx2/source/sidebar/MenuButton \ + sfx2/source/sidebar/IContextChangeReceiver \ + sfx2/source/sidebar/ILayoutableWindow \ sfx2/source/sidebar/Paint \ sfx2/source/sidebar/Panel \ sfx2/source/sidebar/PanelDescriptor \ |