summaryrefslogtreecommitdiff
path: root/sd/source/filter/ppt/propread.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-17 10:36:13 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-17 10:36:13 +0100
commit61f168d98750549107a65e846fbe5c49f277295e (patch)
tree0748b88eefa9bb49285270ac5a7bbce3d10b4ef6 /sd/source/filter/ppt/propread.cxx
parent4f76e46290b26deeb4f9660c580a5ffef58a557e (diff)
Add SvStream::ReadUtf16 (don't assume sal_Unicode is unsigned short)
Change-Id: I74f34e3389582617fa83f8f4a3d6867cf87189e1
Diffstat (limited to 'sd/source/filter/ppt/propread.cxx')
-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 2a3c09265131..6bf66d5f3329 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -116,7 +116,7 @@ bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign )
{
sal_Unicode* pWString = reinterpret_cast<sal_Unicode*>(pString);
for (sal_uInt32 i = 0; i < nItemSize; ++i)
- ReadUInt16( pWString[ i ] );
+ ReadUtf16( pWString[ i ] );
rString = OUString(pWString, lcl_getMaxSafeStrLen(nItemSize));
}
else
@@ -165,7 +165,7 @@ bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign )
{
sal_Unicode* pString = new sal_Unicode[ nItemSize ];
for (sal_uInt32 i = 0; i < nItemSize; ++i)
- ReadUInt16( pString[ i ] );
+ ReadUtf16( pString[ i ] );
if ( pString[ nItemSize - 1 ] == 0 )
{
if ( (sal_uInt16)nItemSize > 1 )
@@ -304,7 +304,7 @@ void Section::GetDictionary(Dictionary& rDict)
{
sal_Unicode* pWString = new sal_Unicode[nSize];
for (sal_uInt32 j = 0; j < nSize; ++j)
- aStream.ReadUInt16(pWString[j]);
+ aStream.ReadUtf16(pWString[j]);
aString = OUString(pWString, lcl_getMaxSafeStrLen(nSize));
delete[] pWString;
}