summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPhilippe Jung <phil.jung@free.fr>2015-05-16 15:11:36 +0200
committerMichael Meeks <michael.meeks@collabora.com>2015-05-16 17:39:28 +0000
commit91b181467f8fe5f7bf325e3bb82aead7eadc6ad9 (patch)
treed17bc718a75587c7d34b76c18dcfb84f54987514 /include
parent16e5fe1af6025fecb06d4cfdd300903019e4eac9 (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: Idfbe698348f7bfb46aae7f97f6edbe7127df58cf Reviewed-on: https://gerrit.libreoffice.org/15756 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'include')
-rw-r--r--include/vcl/splitwin.hxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index ea38e5b01c3f..e8b442d38832 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -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();