mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS sixtyfour02 (1.3.34); FILE MERGED

Browse Source 
2006/02/21 13:19:03 cmc 1.3.34.1: #i62328# stream sal_uInt32, not ULONG
This commit is contained in:
Vladimir Glazounov
2006-03-16 12:12:31 +00:00
parent 002f230463
commit d2b25acee6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sot/source/sdstor/stgole.hxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: stgole.hxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -74,10 +74,10 @@ public:
class StgOleStream : public StgInternalStream class StgOleStream : public StgInternalStream
{ {
ULONG nFlags; sal_uInt32 nFlags;
public: public:
StgOleStream( BaseStorage&, BOOL ); StgOleStream( BaseStorage&, BOOL );
ULONG& GetFlags() { return nFlags; } sal_uInt32& GetFlags() { return nFlags; }
BOOL Load(); BOOL Load();
BOOL Store(); BOOL Store();
}; };

6
sot/source/sdstor/storinfo.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: storinfo.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * 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 ReadClipboardFormat( SvStream & rStm )
{ {
ULONG nFormat = 0; sal_uInt32 nFormat = 0;
INT32 nLen = 0; INT32 nLen = 0;
rStm >> nLen; rStm >> nLen;
if( rStm.IsEof() ) if( rStm.IsEof() )