diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/tblafmt.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/inc/swfont.hxx | 21 | ||||
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.hxx | 4 |
4 files changed, 19 insertions, 12 deletions
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 126733a683a4..d14079d85648 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -534,7 +534,7 @@ sal_Bool SwBoxAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const aRotateMode.Store( rStream, aRotateMode.GetVersion(fileVersion) ); // --- from 680/dr25 on: store strings as UTF-8 - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, sNumFmtString, + write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, sNumFmtString, RTL_TEXTENCODING_UTF8); rStream.WriteUInt16( (sal_uInt16)eSysLanguage ).WriteUInt16( (sal_uInt16)eNumFmtLanguage ); @@ -966,7 +966,7 @@ sal_Bool SwTableAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const sal_Bool b; rStream.WriteUInt16( nVal ); // --- from 680/dr25 on: store strings as UTF-8 - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, m_aName, + write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, m_aName, RTL_TEXTENCODING_UTF8 ); rStream.WriteUInt16( nStrResId ); rStream.WriteUChar( ( b = bInclFont ) ); diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 6e3d432d620e..21bdfcf19e4a 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -1087,14 +1087,21 @@ inline void SvStatistics::PrintOn( SvStream &rOS ) const //$ ostream if( IsEmpty() ) return; - rOS << "{ SV called:" << '\n'; + rOS.WriteCharPtr( "{ SV called:\n" ); if( nGetTextSize ) - rOS << "\tnGetTextSize: " << nGetTextSize << '\n'; if( nDrawText ) - rOS << "\tnDrawText: " << nDrawText << '\n'; if( nGetStretchTextSize ) - rOS << "\tnGetStretchTextSize: " << nGetStretchTextSize << '\n'; if( nDrawStretchText ) - rOS << "\tnDrawStretchText: " << nDrawStretchText << '\n'; if( nChangeFont ) - rOS << "\tnChangeFont: " << nChangeFont << '\n'; if( nGetFontMetric ) - rOS << "\tnGetFontMetric: " << nGetFontMetric << '\n'; rOS << "}" << '\n'; } + rOS.WriteCharPtr( "\tnGetTextSize: " ).WriteUInt16( nGetTextSize ).WriteChar( '\n' ); + if( nDrawText ) + rOS.WriteCharPtr( "\tnDrawText: " ).WriteUInt16( nDrawText ).WriteChar( '\n' ); + if( nGetStretchTextSize ) + rOS.WriteCharPtr( "\tnGetStretchTextSize: " ).WriteUInt16( nGetStretchTextSize ).WriteChar( '\n' ); + if( nDrawStretchText ) + rOS.WriteCharPtr( "\tnDrawStretchText: " ).WriteUInt16( nDrawStretchText ).WriteChar( '\n' ); + if( nChangeFont ) + rOS.WriteCharPtr( "\tnChangeFont: " ).WriteUInt16( nChangeFont ).WriteChar( '\n' ); + if( nGetFontMetric ) + rOS.WriteCharPtr( "\tnGetFontMetric: " ).WriteUInt16( nGetFontMetric ).WriteChar( '\n' ); + rOS.WriteCharPtr( "}\n" ); +} #else #define SV_STAT(nWhich) #endif /* DBG_UTIL */ diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index ca7f67f2583e..b9c00a37d790 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -1191,7 +1191,7 @@ SvStream& SwFmtVertOrient::Store(SvStream &rStream, sal_uInt16 /*version*/) cons #if SAL_TYPES_SIZEOFLONG == 8 rStream.WriteInt64(nYPos); #else - rStream << static_cast<sal_Int32>(nYPos); + rStream.WriteInt32(nYPos); #endif rStream.WriteInt16( eOrient ).WriteInt16( eRelation ); return rStream; diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 786d296801f4..1a781e56744c 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -895,10 +895,10 @@ public: static sal_uLong FillUntil( SvStream& rStrm, sal_uLong nEndPos = 0 ); static void FillCount( SvStream& rStrm, sal_uLong nCount ); - static void WriteShort( SvStream& rStrm, sal_Int16 nVal ) { rStrm << nVal; } + static void WriteShort( SvStream& rStrm, sal_Int16 nVal ) { rStrm.WriteInt16( nVal ); } static void WriteShort( SvStream& rStrm, sal_uLong nPos, sal_Int16 nVal ); - static void WriteLong( SvStream& rStrm, sal_Int32 nVal ) { rStrm << nVal; } + static void WriteLong( SvStream& rStrm, sal_Int32 nVal ) { rStrm.WriteInt32( nVal ); } static void WriteLong( SvStream& rStrm, sal_uLong nPos, sal_Int32 nVal ); static void WriteString16(SvStream& rStrm, const OUString& rStr, |