diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-06-04 16:21:29 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-06-04 16:21:29 +0000 |
| commit | c3e9297cb1fd34478e529f95892bcd93be9121ab (patch) | |
| tree | aadf115a00eafe8e5397143de95f242bcb436c8f /svx/source/table/tablecolumn.cxx | |
| parent | 837a58b872594da72126e120e0575b5401c9e0c7 (diff) | |
CWS-TOOLING: integrate CWS clnoundo
2009-05-18 09:40:22 +0200 wg r271998 : i102011
2009-04-28 12:20:24 +0200 cl r271318 : CWS-TOOLING: rebase CWS clnoundo to trunk@270723 (milestone: DEV300:m46)
2009-04-02 11:37:14 +0200 cl r270388 : #i100371# check valid positions all the time to avoid crashes during model lock
2009-03-30 13:02:27 +0200 cl r270219 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:59:41 +0200 cl r270218 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:55:06 +0200 cl r270217 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:53:27 +0200 cl r270216 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:49:28 +0200 cl r270215 : #i100371# added EnableUndo() and IsUndoEnabled()
Diffstat (limited to 'svx/source/table/tablecolumn.cxx')
| -rw-r--r-- | svx/source/table/tablecolumn.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index 81644a8c3384..f0ee7ec88413 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -161,8 +161,10 @@ void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& a bool bOk = false; bool bChange = false; + SdrModel* pModel = mxTableModel->getSdrTableObj()->GetModel(); + TableColumnUndo* pUndo = 0; - if( mxTableModel.is() && mxTableModel->getSdrTableObj() && mxTableModel->getSdrTableObj()->IsInserted() ) + if( mxTableModel.is() && mxTableModel->getSdrTableObj() && mxTableModel->getSdrTableObj()->IsInserted() && pModel && pModel->IsUndoEnabled() ) { TableColumnRef xThis( this ); pUndo = new TableColumnUndo( xThis ); @@ -228,12 +230,8 @@ void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& a { if( pUndo ) { - SdrModel* pModel = mxTableModel->getSdrTableObj()->GetModel(); - if( pModel ) - { - pModel->AddUndo( pUndo ); - pUndo = 0; - } + pModel->AddUndo( pUndo ); + pUndo = 0; } mxTableModel->setModified(sal_True); } |