diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-10-06 10:11:45 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-10-06 10:11:45 +0000 |
| commit | b636ac0cd733b8fcd713b184847b0169bdfacfcc (patch) | |
| tree | a1527d6d56db278b6263603a814d59b1d9c00700 /goodies | |
| parent | ad0c3ef264d7846b79944008fdd46d6481c8d7f3 (diff) | |
INTEGRATION: CWS intptr (1.8.90); FILE MERGED
2005/09/16 09:36:47 kendy 1.8.90.2: #i54498# Forgotten sal_IntPtr -> sal_uIntPtr.
2005/09/13 14:51:11 kendy 1.8.90.1: #i54498#
Introduce and use sal_IntPtr/sal_uIntPtr for ints where we have to store a pointer
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/filter.vcl/icgm/cgm.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/goodies/source/filter.vcl/icgm/cgm.cxx b/goodies/source/filter.vcl/icgm/cgm.cxx index 27f3784d5904..642d6cbbb354 100644 --- a/goodies/source/filter.vcl/icgm/cgm.cxx +++ b/goodies/source/filter.vcl/icgm/cgm.cxx @@ -4,9 +4,9 @@ * * $RCSfile: cgm.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: hr $ $Date: 2005-09-23 13:45:25 $ + * last change: $Author: kz $ $Date: 2005-10-06 11:11:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -796,7 +796,7 @@ void CGM::ImplDefaultReplacement() sal_uInt8* pBuf = (sal_uInt8*)maDefRepList.First(); if ( pBuf ) { - sal_uInt32 nElementSize = (sal_uInt32)maDefRepSizeList.First(); + sal_uInt32 nElementSize = (sal_uInt32)(sal_uIntPtr)maDefRepSizeList.First(); sal_uInt32 nOldEscape = mnEscape; sal_uInt32 nOldElementClass = mnElementClass; sal_uInt32 nOldElementID = mnElementID; @@ -826,7 +826,7 @@ void CGM::ImplDefaultReplacement() if ( ( mnElementClass != 1 ) || ( mnElementID != 0xc ) ) // rekursion hier nicht moeglich!! ImplDoClass(); } - nElementSize = (sal_uInt32)maDefRepSizeList.Next(); + nElementSize = (sal_uInt32)(sal_uIntPtr)maDefRepSizeList.Next(); pBuf = (sal_uInt8*)maDefRepList.Next(); } mnEscape = nOldEscape; |