diff options
| author | Philippe Jung <phil.jung@free.fr> | 2015-05-18 16:58:39 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-19 08:39:08 +0000 |
| commit | 9451097a9d20f8a522d587271d57efee1fc5566d (patch) | |
| tree | c7a7cce29d15583481914da7f22bbc44e139fc42 /include/vcl | |
| parent | de323517555bdb812c65112f6f091f4f6f6c0b93 (diff) | |
tdf#91259 Crash when closing Help
Rewrite of splitwin.
The previous implementation used struct and memset/memcpy/memmove.
Struct have been replaced by classes with destructors. Array of pointers
are handled in vectors.
This enables clean call to clear of VclPtr.
Change-Id: Iab77303fb1d802f208dfdf476140557e42af949a
Reviewed-on: https://gerrit.libreoffice.org/15788
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/splitwin.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index ea38e5b01c3f..867a34307a9b 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -24,7 +24,7 @@ #include <vcl/dockwin.hxx> class Wallpaper; -struct ImplSplitSet; +class ImplSplitSet; typedef sal_uInt16 SplitWindowItemBits; @@ -57,9 +57,9 @@ private: long mnMSplitPos; WinBits mnWinStyle; WindowAlign meAlign; - sal_uInt16 mnSplitTest; - sal_uInt16 mnSplitPos; - sal_uInt16 mnMouseModifier; + sal_uInt16 mnSplitTest; + sal_uInt16 mnSplitPos; + sal_uInt16 mnMouseModifier; bool mbDragFull:1, mbHorz:1, mbBottomRight:1, @@ -145,10 +145,10 @@ public: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void InsertItem( sal_uInt16 nId, vcl::Window* pWindow, long nSize, - sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nSetId = 0, + sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nIntoSetId = 0, SplitWindowItemBits nBits = 0 ); void InsertItem( sal_uInt16 nId, long nSize, - sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nSetId = 0, + sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nIntoSetId = 0, SplitWindowItemBits nBits = 0 ); void RemoveItem( sal_uInt16 nId, bool bHide = true ); void Clear(); |