diff options
| author | Release Engineers <releng@openoffice.org> | 2009-06-22 10:18:07 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-06-22 10:18:07 +0000 |
| commit | 7e7d39c00979ee54ef8292f05114112d094f336b (patch) | |
| tree | 06e41e1fe65e03d2ab85de3c3ea539c2ca0a3e96 | |
| parent | 4b97c008fe42dabd535e7a551a916389aa3a6177 (diff) | |
#i10000# build fix
| -rw-r--r-- | svx/source/table/tablemodel.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index 59f1d92595..bd1fe4dd93 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -1184,6 +1184,8 @@ void TableModel::optimize() void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_Int32 nRowSpan ) { + SdrModel* pModel = mpTableObj->GetModel(); + const bool bUndo = pModel && mpTableObj->IsInserted() && pModel->IsUndoEnabled(); const sal_Int32 nLastRow = nRow + nRowSpan; |