[Libreoffice-commits] core.git: 2 commits - basic/source dbaccess/source editeng/source filter/source idl/source include/editeng include/sot include/vcl lotuswordpro/source sc/source sd/source sfx2/source sot/source starmath/source svl/source sw/source tools/source vcl/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Jun 6 06:16:19 UTC 2017
basic/source/classes/image.cxx | 4 ++--
basic/source/runtime/iosys.cxx | 2 +-
basic/source/runtime/methods.cxx | 2 +-
basic/source/sbx/sbxarray.cxx | 2 +-
basic/source/sbx/sbxbase.cxx | 2 +-
dbaccess/source/ui/misc/TokenWriter.cxx | 4 ++--
editeng/source/misc/svxacorr.cxx | 16 ++++++++--------
filter/source/msfilter/msdffimp.cxx | 4 ++--
filter/source/msfilter/svdfppt.cxx | 10 +++++-----
idl/source/cmptools/lex.cxx | 10 +++++-----
idl/source/prj/command.cxx | 2 +-
idl/source/prj/database.cxx | 4 ++--
idl/source/prj/parser.cxx | 2 +-
idl/source/prj/svidl.cxx | 4 ++--
include/editeng/editdata.hxx | 2 +-
include/sot/stg.hxx | 2 +-
include/sot/storage.hxx | 2 +-
include/vcl/errcode.hxx | 4 ----
lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 2 +-
sc/source/core/tool/rechead.cxx | 6 +++---
sc/source/filter/excel/excimp8.cxx | 2 +-
sc/source/ui/docshell/impex.cxx | 12 ++++++------
sd/source/filter/eppt/eppt.cxx | 6 +++---
sd/source/filter/html/pubdlg.cxx | 4 ++--
sfx2/source/doc/docfile.cxx | 12 ++++++------
sfx2/source/doc/objstor.cxx | 4 ++--
sfx2/source/doc/oleprops.cxx | 8 ++++----
sot/source/sdstor/stg.cxx | 10 +++++-----
sot/source/sdstor/stgcache.cxx | 6 +++---
sot/source/sdstor/stgcache.hxx | 2 +-
sot/source/sdstor/stgdir.cxx | 6 +++---
sot/source/sdstor/stgio.cxx | 4 ++--
sot/source/sdstor/stgole.cxx | 12 ++++++------
sot/source/sdstor/stgstrms.cxx | 8 ++++----
sot/source/sdstor/storage.cxx | 14 +++++++-------
starmath/source/eqnolefilehdr.cxx | 2 +-
starmath/source/mathtype.cxx | 4 ++--
svl/source/items/macitem.cxx | 2 +-
sw/source/core/layout/laycache.cxx | 8 ++++----
sw/source/core/swg/SwXMLTextBlocks1.cxx | 2 +-
sw/source/filter/ascii/parasc.cxx | 2 +-
sw/source/filter/basflt/iodetect.cxx | 4 ++--
sw/source/filter/ww8/wrtww8.cxx | 2 +-
sw/source/filter/ww8/ww8glsy.cxx | 2 +-
sw/source/filter/ww8/ww8par.cxx | 6 +++---
tools/source/ref/pstm.cxx | 2 +-
tools/source/stream/stream.cxx | 12 ++++++------
tools/source/stream/strmunx.cxx | 4 ++--
tools/source/stream/strmwnt.cxx | 2 +-
vcl/source/gdi/print.cxx | 2 +-
vcl/source/gdi/print3.cxx | 2 +-
51 files changed, 125 insertions(+), 129 deletions(-)
New commits:
commit 86cefcf4dfeefc9c08dc1b6d30f9920db52bcc99
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Jun 5 15:04:58 2017 +0200
replace PRINTER_OK with ERRORCODE_NONE
since the first is #define'd to the second, and offers no extra value
Change-Id: Id3ce344e246d88b34d0e0fc2619da13f67587000
Reviewed-on: https://gerrit.libreoffice.org/38409
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/vcl/errcode.hxx b/include/vcl/errcode.hxx
index de41eae4b4af..ecd7c788c0cd 100644
--- a/include/vcl/errcode.hxx
+++ b/include/vcl/errcode.hxx
@@ -252,7 +252,6 @@ inline sal_uInt32 ERRCODE_TOERROR( ErrCode x )
// For the EditEngine:
#define SVSTREAM_ERRBASE_USER ERRCODE_AREA_LIB1
-#define PRINTER_OK ERRCODE_NONE
#define PRINTER_ABORT ERRCODE_IO_ABORT
#define PRINTER_GENERALERROR ERRCODE_IO_GENERAL
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 7941632b89fc..e88691a34b50 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1615,7 +1615,7 @@ sal_uLong Printer::ImplSalPrinterErrorCodeToVCL( sal_uLong nError )
switch ( nError )
{
case 0:
- nVCLError = PRINTER_OK;
+ nVCLError = ERRCODE_NONE;
break;
case SAL_PRINTER_ERROR_ABORT:
nVCLError = PRINTER_ABORT;
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 9005448dbe87..de8609f38b71 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -530,7 +530,7 @@ void Printer::ImplPrintJob(const std::shared_ptr<PrinterController>& xController
bool Printer::StartJob( const OUString& i_rJobName, std::shared_ptr<vcl::PrinterController>& i_xController)
{
- mnError = PRINTER_OK;
+ mnError = ERRCODE_NONE;
if ( IsDisplayPrinter() )
return false;
commit de8caac6bee3237ba634e7dce2e4635dc8bba57b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Jun 5 15:02:51 2017 +0200
replace SVSTREAM_OK with ERRCODE_NONE
since the first is #define'd to the second, and offers no extra value
Change-Id: I2c67e09ea3aa5361b8e7dfe7a20858c6ae054450
Reviewed-on: https://gerrit.libreoffice.org/38406
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index e240c17d7854..db06dc9b5d2b 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -79,7 +79,7 @@ void SbiImage::Clear()
bool SbiGood( SvStream& r )
{
- return !r.IsEof() && r.GetError() == SVSTREAM_OK;
+ return !r.IsEof() && r.GetError() == ERRCODE_NONE;
}
// Open Record
@@ -142,7 +142,7 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
r.ReadUInt16( nSign ).ReadUInt32( nLen ).ReadUInt16( nCount );
nNext += nLen + 8;
- if( r.GetError() == SVSTREAM_OK )
+ if( r.GetError() == ERRCODE_NONE )
{
switch( static_cast<FileOffset>( nSign ) )
{
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 24a2bbdf1871..24ea0cba4f3c 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -144,7 +144,7 @@ void SbiStream::MapError()
{
switch( pStrm->GetError() )
{
- case SVSTREAM_OK:
+ case ERRCODE_NONE:
nError = 0;
break;
case SVSTREAM_FILE_NOT_FOUND:
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index a2c3e6ce940a..92a50b638935 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4760,7 +4760,7 @@ RTLFUNC(DumpAllObjects)
StreamMode::WRITE | StreamMode::TRUNC );
p->Dump( aStrm, rPar.Get( 2 )->GetBool() );
aStrm.Close();
- if( aStrm.GetError() != SVSTREAM_OK )
+ if( aStrm.GetError() != ERRCODE_NONE )
{
StarBASIC::Error( ERRCODE_BASIC_IO_ERROR );
}
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index 06d4ebb8ab89..db4655dace63 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -727,7 +727,7 @@ bool SbxDimArray::LoadData( SvStream& rStrm, sal_uInt16 nVer )
{
short nDimension;
rStrm.ReadInt16( nDimension );
- for( short i = 0; i < nDimension && rStrm.GetError() == SVSTREAM_OK; i++ )
+ for( short i = 0; i < nDimension && rStrm.GetError() == ERRCODE_NONE; i++ )
{
sal_Int16 lb(0), ub(0);
rStrm.ReadInt16( lb ).ReadInt16( ub );
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 2b4944aa3754..6c8148e00022 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -247,7 +247,7 @@ bool SbxBase::Store( SvStream& rStrm )
rStrm.Seek( nOldPos );
rStrm.WriteUInt32( nNewPos - nOldPos );
rStrm.Seek( nNewPos );
- if( rStrm.GetError() != SVSTREAM_OK )
+ if( rStrm.GetError() != ERRCODE_NONE )
bRes = false;
if( bRes )
bRes = true;
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index c55f6b46e4e3..04bce2e1f210 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -509,7 +509,7 @@ bool ORTFImportExport::Write()
m_pStream->WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING );
m_pStream->WriteUChar( 0 );
- return ((*m_pStream).GetError() == SVSTREAM_OK);
+ return ((*m_pStream).GetError() == ERRCODE_NONE);
}
void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_Int32& k,sal_Int32& kk)
@@ -640,7 +640,7 @@ bool OHTMLImportExport::Write()
OUT_LF();
TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_html );
- return ((*m_pStream).GetError() == SVSTREAM_OK);
+ return ((*m_pStream).GetError() == ERRCODE_NONE);
}
return false;
}
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 66357fef4ad0..e0472dd7caea 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1989,7 +1989,7 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp(
{
tools::SvRef<SotStorageStream> xStrm = rStg->OpenSotStream( sStrmName,
( StreamMode::READ | StreamMode::SHARE_DENYWRITE | StreamMode::NOCREATE ) );
- if( SVSTREAM_OK != xStrm->GetError())
+ if( ERRCODE_NONE != xStrm->GetError())
{
xStrm.clear();
rStg.clear();
@@ -2084,13 +2084,13 @@ void SvxAutoCorrectLanguageLists::SaveExceptList_Imp(
xExp->exportDoc( XML_BLOCK_LIST );
xStrm->Commit();
- if( xStrm->GetError() == SVSTREAM_OK )
+ if( xStrm->GetError() == ERRCODE_NONE )
{
xStrm.clear();
if (!bConvert)
{
rStg->Commit();
- if( SVSTREAM_OK != rStg->GetError() )
+ if( ERRCODE_NONE != rStg->GetError() )
{
rStg->Remove( sStrmName );
rStg->Commit();
@@ -2312,7 +2312,7 @@ void SvxAutoCorrectLanguageLists::RemoveStream_Imp( const OUString& rName )
if( sShareAutoCorrFile != sUserAutoCorrFile )
{
tools::SvRef<SotStorage> xStg = new SotStorage( sUserAutoCorrFile, StreamMode::READWRITE );
- if( xStg.is() && SVSTREAM_OK == xStg->GetError() &&
+ if( xStg.is() && ERRCODE_NONE == xStg->GetError() &&
xStg->IsStream( rName ) )
{
xStg->Remove( rName );
@@ -2449,12 +2449,12 @@ bool SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SotStorage& rStg )
xExp->exportDoc( XML_BLOCK_LIST );
refList->Commit();
- bRet = SVSTREAM_OK == refList->GetError();
+ bRet = ERRCODE_NONE == refList->GetError();
if( bRet )
{
refList.clear();
rStg.Commit();
- if( SVSTREAM_OK != rStg.GetError() )
+ if( ERRCODE_NONE != rStg.GetError() )
{
bRemove = true;
bRet = false;
@@ -2482,7 +2482,7 @@ bool SvxAutoCorrectLanguageLists::MakeCombinedChanges( std::vector<SvxAutocorrWo
MakeUserStorage_Impl();
tools::SvRef<SotStorage> xStorage = new SotStorage( sUserAutoCorrFile, StreamMode::READWRITE );
- bool bRet = xStorage.is() && SVSTREAM_OK == xStorage->GetError();
+ bool bRet = xStorage.is() && ERRCODE_NONE == xStorage->GetError();
if( bRet )
{
@@ -2554,7 +2554,7 @@ bool SvxAutoCorrectLanguageLists::PutText( const OUString& rShort, const OUStrin
MakeUserStorage_Impl();
tools::SvRef<SotStorage> xStg = new SotStorage( sUserAutoCorrFile, StreamMode::READWRITE );
- bool bRet = xStg.is() && SVSTREAM_OK == xStg->GetError();
+ bool bRet = xStg.is() && ERRCODE_NONE == xStg->GetError();
// Update the word list
if( bRet )
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 3c865e8ebe3c..87b9cd539e73 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6593,7 +6593,7 @@ bool SvxMSDffManager::MakeContentStream( SotStorage * pStor, const GDIMetaFile &
aEle.Write( *xStm );
xStm->SetBufferSize( 0 );
- return xStm->GetError() == SVSTREAM_OK;
+ return xStm->GetError() == ERRCODE_NONE;
}
struct ClsIDs {
@@ -7165,7 +7165,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
{
sal_uInt32 nLen(0), nDummy(0);
pDataStrm->ReadUInt32( nLen ).ReadUInt32( nDummy );
- if( SVSTREAM_OK != pDataStrm->GetError() ||
+ if( ERRCODE_NONE != pDataStrm->GetError() ||
// Id in BugDoc - exist there other Ids?
// The ConvertToOle2 - does not check for consistent
0x30008 != nDummy )
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 52af6cfab9d3..5f7351712410 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1299,7 +1299,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const OUString& rBaseURL ) :
SdrEscherImport ( rParam, rBaseURL ),
- bOk ( rStCtrl.GetErrorCode() == SVSTREAM_OK ),
+ bOk ( rStCtrl.GetErrorCode() == ERRCODE_NONE ),
pPersistPtr ( nullptr ),
nPersistPtrAnz ( 0 ),
pDefaultSheet ( nullptr ),
@@ -2024,7 +2024,7 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt
// is this a visual basic storage ?
tools::SvRef<SotStorage> xSubStorage = xSource->OpenSotStorage( "VBA",
StreamMode::READWRITE | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL );
- if( xSubStorage.is() && ( SVSTREAM_OK == xSubStorage->GetError() ) )
+ if( xSubStorage.is() && ( ERRCODE_NONE == xSubStorage->GetError() ) )
{
tools::SvRef<SotStorage> xMacros = xDest->OpenSotStorage( "MACROS" );
if ( xMacros.is() )
@@ -2046,13 +2046,13 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt
if ( xDoc.is() )
{
tools::SvRef<SotStorage> xVBA = SotStorage::OpenOLEStorage( xDoc, SvxImportMSVBasic::GetMSBasicStorageName() );
- if ( xVBA.is() && ( xVBA->GetError() == SVSTREAM_OK ) )
+ if ( xVBA.is() && ( xVBA->GetError() == ERRCODE_NONE ) )
{
tools::SvRef<SotStorage> xSubVBA = xVBA->OpenSotStorage( "_MS_VBA_Overhead" );
- if ( xSubVBA.is() && ( xSubVBA->GetError() == SVSTREAM_OK ) )
+ if ( xSubVBA.is() && ( xSubVBA->GetError() == ERRCODE_NONE ) )
{
tools::SvRef<SotStorageStream> xOriginal = xSubVBA->OpenSotStream( "_MS_VBA_Overhead2" );
- if ( xOriginal.is() && ( xOriginal->GetError() == SVSTREAM_OK ) )
+ if ( xOriginal.is() && ( xOriginal->GetError() == ERRCODE_NONE ) )
{
if ( nPersistPtr && ( nPersistPtr < nPersistPtrAnz ) )
{
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index fa4c9f66d24c..8f1d42f06d21 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -202,7 +202,7 @@ bool SvTokenStream::MakeToken( SvToken & rToken )
nColumn += c == '\t' ? nTabSize : 1;
}
}
- while( 0 == c && !IsEof() && ( SVSTREAM_OK == pInStream->GetError() ) );
+ while( 0 == c && !IsEof() && ( ERRCODE_NONE == pInStream->GetError() ) );
sal_uLong nLastLine = nLine;
sal_uLong nLastColumn = nColumn;
@@ -239,8 +239,8 @@ bool SvTokenStream::MakeToken( SvToken & rToken )
}
c = GetFastNextChar();
}
- while( '/' != c && !IsEof() && ( SVSTREAM_OK == pInStream->GetError() ) );
- if( IsEof() || ( SVSTREAM_OK != pInStream->GetError() ) )
+ while( '/' != c && !IsEof() && ( ERRCODE_NONE == pInStream->GetError() ) );
+ if( IsEof() || ( ERRCODE_NONE != pInStream->GetError() ) )
return false;
c = GetNextChar();
rToken.nType = SVTOKENTYPE::Comment;
@@ -275,7 +275,7 @@ bool SvTokenStream::MakeToken( SvToken & rToken )
else
aStr.append(c);
}
- if( IsEof() || ( SVSTREAM_OK != pInStream->GetError() ) )
+ if( IsEof() || ( ERRCODE_NONE != pInStream->GetError() ) )
return false;
rToken.nType = SVTOKENTYPE::String;
rToken.aString = aStr.makeStringAndClear();
@@ -330,7 +330,7 @@ bool SvTokenStream::MakeToken( SvToken & rToken )
}
rToken.SetLine( nLastLine );
rToken.SetColumn( nLastColumn );
- return pInStream->GetError() == SVSTREAM_OK;
+ return pInStream->GetError() == ERRCODE_NONE;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 4c83b588d67c..8f35643db707 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -141,7 +141,7 @@ static bool ResponseFile( StringList * pList, int argc, char ** argv )
if( '@' == **(argv +i) )
{ // when @, then response file
SvFileStream aStm( OUString::createFromAscii((*(argv +i)) +1), StreamMode::STD_READ );
- if( aStm.GetError() != SVSTREAM_OK )
+ if( aStm.GetError() != ERRCODE_NONE )
return false;
OString aStr;
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index c8bb6f198f07..1e0e74dfd8bd 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -146,7 +146,7 @@ bool SvIdlDataBase::ReadIdFile( const OString& rOFileName )
aIdFileList.push_back( rFileName );
this->AddDepFile( aFullName );
SvTokenStream aTokStm( aFullName );
- if( aTokStm.GetStream().GetError() == SVSTREAM_OK )
+ if( aTokStm.GetStream().GetError() == ERRCODE_NONE )
{
SvToken& rTok = aTokStm.GetToken_Next();
@@ -447,7 +447,7 @@ SvIdlWorkingBase::SvIdlWorkingBase(const SvCommand& rCmd) : SvIdlDataBase(rCmd)
bool SvIdlWorkingBase::WriteSfx( SvStream & rOutStm )
{
- if( rOutStm.GetError() != SVSTREAM_OK )
+ if( rOutStm.GetError() != ERRCODE_NONE )
return false;
// reset all tmp variables for writing
diff --git a/idl/source/prj/parser.cxx b/idl/source/prj/parser.cxx
index f0683ab92a92..2688d2d24938 100644
--- a/idl/source/prj/parser.cxx
+++ b/idl/source/prj/parser.cxx
@@ -141,7 +141,7 @@ void SvIdlParser::ReadInclude( SvMetaModule& rModule )
osl::FileBase::getSystemPathFromFileURL( aFullName, aFullName );
rBase.AddDepFile( aFullName );
SvTokenStream aTokStm( aFullName );
- if( SVSTREAM_OK != aTokStm.GetStream().GetError() )
+ if( ERRCODE_NONE != aTokStm.GetStream().GetError() )
{
OStringBuffer aStr("cannot open file: ");
aStr.append(OUStringToOString(aFullName, RTL_TEXTENCODING_UTF8));
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index aa517f67b7c1..afec793b1d2f 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -37,7 +37,7 @@ bool FileMove_Impl( const OUString & rFile1, const OUString & rFile2, bool bImme
{
SvFileStream aOutStm1( rFile1, StreamMode::STD_READ );
SvFileStream aOutStm2( rFile2, StreamMode::STD_READ );
- if( aOutStm1.GetError() == SVSTREAM_OK )
+ if( aOutStm1.GetError() == ERRCODE_NONE )
{
std::unique_ptr<sal_uInt8[]> pBuf1(new sal_uInt8[ BR ]);
std::unique_ptr<sal_uInt8[]> pBuf2(new sal_uInt8[ BR ]);
@@ -144,7 +144,7 @@ int main ( int argc, char ** argv)
aTmpDepFile = tempFileHelper(aCommand.m_DepFile);
SvFileStream aOutStm( aTmpDepFile, StreamMode::READWRITE | StreamMode::TRUNC );
pDataBase->WriteDepFile(aOutStm, aCommand.aTargetFile);
- if( aOutStm.GetError() != SVSTREAM_OK )
+ if( aOutStm.GetError() != ERRCODE_NONE )
{
nExit = -1;
fprintf( stderr, "cannot write dependency file: %s\n",
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index 9560c2e32863..40bb2de969c4 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -55,7 +55,7 @@ enum class EEAnchorMode {
EDITENG_DLLPUBLIC extern const size_t EE_APPEND;
// Error messages for Read / Write Method
-#define EE_READWRITE_OK (SVSTREAM_OK)
+#define EE_READWRITE_OK (ERRCODE_NONE)
#define EE_READWRITE_WRONGFORMAT (SVSTREAM_ERRBASE_USER+1)
#define EE_READWRITE_GENERALERROR (SVSTREAM_ERRBASE_USER+2)
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index a61094730680..3e7cd9f78d43 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -58,7 +58,7 @@ public:
void ResetError() const;
void SetError( ErrCode ) const;
ErrCode GetError() const;
- bool Good() const { return m_nError == SVSTREAM_OK; }
+ bool Good() const { return m_nError == ERRCODE_NONE; }
StreamMode GetMode() const { return m_nMode; }
void SetAutoCommit( bool bSet )
{ m_bAutoCommit = bSet; }
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 5f60cafd3f79..f659149d9f42 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -108,7 +108,7 @@ public:
ErrCode GetError() const { return ERRCODE_TOERROR(m_nError); }
void SetError( ErrCode nErrorCode )
{
- if( m_nError == SVSTREAM_OK )
+ if( m_nError == ERRCODE_NONE )
m_nError = nErrorCode;
}
diff --git a/include/vcl/errcode.hxx b/include/vcl/errcode.hxx
index ba739e069753..de41eae4b4af 100644
--- a/include/vcl/errcode.hxx
+++ b/include/vcl/errcode.hxx
@@ -222,10 +222,7 @@ inline sal_uInt32 ERRCODE_TOERROR( ErrCode x )
#define ERRCODE_IO_NOTSTORABLEINBINARYFORMAT CAST_TO_UINT32(39UL |ERRCODE_CLASS_FORMAT|\
ERRCODE_AREA_IO)
-// FsysErrorCodes
-
// StreamErrorCodes
-#define SVSTREAM_OK ERRCODE_NONE
#define SVSTREAM_GENERALERROR ERRCODE_IO_GENERAL
#define SVSTREAM_FILE_NOT_FOUND ERRCODE_IO_NOTEXISTS
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index d58f8afd2be5..2979e6cd5bd1 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -62,7 +62,7 @@ bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< css::beans::
}
SvFileStream inputStream( sURL, StreamMode::READ );
- if ( inputStream.IsEof() || ( inputStream.GetError() != SVSTREAM_OK ) )
+ if ( inputStream.IsEof() || ( inputStream.GetError() != ERRCODE_NONE ) )
return false;
// An XML import service: what we push sax messages to..
diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx
index babe8a9755ae..15c947d84a86 100644
--- a/sc/source/core/tool/rechead.cxx
+++ b/sc/source/core/tool/rechead.cxx
@@ -37,7 +37,7 @@ ScMultipleReadHeader::ScMultipleReadHeader(SvStream& rNewStream) :
if (nID != SCID_SIZES)
{
OSL_FAIL("SCID_SIZES not found");
- if ( rStream.GetError() == SVSTREAM_OK )
+ if ( rStream.GetError() == ERRCODE_NONE )
rStream.SetError( SVSTREAM_FILEFORMAT_ERROR );
// everything to 0, so BytesLeft() aborts at least
@@ -62,7 +62,7 @@ ScMultipleReadHeader::~ScMultipleReadHeader()
if ( pMemStream && pMemStream->Tell() != pMemStream->GetEndOfData() )
{
OSL_FAIL( "Sizes not fully read" );
- if ( rStream.GetError() == SVSTREAM_OK )
+ if ( rStream.GetError() == ERRCODE_NONE )
rStream.SetError( SCWARN_IMPORT_INFOLOST );
}
delete pMemStream;
@@ -77,7 +77,7 @@ void ScMultipleReadHeader::EndEntry()
OSL_ENSURE( nPos <= nEntryEnd, "read too much" );
if ( nPos != nEntryEnd )
{
- if ( rStream.GetError() == SVSTREAM_OK )
+ if ( rStream.GetError() == ERRCODE_NONE )
rStream.SetError( SCWARN_IMPORT_INFOLOST );
rStream.Seek( nEntryEnd ); // ignore the rest
}
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index d5fb00c995ed..2b7326be0ef3 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -374,7 +374,7 @@ void ImportExcel8::ReadBasic()
{
// see if we have the XCB stream
tools::SvRef<SotStorageStream> xXCB = xRootStrg->OpenSotStream( "XCB", StreamMode::STD_READ );
- if ( xXCB.is()|| SVSTREAM_OK == xXCB->GetError() )
+ if ( xXCB.is()|| ERRCODE_NONE == xXCB->GetError() )
{
ScCTBWrapper wrapper;
if ( wrapper.Read( *xXCB ) )
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 22b9a1b3f5d7..8541cc06e988 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -458,7 +458,7 @@ bool ScImportExport::ExportStream( SvStream& rStrm, const OUString& rBaseURL, So
rStrm.WriteUInt16( 0 );
else
rStrm.WriteChar( 0 );
- return rStrm.GetError() == SVSTREAM_OK;
+ return rStrm.GetError() == ERRCODE_NONE;
}
}
if( nFmt == SotClipboardFormatId::HTML )
@@ -1691,14 +1691,14 @@ bool ScImportExport::Doc2Text( SvStream& rStrm )
lcl_WriteSimpleString( rStrm, OUString(cSep) );
}
WriteUnicodeOrByteEndl( rStrm );
- if( rStrm.GetError() != SVSTREAM_OK )
+ if( rStrm.GetError() != ERRCODE_NONE )
break;
if( nSizeLimit && rStrm.Tell() > nSizeLimit )
break;
}
}
- return rStrm.GetError() == SVSTREAM_OK;
+ return rStrm.GetError() == ERRCODE_NONE;
}
bool ScImportExport::Sylk2Doc( SvStream& rStrm )
@@ -2094,7 +2094,7 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm )
}
lcl_WriteSimpleString( rStrm, OUString( 'E' ) );
WriteUnicodeOrByteEndl( rStrm );
- return rStrm.GetError() == SVSTREAM_OK;
+ return rStrm.GetError() == ERRCODE_NONE;
}
bool ScImportExport::Doc2HTML( SvStream& rStrm, const OUString& rBaseURL )
@@ -2102,14 +2102,14 @@ bool ScImportExport::Doc2HTML( SvStream& rStrm, const OUString& rBaseURL )
// rtl_TextEncoding is ignored in ScExportHTML, read from Load/Save HTML options
ScFormatFilter::Get().ScExportHTML( rStrm, rBaseURL, pDoc, aRange, RTL_TEXTENCODING_DONTKNOW, bAll,
aStreamPath, aNonConvertibleChars, maFilterOptions );
- return rStrm.GetError() == SVSTREAM_OK;
+ return rStrm.GetError() == ERRCODE_NONE;
}
bool ScImportExport::Doc2RTF( SvStream& rStrm )
{
// rtl_TextEncoding is ignored in ScExportRTF
ScFormatFilter::Get().ScExportRTF( rStrm, pDoc, aRange, RTL_TEXTENCODING_DONTKNOW );
- return rStrm.GetError() == SVSTREAM_OK;
+ return rStrm.GetError() == ERRCODE_NONE;
}
bool ScImportExport::Doc2Dif( SvStream& rStrm )
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index fc6dce12a3e5..a05169c5fee9 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1451,13 +1451,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocS
aMSVBas.SaveOrDelMSVBAStorage( true, "_MS_VBA_Overhead" );
tools::SvRef<SotStorage> xOverhead = xDest->OpenSotStorage( "_MS_VBA_Overhead" );
- if ( xOverhead.is() && ( xOverhead->GetError() == SVSTREAM_OK ) )
+ if ( xOverhead.is() && ( xOverhead->GetError() == ERRCODE_NONE ) )
{
tools::SvRef<SotStorage> xOverhead2 = xOverhead->OpenSotStorage( "_MS_VBA_Overhead" );
- if ( xOverhead2.is() && ( xOverhead2->GetError() == SVSTREAM_OK ) )
+ if ( xOverhead2.is() && ( xOverhead2->GetError() == ERRCODE_NONE ) )
{
tools::SvRef<SotStorageStream> xTemp = xOverhead2->OpenSotStream( "_MS_VBA_Overhead2" );
- if ( xTemp.is() && ( xTemp->GetError() == SVSTREAM_OK ) )
+ if ( xTemp.is() && ( xTemp->GetError() == ERRCODE_NONE ) )
{
sal_uInt32 nLen = xTemp->GetSize();
if ( nLen )
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 39de03af59c7..22697b75a581 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -1543,7 +1543,7 @@ void SdPublishingDlg::Load()
pStream->ReadUInt16( nDesigns );
for( sal_uInt16 nIndex = 0;
- pStream->GetError() == SVSTREAM_OK && nIndex < nDesigns;
+ pStream->GetError() == ERRCODE_NONE && nIndex < nDesigns;
nIndex++ )
{
SdPublishingDesign aDesign;
@@ -1576,7 +1576,7 @@ bool SdPublishingDlg::Save()
pStream->WriteUInt16( nDesigns );
for( sal_uInt16 nIndex = 0;
- pStream->GetError() == SVSTREAM_OK && nIndex < nDesigns;
+ pStream->GetError() == ERRCODE_NONE && nIndex < nDesigns;
nIndex++ )
WriteSdPublishingDesign( *pStream, m_aDesignList[nIndex] );
}
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 30d7eb19b0a7..82aaa9468953 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -244,7 +244,7 @@ public:
SfxMedium_Impl::SfxMedium_Impl() :
m_nStorOpenMode(SFX_STREAM_READWRITE),
- m_eError(SVSTREAM_OK),
+ m_eError(ERRCODE_NONE),
bUpdatePickList(true),
bIsTemp( false ),
bDownloadDone( true ),
@@ -291,7 +291,7 @@ SfxMedium_Impl::~SfxMedium_Impl()
void SfxMedium::ResetError()
{
- pImpl->m_eError = SVSTREAM_OK;
+ pImpl->m_eError = ERRCODE_NONE;
if( pImpl->m_pInStream )
pImpl->m_pInStream->ResetError();
if( pImpl->m_pOutStream )
@@ -649,13 +649,13 @@ bool SfxMedium::Commit()
else if( pImpl->m_pInStream )
pImpl->m_pInStream->Flush();
- if ( GetError() == SVSTREAM_OK )
+ if ( GetError() == ERRCODE_NONE )
{
// does something only in case there is a temporary file ( means aName points to different location than aLogicName )
Transfer_Impl();
}
- bool bResult = ( GetError() == SVSTREAM_OK );
+ bool bResult = ( GetError() == ERRCODE_NONE );
if ( bResult && DocNeedsFileDateCheck() )
GetInitFileDate( true );
@@ -1353,7 +1353,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( bool bCreateTempIfNo )
// impossibility to create the storage is no error
}
- if( ( pImpl->nLastStorageError = GetError() ) != SVSTREAM_OK )
+ if( ( pImpl->nLastStorageError = GetError() ) != ERRCODE_NONE )
{
pImpl->xStorage = nullptr;
if ( pImpl->m_pInStream )
@@ -1399,7 +1399,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( bool bCreateTempIfNo )
// There the version is stored as packed Stream
uno::Reference < io::XStream > xStr = xSub->openStreamElement( rTag.Identifier, embed::ElementModes::READ );
SvStream* pStream = utl::UcbStreamHelper::CreateStream( xStr );
- if ( pStream && pStream->GetError() == SVSTREAM_OK )
+ if ( pStream && pStream->GetError() == ERRCODE_NONE )
{
// Unpack Stream in TempDir
::utl::TempFile aTempFile;
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 759cc16b987c..5c0a26a900a7 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2105,7 +2105,7 @@ bool SfxObjectShell::ConvertFrom
*xStream >> ...;
// Do not call 'rMedium.CloseInStream()'! Keep File locked!
- return SVSTREAM_OK == rMedium.GetError();
+ return ERRCODE_NONE == rMedium.GetError();
}
return false;
@@ -2430,7 +2430,7 @@ bool SfxObjectShell::ConvertTo
*xStream << ...;
rMedium.CloseOutStream(); // opens the InStream automatically
- return SVSTREAM_OK == rMedium.GetError();
+ return ERRCODE_NONE == rMedium.GetError();
}
return false ;
}
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index 318f981ee460..d5e7348a8945 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -688,7 +688,7 @@ void SfxOleDictionaryProperty::ImplLoad( SvStream& rStrm )
sal_Int32 nNameCount = GetPropType();
// read property ID/name pairs
maPropNameMap.clear();
- for( sal_Int32 nIdx = 0; (nIdx < nNameCount) && (rStrm.GetErrorCode() == SVSTREAM_OK) && !rStrm.IsEof(); ++nIdx )
+ for( sal_Int32 nIdx = 0; (nIdx < nNameCount) && (rStrm.GetErrorCode() == ERRCODE_NONE) && !rStrm.IsEof(); ++nIdx )
{
sal_Int32 nPropId(0);
rStrm.ReadInt32( nPropId );
@@ -953,7 +953,7 @@ void SfxOleSection::ImplLoad( SvStream& rStrm )
// read property ID/position pairs
typedef ::std::map< sal_Int32, sal_uInt32 > SfxOlePropPosMap;
SfxOlePropPosMap aPropPosMap;
- for( sal_Int32 nPropIdx = 0; (nPropIdx < nPropCount) && (rStrm.GetErrorCode() == SVSTREAM_OK) && !rStrm.IsEof(); ++nPropIdx )
+ for( sal_Int32 nPropIdx = 0; (nPropIdx < nPropCount) && (rStrm.GetErrorCode() == ERRCODE_NONE) && !rStrm.IsEof(); ++nPropIdx )
{
sal_Int32 nPropId(0);
sal_uInt32 nPropPos(0);
@@ -1034,7 +1034,7 @@ void SfxOleSection::ImplSave( SvStream& rStrm )
bool SfxOleSection::SeekToPropertyPos( SvStream& rStrm, sal_uInt32 nPropPos ) const
{
rStrm.Seek( static_cast< std::size_t >( mnStartPos + nPropPos ) );
- return rStrm.GetErrorCode() == SVSTREAM_OK;
+ return rStrm.GetErrorCode() == ERRCODE_NONE;
}
void SfxOleSection::LoadProperty( SvStream& rStrm, sal_Int32 nPropId )
@@ -1099,7 +1099,7 @@ ErrCode SfxOlePropertySet::LoadPropertySet( SotStorage* pStrg, const OUString& r
if( pStrg )
{
tools::SvRef<SotStorageStream> xStrm = pStrg->OpenSotStream( rStrmName, StreamMode::STD_READ );
- if( xStrm.is() && (xStrm->GetError() == SVSTREAM_OK) )
+ if( xStrm.is() && (xStrm->GetError() == ERRCODE_NONE) )
{
xStrm->SetBufferSize( STREAM_BUFFER_SIZE );
Load( *xStrm );
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 04e1ea3f18ca..e744a357d351 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -51,7 +51,7 @@ StorageBase::StorageBase()
: m_bAutoCommit( false )
{
m_nMode = StreamMode::READ;
- m_nError = SVSTREAM_OK;
+ m_nError = ERRCODE_NONE;
}
StorageBase::~StorageBase()
@@ -64,7 +64,7 @@ StorageBase::~StorageBase()
ErrCode StorageBase::GetError() const
{
const ErrCode n = m_nError;
- m_nError = SVSTREAM_OK;
+ m_nError = ERRCODE_NONE;
return n;
}
@@ -76,7 +76,7 @@ void StorageBase::SetError( ErrCode n ) const
void StorageBase::ResetError() const
{
- m_nError = SVSTREAM_OK;
+ m_nError = ERRCODE_NONE;
}
OLEStorageBase::OLEStorageBase( StgIo* p, StgDirEntry* pe, StreamMode& nMode )
@@ -371,7 +371,7 @@ Storage::Storage( SvStream& r, bool bDirect )
m_nMode = StreamMode::READ;
if( r.IsWritable() )
m_nMode = StreamMode::READ | StreamMode::WRITE;
- if( r.GetError() == SVSTREAM_OK )
+ if( r.GetError() == ERRCODE_NONE )
{
pIo->SetStrm( &r, false );
sal_uLong nSize = r.Seek( STREAM_SEEK_TO_END );
@@ -398,7 +398,7 @@ Storage::Storage( UCBStorageStream& rStrm, bool bDirect )
{
m_nMode = StreamMode::READ;
- if ( rStrm.GetError() != SVSTREAM_OK )
+ if ( rStrm.GetError() != ERRCODE_NONE )
{
SetError( rStrm.GetError() );
pEntry = nullptr;
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 57632bcc128c..bb4277556f9f 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -86,7 +86,7 @@ static sal_Int32 lcl_GetPageCount( sal_uLong nFileSize, short nPageSize )
}
StgCache::StgCache()
- : m_nError( SVSTREAM_OK )
+ : m_nError( ERRCODE_NONE )
, m_nPages( 0 )
, m_nRef( 0 )
, m_nReplaceIdx( 0 )
@@ -401,13 +401,13 @@ void StgCache::SetError( ErrCode n )
void StgCache::ResetError()
{
- m_nError = SVSTREAM_OK;
+ m_nError = ERRCODE_NONE;
m_pStrm->ResetError();
}
void StgCache::MoveError( StorageBase& r )
{
- if( m_nError != SVSTREAM_OK )
+ if( m_nError != ERRCODE_NONE )
{
r.SetError( m_nError );
ResetError();
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index 1a61c89f7d3a..cf3b971580e8 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -72,7 +72,7 @@ public:
SvStream* GetStrm() { return m_pStrm; }
void SetStrm( SvStream*, bool );
void SetStrm( UCBStorageStream* );
- bool Good() const { return m_nError == SVSTREAM_OK; }
+ bool Good() const { return m_nError == ERRCODE_NONE; }
ErrCode GetError() { return m_nError; }
void MoveError( StorageBase& );
void SetError( ErrCode );
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index 7d496223e29e..bc0d042065ef 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -322,7 +322,7 @@ bool StgDirEntry::SetSize( sal_Int32 nNewSize )
{
m_pTmpStrm->SetSize( nNewSize );
m_pStgStrm->GetIo().SetError( m_pTmpStrm->GetError() );
- return m_pTmpStrm->GetError() == SVSTREAM_OK;
+ return m_pTmpStrm->GetError() == ERRCODE_NONE;
}
else
{
@@ -561,7 +561,7 @@ bool StgDirEntry::Strm2Tmp()
{
// It was already committed once
m_pTmpStrm = new StgTmpStrm;
- if( m_pTmpStrm->GetError() == SVSTREAM_OK && m_pTmpStrm->Copy( *m_pCurStrm ) )
+ if( m_pTmpStrm->GetError() == ERRCODE_NONE && m_pTmpStrm->Copy( *m_pCurStrm ) )
return true;
n = 1; // indicates error
}
@@ -569,7 +569,7 @@ bool StgDirEntry::Strm2Tmp()
{
n = m_aEntry.GetSize();
m_pTmpStrm = new StgTmpStrm( n );
- if( m_pTmpStrm->GetError() == SVSTREAM_OK )
+ if( m_pTmpStrm->GetError() == ERRCODE_NONE )
{
if( n )
{
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index fcb622b9aa44..b6a704340c28 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.cxx
@@ -132,9 +132,9 @@ bool StgIo::CommitAll()
const ErrCode n = m_pStrm->GetError();
SetError( n );
#ifdef DBG_UTIL
- if( n==SVSTREAM_OK ) ValidateFATs();
+ if( n==ERRCODE_NONE ) ValidateFATs();
#endif
- return n == SVSTREAM_OK;
+ return n == ERRCODE_NONE;
}
}
}
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 15907d4d8502..a00e706e38de 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -105,7 +105,7 @@ bool StgCompObjStream::Load()
memset( &m_aClsId, 0, sizeof( ClsId ) );
m_nCbFormat = SotClipboardFormatId::NONE;
m_aUserName.clear();
- if( GetError() != SVSTREAM_OK )
+ if( GetError() != ERRCODE_NONE )
return false;
Seek( 8L ); // skip the first part
sal_Int32 nMarker = 0;
@@ -137,12 +137,12 @@ bool StgCompObjStream::Load()
SetError( SVSTREAM_GENERALERROR );
}
}
- return GetError() == SVSTREAM_OK;
+ return GetError() == ERRCODE_NONE;
}
bool StgCompObjStream::Store()
{
- if( GetError() != SVSTREAM_OK )
+ if( GetError() != ERRCODE_NONE )
return false;
Seek( 0L );
OString aAsciiUserName(OUStringToOString(m_aUserName, RTL_TEXTENCODING_MS_1252));
@@ -157,7 +157,7 @@ bool StgCompObjStream::Store()
WriteClipboardFormat( *this, m_nCbFormat );
WriteInt32( 0 ); // terminator
Commit();
- return GetError() == SVSTREAM_OK;
+ return GetError() == ERRCODE_NONE;
}
/////////////////////////// class StgOleStream
@@ -169,7 +169,7 @@ StgOleStream::StgOleStream( BaseStorage& rStg )
bool StgOleStream::Store()
{
- if( GetError() != SVSTREAM_OK )
+ if( GetError() != ERRCODE_NONE )
return false;
Seek( 0L );
@@ -179,7 +179,7 @@ bool StgOleStream::Store()
WriteInt32( 0 ); // reserved
WriteInt32( 0 ); // Moniker 1
Commit();
- return GetError() == SVSTREAM_OK;
+ return GetError() == ERRCODE_NONE;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index 8f6f584d4605..38d4972ec416 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -1142,7 +1142,7 @@ bool StgTmpStrm::Copy( StgTmpStrm& rSrc )
sal_uInt64 n = rSrc.GetSize();
const sal_uInt64 nCur = rSrc.Tell();
SetSize( n );
- if( GetError() == SVSTREAM_OK )
+ if( GetError() == ERRCODE_NONE )
{
std::unique_ptr<sal_uInt8[]> p(new sal_uInt8[ 4096 ]);
rSrc.Seek( 0L );
@@ -1232,7 +1232,7 @@ void StgTmpStrm::SetSize(sal_uInt64 n)
break; // error
}
s->Flush();
- if( s->GetError() != SVSTREAM_OK )
+ if( s->GetError() != ERRCODE_NONE )
i = 1;
}
Seek( nCur );
@@ -1278,7 +1278,7 @@ std::size_t StgTmpStrm::PutData( const void* pData, std::size_t n )
if( nNew > THRESHOLD && !m_pStrm )
{
SetSize( nNew );
- if( GetError() != SVSTREAM_OK )
+ if( GetError() != ERRCODE_NONE )
return 0;
}
if( m_pStrm )
@@ -1300,7 +1300,7 @@ sal_uInt64 StgTmpStrm::SeekPos(sal_uInt64 n)
if( n && n > THRESHOLD && !m_pStrm )
{
SetSize( n );
- if( GetError() != SVSTREAM_OK )
+ if( GetError() != ERRCODE_NONE )
return Tell();
else
return n;
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index ea5d4007b45f..ee8f72949834 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -229,11 +229,11 @@ bool SotStorageStream::Commit()
if( pOwnStm )
{
pOwnStm->Flush();
- if( pOwnStm->GetError() == SVSTREAM_OK )
+ if( pOwnStm->GetError() == ERRCODE_NONE )
pOwnStm->Commit();
SetError( pOwnStm->GetError() );
}
- return GetError() == SVSTREAM_OK;
+ return GetError() == ERRCODE_NONE;
}
bool SotStorageStream::SetProperty( const OUString& rName, const css::uno::Any& rValue )
@@ -274,7 +274,7 @@ bool SotStorageStream::SetProperty( const OUString& rName, const css::uno::Any&
#define INIT_SotStorage() \
: m_pOwnStg( nullptr ) \
, m_pStorStm( nullptr ) \
- , m_nError( SVSTREAM_OK ) \
+ , m_nError( ERRCODE_NONE ) \
, m_bIsRoot( false ) \
, m_bDelStm( false ) \
, m_nVersion( SOFFICE_FILEFORMAT_CURRENT )
@@ -580,7 +580,7 @@ bool SotStorage::CopyTo( SotStorage * pDestStg )
else
SetError( SVSTREAM_GENERALERROR );
- return SVSTREAM_OK == GetError();
+ return ERRCODE_NONE == GetError();
}
bool SotStorage::Commit()
@@ -593,7 +593,7 @@ bool SotStorage::Commit()
else
SetError( SVSTREAM_GENERALERROR );
- return SVSTREAM_OK == GetError();
+ return ERRCODE_NONE == GetError();
}
SotStorageStream * SotStorage::OpenSotStream( const OUString & rEleName,
@@ -681,7 +681,7 @@ bool SotStorage::Remove( const OUString & rEleName )
else
SetError( SVSTREAM_GENERALERROR );
- return SVSTREAM_OK == GetError();
+ return ERRCODE_NONE == GetError();
}
bool SotStorage::CopyTo( const OUString & rEleName,
@@ -696,7 +696,7 @@ bool SotStorage::CopyTo( const OUString & rEleName,
else
SetError( SVSTREAM_GENERALERROR );
- return SVSTREAM_OK == GetError();
+ return ERRCODE_NONE == GetError();
}
bool SotStorage::Validate()
diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx
index aa6fdaca6d02..f211f1aaa942 100644
--- a/starmath/source/eqnolefilehdr.cxx
+++ b/starmath/source/eqnolefilehdr.cxx
@@ -32,7 +32,7 @@ bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion )
tools::SvRef<SotStorageStream> xSrc = pStor->OpenSotStream(
"Equation Native",
StreamMode::STD_READ);
- if ( (!xSrc.is()) || (SVSTREAM_OK != xSrc->GetError()))
+ if ( (!xSrc.is()) || (ERRCODE_NONE != xSrc->GetError()))
return bSuccess;
SotStorageStream *pS = xSrc.get();
pS->SetEndian( SvStreamEndian::LITTLE );
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 4a4f84a4dacf..1fc3ba3b8fdb 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -558,7 +558,7 @@ bool MathType::Parse(SotStorage *pStor)
tools::SvRef<SotStorageStream> xSrc = pStor->OpenSotStream(
"Equation Native",
StreamMode::STD_READ);
- if ( (!xSrc.is()) || (SVSTREAM_OK != xSrc->GetError()))
+ if ( (!xSrc.is()) || (ERRCODE_NONE != xSrc->GetError()))
return false;
pS = xSrc.get();
pS->SetEndian( SvStreamEndian::LITTLE );
@@ -1922,7 +1922,7 @@ bool MathType::ConvertFromStarMath( SfxMedium& rMedium )
xStor2.clear();
tools::SvRef<SotStorageStream> xSrc = pStor->OpenSotStream("Equation Native");
- if ( (!xSrc.is()) || (SVSTREAM_OK != xSrc->GetError()))
+ if ( (!xSrc.is()) || (ERRCODE_NONE != xSrc->GetError()))
return false;
pS = xSrc.get();
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index dbf279c6a458..627daa9330dd 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -148,7 +148,7 @@ SvStream& SvxMacroTableDtor::Write( SvStream& rStream ) const
rStream.WriteUInt16( aSvxMacroTable.size() );
SvxMacroTable::const_iterator it = aSvxMacroTable.begin();
- while( it != aSvxMacroTable.end() && rStream.GetError() == SVSTREAM_OK )
+ while( it != aSvxMacroTable.end() && rStream.GetError() == ERRCODE_NONE )
{
const SvxMacro& rMac = it->second;
rStream.WriteUInt16( it->first );
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 74653f8db268..39cfc157aae7 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -1054,7 +1054,7 @@ bool SwLayCacheIoImpl::OpenRec( sal_uInt8 cType )
pStream->ReadUInt32( nVal );
sal_uInt8 cRecTyp = (sal_uInt8)nVal;
if( !nVal || cRecTyp != cType ||
- pStream->GetErrorCode() != SVSTREAM_OK || pStream->IsEof() )
+ pStream->GetErrorCode() != ERRCODE_NONE || pStream->IsEof() )
{
OSL_ENSURE( nVal, "OpenRec: Record-Header is 0" );
OSL_ENSURE( cRecTyp == cType, "OpenRec: Wrong Record Type" );
@@ -1087,7 +1087,7 @@ bool SwLayCacheIoImpl::CloseRec()
sal_uInt32 nVal = ( nSize << 8 ) | aRecords.back().type;
pStream->WriteUInt32( nVal );
pStream->Seek( nPos );
- if( pStream->GetError() != SVSTREAM_OK )
+ if( pStream->GetError() != ERRCODE_NONE )
bRes = false;
}
else
@@ -1100,7 +1100,7 @@ bool SwLayCacheIoImpl::CloseRec()
if( n < nPos )
bRes = false;
}
- if( pStream->GetErrorCode() != SVSTREAM_OK )
+ if( pStream->GetErrorCode() != ERRCODE_NONE )
bRes = false;
}
aRecords.pop_back();
@@ -1133,7 +1133,7 @@ sal_uInt8 SwLayCacheIoImpl::Peek()
sal_uInt32 nPos = pStream->Tell();
pStream->ReadUChar( c );
pStream->Seek( nPos );
- if( pStream->GetErrorCode() != SVSTREAM_OK )
+ if( pStream->GetErrorCode() != ERRCODE_NONE )
{
c = 0;
bError = true;
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index ba3cb734ce3b..1b792cbd25b9 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -392,7 +392,7 @@ sal_uLong SwXMLTextBlocks::PutBlockText( const OUString& rShort,
sal_uLong nRes = 0;
if( nErr == SVSTREAM_DISK_FULL )
nRes = ERR_W4W_WRITE_FULL;
- else if( nErr != SVSTREAM_OK )
+ else if( nErr != ERRCODE_NONE )
nRes = ERR_SWG_WRITE_ERROR;
*/
if( !nRes ) // So that we can access the Doc via GetText & nCur
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 39d36874efc9..a82ca4344848 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -313,7 +313,7 @@ sal_uLong SwASCIIParser::ReadChars()
// Read a new block
sal_uLong lGCount;
- if( SVSTREAM_OK != rInput.GetError() || 0 == (lGCount =
+ if( ERRCODE_NONE != rInput.GetError() || 0 == (lGCount =
rInput.ReadBytes( pArr + nArrOffset,
ASC_BUFFLEN - nArrOffset )))
break; // break from the while loop
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 0eb82bd8d895..32fd3a13048c 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -112,7 +112,7 @@ bool SwIoSystem::IsValidStgFilter(SotStorage& rStg, const SfxFilter& rFilter)
if (rFilter.GetUserData() == FILTER_WW8 || rFilter.GetUserData() == sWW6)
nStgFormatId = SotClipboardFormatId::NONE;
- bool bRet = SVSTREAM_OK == rStg.GetError() &&
+ bool bRet = ERRCODE_NONE == rStg.GetError() &&
( nStgFormatId == SotClipboardFormatId::NONE || rFilter.GetFormat() == nStgFormatId ) &&
( rStg.IsContained( SwIoSystem::GetSubStorageName( rFilter )) );
if( bRet )
@@ -203,7 +203,7 @@ std::shared_ptr<const SfxFilter> SwIoSystem::GetFileFilter(const OUString& rFile
{
}
- if( xStg.is() && ( xStg->GetError() == SVSTREAM_OK ) )
+ if( xStg.is() && ( xStg->GetError() == ERRCODE_NONE ) )
{
while ( pFilter )
{
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index dcd2a65c9579..0927c58eb81e 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3719,7 +3719,7 @@ void WW8Export::RestoreMacroCmds()
xSrcRoot->openStreamElement( SL::aMSMacroCmds, embed::ElementModes::READ );
SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( xSrcStream );
- if ( pStream && SVSTREAM_OK == pStream->GetError())
+ if ( pStream && ERRCODE_NONE == pStream->GetError())
{
pStream->Seek(STREAM_SEEK_TO_END);
pFib->m_lcbCmds = pStream->Tell();
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 374434ec43b7..e632f576aa6e 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -47,7 +47,7 @@ WW8Glossary::WW8Glossary(tools::SvRef<SotStorageStream> &refStrm, sal_uInt8 nVer
xTableStream = pStg->OpenSotStream(
aWwFib.m_fWhichTableStm ? SL::a1Table : SL::a0Table, StreamMode::STD_READ);
- if (xTableStream.is() && SVSTREAM_OK == xTableStream->GetError())
+ if (xTableStream.is() && ERRCODE_NONE == xTableStream->GetError())
{
xTableStream->SetEndian(SvStreamEndian::LITTLE);
pGlossary.reset( new WW8GlossaryFib(*refStrm, nVersion, aWwFib) );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index fb89ecf97b22..69ebd26e56fe 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4871,7 +4871,7 @@ void SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom,
tools::SvRef<SotStorageStream> xTableStream =
rRoot->OpenSotStream(aWwFib.m_fWhichTableStm ? SL::a1Table : SL::a0Table, StreamMode::STD_READ);
- if (xTableStream.is() && SVSTREAM_OK == xTableStream->GetError())
+ if (xTableStream.is() && ERRCODE_NONE == xTableStream->GetError())
{
xTableStream->SetEndian(SvStreamEndian::LITTLE);
WW8Customizations aGblCustomisations( xTableStream.get(), aWwFib );
@@ -5421,7 +5421,7 @@ sal_uLong SwWW8ImplReader::SetSubStreams(tools::SvRef<SotStorageStream> &rTableS
rDataStream = m_pStg->OpenSotStream(SL::aData, StreamMode::STD_READ);
- if (rDataStream.is() && SVSTREAM_OK == rDataStream->GetError())
+ if (rDataStream.is() && ERRCODE_NONE == rDataStream->GetError())
{
m_pDataStream = rDataStream.get();
m_pDataStream->SetEndian(SvStreamEndian::LITTLE);
@@ -6240,7 +6240,7 @@ sal_uLong WW8Reader::OpenMainStream( tools::SvRef<SotStorageStream>& rRef, sal_u
if( rRef.is() )
{
- if( SVSTREAM_OK == rRef->GetError() )
+ if( ERRCODE_NONE == rRef->GetError() )
{
sal_uInt16 nOld = rRef->GetBufferSize();
rRef->SetBufferSize( rBuffSize );
diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
index 5e9a7b450f3d..77856390e2a6 100644
--- a/tools/source/ref/pstm.cxx
+++ b/tools/source/ref/pstm.cxx
@@ -441,7 +441,7 @@ void SvPersistStream::ReadObj
OSL_FAIL( "false version" );
}
- if( !(nHdr & P_ID_0) && GetError() == SVSTREAM_OK )
+ if( !(nHdr & P_ID_0) && GetError() == ERRCODE_NONE )
{
if( P_OBJ & nHdr )
{ // read object, nId only set for P_DBGUTIL
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 488348719892..a91e6bf16341 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -370,12 +370,12 @@ SvStream::~SvStream()
void SvStream::ClearError()
{
m_isEof = false;
- m_nError = SVSTREAM_OK;
+ m_nError = ERRCODE_NONE;
}
void SvStream::SetError( sal_uInt32 nErrorCode )
{
- if (m_nError == SVSTREAM_OK)
+ if (m_nError == ERRCODE_NONE)
m_nError = nErrorCode;
}
@@ -691,13 +691,13 @@ bool SvStream::WriteUnicodeOrByteText( const OUString& rStr, rtl_TextEncoding eD
if ( eDestCharSet == RTL_TEXTENCODING_UNICODE )
{
write_uInt16s_FromOUString(*this, rStr, rStr.getLength());
- return m_nError == SVSTREAM_OK;
+ return m_nError == ERRCODE_NONE;
}
else
{
OString aStr(OUStringToOString(rStr, eDestCharSet));
write_uInt8s_FromOString(*this, aStr, aStr.getLength());
- return m_nError == SVSTREAM_OK;
+ return m_nError == ERRCODE_NONE;
}
}
@@ -710,7 +710,7 @@ bool SvStream::WriteLine(const OString& rStr)
{
WriteBytes(rStr.getStr(), rStr.getLength());
endl(*this);
- return m_nError == SVSTREAM_OK;
+ return m_nError == ERRCODE_NONE;
}
bool SvStream::WriteUniOrByteChar( sal_Unicode ch, rtl_TextEncoding eDestCharSet )
@@ -722,7 +722,7 @@ bool SvStream::WriteUniOrByteChar( sal_Unicode ch, rtl_TextEncoding eDestCharSet
OString aStr(&ch, 1, eDestCharSet);
WriteBytes(aStr.getStr(), aStr.getLength());
}
- return m_nError == SVSTREAM_OK;
+ return m_nError == ERRCODE_NONE;
}
void SvStream::StartWritingUnicodeText()
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 5267a6914d2b..46d0bb79c9dc 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -181,7 +181,7 @@ static sal_uInt32 GetSvError( int nErrno )
{
static struct { int nErr; sal_uInt32 sv; } errArr[] =
{
- { 0, SVSTREAM_OK },
+ { 0, ERRCODE_NONE },
{ EACCES, SVSTREAM_ACCESS_DENIED },
{ EBADF, SVSTREAM_INVALID_HANDLE },
#if defined(NETBSD) || \
@@ -233,7 +233,7 @@ static sal_uInt32 GetSvError( oslFileError nErrno )
{
static struct { oslFileError nErr; sal_uInt32 sv; } errArr[] =
{
- { osl_File_E_None, SVSTREAM_OK },
+ { osl_File_E_None, ERRCODE_NONE },
{ osl_File_E_ACCES, SVSTREAM_ACCESS_DENIED },
{ osl_File_E_BADF, SVSTREAM_INVALID_HANDLE },
{ osl_File_E_DEADLK, SVSTREAM_LOCKING_VIOLATION },
diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx
index f222bbd7af2b..cfd84f39d7bc 100644
--- a/tools/source/stream/strmwnt.cxx
+++ b/tools/source/stream/strmwnt.cxx
@@ -48,7 +48,7 @@ static std::size_t GetSvError( DWORD nWntError )
{
static struct { DWORD wnt; std::size_t sv; } errArr[] =
{
- { ERROR_SUCCESS, SVSTREAM_OK },
+ { ERROR_SUCCESS, ERRCODE_NONE },
{ ERROR_ACCESS_DENIED, SVSTREAM_ACCESS_DENIED },
{ ERROR_ACCOUNT_DISABLED, SVSTREAM_ACCESS_DENIED },
{ ERROR_ACCOUNT_EXPIRED, SVSTREAM_ACCESS_DENIED },
More information about the Libreoffice-commits
mailing list