diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:45:15 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:45:15 +0000 |
| commit | 5c8e2d84391f5ec8fa385652e900fb007ec62d5a (patch) | |
| tree | 6a2a26ae6ffe59de6fc0ffe1035d10aa2ef23a80 /canvas | |
| parent | 853cd5ae05c2a0b70bd15383e819f89d2fac9444 (diff) | |
INTEGRATION: CWS canvas05 (1.4.68); FILE MERGED
2008/04/21 07:27:19 thb 1.4.68.2: RESYNC: (1.4-1.5); FILE MERGED
2007/10/01 13:02:02 thb 1.4.68.1: #i78888# #i78925# #i79258# #i79437# Merge from CWS picom
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/null/null_textlayout.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/canvas/source/null/null_textlayout.cxx b/canvas/source/null/null_textlayout.cxx index d477a75cd9ac..ce1e9251fe2f 100644 --- a/canvas/source/null/null_textlayout.cxx +++ b/canvas/source/null/null_textlayout.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: null_textlayout.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * This file is part of OpenOffice.org. * @@ -32,6 +32,7 @@ #include "precompiled_canvas.hxx" #include <canvas/debug.hxx> +#include <tools/diagnose_ex.h> #include <canvas/verbosetrace.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -115,7 +116,7 @@ namespace nullcanvas { ::osl::MutexGuard aGuard( m_aMutex ); - ENSURE_AND_THROW( mpFont.get(), + ENSURE_OR_THROW( mpFont.get(), "TextLayout::queryTextBounds(): invalid font" ); // fake text bounds by either taking the advancement values, |