From cacbe1d7f69176e5520f456dd8efc9fac95efa92 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Tue, 24 Jun 2008 11:10:33 +0000 Subject: [PATCH] INTEGRATION: CWS canvas05 (1.3.4); FILE MERGED 2008/04/21 07:55:25 thb 1.3.4.2: RESYNC: (1.3-1.4); FILE MERGED 2007/10/01 13:49:13 thb 1.3.4.1: #i79258# Merge from CWS picom --- .../engine/shapes/drawshapesubsetting.cxx | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index 8ced7ae2e96c..3af4eeda59a2 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: drawshapesubsetting.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -33,6 +33,7 @@ // must be first #include +#include #include #include @@ -67,7 +68,7 @@ namespace slideshow void DrawShapeSubsetting::ensureInitializedNodeTree() const { - ENSURE_AND_THROW( mpMtf, + ENSURE_OR_THROW( mpMtf, "DrawShapeSubsetting::ensureInitializedNodeTree(): Invalid mtf" ); if( mbNodeTreeInitialized ) @@ -108,7 +109,7 @@ namespace slideshow // action). const sal_Int32 nIndex( nLastTextActionIndex + pAct->GetValue() ); - ENSURE_AND_THROW( static_cast< ::std::size_t >(nIndex) < maActionClassVector.size(), + ENSURE_OR_THROW( static_cast< ::std::size_t >(nIndex) < maActionClassVector.size(), "DrawShapeSubsetting::ensureInitializedNodeTree(): sentence index out of range" ); maActionClassVector[ nIndex ] = CLASS_CHARACTER_CELL_END; @@ -122,7 +123,7 @@ namespace slideshow // action). const sal_Int32 nIndex( nLastTextActionIndex + pAct->GetValue() ); - ENSURE_AND_THROW( static_cast< ::std::size_t >(nIndex) < maActionClassVector.size(), + ENSURE_OR_THROW( static_cast< ::std::size_t >(nIndex) < maActionClassVector.size(), "DrawShapeSubsetting::ensureInitializedNodeTree(): sentence index out of range" ); maActionClassVector[ nIndex ] = CLASS_WORD_END; @@ -136,7 +137,7 @@ namespace slideshow // action). const sal_Int32 nIndex( nLastTextActionIndex + pAct->GetValue() ); - ENSURE_AND_THROW( static_cast< ::std::size_t >(nIndex) < maActionClassVector.size(), + ENSURE_OR_THROW( static_cast< ::std::size_t >(nIndex) < maActionClassVector.size(), "DrawShapeSubsetting::ensureInitializedNodeTree(): sentence index out of range" ); maActionClassVector[ nIndex ] = CLASS_SENTENCE_END; @@ -256,7 +257,7 @@ namespace slideshow maCurrentSubsets(), mbNodeTreeInitialized( false ) { - ENSURE_AND_THROW( mpMtf, + ENSURE_OR_THROW( mpMtf, "DrawShapeSubsetting::DrawShapeSubsetting(): Invalid metafile" ); initCurrentSubsets(); @@ -273,7 +274,7 @@ namespace slideshow maCurrentSubsets(), mbNodeTreeInitialized( false ) { - ENSURE_AND_THROW( mpMtf, + ENSURE_OR_THROW( mpMtf, "DrawShapeSubsetting::DrawShapeSubsetting(): Invalid metafile" ); initCurrentSubsets(); @@ -520,7 +521,7 @@ namespace slideshow switch( *aCurr ) { default: - ENSURE_AND_THROW( false, + ENSURE_OR_THROW( false, "Unexpected type in iterateDocShapes()" ); case DrawShapeSubsetting::CLASS_NOOP: // ignore NOOP actions