From e0268a7beedd95dcf273806d761c94c75a9a646a Mon Sep 17 00:00:00 2001 From: Alexander Trofimov Date: Thu, 14 May 2020 12:01:20 +0300 Subject: [PATCH] [SSE] Move Move asc_getWrapText to cell info --- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 2 +- apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js | 2 +- apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 111827f50..c3f86bb03 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2320,7 +2320,7 @@ define([ /* read cell text wrapping */ if (!toolbar.btnWrap.isDisabled()) { - val = info.asc_getFlags().asc_getWrapText(); + val = info.asc_getWrapText(); if (this._state.wrap !== val) { toolbar.btnWrap.toggle(val===true, true); this._state.wrap = val; diff --git a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js index 4f59a163c..fa3bc06ca 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js @@ -420,7 +420,7 @@ define([ }); arrItems.push( - cellinfo.asc_getFlags().asc_getWrapText() ? + cellinfo.asc_getWrapText() ? { caption: me.menuUnwrap, event: 'unwrap' diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js index 16e5ce37d..10a861261 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js @@ -219,7 +219,7 @@ define([ vAlign = me._cellInfo.asc_getVertAlign(), hAlignStr = 'left', vAlignStr = 'bottom', - isWrapText = me._cellInfo.asc_getFlags().asc_getWrapText(); + isWrapText = me._cellInfo.asc_getWrapText(); if (vAlign == Asc.c_oAscVAlign.Top) vAlignStr = 'top';