sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 10dac1012b065e5e37ebb42f13d7fbdbda376786 Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Tue Feb 11 12:11:32 2020 +0100 Commit: Xisco Faulí <xiscofa...@libreoffice.org> CommitDate: Wed Feb 12 12:57:36 2020 +0100 tdf#130440 only select first page if no other page is selected Found while implementing the UItest. See https://gerrit.libreoffice.org/c/core/+/88437 it asserts on line 34 AssertionError: 2 != 1 as the first and second slides are selected Change-Id: I249dc0ac6faa55f0f15deedb848beabbc64aeed4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88439 Tested-by: Xisco Faulí <xiscofa...@libreoffice.org> Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org> (cherry picked from commit 7ed602a3b8c0ffe922b4f082cd4cdaa5a8f0d64c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88404 Reviewed-by: Michael Stahl <michael.st...@cib.de> Tested-by: Jenkins diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx index 9eaa7b50c8a2..4dc2ac08d387 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx @@ -126,7 +126,7 @@ void SelectionObserver::EndObservation() bool bSuccess = mrSlideSorter.GetController().GetFocusManager().SetFocusedPageToCurrentPage(); // tdf#129346 nothing currently selected, select something, if possible // but (tdf#129346) only if setting focus to current page failed - if (!bSuccess && rSelector.GetPageCount()) + if (!bSuccess && rSelector.GetPageCount() && rSelector.GetSelectedPageCount() == 0) rSelector.SelectPage(0); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits