summaryrefslogtreecommitdiff
path: root/emfio/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-11-14 09:47:57 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-11-14 13:25:36 +0100
commit7d6f8b48ad4131b13f18ce9d92c10f6b998a68ec (patch)
tree60f5d05fbe713629e3a3b03de3835fc99c270ec0 /emfio/inc
parent36e0acffbe2759dd2a910d2393f266c5c4898786 (diff)
ofz: stop at min of end of record and end of stream
Change-Id: I61c7cf74ea75ec56b6ccb3661f6fdd54a1ff12e1 Reviewed-on: https://gerrit.libreoffice.org/44705 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'emfio/inc')
-rw-r--r--emfio/inc/emfreader.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/emfio/inc/emfreader.hxx b/emfio/inc/emfreader.hxx
index 4b2855cf54f6..a54eee1a9c70 100644
--- a/emfio/inc/emfreader.hxx
+++ b/emfio/inc/emfreader.hxx
@@ -44,10 +44,10 @@ namespace emfio
bool ReadEnhWMF();
private:
- template <class T> void ReadAndDrawPolyPolygon();
- template <class T> void ReadAndDrawPolyLine();
- template <class T> tools::Polygon ReadPolygon(sal_uInt32 nStartIndex, sal_uInt32 nPoints);
- template <class T> tools::Polygon ReadPolygonWithSkip(const bool skipFirst);
+ template <class T> void ReadAndDrawPolyPolygon(sal_uInt32 nNextPos);
+ template <class T> void ReadAndDrawPolyLine(sal_uInt32 nNextPos);
+ template <class T> tools::Polygon ReadPolygon(sal_uInt32 nStartIndex, sal_uInt32 nPoints, sal_uInt32 nNextPos);
+ template <class T> tools::Polygon ReadPolygonWithSkip(const bool skipFirst, sal_uInt32 nNextPos);
tools::Rectangle ReadRectangle();
void ReadEMFPlusComment(sal_uInt32 length, bool& bHaveDC);