diff options
| author | Daniel <danielfaleirosilva@gmail.com> | 2018-05-17 10:23:24 -0300 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-05-21 15:51:33 +0200 |
| commit | 7c5f1caa775e6a3d178c7dae7171d3fca2874635 (patch) | |
| tree | 426fe444824977b3ac389dc4d17a696c1b953f52 /svx | |
| parent | b3b169ddd99be71afe0da19afefcb9a6173a2e79 (diff) | |
tdf#117581 impress: fix selection overlay after moving table
Change-Id: Ie5afa4fbddf86c6692a7ed68af9ef990c2f9f487
Reviewed-on: https://gerrit.libreoffice.org/54493
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/table/tablecontroller.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 3568fa743fd7..3241f2c7d304 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -172,6 +172,7 @@ SvxTableController::SvxTableController( SdrView& rView, const SdrTableObj& rObj) : mbCellSelectionMode(false) + ,mbHasJustMerged(false) ,mbLeftButtonDown(false) ,mpSelectionOverlay(nullptr) ,mrView(rView) @@ -1820,6 +1821,8 @@ void SvxTableController::MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, s } xRange->merge(); + mbHasJustMerged = true; + setSelectedCells( maCursorFirstPos, maCursorFirstPos ); if( bUndo ) rModel.EndUndo(); @@ -2144,6 +2147,11 @@ void SvxTableController::onTableModified() void SvxTableController::updateSelectionOverlay() { + // There is no need to update selection overlay after merging cells + // since the selection overlay should remain the same + if ( mbHasJustMerged ) + return; + destroySelectionOverlay(); if( mbCellSelectionMode ) { @@ -2792,9 +2800,11 @@ IMPL_LINK_NOARG(SvxTableController, UpdateHdl, void*, void) if( aStart != maCursorFirstPos || aEnd != maCursorLastPos ) { setSelectedCells( aStart, aEnd ); - updateSelectionOverlay(); } } + + updateSelectionOverlay(); + mbHasJustMerged = false; } namespace |