Merge pull request #477 in BA/design from ~ZACK/design:release to release

* commit '65596e57799bd9675dd6d0f7c84d1dd2111b935d':
  无JIRA任务 同步release

designer_form/src/com/fr/design/mainframe/EditingMouseListener.java

@@ -288,26 +288,28 @@ public class EditingMouseListener extends MouseInputAdapter {
         if (component.isReport()) {
             xElementCase = (XElementCase)component;
 			UIButton button = (UIButton)xElementCase.getCoverPane().getComponent(0);
-            JComponent button1= (JComponent) xElementCase.getCoverPane().getComponent(1);
             if(designer.getCursor().getType() ==Cursor.HAND_CURSOR) {
 				designer.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
 			} // component.getParent() 是报表块所在的XWTitleLayout
 			int minX = button.getX() + getParentPositionX(component, 0) - designer.getArea().getHorizontalValue();
-            int minX1 = button1.getX() + getParentPositionX(component, 0) - designer.getArea().getHorizontalValue();
 			int minY = button.getY() + getParentPositionY(component, 0) - designer.getArea().getVerticalValue();
-            int minY1 = button1.getY() + getParentPositionY(component, 0) - designer.getArea().getVerticalValue();
 			if (e.getX() + GAP - xElementCase.getInsets().left > minX && e.getX() - GAP - xElementCase.getInsets().left < minX + button.getWidth()) {
 				if (e.getY() + GAP - xElementCase.getInsets().top > minY && e.getY() - GAP - xElementCase.getInsets().top < minY + button.getHeight()) {
 					designer.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
 				}
 			}
 			xElementCase.setHelpBtnOnFocus(false);
+			if (xElementCase.getCoverPane().getComponentCount() > 1) {
+				JComponent button1 = (JComponent) xElementCase.getCoverPane().getComponent(1);
+				int minX1 = button1.getX() + getParentPositionX(component, 0) - designer.getArea().getHorizontalValue();
+				int minY1 = button1.getY() + getParentPositionY(component, 0) - designer.getArea().getVerticalValue();
 				if (e.getX() + GAP - xElementCase.getInsets().left > minX1 && e.getX() - GAP - xElementCase.getInsets().left < minX1 + button1.getWidth()) {
 					if (e.getY() + GAP - xElementCase.getInsets().top > minY1 && e.getY() - GAP - xElementCase.getInsets().top < minY1 + button1.getHeight()) {
 						designer.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
 						xElementCase.setHelpBtnOnFocus(true);
 					}
 				}
+			}
 			xElementCase.displayCoverPane(true);
             xElementCase.setDirections(Direction.TOP_BOTTOM_LEFT_RIGHT);