summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-06-20 09:58:08 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-06-20 12:06:40 +0100
commit81099135677ac6997473ca01a297c32025c58662 (patch)
treee30d5e1d30e588af37a373da935faa8225ed209d /sd/source
parent8c023fd645c8b83637ffcde4055886b2e4f94393 (diff)
ditch last (?) uses of UniString::UniString(sal_Unicode, ...)
Change-Id: Ie04a3465100d2f013f34168aaf136a20cd2f7e0d
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/filter/ppt/propread.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index 8ca34ebfb626..52b9e5b25a2d 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -114,7 +114,7 @@ sal_Bool PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlig
sal_Unicode* pWString = (sal_Unicode*)pString;
for ( i = 0; i < nItemSize; i++ )
*this >> pWString[ i ];
- rString = String( pWString, lcl_getMaxSafeStrLen(nItemSize) );
+ rString = rtl::OUString(pWString, lcl_getMaxSafeStrLen(nItemSize));
}
else
rString = String();
@@ -156,7 +156,7 @@ sal_Bool PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlig
if ( pString[ i - 1 ] == 0 )
{
if ( (sal_uInt16)nItemSize > 1 )
- rString = String( pString, lcl_getMaxSafeStrLen(nItemSize) );
+ rString = rtl::OUString(pString, lcl_getMaxSafeStrLen(nItemSize));
else
rString = String();
bRetValue = sal_True;
@@ -304,7 +304,7 @@ sal_Bool Section::GetDictionary( Dictionary& rDict )
sal_Unicode* pWString = (sal_Unicode*)pString;
for ( i = 0; i < nSize; i++ )
aStream >> pWString[ i ];
- aString = String( pWString, lcl_getMaxSafeStrLen(nSize) );
+ aString = rtl::OUString(pWString, lcl_getMaxSafeStrLen(nSize));
}
else
aString = rtl::OUString(pString, lcl_getMaxSafeStrLen(nSize), mnTextEnc);