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 | 36f032bda3c4ab4b221385ab5e2e921f5e949d05 (patch) | |
| tree | 24a0e0dfdb236836d868a6fe102290189dcb0d27 /svx/source | |
| parent | ade5abb1970f5bb9b55b3f2dc76ded5fd0a933d7 (diff) | |
#i10000# build fix
Diffstat (limited to 'svx/source')
| -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 32646c8e0347..ce79dad77b4c 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; |