sd/source/ui/view/outlview.cxx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 88b9fe9a4afb5212d4378c5678b39b760000a0aa
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Dec 7 13:17:24 2014 +0100
sd: use GetUndoAction()
Change-Id: I4129fdedcf99b711447aa3dd9fab3dec1bb5ad59
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 3057a9a..bdf5a6f 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1618,10 +1618,8 @@ void OutlineView::TryToMergeUndoActions()
// the top EditUndo of the previous undo list
// first remove the merged undo action
-#if 0 // breaks --enable-dbgutil build
- DBG_ASSERT( pListAction->aUndoActions[nEditPos].pAction ==
pEditUndo,
+ DBG_ASSERT(
pListAction->aUndoActions.GetUndoAction(nEditPos) == pEditUndo,
"sd::OutlineView::TryToMergeUndoActions(), wrong edit
pos!" );
-#endif
pListAction->aUndoActions.Remove(nEditPos);
delete pEditUndo;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
