summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-01-14 13:52:54 +0200
committerMichael Stahl <mstahl@redhat.com>2014-01-16 16:08:34 +0100
commitc648d0872058941ed18499a8bf1993037d9b5532 (patch)
tree47121b3eff267e34480335130106ca1c33be6fd9 /sd
parent70f360f34a9f6605864644feee3c9b9b6ffb79a1 (diff)
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
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/eppt/pptexanimations.cxx6
-rw-r--r--sd/source/filter/html/pubdlg.cxx16
-rw-r--r--sd/source/filter/ppt/pptanimations.hxx2
3 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 3a9d5d0ee136..f65ecc1eaeec 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 0b0dede074c3..fcf96066e6aa 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 10a51df3c4a4..4340967ffbf9 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[] =