diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 11:16:14 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 11:16:14 +0000 |
| commit | b93a8ae066c46515022ea307597900d630103a33 (patch) | |
| tree | 718c77a28565df09c13bde18f6ec468248664110 /vcl/source/gdi/fontcfg.cxx | |
| parent | 5d0e55e419c7458da69294770f728a30cd948b30 (diff) | |
INTEGRATION: CWS ooo64bit01 (1.25.28); FILE MERGED
2004/04/13 03:42:26 fa 1.25.28.3: #i8605# Make vcl 64-bit clean, all coordinate arrays (like pDXAry, etc) should be
sal_Int32* rather than long*
2004/03/31 16:49:15 fa 1.25.28.2: Back out of changes since 2004-03-24, focus on smaller, more integratable changes
2004/03/29 00:30:25 fa 1.25.28.1: More 64-bit changes. 'rsc' still broken, but not as much as before.
Diffstat (limited to 'vcl/source/gdi/fontcfg.cxx')
| -rw-r--r-- | vcl/source/gdi/fontcfg.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/gdi/fontcfg.cxx b/vcl/source/gdi/fontcfg.cxx index f9b7b352cc4d..1e6523479e5a 100644 --- a/vcl/source/gdi/fontcfg.cxx +++ b/vcl/source/gdi/fontcfg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fontcfg.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: hr $ $Date: 2004-05-10 15:48:23 $ + * last change: $Author: rt $ $Date: 2004-06-17 12:16:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -867,7 +867,7 @@ static BOOL ImplFindAndErase( String& rName, const char* pStr ) // ======================================================================= void FontSubstConfigItem::getMapName( const String& rOrgName, String& rShortName, - String& rFamilyName, FontWeight& rWeight, FontWidth& rWidth, unsigned long& rType ) + String& rFamilyName, FontWeight& rWeight, FontWidth& rWidth, ULONG& rType ) { rShortName = rOrgName; |