diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-06 08:50:03 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-06 09:52:42 +0000 |
| commit | 2d3203b2db5b44592e70e52c9927324b65a45e06 (patch) | |
| tree | a175859b1be2a2ee2ca598a6b8a9f34c25ea40f2 /sfx2 | |
| parent | fdo#43862: reintroduce fo:margin-* on top of fo:margin for backward compat (diff) | |
| download | core-2d3203b2db5b44592e70e52c9927324b65a45e06.tar.gz core-2d3203b2db5b44592e70e52c9927324b65a45e06.zip | |
make ReadUniOrByteString return a string
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appmisc.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 0ec2e702bf00..1e62b634e6b5 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -190,8 +190,7 @@ std::vector<sal_uInt16>* SfxApplication::GetDisabledSlotList_Impl() if( bSlots && bSlotsEnabled ) { // Read Slot file - String aTitle; - pStream->ReadUniOrByteString(aTitle, pStream->GetStreamCharSet()); + String aTitle = pStream->ReadUniOrByteString(pStream->GetStreamCharSet()); if ( aTitle.CompareToAscii("SfxSlotFile" ) == COMPARE_EQUAL ) { sal_uInt16 nCount; @@ -206,7 +205,7 @@ std::vector<sal_uInt16>* SfxApplication::GetDisabledSlotList_Impl() pList->push_back( nSlot ); } - pStream->ReadUniOrByteString(aTitle, pStream->GetStreamCharSet()); + aTitle = pStream->ReadUniOrByteString(pStream->GetStreamCharSet()); if ( aTitle.CompareToAscii("END" ) != COMPARE_EQUAL || pStream->GetError() ) { // Read failed |