diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-03-16 12:12:31 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-03-16 12:12:31 +0000 |
| commit | d2b25acee66e4495aeffe5478af6ece1c4c86510 (patch) | |
| tree | b41331a93345da2283e2a51553dc1ff2a76511f8 /sot | |
| parent | 002f230463d7034ae9701b00f99e69d0e0b73427 (diff) | |
INTEGRATION: CWS sixtyfour02 (1.3.34); FILE MERGED
2006/02/21 13:19:03 cmc 1.3.34.1: #i62328# stream sal_uInt32, not ULONG
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/sdstor/stgole.hxx | 8 | ||||
| -rw-r--r-- | sot/source/sdstor/storinfo.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx index 306bd1d51869..35c19511243a 100644 --- a/sot/source/sdstor/stgole.hxx +++ b/sot/source/sdstor/stgole.hxx @@ -4,9 +4,9 @@ * * $RCSfile: stgole.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 07:43:00 $ + * last change: $Author: vg $ $Date: 2006-03-16 13:12:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -74,10 +74,10 @@ public: class StgOleStream : public StgInternalStream { - ULONG nFlags; + sal_uInt32 nFlags; public: StgOleStream( BaseStorage&, BOOL ); - ULONG& GetFlags() { return nFlags; } + sal_uInt32& GetFlags() { return nFlags; } BOOL Load(); BOOL Store(); }; diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx index 17e87ece9b6b..3823f749cb50 100644 --- a/sot/source/sdstor/storinfo.cxx +++ b/sot/source/sdstor/storinfo.cxx @@ -4,9 +4,9 @@ * * $RCSfile: storinfo.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 07:44:06 $ + * last change: $Author: vg $ $Date: 2006-03-16 13:12:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -58,7 +58,7 @@ const SvStorageInfo * SvStorageInfoList::Get( const String & rEleName ) *************************************************************************/ ULONG ReadClipboardFormat( SvStream & rStm ) { - ULONG nFormat = 0; + sal_uInt32 nFormat = 0; INT32 nLen = 0; rStm >> nLen; if( rStm.IsEof() ) |