Pull request #2254: REPORT-38529 && REPORT-38527

Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0

* commit 'd91768f8ffe489be57754ea3cb23b7ea16c853a8':
  REPORT-38529 && REPORT-38527

designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java

@@ -1,5 +1,6 @@
 package com.fr.design.form.util;
 
+import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.JTemplate;
@@ -17,7 +18,7 @@ public class FormDesignerUtils {
      * @return
      */
     public static boolean isAppRelayout(FormDesigner designer) {
-        if (!designer.getRootComponent().acceptType(WFitLayout.class)) {
+        if (!designer.getRootComponent().acceptType(XWFitLayout.class)) {
             return false;
         }
         return ((WFitLayout) designer.getRootComponent().toData()).isAppRelayout();