Kaydet (Commit) c81ee161 authored tarafından Jian Fang Zhang's avatar Jian Fang Zhang

#i119686#, refix, add SdrModel pointer check to avoid crashes in some cases

Found by: zhangjf, debin.lei
Patch by: zhangjf 
Review by: Oliver-Rainer Wittmann
üst f1fe15fd
...@@ -455,11 +455,15 @@ void XclImpDrawObjBase::PreProcessSdrObject( XclImpDffConverter& rDffConv, SdrOb ...@@ -455,11 +455,15 @@ void XclImpDrawObjBase::PreProcessSdrObject( XclImpDffConverter& rDffConv, SdrOb
{ {
// default: front layer, derived classes may have to set other layer in DoPreProcessSdrObj() // default: front layer, derived classes may have to set other layer in DoPreProcessSdrObj()
rSdrObj.NbcSetLayer( SC_LAYER_FRONT ); rSdrObj.NbcSetLayer( SC_LAYER_FRONT );
const bool bEnableUndo = rSdrObj.GetModel()->IsUndoEnabled(); SdrModel * pModel = rSdrObj.GetModel();
rSdrObj.GetModel()->EnableUndo(false); if ( pModel ) {
// set object name (GetObjName() will always return a non-empty name) const bool bEnableUndo = pModel->IsUndoEnabled();
rSdrObj.SetName( GetObjName() ); pModel->EnableUndo(false);
rSdrObj.GetModel()->EnableUndo(bEnableUndo); // set object name (GetObjName() will always return a non-empty name)
rSdrObj.SetName( GetObjName() );
pModel->EnableUndo(bEnableUndo);
} else
rSdrObj.SetName( GetObjName() );
// #i39167# full width for all objects regardless of horizontal alignment // #i39167# full width for all objects regardless of horizontal alignment
rSdrObj.SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) ); rSdrObj.SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment