diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:02:42 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:02:42 +0000 |
| commit | 044f703008144bd1ca6e2c643b0d37220dcf24dd (patch) | |
| tree | 623302f9d01389bec6e5e121b4078414e8bcf60e /slideshow/source/engine/shapesubset.cxx | |
| parent | b502897f1d32c5bac10a85abbd57bc43aaf59a33 (diff) | |
INTEGRATION: CWS canvas05 (1.7.18); FILE MERGED
2008/04/21 07:53:04 thb 1.7.18.2: RESYNC: (1.7-1.8); FILE MERGED
2007/10/01 13:49:11 thb 1.7.18.1: #i79258# Merge from CWS picom
Diffstat (limited to 'slideshow/source/engine/shapesubset.cxx')
| -rw-r--r-- | slideshow/source/engine/shapesubset.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index bd1fbe7b415b..e1f078dbd325 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: shapesubset.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.9 $ * * 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 <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> @@ -53,7 +54,7 @@ namespace slideshow maTreeNode( rTreeNode ), mpShapeManager( rShapeManager ) { - ENSURE_AND_THROW( mpShapeManager, + ENSURE_OR_THROW( mpShapeManager, "ShapeSubset::ShapeSubset(): Invalid shape manager" ); } @@ -66,9 +67,9 @@ namespace slideshow maTreeNode( rTreeNode ), mpShapeManager( rOriginalSubset->mpShapeManager ) { - ENSURE_AND_THROW( mpShapeManager, + ENSURE_OR_THROW( mpShapeManager, "ShapeSubset::ShapeSubset(): Invalid shape manager" ); - ENSURE_AND_THROW( rOriginalSubset->maTreeNode.isEmpty() || + ENSURE_OR_THROW( rOriginalSubset->maTreeNode.isEmpty() || (rTreeNode.getStartIndex() >= rOriginalSubset->maTreeNode.getStartIndex() && rTreeNode.getEndIndex() <= rOriginalSubset->maTreeNode.getEndIndex()), "ShapeSubset::ShapeSubset(): Subset is bigger than parent" ); @@ -81,7 +82,7 @@ namespace slideshow maTreeNode(), mpShapeManager( rShapeManager ) { - ENSURE_AND_THROW( mpShapeManager, + ENSURE_OR_THROW( mpShapeManager, "ShapeSubset::ShapeSubset(): Invalid shape manager" ); } |