[ios] tables

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

Excel/api.js

@@ -2388,7 +2388,17 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 		};
 
 		spreadsheet_api.prototype.asc_findText = function (options) {
-			var d = this.wb.findCellText(options);
+            if (window["NATIVE_EDITOR_ENJINE"]) {
+                if (this.wb.findCellText(options)) {
+                    var ws = this.wb.getWorksheet();
+                    return [ws.getCellLeftRelative(ws.activeRange.c1, 0),
+                        ws.getCellTopRelative(ws.activeRange.r1, 0)];
+                }
+
+                return null;
+            }
+
+            var d = this.wb.findCellText(options);
 			if (d) {
 				if (d.deltaX) {this.controller.scrollHorizontal(d.deltaX);}
 				if (d.deltaY) {this.controller.scrollVertical(d.deltaY);}

Excel/native/native.js

@@ -1910,6 +1910,8 @@ function OfflineEditor () {
 
         for (var i = 0; i < _api.asc_getWorksheetsCount(); ++i) {
 
+            var viewSettings = _api.wb.getWorksheet(i).getSheetViewSettings();
+
             if (_api.asc_getWorksheetTabColor(i)) {
                 _stream["WriteByte"](1);
             } else {
@@ -1921,6 +1923,9 @@ function OfflineEditor () {
             _stream['WriteBool'](_api.asc_isWorksheetHidden(i));
             _stream['WriteBool'](_api.asc_isWorkbookLocked(i));
             _stream['WriteBool'](_api.asc_isWorksheetLockedOrDeleted(i));
+            _stream['WriteBool'](viewSettings.asc_getShowGridLines());
+            _stream['WriteBool'](viewSettings.asc_getShowRowColHeaders());
+            _stream['WriteBool'](viewSettings.asc_getIsFreezePane());
 
             if (_api.asc_getWorksheetTabColor(i))
                 asc_menu_WriteColor(0, _api.asc_getWorksheetTabColor(i), _stream);
@@ -1933,6 +1938,9 @@ function OfflineEditor () {
         }
     };
     this.asc_writeWorksheet = function(i) {
+
+        var viewSettings = _api.wb.getWorksheet(i).getSheetViewSettings();
+
         var _stream = global_memory_stream_menu;
         _stream["ClearNoAttack"]();
 
@@ -1947,6 +1955,9 @@ function OfflineEditor () {
         _stream['WriteBool'](_api.asc_isWorksheetHidden(i));
         _stream['WriteBool'](_api.asc_isWorkbookLocked(i));
         _stream['WriteBool'](_api.asc_isWorksheetLockedOrDeleted(i));
+        _stream['WriteBool'](viewSettings.asc_getShowGridLines());
+        _stream['WriteBool'](viewSettings.asc_getShowRowColHeaders());
+        _stream['WriteBool'](viewSettings.asc_getIsFreezePane());
 
         if (_api.asc_getWorksheetTabColor(i)) {
             asc_menu_WriteColor(0, _api.asc_getWorksheetTabColor(i), _stream);
@@ -2713,6 +2724,24 @@ function offline_apply_event(type,params) {
                         break;
                     }
 
+                    case 5: // show gridlines
+                    {
+                        var isLines = _api.asc_getSheetViewSettings();
+                        isLines.asc_setShowGridLines(params[_current.pos++]);
+                        _api.asc_setSheetViewSettings(isLines);
+                        _s.asc_WriteAllWorksheets(true);
+                        break;
+                    }
+
+                    case 6: // row col headers
+                    {
+                        var isHeaders = _api.asc_getSheetViewSettings();
+                        isHeaders.asc_setShowRowColHeaders(params[_current.pos++]);
+                        _api.asc_setSheetViewSettings(isHeaders);
+                        _s.asc_WriteAllWorksheets(true);
+                        break;
+                    }
+
                     case 255:
                     default:
                     {