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 /editeng | |
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 'editeng')
-rw-r--r-- | editeng/source/editeng/editobj.cxx | 6 | ||||
-rw-r--r-- | editeng/source/items/bulitem.cxx | 7 | ||||
-rw-r--r-- | editeng/source/items/flditem.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/frmitems.cxx | 5 | ||||
-rw-r--r-- | editeng/source/items/textitem.cxx | 8 |
5 files changed, 13 insertions, 15 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index f039b1245b02..b4555d8123f0 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1230,7 +1230,7 @@ void BinTextObject::CreateData( SvStream& rIStream ) pC->GetText() = rtl::OStringToOUString(aByteString, eSrcEncoding); // StyleName and Family... - rIStream.ReadUniOrByteString( pC->GetStyle(), eSrcEncoding ); + pC->GetStyle() = rIStream.ReadUniOrByteString(eSrcEncoding); sal_uInt16 nStyleFamily; rIStream >> nStyleFamily; pC->GetFamily() = (SfxStyleFamily)nStyleFamily; @@ -1522,10 +1522,10 @@ void BinTextObject::CreateData300( SvStream& rIStream ) ContentInfo* pC = CreateAndInsertContent(); // The Text... - rIStream.ReadUniOrByteString( pC->GetText(), rIStream.GetStreamCharSet() ); + pC->GetText() = rIStream.ReadUniOrByteString(rIStream.GetStreamCharSet()); // StyleName and Family... - rIStream.ReadUniOrByteString( pC->GetStyle(), rIStream.GetStreamCharSet() ); + pC->GetStyle() = rIStream.ReadUniOrByteString(rIStream.GetStreamCharSet()); sal_uInt16 nStyleFamily; rIStream >> nStyleFamily; pC->GetFamily() = (SfxStyleFamily)nStyleFamily; diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 106a5abd6238..b47a8e1ba372 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -93,8 +93,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer ) rStream >> nTemp; aFont.SetItalic((FontItalic)nTemp); // UNICODE: rStream >> aName; aFont.SetName( aName ); - String aName; - rStream.ReadUniOrByteString(aName, rStream.GetStreamCharSet()); + String aName = rStream.ReadUniOrByteString(rStream.GetStreamCharSet()); aFont.SetName( aName ); if( nVer == 1 ) @@ -166,10 +165,10 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) : rStrm >> nScale; // UNICODE: rStrm >> aPrevText; - rStrm.ReadUniOrByteString(aPrevText, rStrm.GetStreamCharSet()); + aPrevText = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); // UNICODE: rStrm >> aFollowText; - rStrm.ReadUniOrByteString(aFollowText, rStrm.GetStreamCharSet()); + aFollowText = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); nValidMask = 0xFFFF; } diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index bafb976f057b..f1bfbd2baead 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -735,7 +735,7 @@ void SvxExtFileField::Load( SvPersistStream & rStm ) sal_uInt16 nType, nFormat; // UNICODE: rStm >> aFile; - rStm.ReadUniOrByteString(aFile, rStm.GetStreamCharSet()); + aFile = rStm.ReadUniOrByteString(rStm.GetStreamCharSet()); rStm >> nType; rStm >> nFormat; diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index ee8b297d6f76..a196a1e53a54 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -3441,9 +3441,8 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, if ( nDoLoad & LOAD_LINK ) { - String aRel; // UNICODE: rStream >> aRel; - rStream.ReadUniOrByteString(aRel, rStream.GetStreamCharSet()); + String aRel = rStream.ReadUniOrByteString(rStream.GetStreamCharSet()); // TODO/MBA: how can we get a BaseURL here?! OSL_FAIL("No BaseURL!"); @@ -3456,7 +3455,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, { pStrFilter = new String; // UNICODE: rStream >> *pStrFilter; - rStream.ReadUniOrByteString(*pStrFilter, rStream.GetStreamCharSet()); + *pStrFilter = rStream.ReadUniOrByteString(rStream.GetStreamCharSet()); } rStream >> nPos; diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 374655db38ad..e0117a59e908 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -424,10 +424,10 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const rStrm >> eFontTextEncoding; // UNICODE: rStrm >> aName; - rStrm.ReadUniOrByteString(aName, rStrm.GetStreamCharSet()); + aName = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); // UNICODE: rStrm >> aStyle; - rStrm.ReadUniOrByteString(aStyle, rStrm.GetStreamCharSet()); + aStyle = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); // Set the "correct" textencoding eFontTextEncoding = (sal_uInt8)GetSOLoadTextEncoding( eFontTextEncoding, (sal_uInt16)rStrm.GetVersion() ); @@ -442,8 +442,8 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const rStrm >> nMagic; if ( nMagic == STORE_UNICODE_MAGIC_MARKER ) { - rStrm.ReadUniOrByteString( aName, RTL_TEXTENCODING_UNICODE ); - rStrm.ReadUniOrByteString( aStyle, RTL_TEXTENCODING_UNICODE ); + aName = rStrm.ReadUniOrByteString( RTL_TEXTENCODING_UNICODE ); + aStyle = rStrm.ReadUniOrByteString( RTL_TEXTENCODING_UNICODE ); } else { |