summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-03-18 16:40:54 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-04-10 12:01:45 +0100
commit4f72ab022425318b109e52a641e63f673fce653d (patch)
treead177f8ca4e78eabc99df672a8fcb52c9ae9f711 /sc
parent4f386d07474790648843665cac42879cb33eba48 (diff)
nail more lifecycle oddness.
Change-Id: Ibc29b488cf5077f1d5eb996a8d88dfd057de8266
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/view/tabview5.cxx10
1 files changed, 9 insertions, 1 deletions
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 0b5638d06897..a01d9c4679f3 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -176,7 +176,7 @@ ScTabView::~ScTabView()
delete pSelEngine;
// Delete this before the grid windows, since it's a child window of one of them.
- mpInputHintWindow.reset();
+ mpInputHintWindow.disposeAndClear();
for (i=0; i<4; i++)
pGridWin[i].disposeAndClear();
@@ -190,6 +190,14 @@ ScTabView::~ScTabView()
pRowOutline[i].disposeAndClear();
}
+ aScrollBarBox.disposeAndClear();
+ aCornerButton.disposeAndClear();
+ aTopButton.disposeAndClear();
+ aHScrollLeft.disposeAndClear();
+ aHScrollRight.disposeAndClear();
+ aVScrollTop.disposeAndClear();
+ aVScrollBottom.disposeAndClear();
+
pHSplitter.disposeAndClear();
pVSplitter.disposeAndClear();
pTabControl.disposeAndClear();