diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:55:22 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:55:22 +0000 |
| commit | bbeede01cc52c20220c1f3109d9ce80680d5aa83 (patch) | |
| tree | 61b4f05d6d9bc16366466554d620693ebb97492e /sot/source/sdstor/stgstrms.hxx | |
| parent | 6ee9fd2145750f5774c912cc0e2037fac6ffb566 (diff) | |
INTEGRATION: CWS warnings01 (1.2.10); FILE MERGED
2005/10/28 16:15:29 pl 1.2.10.2: #i55991# removed warnings for solaris platform
2005/10/21 16:25:13 pl 1.2.10.1: #i55991# removed warnings for linux platform
Diffstat (limited to 'sot/source/sdstor/stgstrms.hxx')
| -rw-r--r-- | sot/source/sdstor/stgstrms.hxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx index a0460dd20929..957e6150fcaf 100644 --- a/sot/source/sdstor/stgstrms.hxx +++ b/sot/source/sdstor/stgstrms.hxx @@ -4,9 +4,9 @@ * * $RCSfile: stgstrms.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-08 07:43:33 $ + * last change: $Author: hr $ $Date: 2006-06-20 05:55:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -89,7 +89,7 @@ protected: BOOL Copy( INT32 nFrom, INT32 nBytes ); StgStrm( StgIo& ); public: - ~StgStrm(); + virtual ~StgStrm(); StgIo& GetIo() { return rIo; } INT32 GetPos() { return nPos; } INT32 GetStart() { return nStart; } @@ -116,6 +116,8 @@ class StgFATStrm : public StgStrm { // the master FAT stream BOOL SetPage( short, INT32 ); public: StgFATStrm( StgIo& ); + virtual ~StgFATStrm() {} + using StgStrm::GetPage; INT32 GetPage( short, BOOL, USHORT *pnMasterAlloc = 0); virtual BOOL SetSize( INT32 ); virtual StgPage* GetPhysPage( INT32 nBytePos, BOOL bForce = FALSE ); @@ -159,6 +161,7 @@ class StgTmpStrm : public SvMemoryStream { String aName; SvFileStream* pStrm; + using SvMemoryStream::GetData; virtual ULONG GetData( void* pData, ULONG nSize ); virtual ULONG PutData( const void* pData, ULONG nSize ); virtual ULONG SeekPos( ULONG nPos ); @@ -169,6 +172,7 @@ public: ~StgTmpStrm(); BOOL Copy( StgTmpStrm& ); void SetSize( ULONG ); + using SvMemoryStream::GetSize; ULONG GetSize(); }; |