From 48af0b9310023f3789d46d5714498e62728a8d8c Mon Sep 17 00:00:00 2001
From: Armin Le Grand <Armin.Le.Grand@cib.de>
Date: Fri, 23 Jun 2017 12:16:33 +0200
Subject: emfplus: UnitTests and gerrit build corrections

Needed to migrate UnitTest for Emf/Wmf import from
vcl to emfio. Corrected stuff based on gerrit build
feedback

Change-Id: I7fd2456f814ea19583072ba09730a07e9b9d4061
---
 drawinglayer/source/tools/emfphelperdata.cxx | 6 +++++-
 drawinglayer/source/tools/wmfemfhelper.cxx   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'drawinglayer')

diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx
index fdb0fb11c42f..0f81783dec5d 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -390,7 +390,7 @@ namespace emfplushelper
 
     void EmfPlusHelperData::processEmfPlusData(
         SvMemoryStream& rMS,
-        const drawinglayer::geometry::ViewInformation2D& rViewInformation)
+        const drawinglayer::geometry::ViewInformation2D& /*rViewInformation*/)
     {
         sal_uInt64 length = rMS.GetSize();
 
@@ -862,6 +862,10 @@ namespace emfplushelper
                             SAL_INFO("cppcanvas.emf", "EMF+ DrawString layoutRect: " << lx << "," << ly << " - " << lw << "x" << lh);
                             OUString text = read_uInt16s_ToOUString(rMS, stringLength);
                             EMFPStringFormat *stringFormat = static_cast< EMFPStringFormat* >(maEMFPObjects[formatId & 0xff].get());
+
+                            (void)(text); // avoid warning
+                            (void)(stringFormat); // avoid warning
+
     //                        css::rendering::FontRequest aFontRequest;
     //
     //                        if (stringFormat)
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index f10c05724f60..93162e4d3fad 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -46,6 +46,7 @@
 #include <vcl/gradient.hxx>
 #include <vcl/hatch.hxx>
 #include <emfplushelper.hxx>
+#include <numeric>
 
 namespace drawinglayer
 {
-- 
cgit