diff --git a/apps/documenteditor/main/app/controller/ViewTab.js b/apps/documenteditor/main/app/controller/ViewTab.js index 8340890997..b9469af9fd 100644 --- a/apps/documenteditor/main/app/controller/ViewTab.js +++ b/apps/documenteditor/main/app/controller/ViewTab.js @@ -181,7 +181,11 @@ define([ me.view.$el.find('.separator-rulers').remove(); } - if (!config.isEdit || config.customization && config.customization.macros===false) { + if ( + !config.isEdit || + config.customization && config.customization.macros===false || + (Common.Controllers.Desktop && Common.Controllers.Desktop.isWinXp()) + ) { me.view.$el.find('.macro').remove(); } diff --git a/apps/documenteditor/main/app/view/ViewTab.js b/apps/documenteditor/main/app/view/ViewTab.js index 9e2e2d3a92..fba9d6e11a 100644 --- a/apps/documenteditor/main/app/view/ViewTab.js +++ b/apps/documenteditor/main/app/view/ViewTab.js @@ -293,7 +293,11 @@ define([ }); this.lockedControls.push(this.chRulers); - if (this.appConfig.isEdit && !(this.appConfig.customization && this.appConfig.customization.macros===false)) { + if ( + this.appConfig.isEdit && + !(this.appConfig.customization && this.appConfig.customization.macros===false) && + !(Common.Controllers.Desktop && Common.Controllers.Desktop.isWinXp()) + ) { this.btnMacros = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-macros', diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js index c2ba5cd5bb..1b5dd2c56d 100644 --- a/apps/presentationeditor/main/app/view/ViewTab.js +++ b/apps/presentationeditor/main/app/view/ViewTab.js @@ -411,7 +411,11 @@ define([ }); this.lockedControls.push(this.chLeftMenu); - if (this.appConfig.isEdit && !(this.appConfig.customization && this.appConfig.customization.macros===false)) { + if ( + this.appConfig.isEdit && + !(this.appConfig.customization && this.appConfig.customization.macros===false) && + !(Common.Controllers.Desktop && Common.Controllers.Desktop.isWinXp()) + ) { this.btnMacros = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-macros', @@ -589,7 +593,11 @@ define([ me.btnGuides.$el.closest('.group').remove(); me.$el.find('#slot-btn-slide-master').closest('.group').next().addBack().remove(); } - if (!config.isEdit || config.customization && config.customization.macros===false) { + if ( + !config.isEdit || + config.customization && config.customization.macros===false || + (Common.Controllers.Desktop && Common.Controllers.Desktop.isWinXp()) + ) { me.$el.find('.macro').remove(); } if (config.isEdit || config.isRestrictedEdit) { diff --git a/apps/spreadsheeteditor/main/app/view/ViewTab.js b/apps/spreadsheeteditor/main/app/view/ViewTab.js index 7db0c4cf7a..af84781fc9 100644 --- a/apps/spreadsheeteditor/main/app/view/ViewTab.js +++ b/apps/spreadsheeteditor/main/app/view/ViewTab.js @@ -315,7 +315,11 @@ define([ }); this.lockedControls.push(this.btnViewPageBreak); - if (!(this.appConfig.customization && this.appConfig.customization.macros===false)) { + if ( + this.appConfig.isEdit && + !(this.appConfig.customization && this.appConfig.customization.macros===false) && + !(Common.Controllers.Desktop && Common.Controllers.Desktop.isWinXp()) + ) { this.btnMacros = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-macros', @@ -530,7 +534,11 @@ define([ me.toolbar && me.toolbar.$el.find('.separator.sheet-freeze').hide(); me.toolbar && me.toolbar.$el.find('.group.sheet-gridlines').hide(); } - if (!config.isEdit || config.customization && config.customization.macros===false) { + if ( + !config.isEdit || + config.customization && config.customization.macros===false || + (Common.Controllers.Desktop && Common.Controllers.Desktop.isWinXp()) + ) { me.toolbar.$el.find('.macro').remove(); }