diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-17 10:36:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-17 10:36:13 +0100 |
| commit | 61f168d98750549107a65e846fbe5c49f277295e (patch) | |
| tree | 0748b88eefa9bb49285270ac5a7bbce3d10b4ef6 /sot | |
| parent | 4f76e46290b26deeb4f9660c580a5ffef58a557e (diff) | |
Add SvStream::ReadUtf16 (don't assume sal_Unicode is unsigned short)
Change-Id: I74f34e3389582617fa83f8f4a3d6867cf87189e1
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/sdstor/stgelem.cxx | 2 | ||||
| -rw-r--r-- | sot/source/sdstor/stgelem.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index ec5439e017a7..356edc5393e9 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -368,7 +368,7 @@ bool StgEntry::Load(const void* pFrom, sal_uInt32 nBufSize, sal_uInt64 nUnderlyi SvMemoryStream r( const_cast<void *>(pFrom), nBufSize, StreamMode::READ ); for( short i = 0; i < 32; i++ ) - r.ReadUInt16( m_nName[ i ] ); // 00 name as WCHAR + r.ReadUtf16( m_nName[ i ] ); // 00 name as WCHAR r.ReadUInt16( m_nNameLen ) // 40 size of name in bytes including 00H .ReadUChar( m_cType ) // 42 entry type .ReadUChar( m_cFlags ) // 43 0 or 1 (tree balance?) diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx index 3972f80f3985..790fadd6625c 100644 --- a/sot/source/sdstor/stgelem.hxx +++ b/sot/source/sdstor/stgelem.hxx @@ -108,7 +108,7 @@ enum StgEntryTime { // time codes: //StructuredStorageDirectoryEntry class StgEntry { // directory entry - sal_uInt16 m_nName[ 32 ]; // 00 name as WCHAR + sal_Unicode m_nName[ 32 ]; // 00 name as WCHAR sal_uInt16 m_nNameLen; // 40 size of name in bytes including 00H sal_uInt8 m_cType; // 42 entry type sal_uInt8 m_cFlags; // 43 0 or 1 (tree balance?) |