Kaydet (Commit) b560dc89 authored tarafından Caolán McNamara's avatar Caolán McNamara

so noone cares about the return of [Read|Write]ImpGraphic

Change-Id: I2e251ff71b1f20e43c797c3fc901f3a70dce7c6c
üst 970edf67
...@@ -138,8 +138,8 @@ private: ...@@ -138,8 +138,8 @@ private:
bool ImplExportNative( SvStream& rOStm ) const; bool ImplExportNative( SvStream& rOStm ) const;
friend SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic ); friend void WriteImpGraphic(SvStream& rOStm, const ImpGraphic& rImpGraphic);
friend SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ); friend void ReadImpGraphic(SvStream& rIStm, ImpGraphic& rImpGraphic);
const SvgDataPtr& getSvgData() const { return maSvgData; } const SvgDataPtr& getSvgData() const { return maSvgData; }
}; };
......
...@@ -1356,10 +1356,10 @@ bool ImpGraphic::ImplExportNative( SvStream& rOStm ) const ...@@ -1356,10 +1356,10 @@ bool ImpGraphic::ImplExportNative( SvStream& rOStm ) const
} }
SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ) void ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
{ {
if (rIStm.GetError()) if (rIStm.GetError())
return rIStm; return;
const sal_uLong nStmPos1 = rIStm.Tell(); const sal_uLong nStmPos1 = rIStm.Tell();
sal_uInt32 nTmp; sal_uInt32 nTmp;
...@@ -1375,7 +1375,7 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ) ...@@ -1375,7 +1375,7 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
// read nothing. CAUTION: Eof is only true AFTER reading another // read nothing. CAUTION: Eof is only true AFTER reading another
// byte, a speciality of SvMemoryStream (!) // byte, a speciality of SvMemoryStream (!)
if (rIStm.GetError() || rIStm.IsEof()) if (rIStm.GetError() || rIStm.IsEof())
return rIStm; return;
if (NATIVE_FORMAT_50 == nTmp) if (NATIVE_FORMAT_50 == nTmp)
{ {
...@@ -1414,7 +1414,7 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ) ...@@ -1414,7 +1414,7 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
rIStm.Seek( nStmPos1 ); rIStm.Seek( nStmPos1 );
rIStm.SetError( ERRCODE_IO_WRONGFORMAT ); rIStm.SetError( ERRCODE_IO_WRONGFORMAT );
} }
return rIStm; return;
} }
BitmapEx aBmpEx; BitmapEx aBmpEx;
...@@ -1516,11 +1516,9 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ) ...@@ -1516,11 +1516,9 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
} }
rIStm.SetEndian( nOldFormat ); rIStm.SetEndian( nOldFormat );
return rIStm;
} }
SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic ) void WriteImpGraphic(SvStream& rOStm, const ImpGraphic& rImpGraphic)
{ {
if( !rOStm.GetError() ) if( !rOStm.GetError() )
{ {
...@@ -1603,8 +1601,6 @@ SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic ) ...@@ -1603,8 +1601,6 @@ SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic )
else else
rOStm.SetError( SVSTREAM_GENERALERROR ); rOStm.SetError( SVSTREAM_GENERALERROR );
} }
return rOStm;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment