diff options
| -rw-r--r-- | svx/source/table/tablemodel.cxx | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index d40c3ba99f6d..71935c397f02 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -1124,12 +1124,12 @@ void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_ // merge first cell CellRef xOriginCell( dynamic_cast< Cell* >( getCellByPosition( nCol, nRow ).get() ) ); - if( xOriginCell.is() ) - { - if( bUndo ) - xOriginCell->AddUndo(); - xOriginCell->merge( nColSpan, nRowSpan ); - } + if(!xOriginCell.is()) + return; + + if( bUndo ) + xOriginCell->AddUndo(); + xOriginCell->merge( nColSpan, nRowSpan ); sal_Int32 nTempCol = nCol + 1; @@ -1151,9 +1151,6 @@ void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_ } } - - - void TableModel::updateRows() { sal_Int32 nRow = 0; @@ -1164,8 +1161,6 @@ void TableModel::updateRows() } } - - void TableModel::updateColumns() { sal_Int32 nColumn = 0; @@ -1176,8 +1171,6 @@ void TableModel::updateColumns() } } - - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |