drawinglayer/source/tools/emfphelperdata.hxx | 6 +++--- emfio/source/reader/emfreader.cxx | 23 +++++++++++------------ 2 files changed, 14 insertions(+), 15 deletions(-)
New commits: commit 3f77e27b55a29de6cb9e0a42877a405012b103da Author: Armin Le Grand <[email protected]> Date: Fri Jun 23 14:02:38 2017 +0200 emfplus: more corrections due to linux build Change-Id: Ib2c3bff23043638d315405b5a91b2596e92f7ffa diff --git a/drawinglayer/source/tools/emfphelperdata.hxx b/drawinglayer/source/tools/emfphelperdata.hxx index 67f423436fa4..21f5dcdddabd 100644 --- a/drawinglayer/source/tools/emfphelperdata.hxx +++ b/drawinglayer/source/tools/emfphelperdata.hxx @@ -223,7 +223,7 @@ namespace emfplushelper // readers void processObjectRecord(SvMemoryStream& rObjectStream, sal_uInt16 flags, sal_uInt32 dataSize, bool bUseWholeStream = false); - void ReadPoint(SvStream& s, float& x, float& y, sal_uInt32 flags); + static void ReadPoint(SvStream& s, float& x, float& y, sal_uInt32 flags); // internal mapper void mappingChanged(); @@ -248,8 +248,8 @@ namespace emfplushelper ::basegfx::B2DSize MapSize(double iwidth, double iheight); // readers - void ReadRectangle(SvStream& s, float& x, float& y, float &width, float& height, bool bCompressed = false); - bool readXForm(SvStream& rIn, basegfx::B2DHomMatrix& rTarget); + static void ReadRectangle(SvStream& s, float& x, float& y, float &width, float& height, bool bCompressed = false); + static bool readXForm(SvStream& rIn, basegfx::B2DHomMatrix& rTarget); }; } diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx index 243b84fb7395..9e36a9afe113 100644 --- a/emfio/source/reader/emfreader.cxx +++ b/emfio/source/reader/emfreader.cxx @@ -454,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). @@ -542,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) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
