From 13dfaa3c3704a5a963f9e1e5d45796472f43c80e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 13 Dec 2019 12:47:54 +0000 Subject: Resolves: tdf#129346 if nothing currently selected, select something MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit in the slidesorter Change-Id: I66853ba56eab93dfb18de7496212eb64e97cd2bf Reviewed-on: https://gerrit.libreoffice.org/85108 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx index 0d4b23ff8dfe..bacf5fdf0323 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx @@ -112,7 +112,7 @@ void SelectionObserver::EndObservation() PageSelector& rSelector (mrSlideSorter.GetController().GetPageSelector()); PageSelector::UpdateLock aUpdateLock (mrSlideSorter); rSelector.DeselectAllPages(); - if ( ! maInsertedPages.empty()) + if (!maInsertedPages.empty()) { // Select the inserted pages. for (const auto& rpPage : maInsertedPages) @@ -121,6 +121,12 @@ void SelectionObserver::EndObservation() } maInsertedPages.clear(); } + else + { + // tdf#129346 nothing currently selected, select something, if possible + if (rSelector.GetPageCount()) + rSelector.SelectPage(0); + } aUpdateLock.Release(); mrSlideSorter.GetController().GetFocusManager().SetFocusedPageToCurrentPage(); -- cgit v1.2.3