From ed2cea3e5087b90cd3686d8fd9da7e74981c8da6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 13 Jan 2015 14:52:40 +0200 Subject: 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 --- include/svx/fmgridcl.hxx | 1 + 1 file changed, 1 insertion(+) (limited to 'include/svx/fmgridcl.hxx') diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index f373f5e59787..5517a27d3ec2 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -43,6 +43,7 @@ protected: public: FmGridHeader( BrowseBox* pParent, WinBits nWinBits = WB_STDHEADERBAR | WB_DRAG ); virtual ~FmGridHeader(); + virtual void dispose() SAL_OVERRIDE; public: struct AccessControl { friend class FmGridControl; private: AccessControl() { } }; -- cgit From cb516fafbb2a6217d9c41030217cb024ff18272e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 17 Apr 2015 16:55:41 +0200 Subject: svx: convert new to ::Create. Change-Id: Idbcc64e883b79081c7a6399e1aed8a6b20035f69 --- include/svx/fmgridcl.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/svx/fmgridcl.hxx') diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index 5517a27d3ec2..5b46d58259b8 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -154,7 +154,7 @@ public: protected: virtual void Command(const CommandEvent& rEvt) SAL_OVERRIDE; - virtual BrowserHeader* imp_CreateHeaderBar(BrowseBox* pParent) SAL_OVERRIDE; + virtual VclPtr imp_CreateHeaderBar(BrowseBox* pParent) SAL_OVERRIDE; virtual long QueryMinimumRowHeight() SAL_OVERRIDE; virtual void RowHeightChanged() SAL_OVERRIDE; virtual void ColumnResized(sal_uInt16 nId) SAL_OVERRIDE; -- cgit