diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-28 15:14:11 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-28 15:14:11 +0100 |
| commit | ce82146a6be87b239a0bde0b59fddf8865290b99 (patch) | |
| tree | bdce5bc3ccd342e87b8e7416cdf2b426d3b80ecf /include/svx/tbxalign.hxx | |
| parent | a31991c4188e91326941fbe510ce70129d1ccde8 (diff) | |
| parent | e8b97a52c96df9c8e8055407b1e40ed7cb9cfc67 (diff) | |
Merge remote-tracking branch 'origin/feature/vclptrmerge2'
Diffstat (limited to 'include/svx/tbxalign.hxx')
| -rw-r--r-- | include/svx/tbxalign.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/svx/tbxalign.hxx b/include/svx/tbxalign.hxx index 00a98d1eaf80..71322ee67bcf 100644 --- a/include/svx/tbxalign.hxx +++ b/include/svx/tbxalign.hxx @@ -32,7 +32,7 @@ public: virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; - virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; + virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); |