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
This commit is contained in:
Kurt Zenker
2008-06-24 10:48:19 +00:00
parent 4e6375b887
commit 053b160ea9

View File

@@ -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" );
}