From 34ad3f69df05ab6c0e3a120cc970bce0d57a33a8 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Thu, 28 Sep 2017 17:32:11 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4822=20IE=20=E5=92=8C=E8=B0=B7=E6=AD=8C?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=EF=BC=8C=E5=90=8C=E6=A0=B7=E7=9A=84?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=89=93=E5=BC=80=E5=AD=97=E4=BD=93=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E6=A0=B7=3D>=E7=BB=9F=E4=B8=80=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84=E5=AD=97=E5=8F=B7=E9=80=89=E6=8B=A9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/cell/editor/RichTextToolBar.java |  2 +-
 .../src/com/fr/design/gui/style/FRFontPane.java    | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/designer/src/com/fr/design/cell/editor/RichTextToolBar.java b/designer/src/com/fr/design/cell/editor/RichTextToolBar.java
index 1bf8a2f569..b6c10578a7 100644
--- a/designer/src/com/fr/design/cell/editor/RichTextToolBar.java
+++ b/designer/src/com/fr/design/cell/editor/RichTextToolBar.java
@@ -81,7 +81,7 @@ public class RichTextToolBar extends BasicPane{
     private void initAllButton(){
         fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report());
         fontNameComboBox.setPreferredSize(new Dimension(144, 20));
-        fontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES);
+        fontSizeComboBox = new UIComboBox(FRFontPane.getFontSizes());
 		colorSelectPane = new UIToolbarColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/foreground.png"));
 		colorSelectPane.set4Toolbar();
         
diff --git a/designer_base/src/com/fr/design/gui/style/FRFontPane.java b/designer_base/src/com/fr/design/gui/style/FRFontPane.java
index 2dafb005dc..8dfb512e08 100644
--- a/designer_base/src/com/fr/design/gui/style/FRFontPane.java
+++ b/designer_base/src/com/fr/design/gui/style/FRFontPane.java
@@ -7,6 +7,7 @@ package com.fr.design.gui.style;
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.Vector;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -37,8 +38,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
  * Pane to edit Font.
  */
 public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObserver {
-    public static Integer[] FONT_SIZES = {new Integer(6), new Integer(8), new Integer(9), new Integer(10), new Integer(11), new Integer(12), new Integer(14), new Integer(16),
-            new Integer(18), new Integer(20), new Integer(22), new Integer(24), new Integer(26), new Integer(28), new Integer(36), new Integer(48), new Integer(72)};
+    private static final int MAX_FONT_SIZE = 100;
     private static final Dimension BUTTON_SIZE = new Dimension(24, 20);
     private JPanel buttonPane;
     private JPanel isSuperOrSubPane;
@@ -212,10 +212,18 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
         return style.deriveFRFont(frFont);
     }
 
+    public static Vector<Integer> getFontSizes() {
+        Vector<Integer> FONT_SIZES = new Vector<Integer>();
+        for (int i = 1; i < MAX_FONT_SIZE; i++) {
+            FONT_SIZES.add(i);
+        }
+        return FONT_SIZES;
+    }
+
     protected void initComponents() {
         fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report());
         fontNameComboBox.setPreferredSize(new Dimension(144, 20));
-        fontSizeComboBox = new UIComboBox(FONT_SIZES);
+        fontSizeComboBox = new UIComboBox(getFontSizes());
         this.underlineCombo = new LineComboBox(UIConstants.BORDER_LINE_STYLE_ARRAY);
         colorSelectPane = new UIColorButton();
         bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"));