summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-11-22 15:35:14 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-11-22 15:35:14 +0100
commit2c16af58eeb9a5092656e5df67ec504288645068 (patch)
treee4d56224741bcd8b718d0ea0e2506522b4a3b923 /sd
parenta0ed1c9ad9b72347eff85c80ab85d49e7a414396 (diff)
Destroy item sets in SdDialogsTest::tearDown
...as they apparently hold raw pointers to objects destroyed early, so only destroying the item sets in the SdDialogsTest dtor caused use-after-free crashes during shutdown. Change-Id: Ibe3848c81a56fb0db4bf1fca0eab35836aab6a66
Diffstat (limited to 'sd')
-rw-r--r--sd/qa/unit/dialogs-test.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 66a4fd63e6ee..a3149861c78f 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -142,6 +142,9 @@ void SdDialogsTest::setUp()
void SdDialogsTest::tearDown()
{
+ mpSfxItemSetFromSdrObject.reset();
+ mpEmptySfxItemSet.reset();
+ mpEmptyFillStyleSfxItemSet.reset();
mxComponent->dispose();
ScreenshotTest::tearDown();
}