head	1.2;
access;
symbols;
locks; strict;
comment	@// @;


1.2
date	2014.02.02.07.43.40;	author ryoon;	state dead;
branches;
next	1.1;
commitid	SCRPn9tBPxRmXunx;

1.1
date	2014.01.20.19.27.51;	author joerg;	state Exp;
branches;
next	;
commitid	mZR31TNIY8KOgTlx;


desc
@@


1.2
log
@Update to 4.2.0.4

Changelog:
* Many bugfixes
* Many new features
See https://wiki.documentfoundation.org/ReleaseNotes/4.2
and https://www.libreoffice.org/download/4-2-new-features-and-fixes/
@
text
@$NetBSD: patch-vcl_headless_svptext.cxx,v 1.1 2014/01/20 19:27:51 joerg Exp $

--- vcl/headless/svptext.cxx.orig	2014-01-18 00:29:16.000000000 +0000
+++ vcl/headless/svptext.cxx
@@@@ -172,7 +172,7 @@@@ void SvpGlyphPeer::RemovingFont( ServerF
 
 void SvpGlyphPeer::RemovingGlyph( ServerFont&, GlyphData& rGlyphData, int /*nGlyphIndex*/ )
 {
-    if( rGlyphData.ExtDataRef().mpData != Format::NONE )
+    if( rGlyphData.ExtDataRef().mpData != NULL )
     {
         // release the glyph related resources
         DBG_ASSERT( (rGlyphData.ExtDataRef().meInfo <= Format::MAX), "SVP::RG() invalid alpha format" );
@


1.1
log
@Fix build with Clang. Patches mostly from FreeBSD.
@
text
@d1 1
a1 1
$NetBSD$
@