summaryrefslogtreecommitdiff
path: root/idl
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-05 15:02:51 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-06 08:15:57 +0200
commitde8caac6bee3237ba634e7dce2e4635dc8bba57b (patch)
tree9260fb99b4f6de1619df46a11aa388ad8d42db63 /idl
parent690f2f5c4633780734a63305fd16733fb1344c74 (diff)
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@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'idl')
-rw-r--r--idl/source/cmptools/lex.cxx10
-rw-r--r--idl/source/prj/command.cxx2
-rw-r--r--idl/source/prj/database.cxx4
-rw-r--r--idl/source/prj/parser.cxx2
-rw-r--r--idl/source/prj/svidl.cxx4
5 files changed, 11 insertions, 11 deletions
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",