summaryrefslogtreecommitdiffstats
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-13 19:24:22 +0100
commit5f7987cef5133d7207b09c0c523289bff06f6241 (patch)
tree9462d51707d6b672122d9d9dc816e62c94eb252c /sd
parenttdf#128191 Show infobar when hyphenation info for text language is missing (diff)
downloadcore-5f7987cef5133d7207b09c0c523289bff06f6241.tar.gz
core-5f7987cef5133d7207b09c0c523289bff06f6241.zip
Resolves: tdf#129346 if nothing currently selected, select something
in the slidesorter Change-Id: I66853ba56eab93dfb18de7496212eb64e97cd2bf Reviewed-on: https://gerrit.libreoffice.org/85109 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 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();