diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-13 14:52:40 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 21:21:05 +0100 |
| commit | ed2cea3e5087b90cd3686d8fd9da7e74981c8da6 (patch) | |
| tree | acf3852fcd4550285a8ebc014ac5134ff045035a /svx/source/gallery2/galbrws1.hxx | |
| parent | 232eec872bdaf1dd6d87df97baa3b9ad432a7acd (diff) | |
vcl: VclPtr conversion in svx.
Change-Id: I3a1000baa049b11728c46efbc2f0af0d8f34cf2b
Conflicts:
include/svx/charmap.hxx
include/svx/float3d.hxx
include/svx/fontwork.hxx
include/svx/galctrl.hxx
svx/inc/svdibrow.hxx
svx/source/dialog/dlgctl3d.cxx
svx/source/dialog/fontwork.cxx
svx/source/engine3d/float3d.cxx
svx/source/fmcomp/gridctrl.cxx
svx/source/gallery2/galbrws1.cxx
svx/source/inc/docrecovery.hxx
Diffstat (limited to 'svx/source/gallery2/galbrws1.hxx')
| -rw-r--r-- | svx/source/gallery2/galbrws1.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index ce391f0d170a..1b24dd9c63a4 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -41,7 +41,6 @@ private: public: GalleryButton( GalleryBrowser1* pParent, WinBits nWinBits ); - virtual ~GalleryButton(); }; // - GalleryThemeListBox - @@ -58,7 +57,6 @@ protected: public: GalleryThemeListBox( GalleryBrowser1* pParent, WinBits nWinBits ); - virtual ~GalleryThemeListBox(); }; // - GalleryBrowser1 - @@ -82,7 +80,7 @@ class GalleryBrowser1 : public Control, SfxListener private: - GalleryButton maNewTheme; + VclPtr<GalleryButton> maNewTheme; GalleryThemeListBox* mpThemes; Gallery* mpGallery; ExchangeData* mpExchangeData; @@ -127,6 +125,7 @@ public: const ::boost::function<sal_Bool(const KeyEvent&,Window*)>& rKeyInputHandler, const ::boost::function<void(void)>& rThemeSlectionHandler); virtual ~GalleryBrowser1(); + virtual void dispose() SAL_OVERRIDE; void SelectTheme( const OUString& rThemeName ) { mpThemes->SelectEntry( rThemeName ); SelectThemeHdl( NULL ); } void SelectTheme( sal_uIntPtr nThemePos ) { mpThemes->SelectEntryPos( (sal_uInt16) nThemePos ); SelectThemeHdl( NULL ); } |