diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 10:48:19 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 10:48:19 +0000 |
| commit | 053b160ea9a840b0467fa8739acf0da4498ed6e3 (patch) | |
| tree | 5ebbd6a3f601f7480aeacca68fb81fa31b1065d6 /cppcanvas/source | |
| parent | 4e6375b88740d13e04237abb30818f88569dec9c (diff) | |
INTEGRATION: CWS canvas05 (1.12.14); FILE MERGED
2008/04/21 07:50:14 thb 1.12.14.2: RESYNC: (1.12-1.13); FILE MERGED
2007/10/01 13:41:44 thb 1.12.14.1: #i79258# Merge from CWS picom
Diffstat (limited to 'cppcanvas/source')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/mtftools.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx index 50e4c9dba001..baf39cc0c13e 100644 --- a/cppcanvas/source/mtfrenderer/mtftools.cxx +++ b/cppcanvas/source/mtfrenderer/mtftools.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: mtftools.cxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.14 $ * * This file is part of OpenOffice.org. * @@ -32,6 +32,7 @@ #include "precompiled_cppcanvas.hxx" #include <canvas/debug.hxx> +#include <tools/diagnose_ex.h> #include <canvas/verbosetrace.hxx> #include <com/sun/star/rendering/RenderState.hpp> @@ -86,7 +87,7 @@ namespace cppcanvas aMetric.GetIntLeading() + aMetric.GetAscent() ); default: - ENSURE_AND_THROW( false, + ENSURE_OR_THROW( false, "tools::getBaselineOffset(): Unexpected TextAlign value" ); // FALLTHROUGH intended (to calm compiler warning - case won't happen) case ALIGN_BASELINE: @@ -497,7 +498,7 @@ namespace cppcanvas break; default: - ENSURE_AND_THROW( false, + ENSURE_OR_THROW( false, "::cppcanvas::internal::createTextLinesPolyPolygon(): Unexpected underline case" ); } @@ -552,7 +553,7 @@ namespace cppcanvas break; default: - ENSURE_AND_THROW( false, + ENSURE_OR_THROW( false, "::cppcanvas::internal::createTextLinesPolyPolygon(): Unexpected strikeout case" ); } |