From 4da0c31392e79f93176e17c5514afcbe166006fb Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Wed, 3 May 2017 15:52:17 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-1885=20frm=E8=B7=91=E9=A9=AC=E7=81=AF=3D?=
 =?UTF-8?q?>=E9=BB=98=E8=AE=A4=E5=AD=97=E4=BD=93=E7=94=B1textPane=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A=EF=BC=8C=E4=B8=8D=E5=86=99=E6=AD=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer/src/com/fr/design/cell/editor/RichTextToolBar.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer/src/com/fr/design/cell/editor/RichTextToolBar.java b/designer/src/com/fr/design/cell/editor/RichTextToolBar.java
index 8d7708c9c..1bf8a2f56 100644
--- a/designer/src/com/fr/design/cell/editor/RichTextToolBar.java
+++ b/designer/src/com/fr/design/cell/editor/RichTextToolBar.java
@@ -134,7 +134,7 @@ public class RichTextToolBar extends BasicPane{
     }
     
     private void bindListener(){
-        FRFont defaultFont = RichTextPane.DEFAUL_FONT;
+        FRFont defaultFont = (this.textPane != null) ? FRFont.getInstance(this.textPane.getFont()) : RichTextPane.DEFAUL_FONT;
         fontNameComboBox.addItemListener(fontNameItemListener);
         fontNameComboBox.setSelectedItem(defaultFont.getFontName());
         fontSizeComboBox.addItemListener(fontSizeItemListener);