From 4de7c7f35a491e88a39d22b895dea720a9f84d1a Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 5 Nov 2021 13:01:11 +0100 Subject: [PATCH 1/3] Check migration with OnlyOffice tables --- www/common/onlyoffice/inner.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index 306b166dd..288e47774 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -1638,13 +1638,15 @@ define([ var d, hasChart; if (app === 'doc') { d = getEditor().GetDocument(); - hasChart = d.GetAllCharts().length; + hasChart = d.GetAllCharts().length || d.Document.Content.some(function (obj) { + return obj instanceof AscCommonWord.CTable; + }); if (hasChart) { Feedback.send('OO_DOC_CHART', true); } } else if (app === 'presentation') { d = getEditor().GetPresentation().Presentation; hasChart = d.Slides.some(function (slide) { return slide.getDrawingObjects().some(function (obj) { - return obj instanceof getWindow().AscFormat.CChartSpace; + return obj instanceof getWindow().AscFormat.CChartSpace || obj instanceof getWindow().AscFormat.CGraphicFrame; }); }); if (hasChart) { Feedback.send('OO_SLIDE_CHART', true); } From 6895fe06506a16dbc69aced9e72dd4bc8fd4f581 Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 5 Nov 2021 13:04:30 +0100 Subject: [PATCH 2/3] Disable tables in doc and presentations --- www/common/onlyoffice/inner.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index 288e47774..e399900ae 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -1588,6 +1588,8 @@ define([ //'#id-toolbar-full .toolbar-group:nth-child(2), #id-toolbar-full .separator:nth-child(3) { display: none; }' + '#slot-btn-inschart { display: none !important; }' + // XXX XXX '#slot-btn-insertchart { display: none !important; }' + // XXX XXX + '#slot-btn-instable { display: none !important; }' + // XXX XXX + '#slot-btn-inserttable { display: none !important; }' + // XXX XXX //'#fm-btn-save { display: none !important; }' + //'#panel-settings-general tr.autosave { display: none !important; }' + //'#panel-settings-general tr.coauth { display: none !important; }' + From 90fc5ae4f1356ecbf608fd05fcb9e3d7d7f7c6bd Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 5 Nov 2021 13:06:11 +0100 Subject: [PATCH 3/3] lint compliance --- www/common/onlyoffice/inner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index e399900ae..d2d6e8c07 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -1641,7 +1641,7 @@ define([ if (app === 'doc') { d = getEditor().GetDocument(); hasChart = d.GetAllCharts().length || d.Document.Content.some(function (obj) { - return obj instanceof AscCommonWord.CTable; + return obj instanceof getWindow().AscCommonWord.CTable; }); if (hasChart) { Feedback.send('OO_DOC_CHART', true); } } else if (app === 'presentation') {