fix bug #26258

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68130 954022d7-b5bf-4e40-9824-e11837661b57

Excel/view/WorksheetView.js

@@ -6266,24 +6266,6 @@
         x *= asc_getcvt( 0/*px*/, 1/*pt*/, this._getPPIX() );
         y *= asc_getcvt( 0/*px*/, 1/*pt*/, this._getPPIY() );
 
-        if ( this.stateFormatPainter ) {
-            if ( x <= this.cellsLeft && y >= this.cellsTop ) {
-                r = this._findRowUnderCursor( y, true );
-                if ( r !== null ) {
-                    target = c_oTargetType.RowHeader;
-                    row = r.row;
-                }
-            }
-            if ( y <= this.cellsTop && x >= this.cellsLeft ) {
-                c = this._findColUnderCursor( x, true );
-                if ( c !== null ) {
-                    target = c_oTargetType.ColumnHeader;
-                    col = c.col;
-                }
-            }
-            return {cursor: kCurFormatPainterExcel, target: target, col: col, row: row};
-        }
-
         var oResDefault = {cursor: kCurDefault, target: c_oTargetType.None, col: -1, row: -1};
         if ( x < this.cellsLeft && y < this.cellsTop ) {
             return {cursor: kCurCorner, target: c_oTargetType.Corner, col: -1, row: -1};
@@ -6335,6 +6317,24 @@
             };
         }
 
+        if ( this.stateFormatPainter ) {
+            if ( x <= this.cellsLeft && y >= this.cellsTop ) {
+                r = this._findRowUnderCursor( y, true );
+                if ( r !== null ) {
+                    target = c_oTargetType.RowHeader;
+                    row = r.row;
+                }
+            }
+            if ( y <= this.cellsTop && x >= this.cellsLeft ) {
+                c = this._findColUnderCursor( x, true );
+                if ( c !== null ) {
+                    target = c_oTargetType.ColumnHeader;
+                    col = c.col;
+                }
+            }
+            return {cursor: kCurFormatPainterExcel, target: target, col: col, row: row};
+        }
+
         if ( this.isFormulaEditMode || this.isChartAreaEditMode ) {
             var oFormulaOrChartCursor = this._getCursorFormulaOrChart( this.visibleRange, x, y, offsetX, offsetY );
             if ( oFormulaOrChartCursor ) {