[Libreoffice-commits] core.git: 3 commits - basic/source connectivity/source dbaccess/source drawinglayer/source editeng/source idl/inc idl/source include/editeng include/sot include/svtools include/svx include/tools include/vcl sc/inc sc/source sd/source sfx2/source sot/source svl/source svtools/source svx/inc svx/source sw/source sw/uiconfig toolkit/source tools/source vcl/inc vcl/source
Michael Stahl
mstahl at redhat.com
Thu Jan 16 07:18:40 PST 2014
basic/source/runtime/methods.cxx | 2
connectivity/source/drivers/dbase/DIndex.cxx | 4
connectivity/source/drivers/dbase/dindexnode.cxx | 11 -
connectivity/source/inc/dbase/DIndex.hxx | 4
connectivity/source/inc/dbase/dindexnode.hxx | 8
dbaccess/source/ui/inc/TableRow.hxx | 4
dbaccess/source/ui/tabledesign/TableRow.cxx | 2
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 2
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 4
editeng/source/items/bulitem.cxx | 2
editeng/source/items/flditem.cxx | 4
editeng/source/items/frmitems.cxx | 22 +-
editeng/source/items/numitem.cxx | 6
editeng/source/items/textitem.cxx | 7
idl/inc/bastype.hxx | 14 -
idl/source/objects/basobj.cxx | 18 -
idl/source/objects/bastype.cxx | 12 -
idl/source/objects/module.cxx | 12 -
idl/source/objects/object.cxx | 10 -
idl/source/objects/slot.cxx | 20 +-
idl/source/objects/types.cxx | 30 +--
idl/source/prj/database.cxx | 4
include/editeng/adjustitem.hxx | 2
include/editeng/hyphenzoneitem.hxx | 2
include/editeng/lspcitem.hxx | 2
include/editeng/orphitem.hxx | 2
include/editeng/tstpitem.hxx | 2
include/editeng/widwitem.hxx | 2
include/sot/filelist.hxx | 2
include/svtools/grfmgr.hxx | 4
include/svtools/transfer.hxx | 2
include/svx/galtheme.hxx | 2
include/svx/svdsob.hxx | 4
include/svx/xexch.hxx | 2
include/tools/color.hxx | 2
include/tools/fract.hxx | 2
include/tools/gen.hxx | 4
include/tools/globname.hxx | 2
include/tools/inetmsg.hxx | 4
include/tools/poly.hxx | 4
include/tools/pstm.hxx | 6
include/vcl/animate.hxx | 2
include/vcl/font.hxx | 2
include/vcl/gdimtf.hxx | 2
include/vcl/gfxlink.hxx | 2
include/vcl/gradient.hxx | 4
include/vcl/graph.hxx | 2
include/vcl/graphictools.hxx | 4
include/vcl/hatch.hxx | 4
include/vcl/jobset.hxx | 2
include/vcl/lineinfo.hxx | 4
include/vcl/mapmod.hxx | 4
include/vcl/print.hxx | 2
include/vcl/region.hxx | 2
include/vcl/wall.hxx | 2
sc/inc/bigrange.hxx | 13 -
sc/source/core/tool/autoform.cxx | 8
sd/source/filter/eppt/pptexanimations.cxx | 6
sd/source/filter/html/pubdlg.cxx | 16 -
sd/source/filter/ppt/pptanimations.hxx | 2
sfx2/source/appl/fileobj.cxx | 2
sfx2/source/doc/oleprops.cxx | 4
sfx2/source/doc/sfxbasemodel.cxx | 2
sfx2/source/view/printer.cxx | 2
sot/source/base/filelist.cxx | 4
sot/source/sdstor/stgelem.cxx | 6
sot/source/sdstor/stgelem.hxx | 2
sot/source/sdstor/stgole.cxx | 2
svl/source/items/ptitem.cxx | 2
svl/source/items/rectitem.cxx | 2
svl/source/items/szitem.cxx | 2
svtools/source/graphic/grfattr.cxx | 2
svtools/source/graphic/grfmgr.cxx | 7
svtools/source/graphic/provider.cxx | 2
svtools/source/misc/imap.cxx | 8
svtools/source/misc/templatefoldercache.cxx | 4
svtools/source/misc/transfer.cxx | 8
svx/inc/galobj.hxx | 2
svx/source/gallery2/galobj.cxx | 4
svx/source/gallery2/galtheme.cxx | 6
svx/source/tbxctrls/colrctrl.cxx | 2
svx/source/xoutdev/xattr.cxx | 2
svx/source/xoutdev/xexch.cxx | 2
sw/source/core/text/inftxt.hxx | 10 -
sw/source/core/text/porlin.hxx | 2
sw/source/ui/index/cnttab.cxx | 4
sw/uiconfig/swriter/ui/assignstylesdialog.ui | 2
toolkit/source/awt/vclxprinter.cxx | 2
tools/source/generic/color.cxx | 4
tools/source/generic/fract.cxx | 2
tools/source/generic/gen.cxx | 4
tools/source/generic/poly.cxx | 4
tools/source/generic/poly2.cxx | 4
tools/source/inet/inetmsg.cxx | 2
tools/source/ref/globname.cxx | 2
tools/source/ref/pstm.cxx | 4
vcl/inc/impfont.hxx | 2
vcl/inc/impgraph.hxx | 2
vcl/inc/wall2.hxx | 2
vcl/source/filter/sgfbram.cxx | 45 ++--
vcl/source/filter/sgfbram.hxx | 4
vcl/source/filter/wmf/winmtf.cxx | 2
vcl/source/gdi/animate.cxx | 8
vcl/source/gdi/cvtsvm.cxx | 90 +++++----
vcl/source/gdi/dibtools.cxx | 2
vcl/source/gdi/font.cxx | 8
vcl/source/gdi/gdimetafiletools.cxx | 4
vcl/source/gdi/gdimtf.cxx | 10 -
vcl/source/gdi/gfxlink.cxx | 5
vcl/source/gdi/gradient.cxx | 9
vcl/source/gdi/graph.cxx | 6
vcl/source/gdi/graphictools.cxx | 14 -
vcl/source/gdi/hatch.cxx | 9
vcl/source/gdi/impgraph.cxx | 16 -
vcl/source/gdi/jobset.cxx | 2
vcl/source/gdi/lineinfo.cxx | 6
vcl/source/gdi/mapmod.cxx | 14 -
vcl/source/gdi/metaact.cxx | 120 +++++++------
vcl/source/gdi/print.cxx | 2
vcl/source/gdi/region.cxx | 4
vcl/source/gdi/wall.cxx | 12 -
121 files changed, 448 insertions(+), 412 deletions(-)
New commits:
commit c2b002ba96a9cd1ffc45281f7ba195063c94a54a
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Jan 16 16:04:04 2014 +0100
sw: the Assign Styles dialog is not called Insert Database Columns
Change-Id: I96e0ee5fa0c7e45989cee663378d2ea7516fddfe
diff --git a/sw/uiconfig/swriter/ui/assignstylesdialog.ui b/sw/uiconfig/swriter/ui/assignstylesdialog.ui
index 60fa44e..9eda33c 100644
--- a/sw/uiconfig/swriter/ui/assignstylesdialog.ui
+++ b/sw/uiconfig/swriter/ui/assignstylesdialog.ui
@@ -16,7 +16,7 @@
<object class="GtkDialog" id="AssignStylesDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Insert Database Columns</property>
+ <property name="title" translatable="yes">Assign Styles</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
commit 77a637fb8ddfc4b045b3453f8435822a21198b19
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Jan 16 15:58:12 2014 +0100
fdo#73043: sw: fix Index/TOC Assign Styles dialog
SvTabListBox::GetEntryText(pEntry, 0xffff) will append 10 tabs to the
returned string, so it will no longer be equal to a style name.
(regression from 77173d8954c370bcaca80b48181c330b759b9517)
Change-Id: I7d3bee47eabec9180d6352fb6cf1b2e948153d37
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 91a2586..d5e9a11 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -725,7 +725,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent,
if (!aName.isEmpty())
{
SvTreeListEntry* pEntry = m_pHeaderTree->First();
- while (pEntry && m_pHeaderTree->GetEntryText(pEntry)!=aName)
+ while (pEntry && m_pHeaderTree->GetEntryText(pEntry, 0) != aName)
{
pEntry = m_pHeaderTree->Next(pEntry);
}
@@ -754,7 +754,7 @@ IMPL_LINK_NOARG(SwAddStylesDlg_Impl, OkHdl)
sal_IntPtr nLevel = (sal_IntPtr)pEntry->GetUserData();
if(nLevel != USHRT_MAX)
{
- OUString sName(m_pHeaderTree->GetEntryText(pEntry));
+ OUString sName(m_pHeaderTree->GetEntryText(pEntry, 0));
if(!pStyleArr[nLevel].isEmpty())
pStyleArr[nLevel] += OUString(TOX_STYLE_DELIMITER);
pStyleArr[nLevel] += sName;
commit c648d0872058941ed18499a8bf1993037d9b5532
Author: Noel Grandin <noel at peralex.com>
Date: Tue Jan 14 13:52:54 2014 +0200
convert SvStream::operator<< overloads to more explicit methods
This is in preparation for more conversion of SvStream::operator<< calls
to use more explicit method names.
This converts the subclasses that have their own convenience overloads
of operator<< to use normal methods.
Change-Id: I5efd5d9a24c264cb86d2471303dd5849bf91ba80
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 5951494..36d7c3c 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4519,7 +4519,7 @@ RTLFUNC(SavePicture)
{
SvFileStream aOStream( rPar.Get(2)->GetOUString(), STREAM_WRITE | STREAM_TRUNC );
Graphic aGraphic = ((SbStdPicture*)pObj)->GetGraphic();
- aOStream << aGraphic;
+ WriteGraphic( aOStream, aGraphic );
}
}
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 8fbfe9b..55790e9 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -307,7 +307,7 @@ void ODbaseIndex::Release(sal_Bool bSave)
{
m_aHeader.db_rootpage = m_nRootPage;
m_aHeader.db_pagecount = m_nPageCount;
- (*m_pFileStream) << *this;
+ WriteODbaseIndex( *m_pFileStream, *this );
}
m_nRootPage = m_nPageCount = 0;
m_nCurNode = NODE_NOTFOUND;
@@ -356,7 +356,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ODbaseIndex& rInd
return rStream;
}
//------------------------------------------------------------------
-SvStream& connectivity::dbase::operator << (SvStream &rStream, ODbaseIndex& rIndex)
+SvStream& connectivity::dbase::WriteODbaseIndex(SvStream &rStream, ODbaseIndex& rIndex)
{
rStream.Seek(0);
OSL_VERIFY_EQUALS( rStream.Write(&rIndex.m_aHeader,DINDEX_PAGE_SIZE), DINDEX_PAGE_SIZE, "Write not successful: Wrong header size for dbase index!");
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 3341af9..cfa06db 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -90,7 +90,7 @@ void ONDXPage::QueryDelete()
{
// Store in GarbageCollector
if (IsModified() && rIndex.m_pFileStream)
- (*rIndex.m_pFileStream) << *this;
+ WriteONDXPage( *rIndex.m_pFileStream, *this );
bModified = sal_False;
if (rIndex.UseCollector())
@@ -713,7 +713,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
}
rStream.Write(&pBuf[0], nLen);
}
- rStream << aChild;
+ WriteONDXPagePtr( rStream, aChild );
}
@@ -791,7 +791,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPagePtr& rPag
return rStream;
}
// -----------------------------------------------------------------------------
-SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPagePtr& rPage)
+SvStream& connectivity::dbase::WriteONDXPagePtr(SvStream &rStream, const ONDXPagePtr& rPage)
{
rStream.WriteUInt32( rPage.nPagePos );
return rStream;
@@ -845,7 +845,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
}
//------------------------------------------------------------------
-SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& rPage)
+SvStream& connectivity::dbase::WriteONDXPage(SvStream &rStream, const ONDXPage& rPage)
{
// Page doesn't exist yet
sal_uIntPtr nSize = (rPage.GetPagePos() + 1) * DINDEX_PAGE_SIZE;
@@ -862,7 +862,8 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& r
OSL_UNUSED( nCurrentPos );
nValue = rPage.nCount;
- rStream.WriteUInt32( nValue ) << rPage.aChild;
+ rStream.WriteUInt32( nValue );
+ WriteONDXPagePtr( rStream, rPage.aChild );
sal_uInt16 i = 0;
for (; i < rPage.nCount; i++)
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 7a0bb52..19da5d5 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -40,7 +40,7 @@ namespace connectivity
class ODbaseIndex : public ODbaseIndex_BASE
{
- friend SvStream& operator << (SvStream &rStream, ODbaseIndex&);
+ friend SvStream& WriteODbaseIndex(SvStream &rStream, ODbaseIndex&);
friend SvStream& operator >> (SvStream &rStream, ODbaseIndex&);
friend class ONDXNode;
@@ -141,7 +141,7 @@ namespace connectivity
sal_Bool ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue);
};
- SvStream& operator << (SvStream &rStream, ODbaseIndex&);
+ SvStream& WriteODbaseIndex(SvStream &rStream, ODbaseIndex&);
SvStream& operator >> (SvStream &rStream, ODbaseIndex&);
}
}
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index 81a8315..a6b0086 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -91,7 +91,7 @@ namespace connectivity
class ONDXPagePtr : public ONDXPageRef
{
- friend SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
+ friend SvStream& WriteONDXPagePtr(SvStream &rStream, const ONDXPagePtr&);
friend SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
sal_uInt32 nPagePos; // Position in the index file
@@ -115,7 +115,7 @@ namespace connectivity
{
friend class ODbaseIndex;
- friend SvStream& operator << (SvStream &rStream, const ONDXPage&);
+ friend SvStream& WriteONDXPage(SvStream &rStream, const ONDXPage&);
friend SvStream& operator >> (SvStream &rStream, ONDXPage&);
sal_uInt32 nPagePos; // Position in the index file
@@ -190,7 +190,7 @@ namespace connectivity
SV_IMPL_REF(ONDXPage);
- SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
+ SvStream& WriteONDXPagePtr(SvStream &rStream, const ONDXPagePtr&);
SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
inline sal_Bool ONDXPage::IsRoot() const {return !aParent.Is();}
@@ -212,7 +212,7 @@ namespace connectivity
aChild->SetParent(this);
}
SvStream& operator >> (SvStream &rStream, ONDXPage& rPage);
- SvStream& operator << (SvStream &rStream, const ONDXPage& rPage);
+ SvStream& WriteONDXPage(SvStream &rStream, const ONDXPage& rPage);
typedef ::std::vector<ONDXPage*> ONDXPageList;
diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx
index dbd9f4e..e503928 100644
--- a/dbaccess/source/ui/inc/TableRow.hxx
+++ b/dbaccess/source/ui/inc/TableRow.hxx
@@ -69,10 +69,12 @@ namespace dbaui
*/
inline bool IsReadOnly() const { return m_bReadOnly; }
- friend SvStream& operator<<( SvStream& rStr,const OTableRow& _rRow );
+ friend SvStream& WriteOTableRow( SvStream& rStr,const OTableRow& _rRow );
friend SvStream& operator>>( SvStream& rStr, OTableRow& _rRow );
};
+
}
+
#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx
index 63284a4..03dfe08 100644
--- a/dbaccess/source/ui/tabledesign/TableRow.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRow.cxx
@@ -106,7 +106,7 @@ void OTableRow::SetFieldType( const TOTypeInfoSP& _pType, sal_Bool _bForce )
namespace dbaui
{
- SvStream& operator<<( SvStream& _rStr, const OTableRow& _rRow )
+ SvStream& WriteOTableRow( SvStream& _rStr, const OTableRow& _rRow )
{
_rStr.WriteInt32( _rRow.m_nPos );
OFieldDescription* pFieldDesc = _rRow.GetActFieldDescr();
diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
index 0d52039..fd485d9 100644
--- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
@@ -41,7 +41,7 @@ namespace dbaui
::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = pRows->begin();
::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = pRows->end();
for(;aIter != aEnd;++aIter)
- (*rxOStm) << *(*aIter);
+ WriteOTableRow(*rxOStm, **aIter);
return sal_True;
}
}
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index f6aad73..ac5d6e7 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -363,7 +363,7 @@ namespace drawinglayer
{
SvMemoryStream aMemStm;
- aMemStm << *pSvtGraphicFill;
+ WriteSvtGraphicFill( aMemStm, *pSvtGraphicFill );
mpMetaFile->AddAction(new MetaCommentAction("XPATHFILL_SEQ_BEGIN", 0, static_cast< const sal_uInt8* >(aMemStm.GetData()), aMemStm.Seek(STREAM_SEEK_TO_END)));
mnSvtGraphicFillCount++;
}
@@ -552,7 +552,7 @@ namespace drawinglayer
{
SvMemoryStream aMemStm;
- aMemStm << *pSvtGraphicStroke;
+ WriteSvtGraphicStroke( aMemStm, *pSvtGraphicStroke );
mpMetaFile->AddAction(new MetaCommentAction("XPATHSTROKE_SEQ_BEGIN", 0, static_cast< const sal_uInt8* >(aMemStm.GetData()), aMemStm.Seek(STREAM_SEEK_TO_END)));
mnSvtGraphicStrokeCount++;
}
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 1c681c4..e9bfaf3 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -38,7 +38,7 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont )
{
sal_uInt16 nTemp;
- rStream << rFont.GetColor();
+ WriteColor( rStream, rFont.GetColor() );
nTemp = (sal_uInt16)rFont.GetFamily(); rStream.WriteUInt16( nTemp );
nTemp = (sal_uInt16)GetSOStoreTextEncoding((rtl_TextEncoding)rFont.GetCharSet());
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 96de48e..47d68f0 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -342,10 +342,10 @@ SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) co
{
// SvxFieldData not enough, because not registered on ClassMgr.
SvxURLField aDummyData;
- aPStrm << &aDummyData;
+ WriteSvPersistBase( aPStrm , &aDummyData );
}
else
- aPStrm << pField;
+ WriteSvPersistBase( aPStrm, pField );
return rStrm;
}
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 6b8c60a..bd88e97 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -106,7 +106,7 @@ namespace
/// Store a border line to a stream.
SvStream& StoreBorderLine(SvStream &stream, const SvxBorderLine &l, sal_uInt16 version)
{
- stream << l.GetColor();
+ WriteColor( stream, l.GetColor() );
stream.WriteUInt16( l.GetOutWidth() )
.WriteUInt16( l.GetInWidth() )
.WriteUInt16( l.GetDistance() );
@@ -1512,9 +1512,9 @@ SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
{
rStrm.WriteSChar( (sal_Int8) GetLocation() )
.WriteUInt16( (sal_uInt16) GetWidth() )
- .WriteUChar( (sal_Bool)(aShadowColor.GetTransparency() > 0) )
- << GetColor()
- << GetColor();
+ .WriteUChar( (sal_Bool)(aShadowColor.GetTransparency() > 0) );
+ WriteColor( rStrm, GetColor() );
+ WriteColor( rStrm, GetColor() );
rStrm.WriteSChar( (sal_Int8)(aShadowColor.GetTransparency() > 0 ? 0 : 1) ); //BRUSH_NULL : BRUSH_SOLID
return rStrm;
}
@@ -2612,8 +2612,8 @@ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
const SvxBorderLine* l = pLine[ i ];
if( l )
{
- rStrm.WriteChar( (char) i )
- << l->GetColor();
+ rStrm.WriteChar( (char) i );
+ WriteColor( rStrm, l->GetColor() );
rStrm.WriteInt16( (short) l->GetOutWidth() )
.WriteInt16( (short) l->GetInWidth() )
.WriteInt16( (short) l->GetDistance() );
@@ -3257,14 +3257,14 @@ SvStream& SvxLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
{
if( pLine )
{
- rStrm << pLine->GetColor();
+ WriteColor( rStrm, pLine->GetColor() );
rStrm.WriteInt16( (short)pLine->GetOutWidth() )
.WriteInt16( (short)pLine->GetInWidth() )
.WriteInt16( (short)pLine->GetDistance() );
}
else
{
- rStrm << Color();
+ WriteColor( rStrm, Color() );
rStrm.WriteInt16( (short)0 ).WriteInt16( (short)0 ).WriteInt16( (short)0 );
}
return rStrm;
@@ -3901,8 +3901,8 @@ SfxPoolItem* SvxBrushItem::Create( SvStream& rStream, sal_uInt16 nVersion ) cons
SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) const
{
rStream.WriteUChar( (sal_Bool)sal_False );
- rStream << aColor;
- rStream << aColor;
+ WriteColor( rStream, aColor );
+ WriteColor( rStream, aColor );
rStream.WriteSChar( (sal_Int8)(aColor.GetTransparency() > 0 ? 0 : 1) ); //BRUSH_NULL : BRUSH_SOLID
sal_uInt16 nDoLoad = 0;
@@ -3916,7 +3916,7 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ )
rStream.WriteUInt16( nDoLoad );
if ( pImpl->pGraphicObject && maStrLink.isEmpty() )
- rStream << pImpl->pGraphicObject->GetGraphic();
+ WriteGraphic( rStream, pImpl->pGraphicObject->GetGraphic() );
if ( !maStrLink.isEmpty() )
{
OSL_FAIL("No BaseURL!");
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 719970f..47bf1e0 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -283,16 +283,16 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
if(pBulletFont)
{
rStream.WriteUInt16( (sal_uInt16)1 );
- rStream << *pBulletFont;
+ WriteFont( rStream, *pBulletFont );
}
else
rStream.WriteUInt16( (sal_uInt16)0 );
- rStream << aGraphicSize;
+ WritePair( rStream, aGraphicSize );
Color nTempColor = nBulletColor;
if(COL_AUTO == nBulletColor.GetColor())
nTempColor = COL_BLACK;
- rStream << nTempColor;
+ WriteColor( rStream, nTempColor );
rStream.WriteUInt16( nBulletRelSize );
rStream.WriteUInt16( (sal_uInt16)IsShowSymbol() );
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 7089b02..d183236 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -2006,9 +2006,9 @@ SvStream& SvxColorItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
{
if( VERSION_USEAUTOCOLOR == nItemVersion &&
COL_AUTO == mColor.GetColor() )
- rStrm << Color( COL_BLACK );
+ WriteColor( rStrm, Color( COL_BLACK ) );
else
- rStrm << mColor;
+ WriteColor( rStrm, mColor );
return rStrm;
}
@@ -2082,7 +2082,8 @@ SfxPoolItem* SvxCharSetColorItem::Clone( SfxItemPool * ) const
SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm.WriteUChar( (sal_uInt8)GetSOStoreTextEncoding(GetCharSet()) ) << GetValue();
+ rStrm.WriteUChar( (sal_uInt8)GetSOStoreTextEncoding(GetCharSet()) );
+ WriteColor( rStrm, GetValue() );
return rStrm;
}
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index f03f3f6..8a2fe6f 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -42,7 +42,7 @@ public:
static sal_uInt32 Read( SvStream & rStm );
static void Write( SvStream & rStm, sal_uInt32 nVal );
- friend SvStream& operator << (SvStream & rStm, const SvUINT32 & r )
+ friend SvStream& WriteSvUINT32(SvStream & rStm, const SvUINT32 & r )
{ SvUINT32::Write( rStm, r.nVal ); return rStm; }
friend SvStream& operator >> (SvStream & rStm, SvUINT32 & r )
{ r.nVal = SvUINT32::Read( rStm ); return rStm; }
@@ -62,7 +62,7 @@ public:
operator int ()const { return nVal; }
sal_Bool IsSet() const { return bSet; }
- friend SvStream& operator << (SvStream & rStm, const Svint & r )
+ friend SvStream& WriteSvint(SvStream & rStm, const Svint & r )
{ SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); rStm << r.bSet; return rStm; }
friend SvStream& operator >> (SvStream & rStm, Svint & r )
{ r.nVal = (int)SvUINT32::Read( rStm ); rStm >> r.bSet ; return rStm; }
@@ -86,7 +86,7 @@ public:
sal_Bool Is() const { return nVal; }
sal_Bool IsSet() const { return bSet; }
- friend SvStream& operator << (SvStream &, const SvBOOL &);
+ friend SvStream& WriteSvBOOL(SvStream &, const SvBOOL &);
friend SvStream& operator >> (SvStream &, SvBOOL &);
sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
@@ -111,7 +111,7 @@ public:
{
return m_aStr;
}
- friend SvStream& operator << (SvStream &, const SvIdentifier &);
+ friend SvStream& WriteSvIdentifier(SvStream &, const SvIdentifier &);
friend SvStream& operator >> (SvStream &, SvIdentifier &);
sal_Bool IsSet() const
@@ -138,7 +138,7 @@ public:
sal_uInt32 GetValue() const { return nValue; }
void SetValue( sal_uInt32 nVal ) { nValue = nVal; }
- friend SvStream& operator << (SvStream &, const SvNumberIdentifier &);
+ friend SvStream& WriteSvNumberIdentifier(SvStream &, const SvNumberIdentifier &);
friend SvStream& operator >> (SvStream &, SvNumberIdentifier &);
sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
sal_Bool ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
@@ -164,7 +164,7 @@ public:
{
return !m_aStr.isEmpty();
}
- friend SvStream& operator << (SvStream &, const SvString &);
+ friend SvStream& WriteSvString(SvStream &, const SvString &);
friend SvStream& operator >> (SvStream &, SvString &);
sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
@@ -215,7 +215,7 @@ public:
sal_uInt16 GetMajorVersion() const { return nMajorVersion; }
sal_uInt16 GetMinorVersion() const { return nMinorVersion; }
- friend SvStream& operator << (SvStream &, const SvVersion &);
+ friend SvStream& WriteSvVersion(SvStream &, const SvVersion &);
friend SvStream& operator >> (SvStream &, SvVersion &);
sal_Bool ReadSvIdl( SvTokenStream & rInStm );
sal_Bool WriteSvIdl( SvStream & rOutStm );
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 7901b2f..c305b51 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -145,11 +145,11 @@ void SvMetaName::Save( SvPersistStream & rStm )
if( aDescription.IsSet() ) nMask |= 0x10;
rStm << nMask;
- if( nMask & 0x01 ) rStm << aName;
- if( nMask & 0x02 ) rStm << aHelpContext;
- if( nMask & 0x04 ) rStm << aHelpText;
- if( nMask & 0x08 ) rStm << aConfigName;
- if( nMask & 0x10 ) rStm << aDescription;
+ if( nMask & 0x01 ) WriteSvString( rStm, aName );
+ if( nMask & 0x02 ) WriteSvNumberIdentifier( rStm, aHelpContext );
+ if( nMask & 0x04 ) WriteSvString( rStm, aHelpText );
+ if( nMask & 0x08 ) WriteSvString( rStm, aConfigName );
+ if( nMask & 0x10 ) WriteSvString( rStm, aDescription );
}
sal_Bool SvMetaName::SetName( const OString& rName, SvIdlDataBase * )
@@ -427,7 +427,7 @@ void SvMetaReference::Save( SvPersistStream & rStm )
// write data
rStm << nMask;
- if( nMask & 0x01 ) rStm << aRef;
+ if( nMask & 0x01 ) WriteSvPersistBase( rStm, aRef );
}
SV_IMPL_META_FACTORY1( SvMetaExtern, SvMetaReference );
@@ -472,9 +472,9 @@ void SvMetaExtern::Save( SvPersistStream & rStm )
// write data
rStm << nMask;
- if( nMask & 0x01 ) rStm << pModule;
- if( nMask & 0x02 ) rStm << aUUId;
- if( nMask & 0x04 ) rStm << aVersion;
+ if( nMask & 0x01 ) WriteSvPersistBase( rStm, pModule );
+ if( nMask & 0x02 ) WriteSvGlobalName( rStm, aUUId );
+ if( nMask & 0x04 ) WriteSvVersion( rStm, aVersion );
}
SvMetaModule * SvMetaExtern::GetModule() const
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 171c32c..bccb4e6 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -66,7 +66,7 @@ void SvUINT32::Write( SvStream & rStm, sal_uInt32 nVal )
SvPersistStream::WriteCompressed( rStm, nVal );
}
-SvStream& operator << (SvStream & rStm, const SvBOOL & rb )
+SvStream& WriteSvBOOL(SvStream & rStm, const SvBOOL & rb )
{
sal_uInt8 n = rb.nVal;
if( rb.bSet )
@@ -88,7 +88,7 @@ SvStream& operator >> (SvStream & rStm, SvBOOL & rb )
return rStm;
}
-SvStream& operator << (SvStream & rStm, const SvVersion & r )
+SvStream& WriteSvVersion(SvStream & rStm, const SvVersion & r )
{
if( (r.GetMajorVersion() || r.GetMinorVersion())
&& r.GetMajorVersion() <= 0x0F && r.GetMinorVersion() <= 0x0F )
@@ -212,7 +212,7 @@ sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
return sal_True;
}
-SvStream& operator << (SvStream & rStm, const SvIdentifier & r )
+SvStream& WriteSvIdentifier(SvStream & rStm, const SvIdentifier & r )
{
write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, r.getString());
return rStm;
@@ -275,9 +275,9 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
return sal_False;
}
-SvStream& operator << (SvStream & rStm, const SvNumberIdentifier & r )
+SvStream& WriteSvNumberIdentifier(SvStream & rStm, const SvNumberIdentifier & r )
{
- rStm << (SvIdentifier &)r;
+ WriteSvIdentifier( rStm, (SvIdentifier &)r );
SvPersistStream::WriteCompressed( rStm, r.nValue );
return rStm;
}
@@ -325,7 +325,7 @@ sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
return sal_True;
}
-SvStream& operator << (SvStream & rStm, const SvString & r )
+SvStream& WriteSvString(SvStream & rStm, const SvString & r )
{
write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, r.getString());
return rStm;
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 14acf19..2bd822d 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -77,9 +77,9 @@ void SvMetaModule::Save( SvPersistStream & rStm )
rStm << (sal_uInt16)(MODULE_VER | IDL_WRITE_COMPILER); // Version
- rStm << aClassList;
- rStm << aTypeList;
- rStm << aAttrList;
+ WriteSvDeclPersistList( rStm, aClassList );
+ WriteSvDeclPersistList( rStm, aTypeList );
+ WriteSvDeclPersistList( rStm, aAttrList );
// browser
rStm.WriteUniOrByteString( aIdlFileName, rStm.GetStreamCharSet() );
write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aHelpFileName.getString());
@@ -90,9 +90,9 @@ void SvMetaModule::Save( SvPersistStream & rStm )
sal_uInt16 nCmpLen = 0;
sal_uLong nLenPos = rStm.Tell();
rStm << nCmpLen;
- rStm << aBeginName;
- rStm << aEndName;
- rStm << aNextName;
+ WriteSvGlobalName( rStm, aBeginName );
+ WriteSvGlobalName( rStm, aEndName );
+ WriteSvGlobalName( rStm, aNextName );
// write length of compiler data
sal_uLong nPos = rStm.Tell();
rStm.Seek( nLenPos );
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index d826561..8199667 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -65,7 +65,7 @@ void SvClassElement::Save( SvPersistStream & rStm )
rStm << nMask;
if( nMask & 0x01 ) rStm << aAutomation;
if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aPrefix);
- if( nMask & 0x04 ) rStm << xClass;
+ if( nMask & 0x04 ) WriteSvPersistBase( rStm, xClass );
}
SV_IMPL_META_FACTORY1( SvMetaClass, SvMetaType );
@@ -117,10 +117,10 @@ void SvMetaClass::Save( SvPersistStream & rStm )
// write data
rStm << nMask;
- if( nMask & 0x01 ) rStm << aAttrList;
- if( nMask & 0x02 ) rStm << aSuperClass;
- if( nMask & 0x04 ) rStm << aClassList;
- if( nMask & 0x08 ) rStm << xAutomationInterface;
+ if( nMask & 0x01 ) WriteSvDeclPersistList( rStm, aAttrList );
+ if( nMask & 0x02 ) WriteSvPersistBase( rStm, aSuperClass );
+ if( nMask & 0x04 ) WriteSvDeclPersistList( rStm, aClassList );
+ if( nMask & 0x08 ) WriteSvPersistBase( rStm, xAutomationInterface );
if( nMask & 0x10 ) rStm << aAutomation;
}
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index c540104..3f96386 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -182,19 +182,19 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
// write data
rStm << nMask;
TEST_WRITE
- if( nMask & 0x0001 ) rStm << aMethod;
+ if( nMask & 0x0001 ) WriteSvPersistBase( rStm, aMethod );
TEST_WRITE
- if( nMask & 0x0002 ) rStm << aGroupId;
+ if( nMask & 0x0002 ) WriteSvIdentifier( rStm, aGroupId );
TEST_WRITE
if( nMask & 0x0004 ) rStm << aHasCoreId;
TEST_WRITE
- if( nMask & 0x0008 ) rStm << aConfigId;
+ if( nMask & 0x0008 ) WriteSvIdentifier( rStm, aConfigId );
TEST_WRITE
- if( nMask & 0x0010 ) rStm << aExecMethod;
+ if( nMask & 0x0010 ) WriteSvIdentifier( rStm, aExecMethod );
TEST_WRITE
- if( nMask & 0x0020 ) rStm << aStateMethod;
+ if( nMask & 0x0020 ) WriteSvIdentifier( rStm, aStateMethod );
TEST_WRITE
- if( nMask & 0x0040 ) rStm << aDefault;
+ if( nMask & 0x0040 ) WriteSvIdentifier( rStm, aDefault );
TEST_WRITE
if( nMask & 0x0080 ) rStm << aPseudoSlots;
TEST_WRITE
@@ -245,9 +245,9 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
TEST_WRITE
if( nMask & 0x0008 ) rStm << aHasDialog;
TEST_WRITE
- if( nMask & 0x0010 ) rStm << aDisableFlags;
+ if( nMask & 0x0010 ) WriteSvString( rStm, aDisableFlags );
TEST_WRITE
- if( nMask & 0x0020 ) rStm << aPseudoPrefix;
+ if( nMask & 0x0020 ) WriteSvIdentifier( rStm, aPseudoPrefix );
TEST_WRITE
if( nMask & 0x0040 ) rStm << aRecordPerSet;
TEST_WRITE
@@ -263,7 +263,7 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
TEST_WRITE
if( nMask & 0x1000 ) rStm << aContainer;
TEST_WRITE
- if( nMask & 0x2000 ) rStm << aSlotType;
+ if( nMask & 0x2000 ) WriteSvPersistBase( rStm, aSlotType );
TEST_WRITE
if( nMask & 0x4000 ) rStm << aRecordAbsolute;
TEST_WRITE
@@ -274,7 +274,7 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
if( aImageReflection.IsSet() ) nMask |= 0x0002;
rStm << nMask;
TEST_WRITE
- if( nMask & 0x0001 ) rStm << aUnoName;
+ if( nMask & 0x0001 ) WriteSvString( rStm, aUnoName );
TEST_WRITE
if( nMask & 0x0002 ) rStm << aImageReflection;
}
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 15b835f..c9c9371 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -87,8 +87,8 @@ void SvMetaAttribute::Save( SvPersistStream & rStm )
// write data
rStm << nMask;
- if( nMask & 0x1 ) rStm << aType;
- if( nMask & 0x2 ) rStm << aSlotId;
+ if( nMask & 0x1 ) WriteSvPersistBase( rStm, aType );
+ if( nMask & 0x2 ) WriteSvNumberIdentifier( rStm, aSlotId );
if( nMask & 0x4 ) rStm << aExport;
if( nMask & 0x8 ) rStm << aReadonly;
if( nMask & 0x10 ) rStm << aAutomation;
@@ -838,20 +838,20 @@ void SvMetaType::Save( SvPersistStream & rStm )
// write data
rStm << nMask;
- if( nMask & 0x0001 ) rStm << aIn;
- if( nMask & 0x0002 ) rStm << aOut;
- if( nMask & 0x0004 ) rStm << aCall0;
- if( nMask & 0x0008 ) rStm << aCall1;
- if( nMask & 0x0010 ) rStm << aSbxDataType;
- if( nMask & 0x0020 ) rStm << aSvName;
- if( nMask & 0x0040 ) rStm << aSbxName;
- if( nMask & 0x0080 ) rStm << aOdlName;
- if( nMask & 0x0100 ) rStm << *pAttrList;
+ if( nMask & 0x0001 ) WriteSvBOOL( rStm, aIn );
+ if( nMask & 0x0002 ) WriteSvBOOL( rStm, aOut );
+ if( nMask & 0x0004 ) WriteSvint( rStm, aCall0 );
+ if( nMask & 0x0008 ) WriteSvint( rStm, aCall1 );
+ if( nMask & 0x0010 ) WriteSvint( rStm, aSbxDataType );
+ if( nMask & 0x0020 ) WriteSvIdentifier( rStm, aSvName );
+ if( nMask & 0x0040 ) WriteSvIdentifier( rStm, aSbxName );
+ if( nMask & 0x0080 ) WriteSvIdentifier( rStm, aOdlName );
+ if( nMask & 0x0100 ) WriteSvDeclPersistList( rStm, *pAttrList );
if( nMask & 0x0800 ) rStm << (sal_uInt16)nType;
if( nMask & 0x1000 ) rStm << cParserChar;
- if( nMask & 0x2000 ) rStm << aCName;
- if( nMask & 0x4000 ) rStm << aBasicName;
- if( nMask & 0x8000 ) rStm << aBasicPostfix;
+ if( nMask & 0x2000 ) WriteSvIdentifier( rStm, aCName );
+ if( nMask & 0x4000 ) WriteSvIdentifier( rStm, aBasicName );
+ if( nMask & 0x8000 ) WriteSvIdentifier( rStm, aBasicPostfix );
}
SvMetaAttributeMemberList & SvMetaType::GetAttrList() const
@@ -1841,7 +1841,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
// write data
rStm << nMask;
- if( nMask & 0x01 ) rStm << aEnumValueList;
+ if( nMask & 0x01 ) WriteSvDeclPersistList( rStm, aEnumValueList );
if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aPrefix);
}
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index b42c572..1439ce7 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -144,10 +144,10 @@ void SvIdlDataBase::Save( SvStream & rStm, sal_uInt32 nFlags )
if( !pModule->IsImported() )
aList.insert( pModule->GetClassList() );
}
- aPStm << aList;
+ WriteSvDeclPersistList( aPStm, aList );
}
else
- aPStm << aClassList;
+ WriteSvDeclPersistList( aPStm, aClassList );
aTypeList.WriteObjects( aPStm, bOnlyStreamedObjs );
aAttrList.WriteObjects( aPStm, bOnlyStreamedObjs );
diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx
index 642d036..c6ca55c 100644
--- a/include/editeng/adjustitem.hxx
+++ b/include/editeng/adjustitem.hxx
@@ -46,7 +46,7 @@ class EDITENG_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface
sal_Bool bLastCenter : 1;
sal_Bool bLastBlock : 1;
- friend SvStream& operator<<( SvStream&, SvxAdjustItem& ); //$ ostream
+ friend SvStream& WriteSvxAdjustItem( SvStream&, SvxAdjustItem& ); //$ ostream
public:
TYPEINFO();
diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx
index 5d1cd57..84bcec0 100644
--- a/include/editeng/hyphenzoneitem.hxx
+++ b/include/editeng/hyphenzoneitem.hxx
@@ -40,7 +40,7 @@ class EDITENG_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem
sal_uInt8 nMinTrail;
sal_uInt8 nMaxHyphens;
- friend SvStream & operator<<( SvStream & aS, SvxHyphenZoneItem & );
+ friend SvStream & WriteSvxHyphenZoneItem( SvStream & aS, SvxHyphenZoneItem & );
public:
TYPEINFO();
diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx
index 8bb2fad..54ff961 100644
--- a/include/editeng/lspcitem.hxx
+++ b/include/editeng/lspcitem.hxx
@@ -34,7 +34,7 @@ class SvXMLUnitConverter;
#define LINE_SPACE_DEFAULT_HEIGHT 200
class EDITENG_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface
{
- friend SvStream& operator<<( SvStream&, SvxLineSpacingItem& ); //$ ostream
+ friend SvStream& WriteSvxLineSpacingItem( SvStream&, SvxLineSpacingItem& ); //$ ostream
short nInterLineSpace;
sal_uInt16 nLineHeight;
diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx
index 9fbacf2..f0f10d4 100644
--- a/include/editeng/orphitem.hxx
+++ b/include/editeng/orphitem.hxx
@@ -33,7 +33,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxOrphansItem: public SfxByteItem
{
- friend SvStream & operator<<( SvStream & aS, SvxOrphansItem & );
+ friend SvStream & WriteSvxOrphansItem( SvStream & aS, SvxOrphansItem & );
public:
TYPEINFO();
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index 5f47d64..719f502 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -41,7 +41,7 @@ private:
mutable sal_Unicode m_cDecimal;
sal_Unicode cFill;
- EDITENG_DLLPRIVATE friend SvStream& operator<<( SvStream&, SvxTabStop& );
+ EDITENG_DLLPRIVATE friend SvStream& WriteSvxTabStop( SvStream&, SvxTabStop& );
void fillDecimal() const;
diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx
index ef0d8ac..ec1c42f 100644
--- a/include/editeng/widwitem.hxx
+++ b/include/editeng/widwitem.hxx
@@ -33,7 +33,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxWidowsItem: public SfxByteItem
{
- friend SvStream & operator<<( SvStream & aS, SvxWidowsItem & );
+ friend SvStream & WriteSvxWidowsItem( SvStream & aS, SvxWidowsItem & );
public:
TYPEINFO();
diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx
index 631f3ca..6149ddfc 100644
--- a/include/sot/filelist.hxx
+++ b/include/sot/filelist.hxx
@@ -51,7 +51,7 @@ public:
FileList& operator=( const FileList& rFileList );
// Im-/Export
- SOT_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const FileList& rFileList );
+ SOT_DLLPUBLIC friend SvStream& WriteFileList( SvStream& rOStm, const FileList& rFileList );
SOT_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, FileList& rFileList );
// Liste fuellen/abfragen
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index a675162..9a9fdef 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -150,7 +150,7 @@ public:
mnGPercent != 0 || mnBPercent != 0 || mfGamma != 1.0 || mbInvert );
}
- friend SvStream& operator<<( SvStream& rOStm, const GraphicAttr& rAttr );
+ friend SvStream& WriteGraphicAttr( SvStream& rOStm, const GraphicAttr& rAttr );
friend SvStream& operator>>( SvStream& rIStm, GraphicAttr& rAttr );
};
@@ -484,7 +484,7 @@ public:
void StopAnimation( OutputDevice* pOut = NULL, long nExtraData = 0L );
- friend SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj );
+ friend SvStream& WriteGraphicObject( SvStream& rOStm, const GraphicObject& rGraphicObj );
friend SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj );
static GraphicObject CreateGraphicObjectFromURL( const OUString &rURL );
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 2a8ce29..89e8130 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -80,7 +80,7 @@ struct TransferableObjectDescriptor
{}
SVT_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc );
- SVT_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc );
+ SVT_DLLPUBLIC friend SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc );
};
struct AcceptDropEvent
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 7dbe9903..f657a00 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -230,7 +230,7 @@ public:
void SetPreviewBitmapExAndStrings(sal_uIntPtr nPos, const BitmapEx& rBitmapEx, const Size& rSize, const OUString& rTitle, const OUString& rPath);
};
-SvStream& operator<<( SvStream& rOut, const GalleryTheme& rTheme );
+SvStream& WriteGalleryTheme( SvStream& rOut, const GalleryTheme& rTheme );
SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme );
#endif
diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx
index 9faf64f..18a15a7 100644
--- a/include/svx/svdsob.hxx
+++ b/include/svx/svdsob.hxx
@@ -90,7 +90,7 @@ public:
void operator&=(const SetOfByte& r2ndSet);
void operator|=(const SetOfByte& r2ndSet);
- friend inline SvStream& operator<<(SvStream& rOut, const SetOfByte& rSet);
+ friend inline SvStream& WriteSetOfByte(SvStream& rOut, const SetOfByte& rSet);
friend inline SvStream& operator>>(SvStream& rIn, SetOfByte& rSet);
// initialize this set with a uno sequence of sal_Int8
@@ -100,7 +100,7 @@ public:
void QueryValue(com::sun::star::uno::Any & rAny) const;
};
-inline SvStream& operator<<(SvStream& rOut, const SetOfByte& rSet)
+inline SvStream& WriteSetOfByte(SvStream& rOut, const SetOfByte& rSet)
{
rOut.Write((char*)rSet.aData,32);
return rOut;
diff --git a/include/svx/xexch.hxx b/include/svx/xexch.hxx
index 4dab8ca..4cba3bc 100644
--- a/include/svx/xexch.hxx
+++ b/include/svx/xexch.hxx
@@ -48,7 +48,7 @@ public:
XFillExchangeData& operator=( const XFillExchangeData& rXFillExchangeData );
- SVX_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rXFillExchangeData );
+ SVX_DLLPUBLIC friend SvStream& WriteXFillExchangeData( SvStream& rOStm, const XFillExchangeData& rXFillExchangeData );
SVX_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, XFillExchangeData& rXFillExchangeData );
XFillAttrSetItem* GetXFillAttrSetItem() { return pXFillAttrSetItem; }
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 7b13321..626f625 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -161,7 +161,7 @@ public:
SvStream& Write( SvStream& rOStm, bool bNewFormat = true );
TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Color& rColor );
- TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const Color& rColor );
+ TOOLS_DLLPUBLIC friend SvStream& WriteColor( SvStream& rOStream, const Color& rColor );
// get ::basegfx::BColor from this color
::basegfx::BColor getBColor() const { return ::basegfx::BColor(GetRed() / 255.0, GetGreen() / 255.0, GetBlue() / 255.0); }
diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx
index aca04ee..2e1bb20 100644
--- a/include/tools/fract.hxx
+++ b/include/tools/fract.hxx
@@ -66,7 +66,7 @@ public:
friend inline bool operator>=( const Fraction& rVal1, const Fraction& rVal2 );
TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Fraction& rFract );
- TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const Fraction& rFract );
+ TOOLS_DLLPUBLIC friend SvStream& WriteFraction( SvStream& rOStream, const Fraction& rFract );
};
inline Fraction::Fraction( const Fraction& rFrac )
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index 3986058..e3a33ca 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -46,7 +46,7 @@ public:
bool operator != ( const Pair& rPair ) const;
TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Pair& rPair );
- TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const Pair& rPair );
+ TOOLS_DLLPUBLIC friend SvStream& WritePair( SvStream& rOStream, const Pair& rPair );
protected:
long nA;
@@ -418,7 +418,7 @@ public:
friend inline Rectangle operator - ( const Rectangle& rRect, const Point& rPt );
TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Rectangle& rRect );
- TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const Rectangle& rRect );
+ TOOLS_DLLPUBLIC friend SvStream& WriteRectangle( SvStream& rOStream, const Rectangle& rRect );
// ONE
long getX() const { return nLeft; }
diff --git a/include/tools/globname.hxx b/include/tools/globname.hxx
index 9e9064c..8bd996f 100644
--- a/include/tools/globname.hxx
+++ b/include/tools/globname.hxx
@@ -79,7 +79,7 @@ public:
~SvGlobalName();
TOOLS_DLLPUBLIC friend SvStream & operator >> ( SvStream &, SvGlobalName & );
- TOOLS_DLLPUBLIC friend SvStream & operator << ( SvStream &, const SvGlobalName & );
+ TOOLS_DLLPUBLIC friend SvStream & WriteSvGlobalName( SvStream &, const SvGlobalName & );
bool operator < ( const SvGlobalName & rObj ) const;
SvGlobalName& operator += ( sal_uInt32 );
diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx
index 324a733..d8af698 100644
--- a/include/tools/inetmsg.hxx
+++ b/include/tools/inetmsg.hxx
@@ -62,7 +62,7 @@ public:
const OString& GetName() const { return m_aName; }
const OString& GetValue() const { return m_aValue; }
- friend SvStream& operator<< (
+ friend SvStream& WriteINetMessageHeader(
SvStream& rStrm, const INetMessageHeader& rHdr)
{
write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStrm, rHdr.m_aName);
@@ -194,7 +194,7 @@ public:
SvLockBytes* GetDocumentLB() const { return m_xDocLB; }
void SetDocumentLB (SvLockBytes *pDocLB) { m_xDocLB = pDocLB; }
- friend SvStream& operator<< (
+ friend SvStream& WriteINetMessage(
SvStream& rStrm, const INetMessage& rMsg)
{
return rMsg.operator<< (rStrm);
diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index 04b21d0..c677143 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -178,7 +178,7 @@ public:
// streaming a Polygon does ignore PolyFlags, so use the Write Or Read
// method to take care of PolyFlags
TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Polygon& rPoly );
- TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const Polygon& rPoly );
+ TOOLS_DLLPUBLIC friend SvStream& WritePolygon( SvStream& rOStream, const Polygon& rPoly );
void Read( SvStream& rIStream );
void Write( SvStream& rOStream ) const;
@@ -263,7 +263,7 @@ public:
bool IsEqual( const PolyPolygon& rPolyPoly ) const;
TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, PolyPolygon& rPolyPoly );
- TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const PolyPolygon& rPolyPoly );
+ TOOLS_DLLPUBLIC friend SvStream& WritePolyPolygon( SvStream& rOStream, const PolyPolygon& rPolyPoly );
void Read( SvStream& rIStream );
void Write( SvStream& rOStream ) const;
diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx
index a959436..660fb31 100644
--- a/include/tools/pstm.hxx
+++ b/include/tools/pstm.hxx
@@ -134,7 +134,7 @@ public:
};
template<typename T>
-SvPersistStream& operator << (SvPersistStream &rStm, const SvDeclPersistList<T> &rLst)
+SvPersistStream& WriteSvDeclPersistList(SvPersistStream &rStm, const SvDeclPersistList<T> &rLst)
{
WritePersistListObjects( rLst, rStm );
return rStm;
@@ -232,12 +232,12 @@ public:
SvPersistStream& WritePointer( SvPersistBase * pObj );
SvPersistStream& ReadPointer( SvPersistBase * & rpObj );
- TOOLS_DLLPUBLIC friend SvPersistStream& operator << (SvPersistStream &, SvPersistBase *);
+ TOOLS_DLLPUBLIC friend SvPersistStream& WriteSvPersistBase(SvPersistStream &, SvPersistBase *);
TOOLS_DLLPUBLIC friend SvPersistStream& operator >> (SvPersistStream &, SvPersistBase * &);
// Objects maintain their IDs while storing and loading to/from stream
friend SvStream& operator >> ( SvStream &, SvPersistStream & );
- friend SvStream& operator << ( SvStream &, SvPersistStream & );
+ friend SvStream& WriteSvPersistStream( SvStream &, SvPersistStream & );
};
#endif
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index 3bf7ae0..9667038 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -230,7 +230,7 @@ public:
);
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, Animation& rAnimation );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const Animation& rAnimation );
+ friend VCL_DLLPUBLIC SvStream& WriteAnimation( SvStream& rOStream, const Animation& rAnimation );
};
#endif // INCLUDED_VCL_ANIMATE_HXX
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index 9da08b1..1aa1cd1 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -132,7 +132,7 @@ public:
sal_Bool IsSameInstance( const Font& ) const;
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Font& );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Font& );
+ friend VCL_DLLPUBLIC SvStream& WriteFont( SvStream& rOStm, const Font& );
static Font identifyFont( const void* pBuffer, sal_uInt32 nLen );
};
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index 8afdc14..d14d6a2 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -211,7 +211,7 @@ public:
// Stream-operators write (still) the old format
// and read both the old and the new format
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile );
+ friend VCL_DLLPUBLIC SvStream& WriteGDIMetaFile( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile );
sal_Bool CreateThumbnail( sal_uInt32 nMaximumExtent, BitmapEx& rBmpEx, const BitmapEx* pOverlay = NULL, const Rectangle* pOverlayRect = NULL ) const;
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 80187b1..15c9170 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -173,7 +173,7 @@ public:
public:
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const GfxLink& rGfxLink );
+ friend VCL_DLLPUBLIC SvStream& WriteGfxLink( SvStream& rOStream, const GfxLink& rGfxLink );
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, GfxLink& rGfxLink );
};
diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx
index 3e2cb74..e0cb0f4 100644
--- a/include/vcl/gradient.hxx
+++ b/include/vcl/gradient.hxx
@@ -50,7 +50,7 @@ public:
sal_uInt16 mnStepCount;
friend SvStream& operator>>( SvStream& rIStm, Impl_Gradient& rImplGradient );
- friend SvStream& operator<<( SvStream& rOStm, const Impl_Gradient& rImplGradient );
+ friend SvStream& WriteImpl_Gradient( SvStream& rOStm, const Impl_Gradient& rImplGradient );
Impl_Gradient();
Impl_Gradient( const Impl_Gradient& rImplGradient );
@@ -110,7 +110,7 @@ public:
{ return (mpImplGradient == rGradient.mpImplGradient); }
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Gradient& rGradient );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Gradient& rGradient );
+ friend VCL_DLLPUBLIC SvStream& WriteGradient( SvStream& rOStm, const Gradient& rGradient );
};
#endif // INCLUDED_VCL_GRADIENT_HXX
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 4217f64..12221ec 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -188,7 +188,7 @@ public:
sal_Bool ExportNative( SvStream& rOStream ) const;
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const Graphic& rGraphic );
+ friend VCL_DLLPUBLIC SvStream& WriteGraphic( SvStream& rOStream, const Graphic& rGraphic );
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, Graphic& rGraphic );
public:
diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx
index ee24b12..ff170f5 100644
--- a/include/vcl/graphictools.hxx
+++ b/include/vcl/graphictools.hxx
@@ -175,7 +175,7 @@ public:
private:
// friends
- VCL_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const SvtGraphicStroke& rClass );
+ VCL_DLLPUBLIC friend SvStream& WriteSvtGraphicStroke( SvStream& rOStm, const SvtGraphicStroke& rClass );
VCL_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, SvtGraphicStroke& rClass );
Polygon maPath;
@@ -352,7 +352,7 @@ public:
private:
// friends
- VCL_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const SvtGraphicFill& rClass );
+ VCL_DLLPUBLIC friend SvStream& WriteSvtGraphicFill( SvStream& rOStm, const SvtGraphicFill& rClass );
VCL_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, SvtGraphicFill& rClass );
PolyPolygon maPath;
diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx
index 08dab0b..da669b3 100644
--- a/include/vcl/hatch.hxx
+++ b/include/vcl/hatch.hxx
@@ -43,7 +43,7 @@ struct ImplHatch
ImplHatch( const ImplHatch& rImplHatch );
friend SvStream& operator>>( SvStream& rIStm, ImplHatch& rImplHatch );
- friend SvStream& operator<<( SvStream& rOStm, const ImplHatch& rImplHatch );
+ friend SvStream& WriteImplHatch( SvStream& rOStm, const ImplHatch& rImplHatch );
};
// ---------
@@ -81,7 +81,7 @@ public:
sal_uInt16 GetAngle() const { return mpImplHatch->mnAngle; }
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Hatch& rHatch );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Hatch& rHatch );
+ friend VCL_DLLPUBLIC SvStream& WriteHatch( SvStream& rOStm, const Hatch& rHatch );
};
#endif // INCLUDED_VCL_HATCH_HXX
diff --git a/include/vcl/jobset.hxx b/include/vcl/jobset.hxx
index a5caf7b..1732ae9 100644
--- a/include/vcl/jobset.hxx
+++ b/include/vcl/jobset.hxx
@@ -66,7 +66,7 @@ public:
{ return !(JobSetup::operator==( rJobSetup )); }
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup );
+ friend VCL_DLLPUBLIC SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup );
};
#endif // INCLUDED_VCL_JOBSET_HXX
diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx
index b1ce3bd..e198970 100644
--- a/include/vcl/lineinfo.hxx
+++ b/include/vcl/lineinfo.hxx
@@ -53,7 +53,7 @@ struct ImplLineInfo
bool operator==( const ImplLineInfo& ) const;
friend SvStream& operator>>( SvStream& rIStm, ImplLineInfo& rImplLineInfo );
- friend SvStream& operator<<( SvStream& rOStm, const ImplLineInfo& rImplLineInfo );
+ friend SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo );
};
// ------------
@@ -109,7 +109,7 @@ public:
sal_Bool IsDefault() const;
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, LineInfo& rLineInfo );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const LineInfo& rLineInfo );
+ friend VCL_DLLPUBLIC SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo );
// helper to get decomposed polygon data with the LineInfo applied. The source
// hairline polygon is given in io_rLinePolyPolygon. Both given polygons may
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index d2b2cd2..17beccf 100644
--- a/include/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
@@ -49,7 +49,7 @@ private:
sal_Bool mbSimple;
friend SvStream& operator>>( SvStream& rIStm, ImplMapMode& rMapMode );
- friend SvStream& operator<<( SvStream& rOStm, const ImplMapMode& rMapMode );
+ friend SvStream& WriteImplMapMode( SvStream& rOStm, const ImplMapMode& rMapMode );
static ImplMapMode* ImplGetStaticMapMode( MapUnit eUnit );
public:
@@ -102,7 +102,7 @@ public:
{ return (mpImplMapMode == rMapMode.mpImplMapMode); }
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, MapMode& rMapMode );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const MapMode& rMapMode );
+ friend VCL_DLLPUBLIC SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode );
};
#endif // INCLUDED_VCL_MAPMOD_HXX
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index f4537fe..44ffa71 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -115,7 +115,7 @@ public:
bool operator==( const QueueInfo& rInfo ) const;
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, QueueInfo& rInfo );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const QueueInfo& rInfo );
+ friend VCL_DLLPUBLIC SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo );
};
// ------------------
diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index c9ab0c7..7daa349 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -117,7 +117,7 @@ public:
bool operator!=( const Region& rRegion ) const { return !(Region::operator==( rRegion )); }
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Region& rRegion );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Region& rRegion );
+ friend VCL_DLLPUBLIC SvStream& WriteRegion( SvStream& rOStm, const Region& rRegion );
/* workaround: faster conversion for PolyPolygons
* if half of the Polygons contained in rPolyPoly are actually
diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx
index cf230c5..46cfbb7 100644
--- a/include/vcl/wall.hxx
+++ b/include/vcl/wall.hxx
@@ -125,7 +125,7 @@ public:
{ return (mpImplWallpaper == rWallpaper.mpImplWallpaper); }
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Wallpaper& rWallpaper );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Wallpaper& rWallpaper );
+ friend VCL_DLLPUBLIC SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper& rWallpaper );
};
#endif // INCLUDED_VCL_WALL_HXX
diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx
index 8db2b34..89fb675 100644
--- a/sc/inc/bigrange.hxx
+++ b/sc/inc/bigrange.hxx
@@ -71,11 +71,12 @@ public:
bool operator!=( const ScBigAddress& r ) const
{ return !operator==( r ); }
- friend inline SvStream& operator<< ( SvStream& rStream, const ScBigAddress& rAdr );
+ friend inline SvStream& WriteScBigAddress( SvStream& rStream, const ScBigAddress& rAdr );
friend inline SvStream& operator>> ( SvStream& rStream, ScBigAddress& rAdr );
};
+
inline void ScBigAddress::PutInOrder( ScBigAddress& r )
{
sal_Int32 nTmp;
@@ -130,7 +131,7 @@ inline ScAddress ScBigAddress::MakeAddress() const
}
-inline SvStream& operator<< ( SvStream& rStream, const ScBigAddress& rAdr )
+inline SvStream& WriteScBigAddress( SvStream& rStream, const ScBigAddress& rAdr )
{
rStream << rAdr.nCol << rAdr.nRow << rAdr.nTab;
return rStream;
@@ -196,7 +197,7 @@ public:
bool operator!=( const ScBigRange& r ) const
{ return !operator==( r ); }
- friend inline SvStream& operator<< ( SvStream& rStream, const ScBigRange& rRange );
+ friend inline SvStream& WriteScBigRange ( SvStream& rStream, const ScBigRange& rRange );
friend inline SvStream& operator>> ( SvStream& rStream, ScBigRange& rRange );
};
@@ -229,10 +230,10 @@ inline sal_Bool ScBigRange::Intersects( const ScBigRange& r ) const
}
-inline SvStream& operator<< ( SvStream& rStream, const ScBigRange& rRange )
+inline SvStream& WriteScBigRange ( SvStream& rStream, const ScBigRange& rRange )
{
- rStream << rRange.aStart;
- rStream << rRange.aEnd;
+ WriteScBigAddress( rStream, rRange.aStart );
+ WriteScBigAddress( rStream, rRange.aEnd );
return rStream;
}
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 3e8f915..d1dc79a 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -104,7 +104,7 @@ namespace
}
/// Write an AutoFormatSwBlob to stream.
- SvStream& operator<<(SvStream &stream, AutoFormatSwBlob &blob)
+ SvStream& WriteAutoFormatSwBlob(SvStream &stream, AutoFormatSwBlob &blob)
{
const sal_uInt64 endOfBlob = stream.Tell() + sizeof(sal_uInt64) + blob.size;
stream.WriteUInt64( endOfBlob );
@@ -192,7 +192,7 @@ void ScAfVersions::Write(SvStream& rStream, sal_uInt16 fileVersion)
rStream.WriteUInt16( SvxAdjustItem(SVX_ADJUST_LEFT, 0).GetVersion(fileVersion) );
if (fileVersion >= SOFFICE_FILEFORMAT_50)
- rStream << swVersions;
+ WriteAutoFormatSwBlob( rStream, swVersions );
rStream.WriteUInt16( SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY).GetVersion(fileVersion) );
rStream.WriteUInt16( SvxVerJustifyItem(SVX_VER_JUSTIFY_STANDARD, ATTR_VER_JUSTIFY).GetVersion(fileVersion) );
@@ -413,7 +413,7 @@ sal_Bool ScAutoFormatDataField::Save( SvStream& rStream, sal_uInt16 fileVersion
aAdjust.Store ( rStream, aAdjust.GetVersion( fileVersion ) );
if (fileVersion >= SOFFICE_FILEFORMAT_50)
- rStream << m_swFields;
+ WriteAutoFormatSwBlob( rStream, m_swFields );
aHorJustify.Store ( rStream, aHorJustify.GetVersion( fileVersion ) );
aVerJustify.Store ( rStream, aVerJustify.GetVersion( fileVersion ) );
@@ -805,7 +805,7 @@ bool ScAutoFormatData::Save(SvStream& rStream, sal_uInt16 fileVersion)
rStream.WriteUChar( ( b = bIncludeWidthHeight ) );
if (fileVersion >= SOFFICE_FILEFORMAT_50)
- rStream << m_swFields;
+ WriteAutoFormatSwBlob( rStream, m_swFields );
sal_Bool bRet = 0 == rStream.GetError();
for (sal_uInt16 i = 0; bRet && (i < 16); i++)
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 3a9d5d0..f65ecc1 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -252,7 +252,7 @@ const sal_Char* AnimationExporter::FindTransitionName( const sal_Int16 nType, co
return pRet;
}
-SvStream& operator<<(SvStream& rOut, AnimationNode& rNode )
+SvStream& WriteAnimationNode(SvStream& rOut, AnimationNode& rNode )
{
rOut.WriteInt32( rNode.mnU1 );
rOut.WriteInt32( rNode.mnRestart );
@@ -570,7 +570,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode >
case AnimationFill::HOLD : aAnim.mnFill = 3; break;
case AnimationFill::TRANSITION : aAnim.mnFill = 4; break;
}
- rStrm << aAnim;
+ WriteAnimationNode( rStrm, aAnim );
}
exportIterate( rStrm, xNode );
exportAnimPropertySet( rStrm, xNode );
@@ -878,7 +878,7 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima
break;
}
- rStrm << aAnim;
+ WriteAnimationNode( rStrm, aAnim );
}
void AnimationExporter::GetUserData( const Sequence< NamedValue >& rUserData, const Any ** pAny, sal_Size nLen )
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 0b0dede..fcf9606 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -131,7 +131,7 @@ public:
int operator ==(const SdPublishingDesign & rDesign) const;
friend SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign);
- friend SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign);
+ friend SvStream& WriteSdPublishingDesign(SvStream& rOut, const SdPublishingDesign& rDesign);
};
// load Default-settings
@@ -295,7 +295,7 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign)
}
// Set the design to the stream
-SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign)
+SvStream& WriteSdPublishingDesign(SvStream& rOut, const SdPublishingDesign& rDesign)
{
// The last parameter is the versionnumber of the code
SdIOCompat aIO(rOut, STREAM_WRITE, 0);
@@ -323,11 +323,11 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign)
rOut.WriteUChar( rDesign.m_bCreated ); // not used
rOut.WriteInt16( rDesign.m_nButtonThema );
rOut.WriteUChar( rDesign.m_bUserAttr );
- rOut << rDesign.m_aBackColor;
- rOut << rDesign.m_aTextColor;
- rOut << rDesign.m_aLinkColor;
- rOut << rDesign.m_aVLinkColor;
- rOut << rDesign.m_aALinkColor;
+ WriteColor( rOut, rDesign.m_aBackColor );
+ WriteColor( rOut, rDesign.m_aTextColor );
+ WriteColor( rOut, rDesign.m_aLinkColor );
+ WriteColor( rOut, rDesign.m_aVLinkColor );
+ WriteColor( rOut, rDesign.m_aALinkColor );
rOut.WriteUChar( rDesign.m_bUseAttribs );
rOut.WriteUChar( rDesign.m_bUseColor );
@@ -1570,7 +1570,7 @@ sal_Bool SdPublishingDlg::Save()
for( sal_uInt16 nIndex = 0;
pStream->GetError() == SVSTREAM_OK && nIndex < nDesigns;
nIndex++ )
- *pStream << m_aDesignList[nIndex];
+ WriteSdPublishingDesign( *pStream, m_aDesignList[nIndex] );
}
aMedium.Close();
diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx
index 10a51df3..4340967 100644
--- a/sd/source/filter/ppt/pptanimations.hxx
+++ b/sd/source/filter/ppt/pptanimations.hxx
@@ -215,7 +215,7 @@ public:
public:
friend SvStream& operator>>(SvStream& rIn, AnimationNode& rAtom);
- friend SvStream& operator<<(SvStream& rOut, AnimationNode& rAtom);
+ friend SvStream& WriteAnimationNode(SvStream& rOut, AnimationNode& rAtom);
};
static const ImplAttributeNameConversion gImplConversionList[] =
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 1ffdaef..4ab7ec9 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -165,7 +165,7 @@ sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
if( GRAPHIC_NONE != aGrf.GetType() )
{
aMemStm.SetVersion( SOFFICE_FILEFORMAT_50 );
- aMemStm << aGrf;
+ WriteGraphic( aMemStm, aGrf );
}
break;
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index a58c90f..b95293d 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -1255,7 +1255,7 @@ void SfxOlePropertySet::ImplSave( SvStream& rStrm )
.WriteUInt16( sal_uInt16( 0 ) ) // version
.WriteUInt16( sal_uInt16( 1 ) ) // OS minor version
.WriteUInt16( sal_uInt16( 2 ) ); // OS type always windows for text encoding
- rStrm << aGuid; // unused guid
+ WriteSvGlobalName( rStrm, aGuid ); // unused guid
rStrm .WriteInt32( nSectCount ); // number of sections
// write placeholders for section guid/position pairs
@@ -1272,7 +1272,7 @@ void SfxOlePropertySet::ImplSave( SvStream& rStrm )
SaveObject( rStrm, rSection );
// write section guid/position pair
rStrm.Seek( nSectPosPos );
- rStrm << aIt->first;
+ WriteSvGlobalName( rStrm, aIt->first );
rStrm.WriteUInt32( nSectPos );
nSectPosPos = rStrm.Tell();
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 0392c54..d76f2e4 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2004,7 +2004,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
aDesc.mbCanLink = sal_False;
SvMemoryStream aMemStm( 1024, 1024 );
- aMemStm << aDesc;
+ WriteTransferableObjectDescriptor( aMemStm, aDesc );
aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Tell() );
}
else
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 67565c7..9d8c36c 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -93,7 +93,7 @@ SvStream& SfxPrinter::Store( SvStream& rStream ) const
*/
{
- return ( rStream << GetJobSetup() );
+ return WriteJobSetup( rStream, GetJobSetup() );
}
//--------------------------------------------------------------------
diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx
index 4493fcf..ab0c492 100644
--- a/sot/source/base/filelist.cxx
+++ b/sot/source/base/filelist.cxx
@@ -68,7 +68,7 @@ void FileList::Load( SvStream& rIStm )
void FileList::Save( SvStream& rOStm )
{
- rOStm << *this;
+ WriteFileList( rOStm, *this );
}
void FileList::Assign( const SvDataCopyStream& rCopyStream )
@@ -87,7 +87,7 @@ void FileList::Assign( const SvDataCopyStream& rCopyStream )
* e.g. DropQueryFile
*/
-SvStream& operator<<( SvStream& rOStm, SAL_UNUSED_PARAMETER const FileList& )
+SvStream& WriteFileList( SvStream& rOStm, SAL_UNUSED_PARAMETER const FileList& )
{
OSL_FAIL("TODO: Not implemented!");
return rOStm;
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index 46083e0..0b10719 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -51,7 +51,7 @@ SvStream& operator >>( SvStream& r, ClsId& rId )
return r;
}
-SvStream& operator <<( SvStream& r, const ClsId& rId )
+SvStream& WriteClsId( SvStream& r, const ClsId& rId )
{
return
r .WriteInt32( (sal_Int32) rId.n1 )
@@ -159,7 +159,7 @@ bool StgHeader::Store( StgIo& rIo )
SvStream& r = *rIo.GetStrm();
r.Seek( 0L );
r.Write( cSignature, 8 );
- r << aClsId; // 08 Class ID
+ WriteClsId( r, aClsId ); // 08 Class ID
r.WriteInt32( nVersion ) // 1A version number
.WriteUInt16( nByteOrder ) // 1C Unicode byte order indicator
.WriteInt16( nPageSize ) // 1E 1 << nPageSize = block size
@@ -427,7 +427,7 @@ void StgEntry::Store( void* pTo )
.WriteInt32( nLeft ) // 44 left node entry
.WriteInt32( nRight ) // 48 right node entry
.WriteInt32( nChild ); // 4C 1st child entry if storage;
- r << aClsId; // 50 class ID (optional)
+ WriteClsId( r, aClsId ); // 50 class ID (optional)
r.WriteInt32( nFlags ) // 60 state flags(?)
.WriteInt32( nMtime[ 0 ] ) // 64 modification time
.WriteInt32( nMtime[ 1 ] ) // 64 modification time
diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx
index 7cdd546..822d4e8 100644
--- a/sot/source/sdstor/stgelem.hxx
+++ b/sot/source/sdstor/stgelem.hxx
@@ -31,7 +31,7 @@ class StgIo;
class SvStream;
SvStream& operator>>( SvStream&, ClsId& );
-SvStream& operator<<( SvStream&, const ClsId& );
+SvStream& WriteClsId( SvStream&, const ClsId& );
class StgHeader
{
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 1e83d36..0f87b54 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -148,7 +148,7 @@ bool StgCompObjStream::Store()
WriteInt16( (sal_Int16) -2 ); // 0xFFFE = Byte Order Indicator
WriteInt32( (sal_Int32) 0x0A03 ); // Windows 3.10
WriteInt32( (sal_Int32) -1L );
- *this << aClsId; // Class ID
+ WriteClsId( *this, aClsId ); // Class ID
WriteInt32( (sal_Int32) (aAsciiUserName.getLength() + 1) );
WriteCharPtr( (const char *)aAsciiUserName.getStr() );
WriteUChar( (sal_uInt8) 0 ); // string terminator
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index 52d2688..92c7825 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -111,7 +111,7 @@ SfxPoolItem* SfxPointItem::Create(SvStream &rStream, sal_uInt16 ) const
SvStream& SfxPointItem::Store(SvStream &rStream, sal_uInt16 ) const
{
DBG_CHKTHIS(SfxPointItem, 0);
- rStream << aVal;
+ WritePair( rStream, aVal );
return rStream;
}
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index a1e0e62..d9e9677 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
@@ -111,7 +111,7 @@ SfxPoolItem* SfxRectangleItem::Create(SvStream &rStream, sal_uInt16 ) const
SvStream& SfxRectangleItem::Store(SvStream &rStream, sal_uInt16 ) const
{
DBG_CHKTHIS(SfxRectangleItem, 0);
- rStream << aVal;
+ WriteRectangle( rStream, aVal );
return rStream;
}
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index 5fb184d..6889a78 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -107,7 +107,7 @@ SfxPoolItem* SfxSizeItem::Create(SvStream &rStream, sal_uInt16 ) const
SvStream& SfxSizeItem::Store(SvStream &rStream, sal_uInt16 ) const
{
DBG_CHKTHIS(SfxSizeItem, 0);
- rStream << aVal;
+ WritePair( rStream, aVal );
return rStream;
}
diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx
index fb19ddc..1e328c9 100644
--- a/svtools/source/graphic/grfattr.cxx
+++ b/svtools/source/graphic/grfattr.cxx
@@ -100,7 +100,7 @@ SvStream& operator>>( SvStream& rIStm, GraphicAttr& rAttr )
// ------------------------------------------------------------------------
-SvStream& operator<<( SvStream& rOStm, const GraphicAttr& rAttr )
+SvStream& WriteGraphicAttr( SvStream& rOStm, const GraphicAttr& rAttr )
{
VersionCompat aCompat( rOStm, STREAM_WRITE, 2 );
const sal_uInt32 nTmp32 = 0;
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 8325c3b..4267ebe 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -352,7 +352,7 @@ void GraphicObject::Load( SvStream& rIStm )
void GraphicObject::Save( SvStream& rOStm )
{
- rOStm << *this;
+ WriteGraphicObject( rOStm, *this );
}
void GraphicObject::Assign( const SvDataCopyStream& rCopyStream )
@@ -1129,12 +1129,13 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj )
return rIStm;
}
-SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj )
+SvStream& WriteGraphicObject( SvStream& rOStm, const GraphicObject& rGraphicObj )
{
VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
const sal_Bool bLink = rGraphicObj.HasLink();
- rOStm << rGraphicObj.GetGraphic() << rGraphicObj.GetAttr();
+ WriteGraphic( rOStm, rGraphicObj.GetGraphic() );
+ WriteGraphicAttr( rOStm, rGraphicObj.GetAttr() );
rOStm.WriteUChar( bLink );
if( bLink )
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index 09a8b99..00250e8 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -837,7 +837,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG
SvMemoryStream aMemStrm;
aMemStrm.SetVersion( SOFFICE_FILEFORMAT_CURRENT );
if( 0 == strcmp( pFilterShortName, MIMETYPE_VCLGRAPHIC ) )
- aMemStrm << aGraphic;
+ WriteGraphic( aMemStrm, aGraphic );
else
{
rFilter.ExportGraphic( aGraphic, aPath, aMemStrm,
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 06d588a..5afe6a7 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -182,7 +182,7 @@ void IMapRectangleObject::ImpConstruct( const Rectangle& rRect, sal_Bool bPixel
void IMapRectangleObject::WriteIMapObject( SvStream& rOStm ) const
{
- rOStm << aRect;
+ WriteRectangle( rOStm, aRect );
}
@@ -292,7 +292,7 @@ void IMapCircleObject::WriteIMapObject( SvStream& rOStm ) const
{
sal_uInt32 nTmp = nRadius;
- rOStm << aCenter;
+ WritePair( rOStm, aCenter );
rOStm << nTmp;
}
@@ -431,9 +431,9 @@ void IMapPolygonObject::ImpConstruct( const Polygon& rPoly, sal_Bool bPixel )
void IMapPolygonObject::WriteIMapObject( SvStream& rOStm ) const
{
- rOStm << aPoly;
+ WritePolygon( rOStm, aPoly );
rOStm << bEllipse; // >= Version 2
- rOStm << aEllipse; // >= Version 2
+ WriteRectangle( rOStm, aEllipse ); // >= Version 2
}
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index a1a7b29..231e41c 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -56,7 +56,7 @@ namespace svt
//= helpers
//=====================================================================
//---------------------------------------------------------------------
- SvStream& operator << ( SvStream& _rStorage, const util::DateTime& _rDate )
+ SvStream& WriteDateTime( SvStream& _rStorage, const util::DateTime& _rDate )
{
sal_uInt16 hundredthSeconds = static_cast< sal_uInt16 >( _rDate.NanoSeconds / Time::nanoPerCenti );
_rStorage.WriteUInt16( hundredthSeconds );
@@ -353,7 +353,7 @@ namespace svt
void operator() ( const TemplateContent& _rContent ) const
{
// store the info about this content
- m_rStorage << _rContent.getModDate();
+ WriteDateTime( m_rStorage, _rContent.getModDate() );
// store the info about the children
// the number
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index f4006c6..31fb53d 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -114,13 +114,13 @@ SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc )
// -----------------------------------------------------------------------------
-SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc )
+SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc )
{
const sal_uInt32 nFirstPos = rOStm.Tell(), nViewAspect = rObjDesc.mnViewAspect;
const sal_uInt32 nSig1 = TOD_SIG1, nSig2 = TOD_SIG2;
rOStm.SeekRel( 4 );
- rOStm << rObjDesc.maClassName;
+ WriteSvGlobalName( rOStm, rObjDesc.maClassName );
rOStm.WriteUInt32( nViewAspect );
//#fdo39428 Remove SvStream operator<<(long)
rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(rObjDesc.maSize.Width()) );
@@ -831,7 +831,7 @@ sal_Bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlav
aMemStm.SetVersion( SOFFICE_FILEFORMAT_50 );
aMemStm.SetCompressMode( COMPRESSMODE_NATIVE );
- aMemStm << rGraphic;
+ WriteGraphic( aMemStm, rGraphic );
maAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) );
}
@@ -860,7 +860,7 @@ sal_Bool TransferableHelper::SetTransferableObjectDescriptor( const Transferable
SvMemoryStream aMemStm( 1024, 1024 );
- aMemStm << rDesc;
+ WriteTransferableObjectDescriptor( aMemStm, rDesc );
maAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Tell() );
return( maAny.hasValue() );
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index d7e38dc..8a68903 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -86,7 +86,7 @@ public:
const OUString GetTitle() const;
void SetTitle( const OUString& rTitle );
- friend SvStream& operator<<( SvStream& rOut, const SgaObject& rObj );
+ friend SvStream& WriteSgaObject( SvStream& rOut, const SgaObject& rObj );
friend SvStream& operator>>( SvStream& rIn, SgaObject& rObj );
BitmapEx createPreviewBitmapEx(const Size& rSizePixel) const;
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 09bf8b4..2f07802 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -188,7 +188,7 @@ void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const
rOut.SetCompressMode( nOldCompressMode );
}
else
- rOut << aThumbMtf;
+ WriteGDIMetaFile( rOut, aThumbMtf );
OUString aURLWithoutDestDir = aURL.GetMainURL( INetURLObject::NO_DECODE );
aURLWithoutDestDir = aURLWithoutDestDir.replaceFirst(rDestDir, "");
@@ -252,7 +252,7 @@ void SgaObject::SetTitle( const OUString& rTitle )
aTitle = rTitle;
}
-SvStream& operator<<( SvStream& rOut, const SgaObject& rObj )
+SvStream& WriteSgaObject( SvStream& rOut, const SgaObject& rObj )
{
rObj.WriteData( rOut, "" );
return rOut;
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 8a4534d..8d4f6fb 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -207,7 +207,7 @@ void GalleryTheme::ImplWrite()
if( pOStm )
{
- *pOStm << *this;
+ WriteGalleryTheme( *pOStm, *this );
delete pOStm;
}
@@ -646,7 +646,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
pIStm->Seek( pEntry->nOffset );
*pIStm >> *pObj;
pEntry->nOffset = pTmpStm->Tell();
- *pTmpStm << *pObj;
+ WriteSgaObject( *pTmpStm, *pObj );
delete pObj;
}
}
@@ -1512,7 +1512,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
return rIStm;
}
-SvStream& operator<<( SvStream& rOut, const GalleryTheme& rTheme )
+SvStream& WriteGalleryTheme( SvStream& rOut, const GalleryTheme& rTheme )
{
return rTheme.WriteData( rOut );
}
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 9591235..da6c87b 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -84,7 +84,7 @@ sal_Bool SvxColorValueSetData::GetData( const ::com::sun::star::datatransfer::Da
sal_Bool SvxColorValueSetData::WriteObject( SotStorageStreamRef& rxOStm, void*, sal_uInt32 , const ::com::sun::star::datatransfer::DataFlavor& )
{
- *rxOStm << maData;
+ WriteXFillExchangeData( *rxOStm, maData );
return( rxOStm->GetError() == ERRCODE_NONE );
}
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 4bbb800..cdd7dac 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -320,7 +320,7 @@ SvStream& XColorItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
if ( !IsIndex() )
{
- rOut << aColor;
+ WriteColor( rOut, aColor );
}
return rOut;
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index c5c6776..54ef1f4 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -49,7 +49,7 @@ XFillExchangeData::~XFillExchangeData()
}
/// binary export (currently w/o version control because it is not persistent)
-SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
+SvStream& WriteXFillExchangeData( SvStream& rOStm, const XFillExchangeData& rData )
{
if( rData.pXFillAttrSetItem )
{
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 3cd30dd..b6e40b7 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -119,7 +119,7 @@ public:
return nListTabStopPosition;
}
- friend SvStream &operator<<( SvStream &rOS, const SwLineInfo &rInf );
+ friend SvStream & WriteSwLineInfo( SvStream &rOS, const SwLineInfo &rInf );
};
/*************************************************************************
@@ -143,7 +143,7 @@ public:
const SwParaPortion *GetParaPortion() const { return pPara; }
sal_Int32 GetTxtStart() const { return nTxtStart; }
- friend SvStream &operator<<( SvStream &rOS, const SwTxtInfo &rInf );
+ friend SvStream & WriteSwTxtInfo( SvStream &rOS, const SwTxtInfo &rInf );
};
/*************************************************************************
@@ -305,7 +305,7 @@ public:
inline void SetLen( const sal_Int32 nNew ) { m_nLen = nNew; }
inline void SetTxt( const OUString &rNew ){ m_pTxt = &rNew; }
- friend SvStream &operator<<( SvStream &rOS, const SwTxtSizeInfo &rInf );
+ friend SvStream & WriteSwTxtSizeInfo( SvStream &rOS, const SwTxtSizeInfo &rInf );
// No Bullets for the symbol font!
inline sal_Bool IsNoSymbol() const
@@ -474,7 +474,7 @@ public:
inline const SwRect &GetPaintRect() const { return aPaintRect; }
inline void SetPaintRect( const SwRect &rNew ) { aPaintRect = rNew; }
- friend SvStream &operator<<( SvStream &rOS, const SwTxtPaintInfo &rInf );
+ friend SvStream & WriteSwTxtPaintInfo( SvStream &rOS, const SwTxtPaintInfo &rInf );
//
// STUFF FOR JUSTIFIED ALIGNMENT
@@ -719,7 +719,7 @@ public:
// Return: Position; sets cHookChar if necessary
sal_Int32 ScanPortionEnd( const sal_Int32 nStart, const sal_Int32 nEnd );
- friend SvStream &operator<<( SvStream &rOS, const SwTxtFormatInfo &rInf );
+ friend SvStream & WriteSwTxtFormatInfo( SvStream &rOS, const SwTxtFormatInfo &rInf );
inline void SetTabOverflow( sal_Bool bOverflow ) { bTabOverflow = bOverflow; }
inline sal_Bool IsTabOverflow( ) { return bTabOverflow; }
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index e6d3e56..2c90548 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -32,7 +32,7 @@ class SwPortionHandler;
// The portions output operators are virtual methods of the portion.
#ifdef DBG_UTIL
-#define OUTPUT_OPERATOR virtual SvStream &operator<<( SvStream & aOs ) const;
+#define OUTPUT_OPERATOR virtual SvStream & operator<<( SvStream & aOs ) const;
#else
#define OUTPUT_OPERATOR
#endif
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index f0baf31..0532e62 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -241,7 +241,7 @@ void VCLXPrinterPropertySet::selectForm( const OUString& rFormDescription ) thro
SvMemoryStream aMem;
aMem.WriteUInt32( sal_uInt32(BINARYSETUPMARKER) );
- aMem << GetPrinter()->GetJobSetup();
+ WriteJobSetup( aMem, GetPrinter()->GetJobSetup() );
return ::com::sun::star::uno::Sequence<sal_Int8>( (sal_Int8*) aMem.GetData(), aMem.Tell() );
}
diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx
index 1bce440..9ed8d61 100644
--- a/tools/source/generic/color.cxx
+++ b/tools/source/generic/color.cxx
@@ -227,7 +227,7 @@ SvStream& Color::Write( SvStream& rOStm, bool bNewFormat )
if ( bNewFormat )
rOStm.WriteUInt32( mnColor );
else
- rOStm << *this;
+ WriteColor( rOStm, *this );
return rOStm;
}
@@ -300,7 +300,7 @@ SvStream& operator>>( SvStream& rIStream, Color& rColor )
return rIStream;
}
-SvStream& operator<<( SvStream& rOStream, const Color& rColor )
+SvStream& WriteColor( SvStream& rOStream, const Color& rColor )
{
DBG_ASSERTWARNING( rOStream.GetVersion(), "Color::<< - Solar-Version not set on rOStream" );
diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 3610065..a8a5506 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -493,7 +493,7 @@ SvStream& operator >> ( SvStream& rIStream, Fraction& rFract )
return rIStream;
}
-SvStream& operator << ( SvStream& rOStream, const Fraction& rFract )
+SvStream& WriteFraction( SvStream& rOStream, const Fraction& rFract )
{
//fdo#39428 SvStream no longer supports operator<<(long)
rOStream.WriteInt32( sal::static_int_cast<sal_Int32>(rFract.nNumerator) );
diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx
index a0c74b5c..9643a81 100644
--- a/tools/source/generic/gen.cxx
+++ b/tools/source/generic/gen.cxx
@@ -34,7 +34,7 @@ SvStream& operator>>( SvStream& rIStream, Pair& rPair )
return rIStream;
}
-SvStream& operator<<( SvStream& rOStream, const Pair& rPair )
+SvStream& WritePair( SvStream& rOStream, const Pair& rPair )
{
DBG_ASSERTWARNING( rOStream.GetVersion(), "Pair::<< - Solar-Version not set on rOStream" );
@@ -186,7 +186,7 @@ SvStream& operator>>( SvStream& rIStream, Rectangle& rRect )
return rIStream;
}
-SvStream& operator<<( SvStream& rOStream, const Rectangle& rRect )
+SvStream& WriteRectangle( SvStream& rOStream, const Rectangle& rRect )
{
DBG_ASSERTWARNING( rOStream.GetVersion(), "Rectangle::<< - Solar-Version not set on rOStream" );
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 93f4bb6..2e55994 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -1595,7 +1595,7 @@ SvStream& operator>>( SvStream& rIStream, Polygon& rPoly )
return rIStream;
}
-SvStream& operator<<( SvStream& rOStream, const Polygon& rPoly )
+SvStream& WritePolygon( SvStream& rOStream, const Polygon& rPoly )
{
DBG_CHKOBJ( &rPoly, Polygon, NULL );
DBG_ASSERTWARNING( rOStream.GetVersion(), "Polygon::<< - Solar-Version not set on rOStream" );
@@ -1659,7 +1659,7 @@ void Polygon::Read( SvStream& rIStream )
void Polygon::ImplWrite( SvStream& rOStream ) const
{
bool bHasPolyFlags = mpImplPolygon->mpFlagAry != NULL;
- rOStream << *this;
+ WritePolygon( rOStream, *this );
rOStream.WriteUChar(sal_uInt8(bHasPolyFlags));
if ( bHasPolyFlags )
diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index 7b92501..28a7df5 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -623,7 +623,7 @@ SvStream& operator>>( SvStream& rIStream, PolyPolygon& rPolyPoly )
return rIStream;
}
-SvStream& operator<<( SvStream& rOStream, const PolyPolygon& rPolyPoly )
+SvStream& WritePolyPolygon( SvStream& rOStream, const PolyPolygon& rPolyPoly )
{
DBG_CHKOBJ( &rPolyPoly, PolyPolygon, NULL );
DBG_ASSERTWARNING( rOStream.GetVersion(), "PolyPolygon::<< - Solar-Version not set on rOStream" );
@@ -634,7 +634,7 @@ SvStream& operator<<( SvStream& rOStream, const PolyPolygon& rPolyPoly )
// output polygons
for ( sal_uInt16 i = 0; i < nPolyCount; i++ )
- rOStream << *(rPolyPoly.mpImplPolyPolygon->mpPolyAry[i]);
+ WritePolygon( rOStream, *(rPolyPoly.mpImplPolyPolygon->mpPolyAry[i]) );
return rOStream;
}
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index 3cd6300..bdc7489 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -109,7 +109,7 @@ SvStream& INetMessage::operator<< (SvStream& rStrm) const
rStrm.WriteUInt32( static_cast<sal_uInt32>(n) );
for (i = 0; i < n; i++)
- rStrm << *( m_aHeaderList[ i ] );
+ WriteINetMessageHeader( rStrm, *( m_aHeaderList[ i ] ) );
return rStrm;
}
diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx
index 7eb2022..f23b1ea 100644
--- a/tools/source/ref/globname.cxx
+++ b/tools/source/ref/globname.cxx
@@ -120,7 +120,7 @@ void SvGlobalName::NewImp()
}
}
-SvStream& operator << ( SvStream& rOStr, const SvGlobalName & rObj )
+SvStream& WriteSvGlobalName( SvStream& rOStr, const SvGlobalName & rObj )
{
sal_uInt32 a;
memcpy(&a, rObj.pImp->szData, sizeof(sal_uInt32));
diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
index e84f9fd..c84a0b0 100644
--- a/tools/source/ref/pstm.cxx
+++ b/tools/source/ref/pstm.cxx
@@ -642,7 +642,7 @@ SvPersistStream& SvPersistStream::ReadPointer
return *this;
}
-SvPersistStream& operator <<
+SvPersistStream& WriteSvPersistBase
(
SvPersistStream & rStm,
SvPersistBase * pObj
@@ -660,7 +660,7 @@ SvPersistStream& operator >>
return rStm.ReadPointer( rpObj );
}
-SvStream& operator <<
+SvStream& WriteSvPersistStream
(
SvStream & rStm,
SvPersistStream & rThis
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index b464ee5..0a92660 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -83,7 +83,7 @@ private:
mbTransparent:1; // compatibility, now on output device
friend SvStream& operator>>( SvStream& rIStm, Impl_Font& );
- friend SvStream& operator<<( SvStream& rOStm, const Impl_Font& );
+ friend SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& );
};
// ------------------
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 8ccabf6..76cacb7 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -160,7 +160,7 @@ private:
sal_Bool ImplExportNative( SvStream& rOStm ) const;
- friend SvStream& operator<<( SvStream& rOStm, const ImpGraphic& rImpGraphic );
+ friend SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic );
friend SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic );
// SvgData support
diff --git a/vcl/inc/wall2.hxx b/vcl/inc/wall2.hxx
index f47c8f6..c6329b6 100644
--- a/vcl/inc/wall2.hxx
+++ b/vcl/inc/wall2.hxx
@@ -36,7 +36,7 @@ private:
BitmapEx* mpCache;
friend SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper );
- friend SvStream& operator<<( SvStream& rOStm, const ImplWallpaper& rImplWallpaper );
+ friend SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpaper );
public:
ImplWallpaper();
diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx
index 8c4a6ad..09b8ff9 100644
--- a/vcl/source/filter/sgfbram.cxx
+++ b/vcl/source/filter/sgfbram.cxx
@@ -82,7 +82,7 @@ SvStream& operator>>(SvStream& rIStream, SgfVector& rVect)
return rIStream;
}
-SvStream& operator<<(SvStream& rOStream, BmpFileHeader& rHead)
+SvStream& WriteBmpFileHeader(SvStream& rOStream, BmpFileHeader& rHead)
{
#if defined OSL_BIGENDIAN
rHead.Typ =OSL_SWAPWORD(rHead.Typ );
@@ -123,7 +123,7 @@ sal_uInt32 BmpFileHeader::GetOfs()
return sal_uInt32(OfsLo)+0x00010000*sal_uInt32(OfsHi);
}
-SvStream& operator<<(SvStream& rOStream, BmpInfoHeader& rInfo)
+SvStream& WriteBmpInfoHeader(SvStream& rOStream, BmpInfoHeader& rInfo)
{
#if defined OSL_BIGENDIAN
rInfo.Size =OSL_SWAPDWORD (rInfo.Size );
@@ -155,7 +155,7 @@ SvStream& operator<<(SvStream& rOStream, BmpInfoHeader& rInfo)
return rOStream;
}
-SvStream& operator<<(SvStream& rOStream, const RGBQuad& rQuad)
+SvStream& WriteRGBQuad(SvStream& rOStream, const RGBQuad& rQuad)
{
rOStream.Write((char*)&rQuad,sizeof(rQuad));
return rOStream;
@@ -231,14 +231,15 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntry&)
aBmpInfo.ColMust=0;
pBuf=new sal_uInt8[nWdtOut];
if (!pBuf) return false; // Fehler: kein Speichel da
- rOut<<aBmpHead<<aBmpInfo;
+ WriteBmpFileHeader( rOut, aBmpHead );
+ WriteBmpInfoHeader( rOut, aBmpInfo );
memset(pBuf,0,nWdtOut); // Buffer mit Nullen fuellen
if (nColors==2)
{
- rOut<<RGBQuad(0x00,0x00,0x00); // Schwarz
- rOut<<RGBQuad(0xFF,0xFF,0xFF); // Weiss
+ WriteRGBQuad( rOut, RGBQuad(0x00,0x00,0x00) ); // Schwarz
+ WriteRGBQuad( rOut, RGBQuad(0xFF,0xFF,0xFF) ); // Weiss
nOfs=rOut.Tell();
for (j=0;j<rHead.Ysize;j++)
rOut.Write((char*)pBuf,nWdtOut); // Datei erstmal komplett mit Nullen fuellen
@@ -253,22 +254,22 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntry&)
} else if (nColors==16) {
sal_uInt8 pl2= 0; // Masken fuer die Planes
- rOut<<RGBQuad(0x00,0x00,0x00); // Schwarz
- rOut<<RGBQuad(0x24,0x24,0x24); // Grau 80%
- rOut<<RGBQuad(0x49,0x49,0x49); // Grau 60%
- rOut<<RGBQuad(0x92,0x92,0x92); // Grau 40%
- rOut<<RGBQuad(0x6D,0x6D,0x6D); // Grau 30%
- rOut<<RGBQuad(0xB6,0xB6,0xB6); // Grau 20%
- rOut<<RGBQuad(0xDA,0xDA,0xDA); // Grau 10%
- rOut<<RGBQuad(0xFF,0xFF,0xFF); // Weiss
- rOut<<RGBQuad(0x00,0x00,0x00); // Schwarz
- rOut<<RGBQuad(0xFF,0x00,0x00); // Rot
- rOut<<RGBQuad(0x00,0x00,0xFF); // Blau
- rOut<<RGBQuad(0xFF,0x00,0xFF); // Magenta
- rOut<<RGBQuad(0x00,0xFF,0x00); // Gruen
- rOut<<RGBQuad(0xFF,0xFF,0x00); // Gelb
- rOut<<RGBQuad(0x00,0xFF,0xFF); // Cyan
- rOut<<RGBQuad(0xFF,0xFF,0xFF); // Weiss
+ WriteRGBQuad( rOut, RGBQuad(0x00,0x00,0x00) ); // Schwarz
+ WriteRGBQuad( rOut, RGBQuad(0x24,0x24,0x24) ); // Grau 80%
+ WriteRGBQuad( rOut, RGBQuad(0x49,0x49,0x49) ); // Grau 60%
+ WriteRGBQuad( rOut, RGBQuad(0x92,0x92,0x92) ); // Grau 40%
+ WriteRGBQuad( rOut, RGBQuad(0x6D,0x6D,0x6D) ); // Grau 30%
+ WriteRGBQuad( rOut, RGBQuad(0xB6,0xB6,0xB6) ); // Grau 20%
+ WriteRGBQuad( rOut, RGBQuad(0xDA,0xDA,0xDA) ); // Grau 10%
+ WriteRGBQuad( rOut, RGBQuad(0xFF,0xFF,0xFF) ); // Weiss
+ WriteRGBQuad( rOut, RGBQuad(0x00,0x00,0x00) ); // Schwarz
+ WriteRGBQuad( rOut, RGBQuad(0xFF,0x00,0x00) ); // Rot
+ WriteRGBQuad( rOut, RGBQuad(0x00,0x00,0xFF) ); // Blau
+ WriteRGBQuad( rOut, RGBQuad(0xFF,0x00,0xFF) ); // Magenta
+ WriteRGBQuad( rOut, RGBQuad(0x00,0xFF,0x00) ); // Gruen
+ WriteRGBQuad( rOut, RGBQuad(0xFF,0xFF,0x00) ); // Gelb
+ WriteRGBQuad( rOut, RGBQuad(0x00,0xFF,0xFF) ); // Cyan
+ WriteRGBQuad( rOut, RGBQuad(0xFF,0xFF,0xFF) ); // Weiss
nOfs=rOut.Tell();
for (j=0;j<rHead.Ysize;j++)
diff --git a/vcl/source/filter/sgfbram.hxx b/vcl/source/filter/sgfbram.hxx
index b38d72d..268405e6 100644
--- a/vcl/source/filter/sgfbram.hxx
+++ b/vcl/source/filter/sgfbram.hxx
@@ -113,7 +113,7 @@ public:
void SetSize(sal_uInt32 Size);
void SetOfs(sal_uInt32 Size);
sal_uInt32 GetOfs();
- friend SvStream& operator<<(SvStream& rOStream, BmpFileHeader& rHead);
+ friend SvStream& WriteBmpFileHeader(SvStream& rOStream, BmpFileHeader& rHead);
};
#define BmpInfoHeaderSize 40
@@ -132,7 +132,7 @@ public:
sal_uInt32 ColUsed; // Anzahl der verwendeten Farben (0=alle)
sal_uInt32 ColMust; // Anzahl der wichtigen Farben (0=alle)
- friend SvStream& operator<<(SvStream& rOStream, BmpInfoHeader& rHead);
+ friend SvStream& WriteBmpInfoHeader(SvStream& rOStream, BmpInfoHeader& rHead);
};
#define RGBQuadSize 4
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index f2e7c24..1b204c5 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -1295,7 +1295,7 @@ void WinMtfOutput::DrawPolygon( Polygon& rPolygon, sal_Bool bRecordPath )
SvMemoryStream aMemStm;
- aMemStm << aFill;
+ WriteSvtGraphicFill( aMemStm, aFill );
mpGDIMetaFile->AddAction( new MetaCommentAction( "XPATHFILL_SEQ_BEGIN", 0,
static_cast<const sal_uInt8*>(aMemStm.GetData()),
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 92f19b7..0b128d8 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -695,7 +695,7 @@ sal_Bool Animation::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterPara
return bRet;
}
-SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation )
+SvStream& WriteAnimation( SvStream& rOStm, const Animation& rAnimation )
{
const sal_uInt16 nCount = rAnimation.Count();
@@ -720,9 +720,9 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation )
// Write AnimationBitmap
WriteDIBBitmapEx(rAnimBmp.aBmpEx, rOStm);
- rOStm << rAnimBmp.aPosPix;
- rOStm << rAnimBmp.aSizePix;
- rOStm << rAnimation.maGlobalSize;
+ WritePair( rOStm, rAnimBmp.aPosPix );
+ WritePair( rOStm, rAnimBmp.aSizePix );
+ WritePair( rOStm, rAnimation.maGlobalSize );
rOStm.WriteUInt16( (sal_uInt16) ( ( ANIMATION_TIMEOUT_ON_CLICK == rAnimBmp.nWait ) ? 65535 : rAnimBmp.nWait ) );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list