diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:12:57 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:12:57 +0000 |
| commit | 1a5f60c08cf5048408de43bbf48c83ae5c876315 (patch) | |
| tree | 0a0ce6ac0596839acca4c72546a2ce7f110b64da /slideshow | |
| parent | 617e8a09ac774a4fbec06bdf4472bc8bcd866387 (diff) | |
INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED
2008/04/21 07:55:00 thb 1.2.18.3: RESYNC: (1.3-1.4); FILE MERGED
2008/04/07 14:42:02 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED
2007/10/01 13:49:14 thb 1.2.18.1: #i79258# Merge from CWS picom
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/slide/shapemanagerimpl.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index da610262ae3a..b08241bf8fbb 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: shapemanagerimpl.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -32,6 +32,7 @@ #include "precompiled_slideshow.hxx" #include <canvas/debug.hxx> +#include <tools/diagnose_ex.h> #include <com/sun/star/awt/MouseButton.hpp> #include <com/sun/star/awt/SystemPointer.hpp> #include <com/sun/star/presentation/XShapeEventListener.hpp> @@ -341,7 +342,7 @@ bool ShapeManagerImpl::listenerAdded( if( (aIter = mrGlobalListenersMap.find( xShape )) == mrGlobalListenersMap.end() ) { - ENSURE_AND_RETURN(false, + ENSURE_OR_RETURN(false, "ShapeManagerImpl::listenerAdded(): global " "shape listener map inconsistency!"); } |