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.grandin@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 2e2f5fa..27549aa 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -440,8 +440,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 )
