diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-05 10:41:04 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 15:31:40 +0000 |
commit | 15535e32ddcfee451d4dbc9be9de0b8c9f9d78d4 (patch) | |
tree | db4badc477cea1ecd51f5fab82ce0f24ae20f155 /filter/source/graphicfilter/eos2met/eos2met.cxx | |
parent | drawingML import: wrong namespace for 'pic' (diff) | |
download | core-15535e32ddcfee451d4dbc9be9de0b8c9f9d78d4.tar.gz core-15535e32ddcfee451d4dbc9be9de0b8c9f9d78d4.zip |
convert SvStream::operator>> methods to ReadXXX methods
First, I updated the clang rewriter to do the conversion.
Then I lightly hand-tweaked the output for the few places where
the rewriter messed up, mostly when dealing with calls on "this".
Change-Id: I40a6a977959cd97415c678eafc8507de8aa3b1a9
Reviewed-on: https://gerrit.libreoffice.org/7879
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'filter/source/graphicfilter/eos2met/eos2met.cxx')
-rw-r--r-- | filter/source/graphicfilter/eos2met/eos2met.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index ff2f3e74e01b..5f3b43dc2659 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -566,11 +566,11 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap) // read header of the Windows-BMP file: aTemp.SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN); aTemp.Seek(18); - aTemp >> nWidth >> nHeight; + aTemp.ReadUInt32( nWidth ).ReadUInt32( nHeight ); aTemp.SeekRel(2); - aTemp >> nBitsPerPixel; + aTemp.ReadUInt16( nBitsPerPixel ); aTemp.SeekRel(8); - aTemp >> nResX >> nResY; + aTemp.ReadUInt32( nResX ).ReadUInt32( nResY ); aTemp.SeekRel(8); nNumColors=1<<nBitsPerPixel; @@ -584,7 +584,7 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap) for (i=0; i<nNumColors; i++) { - aTemp >> nb >> ng >> nr; aTemp.SeekRel(1); + aTemp.ReadUChar( nb ).ReadUChar( ng ).ReadUChar( nr ); aTemp.SeekRel(1); aPal[ (sal_uInt16) i ] = BitmapColor( nr, ng, nb ); } |