diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-03-16 11:53:29 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-03-16 11:53:29 +0000 |
| commit | 50c637b5e286381d8e82d6992fde6e8795b8c4c6 (patch) | |
| tree | 4aabef8029df1fc5e73d5d9b13affa97bce70b9e | |
| parent | 635a7a67c5826e48883bb8eaa21f6842ed836288 (diff) | |
INTEGRATION: CWS sixtyfour02 (1.13.190); FILE MERGED
2006/02/23 08:59:18 cmc 1.13.190.3: #i62227# streaming ULONGS to disk
2006/02/23 08:48:22 cmc 1.13.190.2: accidental commit
2006/02/21 14:58:45 cmc 1.13.190.1: #i62227# stream sal_uInt32 explicitly as is currently assumed implicitly
| -rw-r--r-- | vcl/source/gdi/gfxlink.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index d0dacc73bf36..8d7fab786834 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -4,9 +4,9 @@ * * $RCSfile: gfxlink.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2005-09-09 11:58:33 $ + * last change: $Author: vg $ $Date: 2006-03-16 12:53:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -71,7 +71,7 @@ GfxLink::GfxLink( const GfxLink& rGfxLink ) : // ------------------------------------------------------------------------ -GfxLink::GfxLink( BYTE* pBuf, ULONG nSize, GfxLinkType nType, BOOL bOwns ) : +GfxLink::GfxLink( BYTE* pBuf, sal_uInt32 nSize, GfxLinkType nType, BOOL bOwns ) : mpImpData( new ImpGfxLink ) { meType = nType; @@ -177,7 +177,7 @@ BOOL GfxLink::IsNative() const // ------------------------------------------------------------------------ -ULONG GfxLink::GetDataSize() const +sal_uInt32 GfxLink::GetDataSize() const { return mnBufSize; } @@ -355,8 +355,8 @@ SvStream& operator>>( SvStream& rIStream, GfxLink& rGfxLink) { Size aSize; MapMode aMapMode; - ULONG nSize; - ULONG nUserId; + sal_uInt32 nSize; + sal_uInt32 nUserId; UINT16 nType; BYTE* pBuf; bool bMapAndSizeValid( false ); |