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

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,