diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/rechead.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/excel/excimp8.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/docshell/impex.cxx | 12 |
3 files changed, 10 insertions, 10 deletions
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 ) |