Pull request #2159: CHART-15259 release→final

Merge in DESIGN/design from ~BJORN/design:final/10.0 to final/10.0

* commit '2a47a15f56553a50a05eec44ae0a87a8b5289c00':
  CHART-15259 release→final

designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java

@@ -1,12 +1,12 @@
 package com.fr.design.chart;
 
+import com.fr.base.ScreenResolution;
 import com.fr.base.chart.BaseChartPainter;
 import com.fr.base.chart.chartdata.CallbackEvent;
 import com.fr.base.chart.result.WebChartIDInfo;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chartx.attr.ChartProvider;
 import com.fr.design.ChartTypeInterfaceManager;
-import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.script.Calculator;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLable;
@@ -79,7 +79,8 @@ public class ChartIcon implements Icon, XMLable {
 
         BaseChartPainter chartPainter = getChartPainter();
 
-        int resolution = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getJTemplateResolution();
+        //插入图表的宽度是固定的，resolution直接获取屏幕分辨率，resolution现在只会影响到老图表
+        int resolution = ScreenResolution.getScreenResolution();
 
         Graphics2D g2d = (Graphics2D) g;
         Paint oldPaint = g2d.getPaint();