diff options
Diffstat (limited to 'idl/source/prj/database.cxx')
-rw-r--r-- | idl/source/prj/database.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 639e944b97a8..4ca16cbe9cf9 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -601,7 +601,8 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm ) aError = SvIdlError(); } - WriteError( "error", ByteString( aFileName, RTL_TEXTENCODING_UTF8 ), aErrorText.makeStringAndClear(), nRow, nColumn ); + WriteError("error", rtl::OUStringToOString(aFileName, + RTL_TEXTENCODING_UTF8), aErrorText.makeStringAndClear(), nRow, nColumn); DBG_ASSERT( pTok, "token must be found" ); if( !pTok ) @@ -650,9 +651,10 @@ sal_Bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, sal_Bool bImported { if( aStm.GetError() == SVSTREAM_WRONGVERSION ) { - ByteString aStr( "wrong version, file " ); - aStr += ByteString( aFullName.GetFull(), RTL_TEXTENCODING_UTF8 ); - SetError( aStr, pTok ); + rtl::OStringBuffer aStr("wrong version, file "); + aStr.append(rtl::OUStringToOString( + aFullName.GetFull(), RTL_TEXTENCODING_UTF8)); + SetError(aStr.makeStringAndClear(), pTok); WriteError( rInStm ); bOk = sal_False; } |