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 /svtools | |
| parent | 0100280a5c5b121fab2aa932092a7a887bbb507c (diff) | |
make ReadUniOrByteString return a string
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/templatefoldercache.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/misc/transfer.cxx | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index ccf74ec2dafa..c4deeecfd763 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -417,8 +417,7 @@ namespace svt // initialize them with their (local) names while ( nChildren-- ) { - String sURL; - m_rStorage.ReadUniOrByteString( sURL, m_rStorage.GetStreamCharSet() ); + String sURL = m_rStorage.ReadUniOrByteString(m_rStorage.GetStreamCharSet()); sURL = m_xOfficeInstDirs->makeAbsoluteURL( sURL ); INetURLObject aChildURL( sURL ); rChildren.push_back( new TemplateContent( aChildURL ) ); @@ -735,8 +734,7 @@ namespace svt m_aPreviousState.reserve( nRootDirectories ); while ( nRootDirectories-- ) { - String sURL; - m_pCacheStream->ReadUniOrByteString( sURL, m_pCacheStream->GetStreamCharSet() ); + String sURL = m_pCacheStream->ReadUniOrByteString(m_pCacheStream->GetStreamCharSet()); // #116281# Keep office installtion relocatable. Never store // any direct references to office installation directory. sURL = getOfficeInstDirs()->makeAbsoluteURL( sURL ); diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index c8158d19b52a..6faa7e55dfe4 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -96,8 +96,8 @@ SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc ) rIStm >> rObjDesc.maSize.Height(); rIStm >> rObjDesc.maDragStartPos.X(); rIStm >> rObjDesc.maDragStartPos.Y(); - rIStm.ReadUniOrByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); - rIStm.ReadUniOrByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); + rObjDesc.maTypeName = rIStm.ReadUniOrByteString(osl_getThreadTextEncoding()); + rObjDesc.maDisplayName = rIStm.ReadUniOrByteString(osl_getThreadTextEncoding()); rIStm >> nSig1 >> nSig2; rObjDesc.mnViewAspect = static_cast< sal_uInt16 >( nViewAspect ); |