sd/qa/unit/tiledrendering/tiledrendering.cxx | 4 ++-- svx/source/table/tablecontroller.cxx | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-)
New commits: commit 3ba86ee82a2d0c2d8cac3c7ee83e2c5f0a3c291e Author: merttumer <[email protected]> AuthorDate: Thu Apr 15 11:21:01 2021 +0300 Commit: Mert Tumer <[email protected]> CommitDate: Mon May 3 06:51:22 2021 +0200 Fix ESC key selects all the cells of the table object Selecting the table should not necessarily mean selecting all the cells. If all the cells are selected which ESC key does the same thing, it is impossible to delete the table with the delete key, only after an input following by an ESC deleselects them and deleting becomes possible. Change-Id: I33f182d330f1cbc411d47b86098a4aea544a90ae Signed-off-by: merttumer <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114128 Reviewed-by: Jan Holesovsky <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114643 Tested-by: Jenkins diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 55d724a6a069..c9dbbd74fa14 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -1453,8 +1453,8 @@ void SdTiledRenderingTest::testTdf118354() Scheduler::ProcessEventsToIdle(); SdrView* pView = pViewShell->GetView(); - rtl::Reference<sdr::SelectionController> xSelectionController(pView->getSelectionController()); - CPPUNIT_ASSERT(xSelectionController->hasSelectedCells()); + auto pMarkedObj = dynamic_cast<sdr::table::SdrTableObj*>(pView->GetMarkedObjectByIndex(0)); + CPPUNIT_ASSERT_EQUAL(pMarkedObj, pTableObject); } void SdTiledRenderingTest::testPostKeyEventInvalidation() diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 68880ad34754..438ffbcb9392 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -407,13 +407,6 @@ void SvxTableController::onSelectionHasChanged() const SdrMarkList& rMarkList= mrView.GetMarkedObjectList(); if( rMarkList.GetMarkCount() == 1 ) bSelected = mxTableObj.get() == rMarkList.GetMark(0)->GetMarkedSdrObj(); - /* fdo#46186 Selecting the table means selecting the entire cells */ - if (!hasSelectedCells() && pTableObj) - { - maCursorFirstPos = SdrTableObj::getFirstCell(); - maCursorLastPos = pTableObj->getLastCell(); - mbCellSelectionMode=true; - } } if( bSelected ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
