From a63478747a57d801ab99cdce647627a9a2028985 Mon Sep 17 00:00:00 2001
From: zhouping <zhouping@finereport.com>
Date: Wed, 28 Sep 2016 11:20:19 +0800
Subject: [PATCH] =?UTF-8?q?release=E6=89=8B=E5=8A=A8=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=88=B0master=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E6=94=B9=E5=9B=9E=E6=88=90=E9=9A=8F=E7=B3=BB=E7=BB=9F=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/utils/DesignUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/utils/DesignUtils.java b/designer_base/src/com/fr/design/utils/DesignUtils.java
index d6a2ab8a5..4b05b8d68 100644
--- a/designer_base/src/com/fr/design/utils/DesignUtils.java
+++ b/designer_base/src/com/fr/design/utils/DesignUtils.java
@@ -230,7 +230,7 @@ public class DesignUtils {
     
     private static FRFont getCurrentLocaleFont(){
         FRFont guiFRFont;
-        Locale defaultLocale = FRContext.getLocale();
+        Locale defaultLocale = Locale.getDefault();
         
         if (isDisplaySimSun(defaultLocale)) {
             guiFRFont = getNamedFont("SimSun");