diff options
author | Andre Fischer <af@apache.org> | 2013-05-10 11:03:45 +0000 |
---|---|---|
committer | Andre Fischer <af@apache.org> | 2013-05-10 11:03:45 +0000 |
commit | 8f3625e6cf098c3fd5e6701b7b687a0423d78f51 (patch) | |
tree | fd1cfa0b7fe9dd407443dc7b03b26254160abc87 /sfx2 | |
parent | f213ea43fac43326a643f30ff13abd9d77f6aed7 (diff) |
122047: Adding virutal destructors to interfaces to prevent problems with older compilers.
Notes
Notes:
merged as: decee367674661cf2535c0b8686eb9cec8658c09
Diffstat (limited to 'sfx2')
-rwxr-xr-x | sfx2/Library_sfx.mk | 2 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx | 6 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx | 5 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx | 3 |
4 files changed, 12 insertions, 4 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 9a14410d13d0..c10196b5d646 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -234,6 +234,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 \ diff --git a/sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx b/sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx index e495e65ecaff..5fd8f25c3156 100644 --- a/sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx +++ b/sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx @@ -23,6 +23,7 @@ #define SFX_SIDEBAR_CONTEXT_CHANGE_RECEIVER_INTERFACE_HXX #include "EnumContext.hxx" +#include "sfx2/dllapi.h" namespace sfx2 { namespace sidebar { @@ -31,8 +32,9 @@ namespace sfx2 { namespace sidebar { class SFX2_DLLPUBLIC IContextChangeReceiver { public: - virtual void HandleContextChange ( - const EnumContext aContext) = 0; + virtual ~IContextChangeReceiver (void); + + virtual void HandleContextChange (const EnumContext aContext) = 0; }; } } // end of namespace ::sd::sidebar diff --git a/sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx b/sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx index 22b0efc19fb8..024acab79a97 100644 --- a/sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx +++ b/sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx @@ -22,6 +22,7 @@ #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> @@ -32,9 +33,11 @@ class Window; namespace sfx2 { namespace sidebar { -class ILayoutableWindow +class SFX2_DLLPUBLIC ILayoutableWindow { public: + virtual ~ILayoutableWindow (void); + /** Return the preferred height with the constraint, that the window will be set to the given width. */ diff --git a/sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx b/sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx index 9f894e08119e..97c5b0498b48 100644 --- a/sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx +++ b/sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx @@ -23,6 +23,7 @@ #define SFX_SIDEBAR_PANEL_BASE_HXX #include "EnumContext.hxx" +#include "IContextChangeReceiver.hxx" #include <cppuhelper/compbase4.hxx> #include <cppuhelper/basemutex.hxx> @@ -67,7 +68,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 |