svx/source/table/cell.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
New commits: commit c28ec6d9fbb21b363102faac0171de2754ea5d75 Author: Armin Le Grand <[email protected]> AuthorDate: Wed Jul 18 13:53:38 2018 +0200 Commit: Armin Le Grand <[email protected]> CommitDate: Wed Jul 18 15:40:04 2018 +0200 tdf#118354 Do not dereference non-exsisting Object Change-Id: Ie7323302f3b29dfc19b26e2185321c2e609cab2b Reviewed-on: https://gerrit.libreoffice.org/57629 Tested-by: Jenkins Reviewed-by: Armin Le Grand <[email protected]> diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 27549aaa4101..4bf5c07f38cf 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -514,7 +514,14 @@ void Cell::replaceContentAndFormating( const CellRef& xSourceCell ) if( xSourceCell.is() && mpProperties ) { mpProperties->SetMergedItemSet( xSourceCell->GetObjectItemSet() ); - SetOutlinerParaObject( o3tl::make_unique<OutlinerParaObject>(*xSourceCell->GetOutlinerParaObject()) ); + + // tdf#118354 OutlinerParaObject may be nullptr, do not dereference when + // not set (!) + if(nullptr != xSourceCell->GetOutlinerParaObject()) + { + SetOutlinerParaObject( o3tl::make_unique<OutlinerParaObject>(*xSourceCell->GetOutlinerParaObject()) ); + } + SdrTableObj& rTableObj = dynamic_cast< SdrTableObj& >( GetObject() ); SdrTableObj& rSourceTableObj = dynamic_cast< SdrTableObj& >( xSourceCell->GetObject() ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
