diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-13 14:48:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-13 16:46:31 +0000 |
| commit | 4a68a5f32bcc815b116063e6c047397ed9a3e241 (patch) | |
| tree | 6342906f9f4dd71f5f31bb23c15bac29357f67b4 /filter/source/msfilter/msdffimp.cxx | |
| parent | ccd716371c0611726f60519fe4ec3465ceac6db0 (diff) | |
return status never checked
Diffstat (limited to 'filter/source/msfilter/msdffimp.cxx')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index f79b0d274219..80e4ecbea93f 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3736,23 +3736,22 @@ Color SvxMSDffManager::MSO_CLR_ToColor( sal_uInt32 nColorCode, sal_uInt16 nConte return aColor; } -bool SvxMSDffManager::ReadDffString(SvStream& rSt, String& rTxt, DffRecordHeader aStrHd) +rtl::OUString SvxMSDffManager::ReadDffString(SvStream& rSt, DffRecordHeader aStrHd) { - bool bRet=sal_False; + String aRet; if( aStrHd.nRecType == 0x0 && !ReadCommonRecordHeader(aStrHd, rSt) ) rSt.Seek( aStrHd.nFilePos ); else if ( aStrHd.nRecType == DFF_PST_TextBytesAtom || aStrHd.nRecType == DFF_PST_TextCharsAtom ) { bool bUniCode=aStrHd.nRecType==DFF_PST_TextCharsAtom; - bRet=sal_True; sal_uLong nBytes = aStrHd.nRecLen; - MSDFFReadZString( rSt, rTxt, nBytes, bUniCode ); + MSDFFReadZString( rSt, aRet, nBytes, bUniCode ); if( !bUniCode ) { for ( xub_StrLen n = 0; n < nBytes; n++ ) { - if( rTxt.GetChar( n ) == 0x0B ) - rTxt.SetChar( n, ' ' ); // Weicher Umbruch + if( aRet.GetChar( n ) == 0x0B ) + aRet.SetChar( n, ' ' ); // Weicher Umbruch // TODO: Zeilenumbruch im Absatz via Outliner setzen. } } @@ -3760,7 +3759,7 @@ bool SvxMSDffManager::ReadDffString(SvStream& rSt, String& rTxt, DffRecordHeader } else aStrHd.SeekToBegOfRecord( rSt ); - return bRet; + return aRet; } // sj: I just want to set a string for a text object that may contain multiple @@ -3881,7 +3880,7 @@ bool SvxMSDffManager::ReadObjText(SvStream& rSt, SdrObject* pObj) //case TextSpecInfoAtom case DFF_PST_TextBytesAtom: case DFF_PST_TextCharsAtom: - ReadDffString(rSt, aText, aHd); + aText = ReadDffString(rSt, aHd); break; case DFF_PST_TextRulerAtom : { |