diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/bigrange.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/autoform.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xeescher.cxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/html/htmlexp.cxx | 14 | ||||
| -rw-r--r-- | sc/source/filter/inc/xlescher.hxx | 9 |
5 files changed, 20 insertions, 10 deletions
diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx index 4f1a2341a7a5..6e8aed4ab2c8 100644 --- a/sc/inc/bigrange.hxx +++ b/sc/inc/bigrange.hxx @@ -133,7 +133,7 @@ inline ScAddress ScBigAddress::MakeAddress() const inline SvStream& WriteScBigAddress( SvStream& rStream, const ScBigAddress& rAdr ) { - rStream << rAdr.nCol << rAdr.nRow << rAdr.nTab; + rStream.WriteInt32( rAdr.nCol ).WriteInt32( rAdr.nRow ).WriteInt32( rAdr.nTab ); return rStream; } diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index cbf36cd71111..100a06bda5a2 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -794,7 +794,7 @@ bool ScAutoFormatData::Save(SvStream& rStream, sal_uInt16 fileVersion) bool b; rStream.WriteUInt16( nVal ); // --- from 680/dr25 on: store strings as UTF-8 - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, aName, RTL_TEXTENCODING_UTF8); + write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, aName, RTL_TEXTENCODING_UTF8); rStream.WriteUInt16( nStrResId ); rStream.WriteUChar( ( b = bIncludeFont ) ); diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index f58bd9cbdd96..fb07ddb8f1a7 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -224,7 +224,8 @@ void XclExpDffAnchorBase::SetSdrObject( const SdrObject& rSdrObj ) void XclExpDffAnchorBase::WriteDffData( EscherEx& rEscherEx ) const { rEscherEx.AddAtom( 18, ESCHER_ClientAnchor ); - rEscherEx.GetStream().WriteUInt16( mnFlags ) << maAnchor; + rEscherEx.GetStream().WriteUInt16( mnFlags ); + WriteXclObjAnchor( rEscherEx.GetStream(), maAnchor ); } void XclExpDffAnchorBase::WriteData( EscherEx& rEscherEx, const Rectangle& rRect ) diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 999b8a3d9e76..d19636a53a8b 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -116,15 +116,15 @@ const sal_Char ScHTMLExport::sIndentSource[nIndentMax+1] = #define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag ) #define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag, false ) #define OUT_STR( str ) HTMLOutFuncs::Out_String( rStrm, str, eDestEnc, &aNonConvertibleChars ) -#define OUT_LF() rStrm << SAL_NEWLINE_STRING << GetIndentStr() -#define TAG_ON_LF( tag ) (TAG_ON( tag ) << SAL_NEWLINE_STRING << GetIndentStr()) -#define TAG_OFF_LF( tag ) (TAG_OFF( tag ) << SAL_NEWLINE_STRING << GetIndentStr()) +#define OUT_LF() rStrm.WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() ) +#define TAG_ON_LF( tag ) (TAG_ON( tag ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() )) +#define TAG_OFF_LF( tag ) (TAG_OFF( tag ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() )) #define OUT_HR() TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_horzrule ) -#define OUT_COMMENT( comment ) (rStrm << sMyBegComment, OUT_STR( comment ) \ - << sMyEndComment << SAL_NEWLINE_STRING \ - << GetIndentStr()) +#define OUT_COMMENT( comment ) (rStrm.WriteCharPtr( sMyBegComment ), OUT_STR( comment ) \ + .WriteCharPtr( sMyEndComment ).WriteCharPtr( SAL_NEWLINE_STRING ) \ + .WriteCharPtr( GetIndentStr() )) -#define OUT_SP_CSTR_ASS( s ) rStrm << ' ' << s << '=' +#define OUT_SP_CSTR_ASS( s ) rStrm.WriteChar( ' ').WriteCharPtr( s ).WriteChar( '=' ) #define GLOBSTR(id) ScGlobal::GetRscString( id ) diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx index 5ecd2726f9ca..498fb1c3095f 100644 --- a/sc/source/filter/inc/xlescher.hxx +++ b/sc/source/filter/inc/xlescher.hxx @@ -333,6 +333,15 @@ StreamType& operator<<( StreamType& rStrm, const XclObjAnchor& rAnchor ) << static_cast<sal_uInt16>(rAnchor.maLast.mnRow) << static_cast<sal_uInt16>(rAnchor.mnBY); } +inline SvStream& WriteXclObjAnchor( SvStream& rStrm, const XclObjAnchor& rAnchor ) +{ + return rStrm + .WriteUInt16( rAnchor.maFirst.mnCol ).WriteUInt16( rAnchor.mnLX ) + .WriteUInt16( rAnchor.maFirst.mnRow ).WriteUInt16( rAnchor.mnTY ) + .WriteUInt16( rAnchor.maLast.mnCol ).WriteUInt16( rAnchor.mnRX ) + .WriteUInt16( rAnchor.maLast.mnRow).WriteUInt16(rAnchor.mnBY); +} + // ---------------------------------------------------------------------------- struct XclObjLineData |