summaryrefslogtreecommitdiff
path: root/emfio/source
diff options
context:
space:
mode:
Diffstat (limited to 'emfio/source')
-rw-r--r--emfio/source/reader/emfreader.cxx27
-rw-r--r--emfio/source/reader/wmfreader.cxx4
2 files changed, 14 insertions, 17 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)
diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
index d71e234826d9..43a51372ee4f 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -114,7 +114,7 @@
namespace
{
- static void GetWinExtMax(const Point& rSource, tools::Rectangle& rPlaceableBound, const sal_Int16 nMapMode)
+ void GetWinExtMax(const Point& rSource, tools::Rectangle& rPlaceableBound, const sal_Int16 nMapMode)
{
Point aSource(rSource);
if (nMapMode == MM_HIMETRIC)
@@ -129,7 +129,7 @@ namespace
rPlaceableBound.Bottom() = aSource.Y();
}
- static void GetWinExtMax(const tools::Rectangle& rSource, tools::Rectangle& rPlaceableBound, const sal_Int16 nMapMode)
+ void GetWinExtMax(const tools::Rectangle& rSource, tools::Rectangle& rPlaceableBound, const sal_Int16 nMapMode)
{
GetWinExtMax(rSource.TopLeft(), rPlaceableBound, nMapMode);
GetWinExtMax(rSource.BottomRight(), rPlaceableBound, nMapMode);