diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-07-18 13:53:38 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-07-19 11:29:34 +0200 |
| commit | 1663326d292a6ed89215b7a188054a2e27d7832f (patch) | |
| tree | 75520b58c922977f16ccb347d7ce0c3bb5fdfbc0 /svx/source | |
| parent | 4e5248f32d8fdfd4655bd15bd60d83e9a0c6e540 (diff) | |
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 <Armin.Le.Grand@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/57711
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/table/cell.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index b1364f6d60ff..8eadbd453804 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -511,7 +511,14 @@ void Cell::replaceContentAndFormating( const CellRef& xSourceCell ) if( xSourceCell.is() && mpProperties ) { mpProperties->SetMergedItemSet( xSourceCell->GetObjectItemSet() ); - SetOutlinerParaObject( new OutlinerParaObject(*xSourceCell->GetOutlinerParaObject()) ); + + // tdf#118354 OutlinerParaObject may be nullptr, do not dereference when + // not set (!) + if(nullptr != xSourceCell->GetOutlinerParaObject()) + { + SetOutlinerParaObject( new OutlinerParaObject(*xSourceCell->GetOutlinerParaObject()) ); + } + SdrTableObj& rTableObj = dynamic_cast< SdrTableObj& >( GetObject() ); SdrTableObj& rSourceTableObj = dynamic_cast< SdrTableObj& >( xSourceCell->GetObject() ); |