From f65c8b7b48a94574d18cf5222254b45658f81cee Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaledhosny@eglug.org>
Date: Sun, 30 Oct 2016 18:50:01 +0200
Subject: No need to call ParseFeatures in the constructor

Call it once where we will use its results.

Change-Id: I63f3ceaf47e68bea9fab29d6836745416cf8ccb8
---
 vcl/source/gdi/CommonSalLayout.cxx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'vcl')

diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 61395bdc620f..dc6ca2cc745d 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -184,8 +184,6 @@ CommonSalLayout::CommonSalLayout(HDC hDC, WinFontInstance& rWinFontInstance, con
 
         hb_face_destroy(pHbFace);
     }
-
-    ParseFeatures(mrFontSelData.maTargetName);
 }
 
 #elif defined(MACOSX) || defined(IOS)
@@ -210,8 +208,6 @@ CommonSalLayout::CommonSalLayout(const CoreTextStyle& rCoreTextStyle)
 
         hb_face_destroy(pHbFace);
     }
-
-    ParseFeatures(mrFontSelData.maTargetName);
 }
 
 #else
@@ -229,8 +225,6 @@ CommonSalLayout::CommonSalLayout(FreetypeFont& rFreetypeFont)
 
         hb_face_destroy(pHbFace);
     }
-
-    ParseFeatures(mrFontSelData.maTargetName);
 }
 #endif
 
@@ -404,6 +398,8 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
     hb_buffer_set_unicode_funcs(pHbBuffer, pHbUnicodeFuncs);
 #endif
 
+    ParseFeatures(mrFontSelData.maTargetName);
+
     Point aCurrPos(0, 0);
     while (true)
     {
-- 
cgit