diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-01 21:05:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-01 21:05:41 +0000 |
| commit | b560dc89e4c86cf624c327fd393e2c3166d66251 (patch) | |
| tree | c4121e8a4e26664df2eb40db49bfa6b7f173023b /vcl | |
| parent | 970edf67d2369288f12391be5cc06946fcd1684e (diff) | |
so noone cares about the return of [Read|Write]ImpGraphic
Change-Id: I2e251ff71b1f20e43c797c3fc901f3a70dce7c6c
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/impgraph.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/impgraph.cxx | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index d016f55b4007..4dea38c03874 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -138,8 +138,8 @@ private: bool ImplExportNative( SvStream& rOStm ) const; - friend SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic ); - friend SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ); + friend void WriteImpGraphic(SvStream& rOStm, const ImpGraphic& rImpGraphic); + friend void ReadImpGraphic(SvStream& rIStm, ImpGraphic& rImpGraphic); const SvgDataPtr& getSvgData() const { return maSvgData; } }; diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 2d3d85cbc0d3..98d57ac32765 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -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()) - return rIStm; + return; const sal_uLong nStmPos1 = rIStm.Tell(); sal_uInt32 nTmp; @@ -1375,7 +1375,7 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ) // read nothing. CAUTION: Eof is only true AFTER reading another // byte, a speciality of SvMemoryStream (!) if (rIStm.GetError() || rIStm.IsEof()) - return rIStm; + return; if (NATIVE_FORMAT_50 == nTmp) { @@ -1414,7 +1414,7 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ) rIStm.Seek( nStmPos1 ); rIStm.SetError( ERRCODE_IO_WRONGFORMAT ); } - return rIStm; + return; } BitmapEx aBmpEx; @@ -1516,11 +1516,9 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ) } rIStm.SetEndian( nOldFormat ); - - return rIStm; } -SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic ) +void WriteImpGraphic(SvStream& rOStm, const ImpGraphic& rImpGraphic) { if( !rOStm.GetError() ) { @@ -1603,8 +1601,6 @@ SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic ) else rOStm.SetError( SVSTREAM_GENERALERROR ); } - - return rOStm; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |