From 63bc9be68e6d7a0e681516b5a04953388644101a Mon Sep 17 00:00:00 2001
From: Armin Le Grand <Armin.Le.Grand@cib.de>
Date: Wed, 21 Jun 2017 14:46:35 +0200
Subject: emfplus: some cleanup/streamlining

Change-Id: Ia931ca356fb079b9cb2395ba2311b91d2481e2d4
---
 drawinglayer/source/tools/wmfemfhelper.cxx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'drawinglayer/source/tools/wmfemfhelper.cxx')

diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index f2231a1879fe..b272f4a51eb3 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -3028,7 +3028,11 @@ namespace wmfemfhelper
                             SAL_INFO("cppcanvas.emf", "EMF+ passed to canvas mtf renderer - header info, size: " << pA->GetDataSize());
                             SvMemoryStream aMemoryStream(const_cast<sal_uInt8 *>(pA->GetData()), pA->GetDataSize(), StreamMode::READ);
 
-                            aEMFPlus.reset(new emfplushelper::EmfPlusHelper(aMemoryStream));
+                            aEMFPlus.reset(
+                                new emfplushelper::EmfPlusHelper(
+                                    aMemoryStream,
+                                    rTargetHolders,
+                                    rPropertyHolders));
                         }
                     }
                     else if (pA->GetComment().equalsIgnoreAsciiCase("EMF_PLUS"))
@@ -3061,8 +3065,6 @@ namespace wmfemfhelper
 
                                 aEMFPlus->processEmfPlusData(
                                     aMemoryStream,
-                                    rTargetHolders,
-                                    rPropertyHolders,
                                     rViewInformation);
                             }
 
-- 
cgit