diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:54:16 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:54:16 +0000 |
| commit | ec17b0aaf4d4950cd86da71298d52ae8a68716bb (patch) | |
| tree | 5645d723ba7e564826a6bd6826222748278659a3 /sot | |
| parent | 6be670b616ebbbfee05f8bfef6cea1339196cf0c (diff) | |
INTEGRATION: CWS warnings01 (1.6.8); FILE MERGED
2006/04/20 14:47:31 sb 1.6.8.3: #i53898# Made code warning-free again after resync to SRC680m162.
2006/04/07 21:34:20 sb 1.6.8.2: RESYNC: (1.6-1.8); FILE MERGED
2005/10/21 16:25:09 pl 1.6.8.1: #i55991# removed warnings for linux platform
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/sdstor/stgcache.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx index fec68ef3c828..1a46a575edf1 100644 --- a/sot/source/sdstor/stgcache.cxx +++ b/sot/source/sdstor/stgcache.cxx @@ -4,9 +4,9 @@ * * $RCSfile: stgcache.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2006-03-22 12:11:55 $ + * last change: $Author: hr $ $Date: 2006-06-20 05:54:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -57,7 +57,6 @@ #include "stgstrms.hxx" #include "stgdir.hxx" #include "stgio.hxx" -#pragma hdrstop /*************************************************************************/ //----------------------------------------------------------------------------- @@ -449,11 +448,11 @@ BOOL StgCache::Read( INT32 nPage, void* pBuf, INT32 nPg ) } if( pStrm->Tell() != nPos ) { - ULONG nPhysPos = pStrm->Seek( nPos ); + if( pStrm->Seek( nPos ) != nPos ) { #ifdef CHECK_DIRTY - if( nPhysPos != nPos ) ErrorBox( NULL, WB_OK, String("SO2: Seek failed") ).Execute(); #endif + } } pStrm->Read( pBuf, nBytes ); if ( nPg != nPg2 ) @@ -476,11 +475,11 @@ BOOL StgCache::Write( INT32 nPage, void* pBuf, INT32 nPg ) nPos = 0L, nBytes = 512; if( pStrm->Tell() != nPos ) { - ULONG nPhysPos = pStrm->Seek( nPos ); + if( pStrm->Seek( nPos ) != nPos ) { #ifdef CHECK_DIRTY - if( nPhysPos != nPos ) ErrorBox( NULL, WB_OK, String("SO2: Seek failed") ).Execute(); #endif + } } ULONG nRes = pStrm->Write( pBuf, nBytes ); if( nRes != nBytes ) |