[Libreoffice-commits] core.git: vcl/source

[Noel Grandin]

 vcl/source/filter/wmf/enhwmf.cxx |    8 ++++----
 vcl/source/filter/wmf/winmtf.hxx |    7 +------
 vcl/source/filter/wmf/winwmf.cxx |    2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit 3698b72185c1ee6ff7e2c65fa8f6e7c6bbf0479e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Apr 24 10:11:04 2017 +0200

    drop old WinMtfOutput::DrawPolygon method
    
    Change-Id: I7e9696718149f0d708e029efa0edbfa2b4f62b89
    Reviewed-on: https://gerrit.libreoffice.org/36880
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 02776fa83997..b55e969dbea5 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -736,8 +736,8 @@ bool EnhWMFReader::ReadEnhWMF()
                 break;
 
                 case EMR_POLYGON :
-                    ReadAndDrawPolygon<sal_Int32>( [] ( std::unique_ptr<WinMtfOutput> &pWinMtfOutput, tools::Polygon& rPolygon, bool aTo, bool aRecordPath )
-                                                   { pWinMtfOutput->DrawPolygon( rPolygon, aTo, aRecordPath ); }, false );
+                    ReadAndDrawPolygon<sal_Int32>( [] ( std::unique_ptr<WinMtfOutput> &pWinMtfOutput, tools::Polygon& rPolygon, bool /*aTo*/, bool aRecordPath )
+                                                   { pWinMtfOutput->DrawPolygon( rPolygon, aRecordPath ); }, false );
                 break;
 
                 case EMR_POLYLINETO :
@@ -1682,8 +1682,8 @@ bool EnhWMFReader::ReadEnhWMF()
                 break;
 
                 case EMR_POLYGON16 :
-                    ReadAndDrawPolygon<sal_Int16>( [] ( std::unique_ptr<WinMtfOutput> &pWinMtfOutput, tools::Polygon& rPolygon, bool aTo, bool aRecordPath )
-                                                   { pWinMtfOutput->DrawPolygon( rPolygon, aTo, aRecordPath ); }, false );
+                    ReadAndDrawPolygon<sal_Int16>( [] ( std::unique_ptr<WinMtfOutput> &pWinMtfOutput, tools::Polygon& rPolygon, bool /*aTo*/, bool aRecordPath )
+                                                   { pWinMtfOutput->DrawPolygon( rPolygon, aRecordPath ); }, false );
                 break;
 
                 case EMR_POLYLINETO16 :
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index c7402f50ff95..3940062f37d5 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -581,12 +581,7 @@ public:
                             const Point& rStartAngle,
                             const Point& rEndAngle
                         );
-    void                DrawPolygon( tools::Polygon& rPolygon, bool bRecordPath = false );
-    void                DrawPolygon( tools::Polygon& rPolygon, bool /*bDrawTo*/, bool bRecordPath)
-                        {
-                            //For ReadAndDrawPolygon template compatibility
-                            DrawPolygon(rPolygon, bRecordPath);
-                        }
+    void                DrawPolygon( tools::Polygon& rPolygon, bool bRecordPath );
     void                DrawPolyPolygon( tools::PolyPolygon& rPolyPolygon, bool bRecordPath = false );
     void                DrawPolyLine( tools::Polygon& rPolygon,
                                       bool bDrawTo = false,
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 0ce2ff3eccac..c1cd0901b5b1 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -354,7 +354,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
                 tools::Polygon aPoly(nPoints);
                 for (sal_uInt16 i(0); i < nPoints && pWMF->good(); ++i)
                     aPoly[ i ] = ReadPoint();
-                pOut->DrawPolygon(aPoly);
+                pOut->DrawPolygon(aPoly, false/*bRecordPath*/);
             }
 
             SAL_WARN_IF(!bRecordOk, "vcl.wmf", "polygon record has more points than we can handle");