diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-19 22:19:52 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 10:10:58 +0000 |
| commit | d00fc0e293852cfc019ffaffa65bee327397677b (patch) | |
| tree | 3b28b98fb451bee33eff7c06a93dbb4063f07554 /sfx2 | |
| parent | 92f396733ebc518bcb7a9eae2dd3169d333b82b9 (diff) | |
disentangle Read/WriteByteString OUString variants
The ones which use a definite 8-bit encoding read/write pascal-style
strings with a 16bit length prefix.
The ones which use a definite 16-bit encoding read/write pascal-style
UTF-16 strings with a 32bit length prefix, i.e. not ByteStrings at all
The "I dunno" ones might be UTF-16 strings or 8-bit strings, depending
on the charset. Rename to ReadUniOrByteString like the other
similar horrors to flag this misery
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appmisc.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index e323361ed09c..eaef4b41ce49 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -192,7 +192,7 @@ std::vector<sal_uInt16>* SfxApplication::GetDisabledSlotList_Impl() { // Read Slot file String aTitle; - pStream->ReadByteString(aTitle); + pStream->ReadUniOrByteString(aTitle, pStream->GetStreamCharSet()); if ( aTitle.CompareToAscii("SfxSlotFile" ) == COMPARE_EQUAL ) { sal_uInt16 nCount; @@ -207,7 +207,7 @@ std::vector<sal_uInt16>* SfxApplication::GetDisabledSlotList_Impl() pList->push_back( nSlot ); } - pStream->ReadByteString(aTitle); + pStream->ReadUniOrByteString(aTitle, pStream->GetStreamCharSet()); if ( aTitle.CompareToAscii("END" ) != COMPARE_EQUAL || pStream->GetError() ) { // Read failed |