diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:08:27 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:08:27 +0000 |
| commit | 830b1775171a2ae6bc000d392f88c390e66b7279 (patch) | |
| tree | 6ee198dbc4f305c1e9438fb45a114feeeab4776e | |
| parent | fdf086a1c2422d135bc8b037e5311d8af656355a (diff) | |
INTEGRATION: CWS canvas05 (1.11.18); FILE MERGED
2008/04/21 07:54:17 thb 1.11.18.2: RESYNC: (1.11-1.12); FILE MERGED
2007/10/01 13:49:12 thb 1.11.18.1: #i79258# Merge from CWS picom
| -rw-r--r-- | slideshow/source/engine/animationnodes/basenode.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx index 33c121d01768..68ec92f0fea7 100644 --- a/slideshow/source/engine/animationnodes/basenode.hxx +++ b/slideshow/source/engine/animationnodes/basenode.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: basenode.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -31,6 +31,7 @@ #define INCLUDED_SLIDESHOW_BASENODE_HXX #include <canvas/debug.hxx> +#include <tools/diagnose_ex.h> #include <osl/diagnose.hxx> #include "event.hxx" @@ -146,7 +147,7 @@ protected: bool isMainSequenceRootNode() const { return mbIsMainSequenceRootNode; } bool checkValidNode() const { - ENSURE_AND_THROW( mpSelf, "no self ptr set!" ); + ENSURE_OR_THROW( mpSelf, "no self ptr set!" ); bool const bRet = (meCurrState != INVALID); OSL_ENSURE( bRet, "### INVALID node!" ); return bRet; |