From 48ef20f2039d1a300a4324072e9b712c9994b406 Mon Sep 17 00:00:00 2001 From: Gülşah Köse Date: Wed, 20 Feb 2019 19:06:33 +0300 Subject: tdf#123090 Handle removed column with gridSpan. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If477845972ce4c8e7bf09ea8718c58851a5b9740 Signed-off-by: Gülşah Köse Reviewed-on: https://gerrit.libreoffice.org/68102 Tested-by: Jenkins Reviewed-by: Andras Timar --- svx/source/table/cellcursor.cxx | 1 + svx/source/table/tablecontroller.cxx | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'svx/source/table') 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 ); -- cgit