diff options
Diffstat (limited to 'emfio/source/reader/emfreader.cxx')
| -rw-r--r-- | emfio/source/reader/emfreader.cxx | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx index 158f5bdcbfd7..dc8ffdee523f 100644 --- a/emfio/source/reader/emfreader.cxx +++ b/emfio/source/reader/emfreader.cxx @@ -18,16 +18,14 @@ */ #include <emfreader.hxx> - #include <osl/endian.h> #include <basegfx/matrix/b2dhommatrix.hxx> #include <vcl/dibtools.hxx> #include <o3tl/make_unique.hxx> - +#include <tools/stream.hxx> #include <memory> #ifdef DBG_UTIL -#include <tools/stream.hxx> #include <vcl/pngwrite.hxx> #endif @@ -456,6 +454,17 @@ namespace emfio mpInputStream->SeekRel(nRemainder); } + // these are referenced from inside the templates + SvStream& operator >> (SvStream& rStream, sal_Int16 &n) + { + return rStream.ReadInt16(n); + } + + SvStream& operator >> (SvStream& rStream, sal_Int32 &n) + { + return rStream.ReadInt32(n); + } + /** * Reads polygons from the stream. * The \<class T> parameter is for the type of the points (sal_uInt32 or sal_uInt16). @@ -544,18 +553,6 @@ namespace emfio } } - // these are referenced from inside the templates - - SvStream& operator>>(SvStream& rStream, sal_Int16 &n) - { - return rStream.ReadInt16(n); - } - - SvStream& operator>>(SvStream& rStream, sal_Int32 &n) - { - return rStream.ReadInt32(n); - } - /** * Reads a poly polygon from the WMF file and draws it. * The \<class T> parameter refers to the type of the points. (e.g. sal_uInt16 or sal_uInt32) |