summaryrefslogtreecommitdiff
path: root/include/tools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-01-30 13:46:42 +0200
committerMichael Stahl <mstahl@redhat.com>2014-02-04 22:50:39 +0000
commit186b4ebc99a2e80740fee51f9d0276886a003617 (patch)
treea86a4ff5fe3cd36add7053212ef37531540be253 /include/tools
parent95a7e952552adb834f92d1477f83938e7c8d0204 (diff)
convert specialised SvStream::operator>> methods to ReadXXX methods
as preparation for converting the SvStream::operator>> methods on primitive types Change-Id: I62f134bced15c687d6e0d46924f56e8d1c3d95b9 Reviewed-on: https://gerrit.libreoffice.org/7798 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include/tools')
-rw-r--r--include/tools/color.hxx2
-rw-r--r--include/tools/fract.hxx2
-rw-r--r--include/tools/gen.hxx4
-rw-r--r--include/tools/inetmsg.hxx4
-rw-r--r--include/tools/poly.hxx4
5 files changed, 8 insertions, 8 deletions
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 626f6255a990..9fedd25f4c5b 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -160,7 +160,7 @@ public:
SvStream& Read( SvStream& rIStm, bool bNewFormat = true );
SvStream& Write( SvStream& rOStm, bool bNewFormat = true );
- TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Color& rColor );
+ TOOLS_DLLPUBLIC friend SvStream& ReadColor( SvStream& rIStream, Color& rColor );
TOOLS_DLLPUBLIC friend SvStream& WriteColor( SvStream& rOStream, const Color& rColor );
// get ::basegfx::BColor from this color
diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx
index 2e1bb2005e4d..41820e71c377 100644
--- a/include/tools/fract.hxx
+++ b/include/tools/fract.hxx
@@ -65,7 +65,7 @@ public:
friend inline bool operator<=( const Fraction& rVal1, const Fraction& rVal2 );
friend inline bool operator>=( const Fraction& rVal1, const Fraction& rVal2 );
- TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Fraction& rFract );
+ TOOLS_DLLPUBLIC friend SvStream& ReadFraction( SvStream& rIStream, Fraction& rFract );
TOOLS_DLLPUBLIC friend SvStream& WriteFraction( SvStream& rOStream, const Fraction& rFract );
};
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index e3a33ca4f8c1..bc3fb35dd5ab 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -45,7 +45,7 @@ public:
bool operator == ( const Pair& rPair ) const;
bool operator != ( const Pair& rPair ) const;
- TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Pair& rPair );
+ TOOLS_DLLPUBLIC friend SvStream& ReadPair( SvStream& rIStream, Pair& rPair );
TOOLS_DLLPUBLIC friend SvStream& WritePair( SvStream& rOStream, const Pair& rPair );
protected:
@@ -417,7 +417,7 @@ public:
friend inline Rectangle operator + ( const Rectangle& rRect, const Point& rPt );
friend inline Rectangle operator - ( const Rectangle& rRect, const Point& rPt );
- TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Rectangle& rRect );
+ TOOLS_DLLPUBLIC friend SvStream& ReadRectangle( SvStream& rIStream, Rectangle& rRect );
TOOLS_DLLPUBLIC friend SvStream& WriteRectangle( SvStream& rOStream, const Rectangle& rRect );
// ONE
diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx
index 4c07726bed42..1f9e47715e71 100644
--- a/include/tools/inetmsg.hxx
+++ b/include/tools/inetmsg.hxx
@@ -70,7 +70,7 @@ public:
return rStrm;
}
- friend SvStream& operator>> (
+ friend SvStream& ReadINetMessageHeader (
SvStream& rStrm, INetMessageHeader& rHdr)
{
rHdr.m_aName = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStrm);
@@ -200,7 +200,7 @@ public:
return rMsg.operator<< (rStrm);
}
- friend SvStream& operator>> (
+ friend SvStream& ReadINetMessage (
SvStream& rStrm, INetMessage& rMsg)
{
return rMsg.operator>> (rStrm);
diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index ce96dc5ad008..5f5171c99005 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -177,7 +177,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& ReadPolygon( SvStream& rIStream, Polygon& rPoly );
TOOLS_DLLPUBLIC friend SvStream& WritePolygon( SvStream& rOStream, const Polygon& rPoly );
void Read( SvStream& rIStream );
@@ -262,7 +262,7 @@ public:
bool IsEqual( const PolyPolygon& rPolyPoly ) const;
- TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, PolyPolygon& rPolyPoly );
+ TOOLS_DLLPUBLIC friend SvStream& ReadPolyPolygon( SvStream& rIStream, PolyPolygon& rPolyPoly );
TOOLS_DLLPUBLIC friend SvStream& WritePolyPolygon( SvStream& rOStream, const PolyPolygon& rPolyPoly );
void Read( SvStream& rIStream );