diff options
| author | Andre Fischer <af@apache.org> | 2013-05-10 11:03:45 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:32 +0100 |
| commit | 893dd1995976a15e201cfe5c1ea3266c8f003ae0 (patch) | |
| tree | 07bd7a9d394be1707036d8d9a24a23766103ebe3 /include/sfx2 | |
| parent | d68bcdf0db8c4d8b49f7022f59f5db5f0d6e9ada (diff) | |
Resolves: #i122047# Adding virtual destructors to interfaces...
to prevent problems with older compilers
(cherry picked from commit 8f3625e6cf098c3fd5e6701b7b687a0423d78f51)
Conflicts:
sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx
sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx
sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx
Change-Id: I2bf548fd7ff16db58938273bc4b60ad83325b376
Diffstat (limited to 'include/sfx2')
| -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 |
3 files changed, 9 insertions, 6 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 |