diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-13 22:51:42 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-13 22:51:42 +0100 |
commit | 26fced1cd40e8c4631df16451711af893460a1cf (patch) | |
tree | 86fc4e954bfc29f4ed6ddbfd29bd728118e7eb19 /include | |
parent | 318dc66b7720b85f3b7fa426743c6cf808168f43 (diff) |
Re-work sidebar factory to use VclPtr.
Change-Id: Iccbf4166419eee9f78f036d1abe07bba028d09e6
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/sidebar/PanelLayout.hxx | 1 | ||||
-rw-r--r-- | include/svx/sidebar/Popup.hxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx index e4db4f09b732..82790a402e62 100644 --- a/include/svx/sidebar/PanelLayout.hxx +++ b/include/svx/sidebar/PanelLayout.hxx @@ -16,6 +16,7 @@ #include <vcl/ctrl.hxx> #include <vcl/timer.hxx> #include <vcl/idle.hxx> +#include <vcl/vclptr.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx index bcd0bde843a8..67d4c1c1409a 100644 --- a/include/svx/sidebar/Popup.hxx +++ b/include/svx/sidebar/Popup.hxx @@ -91,7 +91,7 @@ protected: private: VclPtr<vcl::Window> mpParent; - ::boost::function<PopupControl*(PopupContainer*)> maControlCreator; + ::boost::function<VclPtr<PopupControl>(PopupContainer*)> maControlCreator; ::boost::function<void(void)> maPopupModeEndCallback; const ::rtl::OUString msAccessibleName; VclPtr<PopupContainer> mxContainer; |