diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2019-02-20 19:06:33 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-02-21 09:07:01 +0100 |
| commit | 48ef20f2039d1a300a4324072e9b712c9994b406 (patch) | |
| tree | 33ed89b2bbdc9186d9890a1f21fd7c3d622101b1 /svx | |
| parent | ffc59a0c4fcc7f5486447c7132cf1133ba58e115 (diff) | |
tdf#123090 Handle removed column with gridSpan.
Change-Id: If477845972ce4c8e7bf09ea8718c58851a5b9740
Signed-off-by: Gülşah Köse <gulsah.kose@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/68102
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/table/cellcursor.cxx | 1 | ||||
| -rw-r--r-- | svx/source/table/tablecontroller.cxx | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index bdd7156ef669..d77dbb3ffc59 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -251,6 +251,7 @@ void SAL_CALL CellCursor::merge( ) try { mxTable->merge( aStart.mnCol, aStart.mnRow, aEnd.mnCol - aStart.mnCol + 1, aEnd.mnRow - aStart.mnRow + 1 ); + mxTable->optimize(); mxTable->setModified(true); } catch( Exception& ) diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index d79e094bf601..57b3171d7a82 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -1839,7 +1839,6 @@ void SvxTableController::MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, s } xRange->merge(); - mxTable->optimize(); mbHasJustMerged = true; setSelectedCells( maCursorFirstPos, maCursorFirstPos ); |