[Libreoffice-commits] core.git: sd/source
Tor Lillqvist
tml at collabora.com
Sun Dec 7 02:20:45 PST 2014
sd/source/ui/view/outlview.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 4ee680939d649f4458c9046d40bdde2f733384f7
Author: Tor Lillqvist <tml at collabora.com>
Date: Sun Dec 7 12:08:53 2014 +0200
Work around error: member access into incomplete type 'MarkedUndoAction'
Change-Id: Ie5c8bc2136b56bd7bb64055c0e84c0559dd9aad2
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index fa50067..3057a9a 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1618,8 +1618,10 @@ 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,
"sd::OutlineView::TryToMergeUndoActions(), wrong edit pos!" );
+#endif
pListAction->aUndoActions.Remove(nEditPos);
delete pEditUndo;
More information about the Libreoffice-commits
mailing list