Skip to content

C
core
Kaydet (Commit) 1cd1e4a3 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

use read_uInt8s_AsOString here

üst 84db1411
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
sw/source/filter/ww1/w1class.cxx
Dosyayı görüntüle @ 1cd1e4a3
...@@ -81,13 +81,15 @@ sal_Unicode Ww1PlainText::operator [] ( sal_uLong ulOffset ) ...@@ -81,13 +81,15 @@ sal_Unicode Ww1PlainText::operator [] ( sal_uLong ulOffset )
String Ww1PlainText::GetText( sal_uLong ulOffset, sal_uLong nLen ) const String Ww1PlainText::GetText( sal_uLong ulOffset, sal_uLong nLen ) const
{ {
String sRet;
ByteString aStr;
OSL_ENSURE(ulOffset+nLen<Count(), "Ww1PlainText"); OSL_ENSURE(ulOffset+nLen<Count(), "Ww1PlainText");
if( rFib.GetStream().Seek(ulFilePos+ulOffset) == ulFilePos+ulOffset &&
rFib.GetStream().Read( aStr.AllocBuffer( static_cast< xub_StrLen >(nLen) ), nLen ) == nLen ) sal_Size nPos = ulFilePos+ulOffset;
sRet = String( aStr, RTL_TEXTENCODING_MS_1252 );
return sRet; bool bSeekOk = rFib.GetStream().Seek(nPos) == nPos;
rtl::OString a8BitStr = bSeekOk ?
read_uInt8s_AsOString(rFib.GetStream(), nLen) :
rtl::OString();
return rtl::OStringToOUString(a8BitStr, RTL_TEXTENCODING_MS_1252);
} }
///////////////////////////////////////////////////////////////// Style ///////////////////////////////////////////////////////////////// Style
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment