diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 07:18:00 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 07:18:00 +0000 |
| commit | 78e04b8aac0c246fe843a9a9f5037b106aab0dee (patch) | |
| tree | f637c4625d26a1161ee1c793779f098c2e0a8873 /svx | |
| parent | e235955e65e2459796564a103d46b0f2574acac5 (diff) | |
INTEGRATION: CWS sixtyfour04 (1.20.166); FILE MERGED
2006/03/14 13:04:47 cmc 1.20.166.1: #i63161# streaming ULONGS to/from disk
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/items/flditem.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/items/flditem.cxx b/svx/source/items/flditem.cxx index 62ecdee664e8..c861b4f8bbf6 100644 --- a/svx/source/items/flditem.cxx +++ b/svx/source/items/flditem.cxx @@ -4,9 +4,9 @@ * * $RCSfile: flditem.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: rt $ $Date: 2005-12-14 14:55:51 $ + * last change: $Author: vg $ $Date: 2006-04-07 08:18:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -63,7 +63,7 @@ #include <tools/tenccvt.hxx> #endif -#define FRAME_MARKER (ULONG)0x21981357 +#define FRAME_MARKER (sal_uInt32)0x21981357 #define CHARSET_MARKER (FRAME_MARKER+1) // ----------------------------------------------------------------------- @@ -489,7 +489,7 @@ int SvxURLField::operator==( const SvxFieldData& rOther ) const void SvxURLField::Load( SvPersistStream & rStm ) { USHORT nFormat; - ULONG nFrameMarker, nCharSetMarker; + sal_uInt32 nFrameMarker, nCharSetMarker; long nUlongSize = (long)sizeof(ULONG); String aTmpURL; |