summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-12-13 12:47:54 +0000
committerXisco Faulí <xiscofauli@libreoffice.org>2019-12-16 12:16:19 +0100
commit63c5b6114b9a29dc691818f96b0f695ceaa2c693 (patch)
tree40b9a227e227c51a90a307ab7434bf54c0d6f507 /sd
parent96bf3c26037c520817fc256d0c942bc78eef3472 (diff)
Resolves: tdf#129346 if nothing currently selected, select something
in the slidesorter Change-Id: I66853ba56eab93dfb18de7496212eb64e97cd2bf Reviewed-on: https://gerrit.libreoffice.org/85131 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
index d6daf3dd0826..29bc46c71789 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
@@ -116,7 +116,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)
@@ -125,6 +125,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();