From 460715d552cf6a24539f1a3651c6723e31df7515 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Wed, 8 Sep 2004 15:22:26 +0000
Subject: [PATCH] INTEGRATION: CWS pdf01 (1.58.26); FILE MERGED 2004/08/12
11:59:51 pl 1.58.26.1: assert only when needed
---
vcl/win/source/gdi/salgdi3.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 1a9c946080f2..cfac5b0f8290 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: salgdi3.cxx,v $
*
- * $Revision: 1.59 $
+ * $Revision: 1.60 $
*
- * last change: $Author: kz $ $Date: 2004-08-30 16:22:17 $
+ * last change: $Author: hr $ $Date: 2004-09-08 16:22:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1043,7 +1043,6 @@ static void ImplGetLogFontFromFontSelect( HDC hDC,
USHORT WinSalGraphics::SetFont( ImplFontSelectData* pFont, int nFallbackLevel )
{
- DBG_ASSERT( pFont->mpFontEntry, "WinSalGraphics mpFontEntry==NULL");
DBG_ASSERT( pFont->mpFontData, "WinSalGraphics mpFontData==NULL");
mpWinFontEntry[ nFallbackLevel ] = reinterpret_cast( pFont->mpFontEntry );
mpWinFontData[ nFallbackLevel ] = reinterpret_cast( pFont->mpFontData );