Return-Path: 
 <commits-return-21663-apmail-openoffice-commits-archive=openoffice.apache.org@openoffice.apache.org>
X-Original-To: apmail-openoffice-commits-archive@www.apache.org
Delivered-To: apmail-openoffice-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 5E921D930
	for <apmail-openoffice-commits-archive@www.apache.org>;
 Tue, 28 May 2013 10:02:23 +0000 (UTC)
Received: (qmail 61816 invoked by uid 500); 28 May 2013 10:02:23 -0000
Delivered-To: apmail-openoffice-commits-archive@openoffice.apache.org
Received: (qmail 61784 invoked by uid 500); 28 May 2013 10:02:23 -0000
Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@openoffice.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@openoffice.apache.org>
List-Post: <mailto:commits@openoffice.apache.org>
List-Id: <commits.openoffice.apache.org>
Reply-To: dev@openoffice.apache.org
Delivered-To: mailing list commits@openoffice.apache.org
Received: (qmail 61775 invoked by uid 99); 28 May 2013 10:02:23 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 May 2013 10:02:23 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 May 2013 10:02:20 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 9BEF92388A9C;
	Tue, 28 May 2013 10:01:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1486846 - in /openoffice/trunk/main/graphite:
 graphite-2.3.1_stlportemu.patch makefile.mk
Date: Tue, 28 May 2013 10:01:59 -0000
To: commits@openoffice.apache.org
From: hdu@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130528100159.9BEF92388A9C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hdu
Date: Tue May 28 10:01:59 2013
New Revision: 1486846

URL: http://svn.apache.org/r1486846
Log:
#i122378# support graphite on system-STL based AOO on Windows

Added:
    openoffice/trunk/main/graphite/graphite-2.3.1_stlportemu.patch
Modified:
    openoffice/trunk/main/graphite/makefile.mk

Added: openoffice/trunk/main/graphite/graphite-2.3.1_stlportemu.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/graphite/graphite-2.3.1_stlportemu.patch?rev=1486846&view=auto
==============================================================================
--- openoffice/trunk/main/graphite/graphite-2.3.1_stlportemu.patch (added)
+++ openoffice/trunk/main/graphite/graphite-2.3.1_stlportemu.patch Tue May 28 10:01:59 2013
@@ -0,0 +1,50 @@
+--- misc/silgraphite-2.3.1/wrappers/win32/WinFont.cpp	2013-05-27 11:54:18.432327600 +0200
++++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.cpp	2013-05-27 11:52:02.662562100 +0200
+@@ -869,7 +869,7 @@
+ 
+ } // namespace gr
+ 
+-template stdext::hash_map<
++template hashmap_ns::hash_map<
+ 	gr::WinFont::LogFontWrapper,
+ 	gr::WinFont::FontHandleCache::FontCacheValue,
+ 	gr::WinFont::LogFontHashFuncs>;
+--- misc/silgraphite-2.3.1/wrappers/win32/WinFont.h	2013-05-27 11:56:04.110372100 +0200
++++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.h	2013-05-27 11:55:56.412931800 +0200
+@@ -28,8 +28,12 @@
+ #include "Font.h"
+ #include <map>
+ 
+-#ifdef _STLPORT_VERSION
+-namespace stdext = _STLP_STD;
++#ifdef SYSTEM_STL_HASHMAP
++namespace hashmap_ns = std;
++#elif defined(_STLPORT_VERSION)
++namespace hashmap_ns = _STLP_STD;
++#else
++namespace hashmap_ns = stdext;
+ #endif
+ 
+ namespace gr
+@@ -212,7 +216,7 @@
+         FontCacheValue GetCache(LOGFONT & lf);
+ 		void DeleteFont(HFONT hfont);
+ 
+-		typedef stdext::hash_map<LogFontWrapper, FontCacheValue, LogFontHashFuncs> FontHandleHashMap;
++		typedef hashmap_ns::hash_map<LogFontWrapper, FontCacheValue, LogFontHashFuncs> FontHandleHashMap;
+ 
+ 	protected:
+ 		FontHandleHashMap m_hmlffcv;
+--- misc/silgraphite-2.3.1/engine/include/graphite/GrCommon.h	2013-05-27 15:10:31.799725700 +0200
++++ misc/build/silgraphite-2.3.1/engine/include/graphite/GrCommon.h	2013-05-27 15:10:19.387015800 +0200
+@@ -18,8 +18,8 @@
+ #ifndef GRCOMMON_INCLUDED
+ #define GRCOMMON_INCLUDED
+ 
+-#define _SECURE_SCL 0	// to allow GlyphSetIterator to work, which points off the end of a vector
+-#define _HAS_ITERATOR_DEBUGGING 0
++//#define _SECURE_SCL 0	// to allow GlyphSetIterator to work, which points off the end of a vector
++//#define _HAS_ITERATOR_DEBUGGING 0
+ 
+ // Standard Headers.
+ 

Modified: openoffice/trunk/main/graphite/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/graphite/makefile.mk?rev=1486846&r1=1486845&r2=1486846&view=diff
==============================================================================
--- openoffice/trunk/main/graphite/makefile.mk (original)
+++ openoffice/trunk/main/graphite/makefile.mk Tue May 28 10:01:59 2013
@@ -50,7 +50,7 @@ all:
 
 TARFILE_NAME=silgraphite-2.3.1
 TARFILE_MD5=d35724900f6a4105550293686688bbb3
-PATCH_FILES=graphite-2.3.1.patch graphite-2.3.1_debug.patch
+PATCH_FILES=graphite-2.3.1.patch graphite-2.3.1_debug.patch graphite-2.3.1_stlportemu.patch
 
 # convert line-endings to avoid problems when patching
 CONVERTFILES=\
@@ -71,8 +71,10 @@ VCNUM=7
 .ELSE
 VCNUM=8
 .ENDIF
+.IF "$(USE_SYSTEM_STL)"!="YES"
 # make use of stlport headerfiles
 EXT_USE_STLPORT=TRUE
+.ENDIF
 BUILD_ACTION=nmake VERBOSE=1
 .IF "x$(debug)"!="x"
 BUILD_FLAGS= "CFG=DEBUG"
@@ -173,4 +175,4 @@ OUT2INC=wrappers$/win32$/WinFont.h
 .INCLUDE :	target.mk
 .INCLUDE :	tg_ext.mk
 
-.ENDIF
\ No newline at end of file
+.ENDIF