From 91b8728108193706e142c25903c0dcd4ea8b0b21 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Sun, 23 Jun 2013 11:25:32 +0000 Subject: Resolves: #i120020# corrected paragraph merge... corresponding undo and ownership of linked undo actions (cherry picked from commit e58fe7afee5163833479b76a474416a77d95f075) Conflicts: editeng/source/editeng/impedit2.cxx sc/source/ui/undo/undobase.cxx sc/source/ui/undo/undodraw.cxx svl/inc/svl/undo.hxx Change-Id: I6672990558a496dfc692554437897d013e258f40 --- sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 79663a8fbf5f..4121add0b584 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -244,7 +244,11 @@ void PageSelector::CheckConsistency (void) const } if (nSelectionCount!=mnSelectedPageCount) { - assert(nSelectionCount==mnSelectedPageCount); + // #i120020# The former call to assert(..) internally calls + // SlideSorterModel::GetPageDescriptor which will crash in this situation + // (only in non-pro code). All what is wanted there is to assert it (the + // error is already detected), so do this directly. + OSL_ENSURE(false, "PageSelector: Consistency error (!)"); } } -- cgit