diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-07 22:41:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-08 09:29:31 +0100 |
| commit | 595ce66e708da9e742a2c418f013fc675ffc45a3 (patch) | |
| tree | 73f17884c529596afd7b5777703c3a57b3cd33fa /sd/source/filter/ppt/propread.cxx | |
| parent | 7d1700b35b6b663af1646d3f0c54ee51db5435c6 (diff) | |
ByteString->rtl::OString, etc
Diffstat (limited to 'sd/source/filter/ppt/propread.cxx')
| -rw-r--r-- | sd/source/filter/ppt/propread.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index 291cf2c1e300..b16f8dca8fb1 100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -130,7 +130,7 @@ sal_Bool PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlig if ( pString[ nItemSize - 1 ] == 0 ) { if ( nItemSize > 1 ) - rString = String( ByteString( pString ), mnTextEnc ); + rString = rtl::OUString(pString, rtl_str_getLength(pString), mnTextEnc); else rString = String(); bRetValue = sal_True; @@ -311,7 +311,7 @@ sal_Bool Section::GetDictionary( Dictionary& rDict ) aString = String( pWString, lcl_getMaxSafeStrLen(nSize) ); } else - aString = String( ByteString( pString, lcl_getMaxSafeStrLen(nSize) ), mnTextEnc ); + aString = rtl::OUString(pString, lcl_getMaxSafeStrLen(nSize), mnTextEnc); delete[] pString; } catch( const std::bad_alloc& ) |