svx/source/table/cell.cxx | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 7239716e4307a348d818606340e34b4fc6ceb282
Author: Armin Le Grand <armin.le.gr...@cib.de>
AuthorDate: Wed Jul 4 09:45:45 2018 +0200
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Oct 4 11:04:59 2018 +0200
tdf#118199 avoid double dispose actions
Cell::dispose may be (and gets in this case) called multiple
times. Do not double-cleanup stuff.
Change-Id: Icb907968e8211eb4ba0bbb1c4d060eb8be9a874a
Reviewed-on: https://gerrit.libreoffice.org/56924
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <armin.le.gr...@cib.de>
(cherry picked from commit ea39c41fdf63191579d25f327db81db14862251c)
Reviewed-on: https://gerrit.libreoffice.org/61318
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 8eadbd453804..e402c483a5ba 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -442,8 +442,13 @@ void Cell::dispose()
mxTable.clear();
}
- mpProperties.reset();
- SetOutlinerParaObject( nullptr );
+ // tdf#118199 avoid double dispose, detect by using mpProperties
+ // as indicator. Only use SetOutlinerParaObject once
+ if( mpProperties )
+ {
+ mpProperties.reset();
+ SetOutlinerParaObject( nullptr );
+ }
}
void Cell::merge( sal_Int32 nColumnSpan, sal_Int32 nRowSpan )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
