Lines 455-465
Link Here
|
455 |
{ |
455 |
{ |
456 |
// default: front layer, derived classes may have to set other layer in DoPreProcessSdrObj() |
456 |
// default: front layer, derived classes may have to set other layer in DoPreProcessSdrObj() |
457 |
rSdrObj.NbcSetLayer( SC_LAYER_FRONT ); |
457 |
rSdrObj.NbcSetLayer( SC_LAYER_FRONT ); |
458 |
const bool bEnableUndo = rSdrObj.GetModel()->IsUndoEnabled(); |
458 |
SdrModel * pModel = rSdrObj.GetModel(); |
459 |
rSdrObj.GetModel()->EnableUndo(false); |
459 |
if ( pModel ) { |
460 |
// set object name (GetObjName() will always return a non-empty name) |
460 |
const bool bEnableUndo = pModel->IsUndoEnabled(); |
461 |
rSdrObj.SetName( GetObjName() ); |
461 |
pModel->EnableUndo(false); |
462 |
rSdrObj.GetModel()->EnableUndo(bEnableUndo); |
462 |
// set object name (GetObjName() will always return a non-empty name) |
|
|
463 |
rSdrObj.SetName( GetObjName() ); |
464 |
pModel->EnableUndo(bEnableUndo); |
465 |
} else |
466 |
rSdrObj.SetName( GetObjName() ); |
463 |
// #i39167# full width for all objects regardless of horizontal alignment |
467 |
// #i39167# full width for all objects regardless of horizontal alignment |
464 |
rSdrObj.SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) ); |
468 |
rSdrObj.SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) ); |
465 |
|
469 |
|