diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-10 08:59:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-10 11:49:49 +0100 |
| commit | e16221d3e0eb11958e20b8a1fd959c7055b9172e (patch) | |
| tree | 5e0025d077178def79f046f69a67f360af20d889 /editeng | |
| parent | c8484a5ddf8e58ae331f41c25825dc2eaef6bdd3 (diff) | |
ByteString::ConvertFromUnicode->rtl::OUStringToOString::toChar
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editobj.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/items/bulitem.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 3ddf1e89f43b..bc2a02e78ed6 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1095,7 +1095,7 @@ void BinTextObject::StoreData( SvStream& rOStream ) const for ( sal_uInt16 nChar = pAttr->GetStart(); nChar < pAttr->GetEnd(); nChar++ ) { sal_Unicode cOld = pC->GetText().GetChar( nChar ); - char cConv = ByteString::ConvertFromUnicode( ConvertFontToSubsFontChar( hConv, cOld ), RTL_TEXTENCODING_SYMBOL ); + char cConv = rtl::OUStringToOString(rtl::OUString(ConvertFontToSubsFontChar(hConv, cOld)), RTL_TEXTENCODING_SYMBOL).toChar(); if ( cConv ) aText.SetChar( nChar, cConv ); } @@ -1120,7 +1120,7 @@ void BinTextObject::StoreData( SvStream& rOStream ) const if ( !pC->GetAttribs().FindAttrib( EE_CHAR_FONTINFO, nChar ) ) { sal_Unicode cOld = pC->GetText().GetChar( nChar ); - char cConv = ByteString::ConvertFromUnicode( ConvertFontToSubsFontChar( hConv, cOld ), RTL_TEXTENCODING_SYMBOL ); + char cConv = rtl::OUStringToOString(rtl::OUString(ConvertFontToSubsFontChar(hConv, cOld)), RTL_TEXTENCODING_SYMBOL).toChar(); if ( cConv ) aText.SetChar( nChar, cConv ); } diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 727ca3ddcecc..cd0430a0956b 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -414,7 +414,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c rStrm << nWidth; rStrm << nStart; rStrm << nJustify; - rStrm << (char)ByteString::ConvertFromUnicode( cSymbol, aFont.GetCharSet() ); + rStrm << rtl::OUStringToOString(rtl::OUString(cSymbol), aFont.GetCharSet()).toChar(); rStrm << nScale; // UNICODE: rStrm << aPrevText; |