mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS pdf01 (1.58.26); FILE MERGED

Browse Source 
2004/08/12 11:59:51 pl 1.58.26.1: assert only when needed
This commit is contained in:
Jens-Heiner Rechtien
2004-09-08 15:22:26 +00:00
parent d0d6ad89b1
commit 460715d552
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vcl/win/source/gdi/salgdi3.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: salgdi3.cxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -1043,7 +1043,6 @@ static void ImplGetLogFontFromFontSelect( HDC hDC,
USHORT WinSalGraphics::SetFont( ImplFontSelectData* pFont, int nFallbackLevel ) USHORT WinSalGraphics::SetFont( ImplFontSelectData* pFont, int nFallbackLevel )
{ {
DBG_ASSERT( pFont->mpFontEntry, "WinSalGraphics mpFontEntry==NULL");
DBG_ASSERT( pFont->mpFontData, "WinSalGraphics mpFontData==NULL"); DBG_ASSERT( pFont->mpFontData, "WinSalGraphics mpFontData==NULL");
mpWinFontEntry[ nFallbackLevel ] = reinterpret_cast<ImplWinFontEntry*>( pFont->mpFontEntry ); mpWinFontEntry[ nFallbackLevel ] = reinterpret_cast<ImplWinFontEntry*>( pFont->mpFontEntry );
mpWinFontData[ nFallbackLevel ] = reinterpret_cast<ImplWinFontData*>( pFont->mpFontData ); mpWinFontData[ nFallbackLevel ] = reinterpret_cast<ImplWinFontData*>( pFont->mpFontData );