[ooo-build-commit] Branch 'ooo/master' - svx/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Jun 22 17:56:01 PDT 2009
svx/source/table/tablemodel.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 7e7d39c00979ee54ef8292f05114112d094f336b
Author: Release Engineers <releng at openoffice.org>
Date: Mon Jun 22 10:18:07 2009 +0000
#i10000# build fix
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 59f1d92..bd1fe4d 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;
More information about the ooo-build-commit
mailing list