[Libreoffice-commits] core.git: 2 commits - basic/source connectivity/source dbaccess/source editeng/source extensions/source filter/source idl/inc idl/source include/svl include/tools sc/inc sc/source sd/source sfx2/source sot/source starmath/source svl/source svtools/source svx/source sw/source tools/source vcl/source vcl/win writerfilter/source
Noel Grandin
noel at peralex.com
Wed Jan 22 14:01:06 PST 2014
basic/source/runtime/methods1.cxx | 2
basic/source/sbx/sbxbase.cxx | 6
basic/source/sbx/sbxcoll.cxx | 2
basic/source/sbx/sbxobj.cxx | 8
basic/source/sbx/sbxvalue.cxx | 8
basic/source/sbx/sbxvar.cxx | 2
connectivity/source/drivers/dbase/dindexnode.cxx | 2
dbaccess/source/ui/misc/TokenWriter.cxx | 148 ++++-----
dbaccess/source/ui/tabledesign/TableRow.cxx | 2
editeng/source/editeng/editobj.cxx | 4
editeng/source/editeng/impedit4.cxx | 184 +++++------
extensions/source/scanner/scanwin.cxx | 4
filter/source/flash/swfwriter2.cxx | 2
filter/source/graphic/GraphicExportFilter.cxx | 2
filter/source/msfilter/escherex.cxx | 2
filter/source/pdf/pdffilter.cxx | 2
idl/inc/bastype.hxx | 2
idl/source/objects/basobj.cxx | 71 ++--
idl/source/objects/bastype.cxx | 40 +-
idl/source/objects/module.cxx | 64 ++--
idl/source/objects/object.cxx | 75 ++--
idl/source/objects/slot.cxx | 348 +++++++++++-----------
idl/source/objects/types.cxx | 361 +++++++++++------------
idl/source/prj/database.cxx | 28 -
include/svl/filerec.hxx | 2
include/tools/inetmsg.hxx | 4
include/tools/stream.hxx | 84 -----
sc/inc/bigrange.hxx | 2
sc/source/core/tool/autoform.cxx | 2
sc/source/filter/excel/xeescher.cxx | 3
sc/source/filter/excel/xestream.cxx | 2
sc/source/filter/html/htmlexp.cxx | 80 ++---
sc/source/filter/html/htmlexp2.cxx | 8
sc/source/filter/inc/xlescher.hxx | 9
sc/source/filter/rtf/rtfexp.cxx | 50 +--
sc/source/ui/app/drwtrans.cxx | 2
sc/source/ui/app/transobj.cxx | 2
sd/source/filter/html/pubdlg.cxx | 16 -
sd/source/ui/app/sdxfer.cxx | 2
sfx2/source/bastyp/frmhtmlw.cxx | 28 -
sfx2/source/bastyp/mieclip.cxx | 4
sfx2/source/bastyp/sfxhtml.cxx | 2
sfx2/source/doc/oleprops.cxx | 4
sot/source/sdstor/ucbstorage.cxx | 2
starmath/source/eqnolefilehdr.hxx | 16 -
svl/source/filerec/filerec.cxx | 8
svl/source/items/cntwall.cxx | 4
svl/source/items/ctypeitm.cxx | 2
svl/source/items/poolio.cxx | 48 +--
svl/source/numbers/zforlist.cxx | 14
svtools/source/graphic/grfattr.cxx | 2
svtools/source/graphic/grfmgr.cxx | 2
svtools/source/misc/imap.cxx | 32 +-
svtools/source/svhtml/htmlout.cxx | 80 ++---
svtools/source/svrtf/rtfout.cxx | 28 -
svx/source/core/graphichelper.cxx | 2
svx/source/gallery2/galmisc.cxx | 2
svx/source/gallery2/galobj.cxx | 10
svx/source/gallery2/galtheme.cxx | 18 -
svx/source/items/chrtitem.cxx | 2
svx/source/items/e3ditem.cxx | 6
svx/source/table/tablertfexporter.cxx | 38 +-
svx/source/unodraw/UnoGraphicExporter.cxx | 2
svx/source/xoutdev/xattr.cxx | 12
svx/source/xoutdev/xattr2.cxx | 12
sw/source/core/doc/tblafmt.cxx | 4
sw/source/core/inc/swfont.hxx | 21 -
sw/source/core/layout/atrfrm.cxx | 2
sw/source/filter/html/css1atr.cxx | 38 +-
sw/source/filter/html/htmlatr.cxx | 78 ++--
sw/source/filter/html/htmlbas.cxx | 8
sw/source/filter/html/htmlcss1.cxx | 2
sw/source/filter/html/htmlforw.cxx | 44 +-
sw/source/filter/html/htmltabw.cxx | 18 -
sw/source/filter/html/wrthtml.cxx | 44 +-
sw/source/filter/ww8/rtfattributeoutput.cxx | 212 ++++++-------
sw/source/filter/ww8/rtfexport.cxx | 162 +++++-----
sw/source/filter/ww8/wrtw8esh.cxx | 6
sw/source/filter/ww8/wrtww8.cxx | 4
sw/source/filter/ww8/wrtww8.hxx | 4
sw/source/ui/config/uinums.cxx | 58 +--
sw/source/ui/dochdl/swdtflvr.cxx | 2
tools/source/inet/inetmsg.cxx | 4
vcl/source/filter/wmf/wmfwr.cxx | 2
vcl/source/gdi/animate.cxx | 2
vcl/source/gdi/cvtsvm.cxx | 2
vcl/source/gdi/impgraph.cxx | 36 +-
vcl/source/gdi/jobset.cxx | 14
vcl/source/gdi/metaact.cxx | 10
vcl/source/gdi/print.cxx | 8
vcl/win/source/gdi/salgdi3.cxx | 22 -
writerfilter/source/filter/RtfFilter.cxx | 2
92 files changed, 1383 insertions(+), 1443 deletions(-)
New commits:
commit 16a2e903356520c90a9bf91c47265f79be12e74a
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jan 17 08:48:50 2014 +0200
remove SvStream::operator<< methods
.. and convert the last few places still using those methods.
Change-Id: Id2cd8f9c0dd281df43af439d4fef65881f34a6fd
Reviewed-on: https://gerrit.libreoffice.org/7495
Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 05b84b2..376da54 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -391,14 +391,14 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer )
sal_Bool SbxInfo::StoreData( SvStream& rStrm ) const
{
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, aComment,
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aComment,
RTL_TEXTENCODING_ASCII_US );
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, aHelpFile,
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aHelpFile,
RTL_TEXTENCODING_ASCII_US);
rStrm.WriteUInt32( nHelpId ).WriteUInt16( static_cast<sal_uInt16>(aParams.size()) );
for(SbxParams::const_iterator i = aParams.begin(); i != aParams.end(); ++i)
{
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, i->aName,
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, i->aName,
RTL_TEXTENCODING_ASCII_US);
rStrm.WriteUInt16( (sal_uInt16) i->eType )
.WriteUInt16( (sal_uInt16) i->nFlags )
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index d92b0f3..741735b 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -314,7 +314,7 @@ sal_Bool SbxStdCollection::StoreData( SvStream& rStrm ) const
sal_Bool bRes = SbxCollection::StoreData( rStrm );
if( bRes )
{
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, aElemClass,
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aElemClass,
RTL_TEXTENCODING_ASCII_US);
rStrm.WriteUChar( bAddRemoveOk );
}
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 5a0750f..4b6c7db 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -676,8 +676,8 @@ sal_Bool SbxObject::StoreData( SvStream& rStrm ) const
{
aDfltProp = pDfltProp->GetName();
}
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US);
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US);
sal_uIntPtr nPos = rStrm.Tell();
rStrm.WriteUInt32( (sal_uInt32) 0L );
if( !StorePrivateData( rStrm ) )
@@ -876,7 +876,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
{
aLine += " !! Not a Method !!";
}
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, aLine, RTL_TEXTENCODING_ASCII_US);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US);
// Output also the object at object-methods
if ( pVar->GetValues_Impl().eType == SbxOBJECT &&
@@ -915,7 +915,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
{
aLine += " !! Not a Property !!";
}
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, aLine, RTL_TEXTENCODING_ASCII_US);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US);
// output also the object at object properties
if ( pVar->GetValues_Impl().eType == SbxOBJECT &&
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 019834f..3cdaeb5 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1568,12 +1568,12 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
case SbxDATE:
// #49935: Save as double, otherwise an error during the read in
((SbxValue*)this)->aData.eType = (SbxDataType)( ( nType & 0xF000 ) | SbxDOUBLE );
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US);
((SbxValue*)this)->aData.eType = (SbxDataType)nType;
break;
case SbxSINGLE:
case SbxDOUBLE:
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US);
break;
case SbxSALUINT64:
case SbxSALINT64:
@@ -1590,11 +1590,11 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
case SbxSTRING:
if( aData.pOUString )
{
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(r, *aData.pOUString, RTL_TEXTENCODING_ASCII_US);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(r, *aData.pOUString, RTL_TEXTENCODING_ASCII_US);
}
else
{
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(r, OUString(), RTL_TEXTENCODING_ASCII_US);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(r, OUString(), RTL_TEXTENCODING_ASCII_US);
}
break;
case SbxERROR:
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index d20ab4a..d621d66 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -644,7 +644,7 @@ sal_Bool SbxVariable::StoreData( SvStream& rStrm ) const
{
return sal_False;
}
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, maName,
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, maName,
RTL_TEXTENCODING_ASCII_US);
rStrm.WriteUInt32( (sal_uInt32)nUserData );
if( pInfo.Is() )
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 29482ed..e12d111 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -641,9 +641,9 @@ const char OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\
// Macros for HTML-Export
#define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag )
#define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag, sal_False )
-#define OUT_LF() (*m_pStream) << 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() m_pStream->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() ))
OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataDescriptor,
const Reference< XComponentContext >& _rM,
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index eee3e24..e812547 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1215,10 +1215,10 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const
// Convert CH_FEATURE to CH_FEATURE_OLD
OString aText = aBuffer.makeStringAndClear().replace(cFeatureConverted, CH_FEATURE_OLD);
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, aText);
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, aText);
// StyleName and Family...
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rC.GetStyle(), eEncoding);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rC.GetStyle(), eEncoding);
rOStream.WriteUInt16( static_cast<sal_uInt16>(rC.GetFamily()) );
// Paragraph attributes ...
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 319445f..6db9b66 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -847,8 +847,8 @@ uno::Sequence< sal_Int8 > ScannerManager::getDIB() throw()
sal_Int8* pBuf = aRet.getArray();
SvMemoryStream* pMemStm = new SvMemoryStream( (char*) pBuf, sizeof( BITMAPFILEHEADER ), STREAM_WRITE );
- *pMemStm << 'B' << 'M' << (sal_uInt32) 0 << (sal_uInt32) 0;
- *pMemStm << (sal_uInt32) ( sizeof( BITMAPFILEHEADER ) + pBIH->biSize + ( nColEntries * sizeof( RGBQUAD ) ) );
+ pMemStm->WriteChar( 'B' ).WriteChar( 'M' ).WriteUInt32( 0 ).WriteUInt32( 0 );
+ pMemStm->WriteUInt32( sizeof( BITMAPFILEHEADER ) + pBIH->biSize + ( nColEntries * sizeof( RGBQUAD ) ) );
delete pMemStm;
memcpy( pBuf + sizeof( BITMAPFILEHEADER ), pBIH, nDIBSize );
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 8a2fe6f..4c7b2da 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -63,7 +63,7 @@ public:
sal_Bool IsSet() const { return bSet; }
friend SvStream& WriteSvint(SvStream & rStm, const Svint & r )
- { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); rStm << r.bSet; return rStm; }
+ { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); rStm.WriteUInt8( r.bSet ); return rStm; }
friend SvStream& operator >> (SvStream & rStm, Svint & r )
{ r.nVal = (int)SvUINT32::Read( rStm ); rStm >> r.bSet ; return rStm; }
};
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 7f517e7..b315190 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -214,7 +214,7 @@ sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
SvStream& WriteSvIdentifier(SvStream & rStm, const SvIdentifier & r )
{
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, r.getString());
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, r.getString());
return rStm;
}
@@ -327,7 +327,7 @@ sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
SvStream& WriteSvString(SvStream & rStm, const SvString & r )
{
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, r.getString());
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, r.getString());
return rStm;
}
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index ac9aed0..72985e9 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -82,9 +82,9 @@ void SvMetaModule::Save( SvPersistStream & rStm )
WriteSvDeclPersistList( rStm, aAttrList );
// browser
rStm.WriteUniOrByteString( aIdlFileName, rStm.GetStreamCharSet() );
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aHelpFileName.getString());
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aSlotIdFile.getString());
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aModulePrefix.getString());
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, aHelpFileName.getString());
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, aSlotIdFile.getString());
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, aModulePrefix.getString());
// write compiler data
sal_uInt16 nCmpLen = 0;
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index a0c3b55..74977a1 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -64,7 +64,7 @@ void SvClassElement::Save( SvPersistStream & rStm )
// write data
rStm.WriteUChar( nMask );
if( nMask & 0x01 ) rStm.WriteUChar( aAutomation );
- if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aPrefix);
+ if( nMask & 0x02 ) write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, aPrefix);
if( nMask & 0x04 ) WriteSvPersistBase( rStm, xClass );
}
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 89ce61f..d0ff705 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1784,7 +1784,7 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm )
// write data
rStm.WriteUChar( nMask );
- if( nMask & 0x01 ) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aEnumValue);
+ if( nMask & 0x01 ) write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, aEnumValue);
}
sal_Bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
@@ -1843,7 +1843,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
// write data
rStm.WriteUChar( nMask );
if( nMask & 0x01 ) WriteSvDeclPersistList( rStm, aEnumValueList );
- if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aPrefix);
+ if( nMask & 0x02 ) write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, aPrefix);
}
namespace
diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index 3cc9248..b7aca76 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -601,7 +601,7 @@ inline SfxMiniRecordWriter::SfxMiniRecordWriter( SvStream* pStream, sal_uInt8 nT
DBG(_nStartPos = pStream->Tell());
DBG( DbgOutf( "SfxFileRec: writing record to %ul", _nStartPos ) );
- *pStream << ( ( nTag << 24 ) | nSize );
+ pStream->WriteUInt32( ( nTag << 24 ) | nSize );
}
/** The destructor closes the record automatically if not done earlier */
diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx
index d8af698..4c07726 100644
--- a/include/tools/inetmsg.hxx
+++ b/include/tools/inetmsg.hxx
@@ -65,8 +65,8 @@ public:
friend SvStream& WriteINetMessageHeader(
SvStream& rStrm, const INetMessageHeader& rHdr)
{
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStrm, rHdr.m_aName);
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStrm, rHdr.m_aValue);
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aName);
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aValue);
return rStrm;
}
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 320e10b..cfd4836 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -315,36 +315,6 @@ public:
SvStream& operator>>( double& rDouble );
SvStream& operator>>( SvStream& rStream );
- SvStream& operator<<( sal_uInt16 nUInt16 )
- { return WriteUInt16(nUInt16); }
- SvStream& operator<<( sal_uInt32 nUInt32 )
- { return WriteUInt32(nUInt32); }
- SvStream& operator<<( sal_uInt64 nuInt64 )
- { return WriteUInt64(nuInt64); }
- SvStream& operator<<( sal_Int16 nInt16 )
- { return WriteInt16(nInt16); }
- SvStream& operator<<( sal_Int32 nInt32 )
- { return WriteInt32(nInt32); }
- SvStream& operator<<( sal_Int64 nInt64 ) SAL_DELETED_FUNCTION;
- SvStream& operator<<( bool b )
- { return operator<<(static_cast< sal_Bool >(b)); }
- SvStream& operator<<( signed char nChar )
- { return WriteSChar(nChar); }
- SvStream& operator<<( char nChar )
- { return WriteChar(nChar); }
- SvStream& operator<<( unsigned char nChar )
- { return WriteUChar(nChar); }
- SvStream& operator<<( float nFloat )
- { return WriteFloat(nFloat); }
- SvStream& operator<<( const double& rDouble )
- { return WriteDouble(rDouble); }
- SvStream& operator<<( const char* pBuf )
- { return WriteCharPtr(pBuf); }
- SvStream& operator<<( const unsigned char* pBuf )
- { return WriteUCharPtr(pBuf); }
- SvStream& operator<<( SvStream& rStream )
- { return WriteStream(rStream); }
-
SvStream& WriteUInt16( sal_uInt16 nUInt16 );
SvStream& WriteUInt32( sal_uInt32 nUInt32 );
SvStream& WriteUInt64( sal_uInt64 nuInt64 );
@@ -577,39 +547,6 @@ TOOLS_DLLPUBLIC inline sal_Size write_uInt16s_FromOUString(SvStream& rStrm,
return write_uInt16s_FromOUString(rStrm, rStr, rStr.getLength());
}
-namespace streamdetail
-{
- /// Attempt to write a pascal-style length (of type prefix) prefixed
- /// sequence of units from a string-type, returned value is number of bytes
- /// written (including byte-count of prefix)
- template<typename prefix, typename S, sal_Size (*writeOper)(SvStream&, const S&, sal_Size)>
- sal_Size write_lenPrefixed_seq_From_str(SvStream& rStrm, const S &rStr)
- {
- sal_Size nWritten = 0;
- prefix nUnits = std::min<sal_Size>(rStr.getLength(), std::numeric_limits<prefix>::max());
- SAL_WARN_IF(static_cast<sal_Size>(nUnits) != static_cast<sal_Size>(rStr.getLength()),
- "tools.stream",
- "string too long for prefix count to fit in output type");
- rStrm << nUnits;
- if (rStrm.good())
- {
- nWritten += sizeof(prefix);
- nWritten += writeOper(rStrm, rStr, nUnits);
- }
- return nWritten;
- }
-}
-
-/// Attempt to write a pascal-style length (of type prefix) prefixed sequence
-/// of 16bit units from an OUString, returned value is number of bytes written
-/// (including byte-count of prefix)
-template<typename prefix>
-sal_Size write_lenPrefixed_uInt16s_FromOUString(SvStream& rStrm,
- const OUString &rStr)
-{
- return streamdetail::write_lenPrefixed_seq_From_str<prefix, OUString, write_uInt16s_FromOUString>(rStrm, rStr);
-}
-
/// Attempt to write a pascal-style length (of type prefix) prefixed sequence
/// of 16bit units from an OUString, returned value is number of bytes written
/// (including byte-count of prefix)
@@ -666,27 +603,6 @@ TOOLS_DLLPUBLIC inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const
return write_uInt8s_FromOString(rStrm, rStr, rStr.getLength());
}
-/// Attempt to write a pascal-style length (of type prefix) prefixed sequence
-/// of 8bit units from an OString, returned value is number of bytes written
-/// (including byte-count of prefix)
-template<typename prefix>
-sal_Size write_lenPrefixed_uInt8s_FromOString(SvStream& rStrm,
- const OString &rStr)
-{
- return streamdetail::write_lenPrefixed_seq_From_str<prefix, OString, write_uInt8s_FromOString>(rStrm, rStr);
-}
-
-/// Attempt to write a pascal-style length (of type prefix) prefixed sequence
-/// of 8bit units from an OUString, returned value is number of bytes written
-/// (including byte-count of prefix)
-template<typename prefix>
-sal_Size write_lenPrefixed_uInt8s_FromOUString(SvStream& rStrm,
- const OUString &rStr,
- rtl_TextEncoding eEnc)
-{
- return write_lenPrefixed_uInt8s_FromOString<prefix>(rStrm, OUStringToOString(rStr, eEnc));
-}
-
/// Attempt to write a pascal-style length (of type prefix) prefixed
/// sequence of units from a string-type, returned value is number of bytes
/// written (including byte-count of prefix)
diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx
index 4f1a234..6e8aed4 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 cbf36cd..100a06b 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 f58bd9c..fb07ddb 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 999b8a3..d19636a 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 5ecd272..498fb1c 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
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 67b5c9e..c82b34c 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -301,23 +301,23 @@ SvStream& WriteSdPublishingDesign(SvStream& rOut, const SdPublishingDesign& rDes
SdIOCompat aIO(rOut, STREAM_WRITE, 0);
// Name
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aDesignName,
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aDesignName,
RTL_TEXTENCODING_UTF8);
rOut.WriteUInt16( (sal_uInt16)rDesign.m_eMode );
rOut.WriteUChar( rDesign.m_bContentPage );
rOut.WriteUChar( rDesign.m_bNotes );
rOut.WriteUInt16( rDesign.m_nResolution );
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aCompression,
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCompression,
RTL_TEXTENCODING_UTF8);
rOut.WriteUInt16( (sal_uInt16)rDesign.m_eFormat );
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aAuthor,
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aAuthor,
RTL_TEXTENCODING_UTF8);
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aEMail,
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aEMail,
RTL_TEXTENCODING_UTF8);
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aWWW,
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aWWW,
RTL_TEXTENCODING_UTF8);
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aMisc,
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aMisc,
RTL_TEXTENCODING_UTF8);
rOut.WriteUChar( rDesign.m_bDownload );
rOut.WriteUChar( rDesign.m_bCreated ); // not used
@@ -332,9 +332,9 @@ SvStream& WriteSdPublishingDesign(SvStream& rOut, const SdPublishingDesign& rDes
rOut.WriteUChar( rDesign.m_bUseColor );
rOut.WriteUInt16( (sal_uInt16)rDesign.m_eScript );
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aURL,
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aURL,
RTL_TEXTENCODING_UTF8);
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aCGI,
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCGI,
RTL_TEXTENCODING_UTF8);
rOut.WriteUChar( rDesign.m_bAutoSlide );
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 800134e..4c6e4ef 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -3228,7 +3228,7 @@ OUString UCBStorage::CreateLinkFile( const OUString& rName )
// store it as key/value pair
OUString aLink = "ContentURL=" + aURL;
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(*pStream, aLink, RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(*pStream, aLink, RTL_TEXTENCODING_UTF8);
pStream->Flush();
// move the stream to its desired location
diff --git a/starmath/source/eqnolefilehdr.hxx b/starmath/source/eqnolefilehdr.hxx
index dfb2baa..000a72b 100644
--- a/starmath/source/eqnolefilehdr.hxx
+++ b/starmath/source/eqnolefilehdr.hxx
@@ -58,14 +58,14 @@ public:
}
inline void Write(SvStorageStream *pS)
{
- *pS << nCBHdr;
- *pS << nVersion;
- *pS << nCf;
- *pS << nCBObject;
- *pS << nReserved1;
- *pS << nReserved2;
- *pS << nReserved3;
- *pS << nReserved4;
+ pS->WriteUInt16( nCBHdr );
+ pS->WriteUInt32( nVersion );
+ pS->WriteUInt16( nCf );
+ pS->WriteUInt32( nCBObject );
+ pS->WriteUInt32( nReserved1 );
+ pS->WriteUInt32( nReserved2 );
+ pS->WriteUInt32( nReserved3 );
+ pS->WriteUInt32( nReserved4 );
}
};
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 4267ebe..b999216 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1139,7 +1139,7 @@ SvStream& WriteGraphicObject( SvStream& rOStm, const GraphicObject& rGraphicObj
rOStm.WriteUChar( bLink );
if( bLink )
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8);
return rOStm;
}
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 34244ac..d38995e 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -88,16 +88,16 @@ void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const
const OString aRelURL = OUStringToOString(
URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding);
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, aRelURL);
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aAltText, eEncoding);
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, aRelURL);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aAltText, eEncoding);
rOStm.WriteUChar( bActive );
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aTarget, eEncoding);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aTarget, eEncoding);
pCompat = new IMapCompat( rOStm, STREAM_WRITE );
WriteIMapObject( rOStm );
aEventList.Write( rOStm ); // V4
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aName, eEncoding); // V5
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aName, eEncoding); // V5
delete pCompat;
}
@@ -949,10 +949,10 @@ void ImageMap::Write( SvStream& rOStm, const OUString& rBaseURL ) const
// write MagicCode
rOStm.WriteCharPtr( IMAPMAGIC );
rOStm.WriteUInt16( GetVersion() );
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aImageName, eEncoding);
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, OString()); //dummy
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding);
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, OString()); //dummy
rOStm.WriteUInt16( nCount );
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aImageName, eEncoding);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding);
pCompat = new IMapCompat( rOStm, STREAM_WRITE );
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 2f07802..6d85fa8 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -192,7 +192,7 @@ void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const
OUString aURLWithoutDestDir = aURL.GetMainURL( INetURLObject::NO_DECODE );
aURLWithoutDestDir = aURLWithoutDestDir.replaceFirst(rDestDir, "");
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aURLWithoutDestDir, RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, aURLWithoutDestDir, RTL_TEXTENCODING_UTF8);
}
void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion )
@@ -299,8 +299,8 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const OUString& rDestDir ) const
SgaObject::WriteData( rOut, rDestDir );
char aDummy[ 10 ];
rOut.Write( aDummy, 10 );
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOut, OString()); //dummy
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOut, OString()); //dummy
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8);
}
void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
@@ -371,7 +371,7 @@ void SgaObjectSound::WriteData( SvStream& rOut, const OUString& rDestDir ) const
{
SgaObject::WriteData( rOut, rDestDir );
rOut.WriteUInt16( (sal_uInt16) eSoundType );
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8);
}
void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
@@ -530,7 +530,7 @@ sal_Bool SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
void SgaObjectSvDraw::WriteData( SvStream& rOut, const OUString& rDestDir ) const
{
SgaObject::WriteData( rOut, rDestDir );
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8);
}
void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 3567a0e..1930262 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1295,7 +1295,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
sal_Bool bRel;
rOStm.WriteUInt16( (sal_uInt16) 0x0004 );
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8);
rOStm.WriteUInt32( nCount ).WriteUInt16( (sal_uInt16) osl_getThreadTextEncoding() );
for( sal_uInt32 i = 0; i < nCount; i++ )
@@ -1347,7 +1347,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
}
rOStm.WriteUChar( bRel );
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aPath, RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aPath, RTL_TEXTENCODING_UTF8);
rOStm.WriteUInt32( pObj->nOffset ).WriteUInt16( (sal_uInt16) pObj->eObjKind );
}
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 126733a..d14079d 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 6e3d432..21bdfcf 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 ca7f67f..b9c00a3 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 786d296..1a781e5 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,
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index bdc7489..427cc26 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -103,7 +103,7 @@ sal_uIntPtr INetMessage::SetHeaderField (
SvStream& INetMessage::operator<< (SvStream& rStrm) const
{
rStrm.WriteUInt32( static_cast<sal_uInt32>(m_nDocSize) );
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, m_aDocName, RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, m_aDocName, RTL_TEXTENCODING_UTF8);
sal_uIntPtr i, n = m_aHeaderList.size();
rStrm.WriteUInt32( static_cast<sal_uInt32>(n) );
@@ -1018,7 +1018,7 @@ SvStream& INetMIMEMessage::operator<< (SvStream& rStrm) const
for (sal_uInt16 i = 0; i < INETMSG_MIME_NUMHDR; i++)
rStrm.WriteUInt32( static_cast<sal_uInt32>(m_nIndex[i]) );
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStrm, m_aBoundary);
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rStrm, m_aBoundary);
rStrm.WriteUInt32( static_cast<sal_uInt32>(aChildren.size()) );
return rStrm;
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 9f702bd..22688ea 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -825,7 +825,7 @@ void WMFWriter::TrueTextOut(const Point & rPoint, const OString& rString)
{
WriteRecordHeader(0,W_META_TEXTOUT);
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(*pWMF, rString);
+ write_uInt16_lenPrefixed_uInt8s_FromOString(*pWMF, rString);
sal_Int32 nLen = rString.getLength();
if ((nLen&1)!=0) pWMF->WriteUChar( (sal_uInt8)0 );
WritePointYX(rPoint);
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 0b128d8..2c1d817 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -730,7 +730,7 @@ SvStream& WriteAnimation( SvStream& rOStm, const Animation& rAnimation )
rOStm.WriteUInt32( nDummy32 ); // Unused
rOStm.WriteUInt32( nDummy32 ); // Unused
rOStm.WriteUInt32( nDummy32 ); // Unused
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, OString()); // dummy
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, OString()); // dummy
rOStm.WriteUInt16( nRest ); // Count of remaining structures
}
}
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 8b6d597..bad3016 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -2395,7 +2395,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
rOStm.SeekRel( 4 );
// write data
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, pA->GetComment());
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, pA->GetComment());
rOStm.WriteInt32( pA->GetValue() ).WriteUInt32( nDataSize );
if( nDataSize )
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 9184dc6..b0204af 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -354,23 +354,23 @@ SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup )
::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it;
for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it )
{
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, it->first, RTL_TEXTENCODING_UTF8);
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, it->second, RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, it->first, RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, it->second, RTL_TEXTENCODING_UTF8);
}
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, "COMPAT_DUPLEX_MODE");
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "COMPAT_DUPLEX_MODE");
switch( pJobData->meDuplexMode )
{
case DUPLEX_UNKNOWN:
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, "DUPLEX_UNKNOWN");
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_UNKNOWN");
break;
case DUPLEX_OFF:
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, "DUPLEX_OFF");
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_OFF");
break;
case DUPLEX_SHORTEDGE:
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, "DUPLEX_SHORTEDGE");
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_SHORTEDGE");
break;
case DUPLEX_LONGEDGE:
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, "DUPLEX_LONGEDGE");
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_LONGEDGE");
break;
}
nLen = sal::static_int_cast<sal_uInt16>(rOStream.Tell() - nPos);
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 3414abe..3151ac2 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1254,7 +1254,7 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
rOStm.WriteInt32(mnIndex);
rOStm.WriteInt32(mnLen);
- write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
+ write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2
}
// ------------------------------------------------------------------------
@@ -1395,7 +1395,7 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
for (sal_Int32 i = 0; i < nAryLen; ++i)
rOStm.WriteInt32( mpDXAry[ i ] );
- write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
+ write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2
}
// ------------------------------------------------------------------------
@@ -1529,7 +1529,7 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
rOStm.WriteInt32( mnIndex );
rOStm.WriteInt32( mnLen );
- write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
+ write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2
}
// ------------------------------------------------------------------------
@@ -1610,7 +1610,7 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
rOStm.WriteUInt16( mnStyle );
- write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
+ write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2
}
// ------------------------------------------------------------------------
@@ -4186,7 +4186,7 @@ sal_Bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const
void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, maComment);
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, maComment);
rOStm.WriteInt32( mnValue ).WriteUInt32( mnDataSize );
if ( mnDataSize )
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 375be67..c423e0c 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -253,10 +253,10 @@ SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo )
{
VersionCompat aCompat( rOStream, STREAM_WRITE, 1 );
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rInfo.maPrinterName, RTL_TEXTENCODING_UTF8);
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8);
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8);
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maPrinterName, RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8);
rOStream.WriteUInt32( rInfo.mnStatus );
rOStream.WriteUInt32( rInfo.mnJobs );
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index c38f271..a3758f4 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -163,7 +163,7 @@ ImplFontAttrCache::~ImplFontAttrCache()
if ( aCacheFile.IsWritable() )
{
sal_uInt32 nCacheMagic = ImplFontAttrCache::MAGIC;
- aCacheFile << nCacheMagic;
+ aCacheFile.WriteUInt32( nCacheMagic );
// write the cache entries to the file
FontAttrMap::const_iterator aIter = aFontAttributes.begin();
@@ -171,22 +171,22 @@ ImplFontAttrCache::~ImplFontAttrCache()
{
const OUString rFontFileURL( (*aIter).first );
const ImplDevFontAttributes& rDFA( (*aIter).second );
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(aCacheFile, rFontFileURL, RTL_TEXTENCODING_UTF8);
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(aCacheFile, rDFA.GetFamilyName(), RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(aCacheFile, rFontFileURL, RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.GetFamilyName(), RTL_TEXTENCODING_UTF8);
- aCacheFile << static_cast<short>(rDFA.GetWeight());
- aCacheFile << static_cast<short>(rDFA.GetSlant());
- aCacheFile << static_cast<short>(rDFA.GetPitch());
- aCacheFile << static_cast<short>(rDFA.GetWidthType());
- aCacheFile << static_cast<short>(rDFA.GetFamilyType());
- aCacheFile << static_cast<short>(rDFA.IsSymbolFont() != false);
+ aCacheFile.WriteInt16(rDFA.GetWeight());
+ aCacheFile.WriteInt16(rDFA.GetSlant());
+ aCacheFile.WriteInt16(rDFA.GetPitch());
+ aCacheFile.WriteInt16(rDFA.GetWidthType());
+ aCacheFile.WriteInt16(rDFA.GetFamilyType());
+ aCacheFile.WriteInt16(rDFA.IsSymbolFont() != false);
- write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(aCacheFile, rDFA.GetStyleName(), RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.GetStyleName(), RTL_TEXTENCODING_UTF8);
++aIter;
}
// EOF Marker
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(aCacheFile, OString());
+ write_uInt16_lenPrefixed_uInt8s_FromOString(aCacheFile, OString());
}
}
}
commit d803483f6a5938b0d0708b8db74b30c511dd8e31
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jan 16 12:40:11 2014 +0200
convert more SvStream::operator<< calls
.. to more explicit SvStream::Write* calls
This was done using another run of the clang rewriter, and then
a lot of hand tweaking to fix all the places where the rewriter
did not play nice with various macros.
Change-Id: I7bcab93851c8dfb59cde6bc76290c6484d88fb18
Reviewed-on: https://gerrit.libreoffice.org/7494
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index a2f440c..af6ae3d 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1043,7 +1043,7 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
{
pStrm->WriteUInt16( (sal_uInt16)eType ); // VarType Id
}
- *pStrm << rVar.GetDouble();
+ pStrm->WriteDouble( rVar.GetDouble() );
break;
case SbxSTRING:
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index cfa06db..aabc1c1 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -697,7 +697,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
rStream.Write(&buf[0], sizeof(double));
}
else
- rStream << (double) aKey.getValue();
+ rStream.WriteDouble( (double) aKey.getValue() );
}
else
{
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index fc6b67f..29482ed 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -373,8 +373,8 @@ sal_Bool ORTFImportExport::Write()
{
SAL_INFO("dbaccess.ui", "ORTFImportExport::Write" );
ODatabaseImportExport::Write();
- (*m_pStream) << '{' << OOO_STRING_SVTOOLS_RTF_RTF;
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ANSI << SAL_NEWLINE_STRING;
+ m_pStream->WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF );
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI ).WriteCharPtr( SAL_NEWLINE_STRING );
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252;
sal_Bool bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight );
@@ -394,36 +394,36 @@ sal_Bool ORTFImportExport::Write()
aFonts = OUStringToOString(aName, eDestEnc);
}
- (*m_pStream) << "{\\fonttbl";
+ m_pStream->WriteCharPtr( "{\\fonttbl" );
sal_Int32 nTokenCount = comphelper::string::getTokenCount(aFonts, ';');
for(sal_Int32 j=0; j<nTokenCount; ++j)
{
- (*m_pStream) << "\\f";
+ m_pStream->WriteCharPtr( "\\f" );
m_pStream->WriteNumber(j);
- (*m_pStream) << "\\fcharset0\\fnil ";
- (*m_pStream) << comphelper::string::getToken(aFonts, j, ';').getStr();
- (*m_pStream) << ';';
+ m_pStream->WriteCharPtr( "\\fcharset0\\fnil " );
+ m_pStream->WriteCharPtr( comphelper::string::getToken(aFonts, j, ';').getStr() );
+ m_pStream->WriteChar( ';' );
}
- (*m_pStream) << '}' ;
- (*m_pStream) << SAL_NEWLINE_STRING;
+ m_pStream->WriteChar( '}' ) ;
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
// write the rtf color table
- (*m_pStream) << '{' << OOO_STRING_SVTOOLS_RTF_COLORTBL << OOO_STRING_SVTOOLS_RTF_RED;
+ m_pStream->WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_COLORTBL ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RED );
m_pStream->WriteNumber(static_cast<sal_uInt32>(aColor.GetRed()));
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_GREEN;
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_GREEN );
m_pStream->WriteNumber(static_cast<sal_uInt32>(aColor.GetGreen()));
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_BLUE;
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_BLUE );
m_pStream->WriteNumber(static_cast<sal_uInt32>(aColor.GetBlue()));
- (*m_pStream) << ";\\red255\\green255\\blue255;\\red192\\green192\\blue192;}"
- << SAL_NEWLINE_STRING;
+ m_pStream->WriteCharPtr( ";\\red255\\green255\\blue255;\\red192\\green192\\blue192;}" )
+ .WriteCharPtr( SAL_NEWLINE_STRING );
static char const aTRRH[] = "\\trrh-270\\pard\\intbl";
static char const aFS[] = "\\fs20\\f0\\cf0\\cb2";
static char const aCell1[] = "\\clbrdrl\\brdrs\\brdrcf0\\clbrdrt\\brdrs\\brdrcf0\\clbrdrb\\brdrs\\brdrcf0\\clbrdrr\\brdrs\\brdrcf0\\clshdng10000\\clcfpat2\\cellx";
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH;
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRGAPH );
m_pStream->WriteNumber(static_cast<sal_Int32>(40));
- (*m_pStream) << SAL_NEWLINE_STRING;
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
if(m_xObject.is())
{
@@ -442,14 +442,14 @@ sal_Bool ORTFImportExport::Write()
for( sal_Int32 i=1; i<=nCount; ++i )
{
- (*m_pStream) << aCell1;
+ m_pStream->WriteCharPtr( aCell1 );
m_pStream->WriteNumber(i*CELL_X);
- (*m_pStream) << SAL_NEWLINE_STRING;
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
}
// column description
- (*m_pStream) << '{' << SAL_NEWLINE_STRING;
- (*m_pStream) << aTRRH;
+ m_pStream->WriteChar( '{' ).WriteCharPtr( SAL_NEWLINE_STRING );
+ m_pStream->WriteCharPtr( aTRRH );
OString* pHorzChar = new OString[nCount];
@@ -479,28 +479,28 @@ sal_Bool ORTFImportExport::Write()
pHorzChar[i-1] = pChar; // to avoid to always rummage in the ITEMSET later on
- (*m_pStream) << SAL_NEWLINE_STRING;
- (*m_pStream) << '{';
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_QC; // column header always centered
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
+ m_pStream->WriteChar( '{' );
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_QC ); // column header always centered
- if ( bBold ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_B;
- if ( bItalic ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_I;
- if ( bUnderline ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_UL;
- if ( bStrikeout ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_STRIKE;
+ if ( bBold ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_B );
+ if ( bItalic ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I );
+ if ( bUnderline ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL );
+ if ( bStrikeout ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_STRIKE );
- (*m_pStream) << aFS;
- (*m_pStream) << ' ';
+ m_pStream->WriteCharPtr( aFS );
+ m_pStream->WriteChar( ' ' );
RTFOutFuncs::Out_String(*m_pStream,sColumnName,eDestEnc);
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL;
- (*m_pStream) << '}';
- (*m_pStream) << SAL_NEWLINE_STRING;
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL;
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELL );
+ m_pStream->WriteChar( '}' );
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_INTBL );
}
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ROW;
- (*m_pStream) << SAL_NEWLINE_STRING << '}';
- (*m_pStream) << SAL_NEWLINE_STRING;
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ROW );
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ).WriteChar( '}' );
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY);
sal_Int32 k=1;
@@ -539,8 +539,8 @@ sal_Bool ORTFImportExport::Write()
delete [] pHorzChar;
}
- (*m_pStream) << '}' << SAL_NEWLINE_STRING;
- (*m_pStream) << (sal_uInt8) 0;
+ m_pStream->WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING );
+ m_pStream->WriteUChar( (sal_uInt8) 0 );
return ((*m_pStream).GetError() == SVSTREAM_OK);
}
@@ -549,18 +549,18 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_
if(!m_pRowMarker || m_pRowMarker[kk] == k)
{
++kk;
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH;
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRGAPH );
m_pStream->WriteNumber(static_cast<sal_Int32>(40));
- (*m_pStream) << SAL_NEWLINE_STRING;
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
static char const aCell2[] = "\\clbrdrl\\brdrs\\brdrcf2\\clbrdrt\\brdrs\\brdrcf2\\clbrdrb\\brdrs\\brdrcf2\\clbrdrr\\brdrs\\brdrcf2\\clshdng10000\\clcfpat1\\cellx";
static char const aTRRH[] = "\\trrh-270\\pard\\intbl";
for ( sal_Int32 i=1; i<=_nColumnCount; ++i )
{
- (*m_pStream) << aCell2;
+ m_pStream->WriteCharPtr( aCell2 );
m_pStream->WriteNumber(i*CELL_X);
- (*m_pStream) << SAL_NEWLINE_STRING;
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
}
const sal_Bool bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight );
@@ -569,20 +569,20 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_
const sal_Bool bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout );
Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY);
- (*m_pStream) << '{';
- (*m_pStream) << aTRRH;
+ m_pStream->WriteChar( '{' );
+ m_pStream->WriteCharPtr( aTRRH );
for ( sal_Int32 i=1; i <= _nColumnCount; ++i )
{
- (*m_pStream) << SAL_NEWLINE_STRING;
- (*m_pStream) << '{';
- (*m_pStream) << pHorzChar[i-1].getStr();
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
+ m_pStream->WriteChar( '{' );
+ m_pStream->WriteCharPtr( pHorzChar[i-1].getStr() );
- if ( bBold ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_B;
- if ( bItalic ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_I;
- if ( bUnderline ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_UL;
- if ( bStrikeout ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_STRIKE;
+ if ( bBold ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_B );
+ if ( bItalic ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I );
+ if ( bUnderline ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL );
+ if ( bStrikeout ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_STRIKE );
- (*m_pStream) << "\\fs20\\f1\\cf0\\cb1 ";
+ m_pStream->WriteCharPtr( "\\fs20\\f1\\cf0\\cb1 " );
try
{
@@ -597,13 +597,13 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_
SAL_WARN("dbaccess.ui","RTF WRITE!");
}
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL;
- (*m_pStream) << '}';
- (*m_pStream) << SAL_NEWLINE_STRING;
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL;
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELL );
+ m_pStream->WriteChar( '}' );
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_INTBL );
}
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ROW << SAL_NEWLINE_STRING;
- (*m_pStream) << '}';
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ROW ).WriteCharPtr( SAL_NEWLINE_STRING );
+ m_pStream->WriteChar( '}' );
}
++k;
}
@@ -669,7 +669,7 @@ sal_Bool OHTMLImportExport::Write()
ODatabaseImportExport::Write();
if(m_xObject.is())
{
- (*m_pStream) << '<' << OOO_STRING_SVTOOLS_HTML_doctype << ' ' << OOO_STRING_SVTOOLS_HTML_doctype40 << '>' << SAL_NEWLINE_STRING << SAL_NEWLINE_STRING;
+ m_pStream->WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype40 ).WriteChar( '>' ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( SAL_NEWLINE_STRING );
TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_html );
WriteHeader();
OUT_LF();
@@ -724,32 +724,32 @@ void OHTMLImportExport::WriteBody()
SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteBody" );
IncIndent(1);
- (*m_pStream) << "<" << OOO_STRING_SVTOOLS_HTML_style << " " << OOO_STRING_SVTOOLS_HTML_O_type << "=\"text/css\">";
+ m_pStream->WriteCharPtr( "<" ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_style ).WriteCharPtr( " " ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_type ).WriteCharPtr( "=\"text/css\">" );
- (*m_pStream) << sMyBegComment; OUT_LF();
- (*m_pStream) << OOO_STRING_SVTOOLS_HTML_body " { " << sFontFamily << '"' << OUStringToOString(m_aFont.Name, osl_getThreadTextEncoding()).getStr() << '\"';
+ m_pStream->WriteCharPtr( sMyBegComment ); OUT_LF();
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_HTML_body ).WriteCharPtr( " { " ).WriteCharPtr( sFontFamily ).WriteChar( '"' ).WriteCharPtr( OUStringToOString(m_aFont.Name, osl_getThreadTextEncoding()).getStr() ).WriteChar( '\"' );
// TODO : think about the encoding of the font name
- (*m_pStream) << "; " << sFontSize;
+ m_pStream->WriteCharPtr( "; " ).WriteCharPtr( sFontSize );
m_pStream->WriteNumber(static_cast<sal_Int32>(m_aFont.Height));
- (*m_pStream) << '}';
+ m_pStream->WriteChar( '}' );
OUT_LF();
- (*m_pStream) << sMyEndComment;
+ m_pStream->WriteCharPtr( sMyEndComment );
IncIndent(-1); OUT_LF(); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_style );
OUT_LF();
// default Textcolour black
- (*m_pStream) << '<' << OOO_STRING_SVTOOLS_HTML_body << ' ' << OOO_STRING_SVTOOLS_HTML_O_text << '=';
+ m_pStream->WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_body ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_text ).WriteChar( '=' );
sal_Int32 nColor = 0;
if(m_xObject.is())
m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor;
::Color aColor(nColor);
HTMLOutFuncs::Out_Color( (*m_pStream), aColor );
- (*m_pStream) << " " OOO_STRING_SVTOOLS_HTML_O_bgcolor "=";
+ m_pStream->WriteCharPtr( " " OOO_STRING_SVTOOLS_HTML_O_bgcolor "=" );
HTMLOutFuncs::Out_Color( (*m_pStream), aColor );
- (*m_pStream) << '>'; OUT_LF();
+ m_pStream->WriteChar( '>' ); OUT_LF();
WriteTables();
@@ -807,7 +807,7 @@ void OHTMLImportExport::WriteTables()
TAG_ON( OOO_STRING_SVTOOLS_HTML_caption );
TAG_ON( OOO_STRING_SVTOOLS_HTML_bold );
- (*m_pStream) << OUStringToOString(m_sName, osl_getThreadTextEncoding()).getStr();
+ m_pStream->WriteCharPtr( OUStringToOString(m_sName, osl_getThreadTextEncoding()).getStr() );
// TODO : think about the encoding of the name
TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold );
TAG_OFF( OOO_STRING_SVTOOLS_HTML_caption );
@@ -1022,7 +1022,7 @@ void OHTMLImportExport::FontOn()
aStrOut = aStrOut + " ";
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_color;
aStrOut = aStrOut + "=";
- (*m_pStream) << aStrOut.getStr();
+ m_pStream->WriteCharPtr( aStrOut.getStr() );
sal_Int32 nColor = 0;
if(m_xObject.is())
@@ -1030,7 +1030,7 @@ void OHTMLImportExport::FontOn()
::Color aColor(nColor);
HTMLOutFuncs::Out_Color( (*m_pStream), aColor );
- (*m_pStream) << ">";
+ m_pStream->WriteCharPtr( ">" );
}
inline void OHTMLImportExport::FontOff()
diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx
index a67cbd4..f996447 100644
--- a/dbaccess/source/ui/tabledesign/TableRow.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRow.cxx
@@ -113,7 +113,7 @@ namespace dbaui
if ( aValue >>= nValue )
{
_rStr.WriteInt32( sal_Int32(1) );
- _rStr << nValue;
+ _rStr.WriteDouble( nValue );
}
else
{
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 4a0284a..9178ca3 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -340,11 +340,11 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
// RTF header ...
- rOutput << '{' ;
+ rOutput.WriteChar( '{' ) ;
- rOutput << OOO_STRING_SVTOOLS_RTF_RTF;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF );
- rOutput << OOO_STRING_SVTOOLS_RTF_ANSI;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI );
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252;
// Generate and write out Font table ...
@@ -379,32 +379,33 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
}
}
- rOutput << endl << '{' << OOO_STRING_SVTOOLS_RTF_FONTTBL;
+ rOutput << endl;
+ rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FONTTBL );
sal_uInt16 j;
for ( j = 0; j < aFontTable.size(); j++ )
{
SvxFontItem* pFontItem = aFontTable[ j ];
- rOutput << '{';
- rOutput << OOO_STRING_SVTOOLS_RTF_F;
+ rOutput.WriteChar( '{' );
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_F );
rOutput.WriteNumber( static_cast<sal_uInt32>( j ) );
switch ( pFontItem->GetFamily() )
{
- case FAMILY_DONTKNOW: rOutput << OOO_STRING_SVTOOLS_RTF_FNIL;
+ case FAMILY_DONTKNOW: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FNIL );
break;
- case FAMILY_DECORATIVE: rOutput << OOO_STRING_SVTOOLS_RTF_FDECOR;
+ case FAMILY_DECORATIVE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FDECOR );
break;
- case FAMILY_MODERN: rOutput << OOO_STRING_SVTOOLS_RTF_FMODERN;
+ case FAMILY_MODERN: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FMODERN );
break;
- case FAMILY_ROMAN: rOutput << OOO_STRING_SVTOOLS_RTF_FROMAN;
+ case FAMILY_ROMAN: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FROMAN );
break;
- case FAMILY_SCRIPT: rOutput << OOO_STRING_SVTOOLS_RTF_FSCRIPT;
+ case FAMILY_SCRIPT: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FSCRIPT );
break;
- case FAMILY_SWISS: rOutput << OOO_STRING_SVTOOLS_RTF_FSWISS;
+ case FAMILY_SWISS: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FSWISS );
break;
default:
break;
}
- rOutput << OOO_STRING_SVTOOLS_RTF_FPRQ;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FPRQ );
sal_uInt16 nVal = 0;
switch( pFontItem->GetPitch() )
{
@@ -419,14 +420,14 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
DBG_ASSERT( eChrSet != 9, "SystemCharSet?!" );
if( RTL_TEXTENCODING_DONTKNOW == eChrSet )
eChrSet = osl_getThreadTextEncoding();
- rOutput << OOO_STRING_SVTOOLS_RTF_FCHARSET;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FCHARSET );
rOutput.WriteNumber( static_cast<sal_uInt32>( rtl_getBestWindowsCharsetFromTextEncoding( eChrSet ) ) );
- rOutput << ' ';
+ rOutput.WriteChar( ' ' );
RTFOutFuncs::Out_String( rOutput, pFontItem->GetFamilyName(), eDestEnc );
- rOutput << ";}";
+ rOutput.WriteCharPtr( ";}" );
}
- rOutput << '}';
+ rOutput.WriteChar( '}' );
rOutput << endl;
// Write out ColorList ...
@@ -443,22 +444,22 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
}
aColorList.Insert( new SvxColorItem( (const SvxColorItem&)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_COLOR) ), i );
- rOutput << '{' << OOO_STRING_SVTOOLS_RTF_COLORTBL;
+ rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_COLORTBL );
for ( j = 0; j < aColorList.Count(); j++ )
{
pColorItem = aColorList.GetObject( j );
if ( !j || ( pColorItem->GetValue() != COL_AUTO ) )
{
- rOutput << OOO_STRING_SVTOOLS_RTF_RED;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RED );
rOutput.WriteNumber( static_cast<sal_uInt32>(pColorItem->GetValue().GetRed()) );
- rOutput << OOO_STRING_SVTOOLS_RTF_GREEN;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_GREEN );
rOutput.WriteNumber( static_cast<sal_uInt32>(pColorItem->GetValue().GetGreen()) );
- rOutput << OOO_STRING_SVTOOLS_RTF_BLUE;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_BLUE );
rOutput.WriteNumber( static_cast<sal_uInt32>(pColorItem->GetValue().GetBlue()) );
}
- rOutput << ';';
+ rOutput.WriteChar( ';' );
}
- rOutput << '}';
+ rOutput.WriteChar( '}' );
rOutput << endl;
// StyleSheets...
@@ -467,14 +468,15 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
sal_uInt16 nStyles = (sal_uInt16)GetStyleSheetPool()->GetStyles().size();
if ( nStyles )
{
- rOutput << '{' << OOO_STRING_SVTOOLS_RTF_STYLESHEET;
+ rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_STYLESHEET );
for ( sal_uInt16 nStyle = 0; nStyle < nStyles; nStyle++ )
{
SfxStyleSheet* pStyle = (SfxStyleSheet*)GetStyleSheetPool()->GetStyles()[ nStyle ].get();
- rOutput << endl << '{' << OOO_STRING_SVTOOLS_RTF_S;
+ rOutput << endl;
+ rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_S );
sal_uInt32 nNumber = nStyle + 1;
rOutput.WriteNumber( nNumber );
@@ -493,7 +495,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
{
SfxStyleSheet* pParent = (SfxStyleSheet*)GetStyleSheetPool()->Find( pStyle->GetParent(), pStyle->GetFamily() );
DBG_ASSERT( pParent, "Parent not found!" );
- rOutput << OOO_STRING_SVTOOLS_RTF_SBASEDON;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SBASEDON );
nNumber = getStylePos( GetStyleSheetPool()->GetStyles(), pParent ) + 1;
rOutput.WriteNumber( nNumber );
}
@@ -504,39 +506,39 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
pNext = (SfxStyleSheet*)GetStyleSheetPool()->Find( pStyle->GetFollow(), pStyle->GetFamily() );
DBG_ASSERT( pNext, "Next ot found!" );
- rOutput << OOO_STRING_SVTOOLS_RTF_SNEXT;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SNEXT );
nNumber = getStylePos( GetStyleSheetPool()->GetStyles(), pNext ) + 1;
rOutput.WriteNumber( nNumber );
// Name of the template ...
- rOutput << " " << OUStringToOString(pStyle->GetName(), eDestEnc).getStr();
- rOutput << ";}";
+ rOutput.WriteCharPtr( " " ).WriteCharPtr( OUStringToOString(pStyle->GetName(), eDestEnc).getStr() );
+ rOutput.WriteCharPtr( ";}" );
}
- rOutput << '}';
+ rOutput.WriteChar( '}' );
rOutput << endl;
}
}
// Write the pool defaults in advance ...
- rOutput << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << "\\EditEnginePoolDefaults";
+ rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_IGNORE ).WriteCharPtr( "\\EditEnginePoolDefaults" );
for ( sal_uInt16 nPoolDefItem = EE_PARA_START; nPoolDefItem <= EE_CHAR_END; nPoolDefItem++)
{
const SfxPoolItem& rItem = aEditDoc.GetItemPool().GetDefaultItem( nPoolDefItem );
WriteItemAsRTF( rItem, rOutput, 0, 0, aFontTable, aColorList );
}
- rOutput << '}' << endl;
+ rOutput.WriteChar( '}' ) << endl;
// DefTab:
MapMode aTwpMode( MAP_TWIP );
sal_uInt16 nDefTabTwps = (sal_uInt16) GetRefDevice()->LogicToLogic(
Point( aEditDoc.GetDefTab(), 0 ),
&GetRefMapMode(), &aTwpMode ).X();
- rOutput << OOO_STRING_SVTOOLS_RTF_DEFTAB;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_DEFTAB );
rOutput.WriteNumber( static_cast<sal_uInt32>( nDefTabTwps ) );
rOutput << endl;
// iterate over the paragraphs ...
- rOutput << '{' << endl;
+ rOutput.WriteChar( '{' ) << endl;
for ( sal_Int32 nNode = nStartNode; nNode <= nEndNode; nNode++ )
{
ContentNode* pNode = aEditDoc.GetObject( nNode );
@@ -549,7 +551,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
if ( pNode->GetStyleSheet() )
{
// Number of template
- rOutput << OOO_STRING_SVTOOLS_RTF_S;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_S );
sal_uInt32 nNumber = getStylePos( GetStyleSheetPool()->GetStyles(), pNode->GetStyleSheet() ) + 1;
rOutput.WriteNumber( nNumber );
@@ -577,7 +579,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
}
}
if ( bAttr )
- rOutput << ' '; // Separator
+ rOutput.WriteChar( ' ' ); // Separator
ItemList aAttribItems;
ParaPortion* pParaPortion = FindParaPortion( pNode );
@@ -602,7 +604,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
if ( aAttribItems.Count() )
{
// These attributes may not apply to the entire paragraph:
- rOutput << '{';
+ rOutput.WriteChar( '{' );
WriteItemListAsRTF( aAttribItems, rOutput, nNode, nStartPos, aFontTable, aColorList );
bFinishPortion = sal_True;
}
@@ -647,9 +649,9 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
// Insert hard attribs AFTER CJK attribs...
lcl_FindValidAttribs( aAttribItems, pNode, nIndex, nScriptType );
- rOutput << '{';
+ rOutput.WriteChar( '{' );
if ( WriteItemListAsRTF( aAttribItems, rOutput, nNode, nIndex, aFontTable, aColorList ) )
- rOutput << ' ';
+ rOutput.WriteChar( ' ' );
sal_uInt16 nS = nIndex;
sal_uInt16 nE = nIndex + pTextPortion->GetLen();
@@ -660,22 +662,22 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
OUString aRTFStr = aEditDoc.GetParaAsString( pNode, nS, nE);
RTFOutFuncs::Out_String( rOutput, aRTFStr, eDestEnc );
- rOutput << '}';
+ rOutput.WriteChar( '}' );
}
if ( bFinishPortion )
{
- rOutput << '}';
+ rOutput.WriteChar( '}' );
bFinishPortion = sal_False;
}
nIndex = nIndex + pTextPortion->GetLen();
}
- rOutput << OOO_STRING_SVTOOLS_RTF_PAR << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN;;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PAR ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PLAIN );
rOutput << endl;
}
// RTF-trailer ...
- rOutput << "}}"; // 1xparentheses paragraphs, 1xparentheses RTF document
+ rOutput.WriteCharPtr( "}}" ); // 1xparentheses paragraphs, 1xparentheses RTF document
rOutput.Flush();
std::vector<SvxFontItem*>::iterator it;
@@ -696,9 +698,9 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
{
const SvxFrameDirectionItem& rWritingMode = (const SvxFrameDirectionItem&)rItem;
if ( rWritingMode.GetValue() == FRMDIR_HORI_RIGHT_TOP )
- rOutput << "\\rtlpar";
+ rOutput.WriteCharPtr( "\\rtlpar" );
else
- rOutput << "\\ltrpar";
+ rOutput.WriteCharPtr( "\\ltrpar" );
}
break;
case EE_PARA_OUTLLEVEL:
@@ -706,7 +708,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
sal_Int32 nLevel = ((const SfxInt16Item&)rItem).GetValue();
if( nLevel >= 0 )
{
- rOutput << "\\level";
+ rOutput.WriteCharPtr( "\\level" );
rOutput.WriteNumber( nLevel );
}
}
@@ -714,15 +716,15 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
case EE_PARA_OUTLLRSPACE:
case EE_PARA_LRSPACE:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_FI;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FI );
sal_Int32 nTxtFirst = ((const SvxLRSpaceItem&)rItem).GetTxtFirstLineOfst();
nTxtFirst = LogicToTwips( nTxtFirst );
rOutput.WriteNumber( nTxtFirst );
- rOutput << OOO_STRING_SVTOOLS_RTF_LI;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LI );
sal_uInt32 nTxtLeft = static_cast< sal_uInt32 >(((const SvxLRSpaceItem&)rItem).GetTxtLeft());
nTxtLeft = (sal_uInt32)LogicToTwips( nTxtLeft );
rOutput.WriteNumber( nTxtLeft );
- rOutput << OOO_STRING_SVTOOLS_RTF_RI;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RI );
sal_uInt32 nTxtRight = ((const SvxLRSpaceItem&)rItem).GetRight();
nTxtRight = LogicToTwips( nTxtRight);
rOutput.WriteNumber( nTxtRight );
@@ -730,11 +732,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
break;
case EE_PARA_ULSPACE:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_SB;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SB );
sal_uInt32 nUpper = ((const SvxULSpaceItem&)rItem).GetUpper();
nUpper = (sal_uInt32)LogicToTwips( nUpper );
rOutput.WriteNumber( nUpper );
- rOutput << OOO_STRING_SVTOOLS_RTF_SA;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SA );
sal_uInt32 nLower = ((const SvxULSpaceItem&)rItem).GetLower();
nLower = LogicToTwips( nLower );
rOutput.WriteNumber( nLower );
@@ -742,7 +744,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
break;
case EE_PARA_SBL:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_SL;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SL );
sal_Int32 nVal = ((const SvxLineSpacingItem&)rItem).GetLineHeight();
char cMult = '0';
if ( ((const SvxLineSpacingItem&)rItem).GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
@@ -755,7 +757,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
cMult = '1';
}
rOutput.WriteNumber( nVal );
- rOutput << OOO_STRING_SVTOOLS_RTF_SLMULT << cMult;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SLMULT ).WriteChar( cMult );
}
break;
case EE_PARA_JUST:
@@ -763,11 +765,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
SvxAdjust eJustification = ((const SvxAdjustItem&)rItem).GetAdjust();
switch ( eJustification )
{
- case SVX_ADJUST_CENTER: rOutput << OOO_STRING_SVTOOLS_RTF_QC;
+ case SVX_ADJUST_CENTER: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_QC );
break;
- case SVX_ADJUST_RIGHT: rOutput << OOO_STRING_SVTOOLS_RTF_QR;
+ case SVX_ADJUST_RIGHT: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_QR );
break;
- default: rOutput << OOO_STRING_SVTOOLS_RTF_QL;
+ default: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_QL );
break;
}
}
@@ -778,7 +780,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
for ( sal_uInt16 i = 0; i < rTabs.Count(); i++ )
{
const SvxTabStop& rTab = rTabs[i];
- rOutput << OOO_STRING_SVTOOLS_RTF_TX;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TX );
rOutput.WriteNumber( LogicToTwips( rTab.GetTabPos() ) );
}
}
@@ -786,7 +788,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
case EE_CHAR_COLOR:
{
sal_uInt32 n = rColorList.GetId( (const SvxColorItem&)rItem );
- rOutput << OOO_STRING_SVTOOLS_RTF_CF;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CF );
rOutput.WriteNumber( n );
}
break;
@@ -804,7 +806,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
}
}
- rOutput << OOO_STRING_SVTOOLS_RTF_F;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_F );
rOutput.WriteNumber( n );
}
break;
@@ -812,7 +814,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
case EE_CHAR_FONTHEIGHT_CJK:
case EE_CHAR_FONTHEIGHT_CTL:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_FS;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FS );
sal_Int32 nHeight = ((const SvxFontHeightItem&)rItem).GetHeight();
nHeight = LogicToTwips( nHeight );
// Twips => HalfPoints
@@ -827,8 +829,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
FontWeight e = ((const SvxWeightItem&)rItem).GetWeight();
switch ( e )
{
- case WEIGHT_BOLD: rOutput << OOO_STRING_SVTOOLS_RTF_B; break;
- default: rOutput << OOO_STRING_SVTOOLS_RTF_B << '0'; break;
+ case WEIGHT_BOLD: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_B ); break;
+ default: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_B ).WriteChar( '0' ); break;
}
}
break;
@@ -839,10 +841,10 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
FontUnderline e = ((const SvxUnderlineItem&)rItem).GetLineStyle();
switch ( e )
{
- case UNDERLINE_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_ULNONE; break;
- case UNDERLINE_SINGLE: rOutput << OOO_STRING_SVTOOLS_RTF_UL; break;
- case UNDERLINE_DOUBLE: rOutput << OOO_STRING_SVTOOLS_RTF_ULDB; break;
- case UNDERLINE_DOTTED: rOutput << OOO_STRING_SVTOOLS_RTF_ULD; break;
+ case UNDERLINE_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULNONE ); break;
+ case UNDERLINE_SINGLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL ); break;
+ case UNDERLINE_DOUBLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULDB ); break;
+ case UNDERLINE_DOTTED: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULD ); break;
default:
break;
}
@@ -853,10 +855,10 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
FontUnderline e = ((const SvxOverlineItem&)rItem).GetLineStyle();
switch ( e )
{
- case UNDERLINE_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_OLNONE; break;
- case UNDERLINE_SINGLE: rOutput << OOO_STRING_SVTOOLS_RTF_OL; break;
- case UNDERLINE_DOUBLE: rOutput << OOO_STRING_SVTOOLS_RTF_OLDB; break;
- case UNDERLINE_DOTTED: rOutput << OOO_STRING_SVTOOLS_RTF_OLD; break;
+ case UNDERLINE_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLNONE ); break;
+ case UNDERLINE_SINGLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OL ); break;
+ case UNDERLINE_DOUBLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLDB ); break;
+ case UNDERLINE_DOTTED: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLD ); break;
default:
break;
}
@@ -868,8 +870,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
switch ( e )
{
case STRIKEOUT_SINGLE:
- case STRIKEOUT_DOUBLE: rOutput << OOO_STRING_SVTOOLS_RTF_STRIKE; break;
- case STRIKEOUT_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_STRIKE << '0'; break;
+ case STRIKEOUT_DOUBLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_STRIKE ); break;
+ case STRIKEOUT_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_STRIKE ).WriteChar( '0' ); break;
default:
break;
}
@@ -883,8 +885,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
switch ( e )
{
case ITALIC_OBLIQUE:
- case ITALIC_NORMAL: rOutput << OOO_STRING_SVTOOLS_RTF_I; break;
- case ITALIC_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_I << '0'; break;
+ case ITALIC_NORMAL: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I ); break;
+ case ITALIC_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I ).WriteChar( '0' ); break;
default:
break;
}
@@ -892,58 +894,58 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
break;
case EE_CHAR_OUTLINE:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_OUTL;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OUTL );
if ( !((const SvxContourItem&)rItem).GetValue() )
- rOutput << '0';
+ rOutput.WriteChar( '0' );
}
break;
case EE_CHAR_RELIEF:
{
sal_uInt16 nRelief = ((const SvxCharReliefItem&)rItem).GetValue();
if ( nRelief == RELIEF_EMBOSSED )
- rOutput << OOO_STRING_SVTOOLS_RTF_EMBO;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_EMBO );
if ( nRelief == RELIEF_ENGRAVED )
- rOutput << OOO_STRING_SVTOOLS_RTF_IMPR;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_IMPR );
}
break;
case EE_CHAR_EMPHASISMARK:
{
sal_uInt16 nMark = ((const SvxEmphasisMarkItem&)rItem).GetValue();
if ( nMark == EMPHASISMARK_NONE )
- rOutput << OOO_STRING_SVTOOLS_RTF_ACCNONE;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ACCNONE );
else if ( nMark == EMPHASISMARK_SIDE_DOTS )
- rOutput << OOO_STRING_SVTOOLS_RTF_ACCCOMMA;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ACCCOMMA );
else
- rOutput << OOO_STRING_SVTOOLS_RTF_ACCDOT;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ACCDOT );
}
break;
case EE_CHAR_SHADOW:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_SHAD;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SHAD );
if ( !((const SvxShadowedItem&)rItem).GetValue() )
- rOutput << '0';
+ rOutput.WriteChar( '0' );
}
break;
case EE_FEATURE_TAB:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_TAB;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TAB );
}
break;
case EE_FEATURE_LINEBR:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_SL;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SL );
}
break;
case EE_CHAR_KERNING:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_EXPNDTW;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_EXPNDTW );
rOutput.WriteNumber( LogicToTwips(
((const SvxKerningItem&)rItem).GetValue() ) );
}
break;
case EE_CHAR_PAIRKERNING:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_KERNING;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_KERNING );
rOutput.WriteNumber( static_cast<sal_uInt32>(((const SvxAutoKernItem&)rItem).GetValue() ? 1 : 0 ));
}
break;
@@ -972,16 +974,16 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
// SWG:
if ( nEsc )
{
- rOutput << "{\\*\\updnprop" << OString::number(
- nProp100).getStr() << '}';
+ rOutput.WriteCharPtr( "{\\*\\updnprop" ).WriteCharPtr( OString::number(
+ nProp100).getStr() ).WriteChar( '}' );
}
long nUpDown = nFontHeight * std::abs( nEsc ) / 100;
OString aUpDown = OString::number(
nUpDown);
if ( nEsc < 0 )
- rOutput << OOO_STRING_SVTOOLS_RTF_DN << aUpDown.getStr();
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_DN ).WriteCharPtr( aUpDown.getStr() );
else if ( nEsc > 0 )
- rOutput << OOO_STRING_SVTOOLS_RTF_UP << aUpDown.getStr();
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UP ).WriteCharPtr( aUpDown.getStr() );
}
break;
}
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index d8d21f05..9c9599f 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -358,7 +358,7 @@ void Tag::addString( const char* pString )
void Tag::addStream( SvStream& rIn )
{
- *this << rIn;
+ (*this).WriteStream( rIn );
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/filter/source/graphic/GraphicExportFilter.cxx b/filter/source/graphic/GraphicExportFilter.cxx
index 57774aa..287f9b7 100644
--- a/filter/source/graphic/GraphicExportFilter.cxx
+++ b/filter/source/graphic/GraphicExportFilter.cxx
@@ -132,7 +132,7 @@ sal_Bool SAL_CALL GraphicExportFilter::filter( const Sequence<PropertyValue>& rD
{
SvOutputStream aOutputStream( mxOutputStream );
aMemStream.Seek(0);
- aOutputStream << aMemStream;
+ aOutputStream.WriteStream( aMemStream );
return true;
}
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 129831e..d8ed47f 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4035,7 +4035,7 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject
.WriteInt16( pGraphicAttr->GetChannelR() )
.WriteInt16( pGraphicAttr->GetChannelG() )
.WriteInt16( pGraphicAttr->GetChannelB() )
- << pGraphicAttr->GetGamma();
+ .WriteDouble( pGraphicAttr->GetGamma() );
aSt.WriteUChar( (sal_Bool)( pGraphicAttr->IsInvert() == sal_True ) )
.WriteUChar( pGraphicAttr->GetTransparency() );
mnIdentifier[ 1 ] = rtl_crc32( 0, aSt.GetData(), aSt.Tell() );
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 2db9df8..77bd2a4 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -118,7 +118,7 @@ sal_Bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
{
SvOutputStream aOStm( xOStm );
- aOStm << *pIStm;
+ aOStm.WriteStream( *pIStm );
bRet = ( aOStm.Tell() && ( aOStm.GetError() == ERRCODE_NONE ) );
delete pIStm;
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index c305b51..8ca2ca8 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -44,15 +44,15 @@ void SvMetaObject::Save( SvPersistStream & )
void SvMetaObject::WriteTab( SvStream & rOutStm, sal_uInt16 nTab )
{
while( nTab-- )
- rOutStm << " ";
+ rOutStm.WriteCharPtr( " " );
}
void SvMetaObject::WriteStars( SvStream & rOutStm )
{
- rOutStm << '/';
+ rOutStm.WriteChar( '/' );
for( int i = 6; i > 0; i-- )
- rOutStm << "**********";
- rOutStm << '/' << endl;
+ rOutStm.WriteCharPtr( "**********" );
+ rOutStm.WriteChar( '/' ) << endl;
}
sal_Bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uLong nBegPos )
@@ -144,7 +144,7 @@ void SvMetaName::Save( SvPersistStream & rStm )
if( aConfigName.IsSet() ) nMask |= 0x08;
if( aDescription.IsSet() ) nMask |= 0x10;
- rStm << nMask;
+ rStm.WriteUChar( nMask );
if( nMask & 0x01 ) WriteSvString( rStm, aName );
if( nMask & 0x02 ) WriteSvNumberIdentifier( rStm, aHelpContext );
if( nMask & 0x04 ) WriteSvString( rStm, aHelpText );
@@ -219,18 +219,19 @@ void SvMetaName::WriteContextSvIdl( SvIdlDataBase &, SvStream &, sal_uInt16 )
void SvMetaName::WriteDescription( SvStream & rOutStm )
{
- rOutStm << "<DESCRIPTION>" << endl;
+ rOutStm.WriteCharPtr( "<DESCRIPTION>" ) << endl;
OString aDesc( GetDescription().getString() );
sal_Int32 nPos = aDesc.indexOf('\n');
while ( nPos != -1 )
{
- rOutStm << aDesc.copy( 0, nPos ).getStr() << endl;
+ rOutStm.WriteCharPtr( aDesc.copy( 0, nPos ).getStr() ) << endl;
aDesc = aDesc.copy(nPos+1);
nPos = aDesc.indexOf('\n');
}
- rOutStm << aDesc.getStr() << endl << "</DESCRIPTION>" << endl;
+ rOutStm.WriteCharPtr( aDesc.getStr() ) << endl;
+ rOutStm.WriteCharPtr( "</DESCRIPTION>" ) << endl;
}
void SvMetaName::WriteAttributesSvIdl( SvIdlDataBase & rBase,
@@ -240,25 +241,25 @@ void SvMetaName::WriteAttributesSvIdl( SvIdlDataBase & rBase,
if( aHelpContext.IsSet() || aHelpText.IsSet() || aConfigName.IsSet() )
{
WriteTab( rOutStm, nTab );
- rOutStm << "// class SvMetaName" << endl;
+ rOutStm.WriteCharPtr( "// class SvMetaName" ) << endl;
}
if( aHelpContext.IsSet() )
{
WriteTab( rOutStm, nTab );
aHelpContext.WriteSvIdl( SvHash_HelpContext(), rOutStm, nTab );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( aHelpText.IsSet() )
{
WriteTab( rOutStm, nTab );
aHelpText.WriteSvIdl( rBase, rOutStm, nTab );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( aConfigName.IsSet() )
{
WriteTab( rOutStm, nTab );
aConfigName.WriteSvIdl( SvHash_ConfigName(), rOutStm, nTab );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
}
@@ -297,7 +298,7 @@ void SvMetaName::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
{
sal_uLong nBeginPos = rOutStm.Tell();
WriteTab( rOutStm, nTab );
- rOutStm << '[' << endl;
+ rOutStm.WriteChar( '[' ) << endl;
sal_uLong nOldPos = rOutStm.Tell();
WriteAttributesSvIdl( rBase, rOutStm, nTab +1 );
@@ -308,13 +309,13 @@ void SvMetaName::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
else
{
WriteTab( rOutStm, nTab );
- rOutStm << ']';
+ rOutStm.WriteChar( ']' );
nBeginPos = rOutStm.Tell();
rOutStm << endl;
}
WriteTab( rOutStm, nTab );
- rOutStm << '{' << endl;
+ rOutStm.WriteChar( '{' ) << endl;
nOldPos = rOutStm.Tell();
WriteContextSvIdl( rBase, rOutStm, nTab +1 );
@@ -325,7 +326,7 @@ void SvMetaName::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
else
{
WriteTab( rOutStm, nTab );
- rOutStm << '}';
+ rOutStm.WriteChar( '}' );
}
}
@@ -335,7 +336,7 @@ void SvMetaName::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
sal_uLong nBeginPos = rOutStm.Tell();
WriteTab( rOutStm, nTab );
- rOutStm << '[' << endl;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list