• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28649 (tree)
Zeit2019-08-04 19:44:47
Autorstefankueng

Log Message

Merged revision(s) r28647 from trunk:
* prevent office from executing macros in the diff scripts.

Ändern Zusammenfassung

Diff

--- branches/1.10.x/contrib/diff-scripts/diff-doc.js (revision 28648)
+++ branches/1.10.x/contrib/diff-scripts/diff-doc.js (revision 28649)
@@ -2,7 +2,7 @@
22 //
33 // TortoiseSVN Diff script for Word Doc files
44 //
5-// Copyright (C) 2004-2008, 2011-2016 the TortoiseSVN team
5+// Copyright (C) 2004-2008, 2011-2016, 2019 the TortoiseSVN team
66 // This file is distributed under the same license as TortoiseSVN
77 //
88 // Last commit by:
@@ -65,6 +65,8 @@
6565 try
6666 {
6767 word = WScript.CreateObject("Word.Application");
68+ // disable macros
69+ word.AutomationSecurity = 3; //msoAutomationSecurityForceDisable
6870
6971 if (parseInt(word.Version, 10) >= vOffice2013)
7072 {
--- branches/1.10.x/contrib/diff-scripts/diff-ppt.js (revision 28648)
+++ branches/1.10.x/contrib/diff-scripts/diff-ppt.js (revision 28649)
@@ -2,7 +2,7 @@
22 //
33 // TortoiseSVN Diff script for Powerpoint files
44 //
5-// Copyright (C) 2004-2010, 2012-2013, 2015 the TortoiseSVN team
5+// Copyright (C) 2004-2010, 2012-2013, 2015, 2019 the TortoiseSVN team
66 // This file is distributed under the same license as TortoiseSVN
77 //
88 // Last commit by:
@@ -74,6 +74,8 @@
7474 try
7575 {
7676 powerpoint = WScript.CreateObject("Powerpoint.Application");
77+ // disable macros
78+ powerpoint.AutomationSecurity = 3; //msoAutomationSecurityForceDisable
7779 }
7880 catch (e)
7981 {
--- branches/1.10.x/contrib/diff-scripts/diff-xls.js (revision 28648)
+++ branches/1.10.x/contrib/diff-scripts/diff-xls.js (revision 28649)
@@ -86,6 +86,10 @@
8686 {
8787 Abort("You must have Excel installed to perform this operation.", "Excel Instantiation Failed");
8888 }
89+
90+// disable all macros
91+objExcelApp.AutomationSecurity = 3; //msoAutomationSecurityForceDisable
92+
8993 var fExcelVersion = parseInt(objExcelApp.Version, 10);
9094
9195 // Open base Excel book
--- branches/1.10.x/contrib/diff-scripts/merge-doc.js (revision 28648)
+++ branches/1.10.x/contrib/diff-scripts/merge-doc.js (revision 28649)
@@ -2,7 +2,7 @@
22 //
33 // TortoiseSVN Merge script for Word Doc files
44 //
5-// Copyright (C) 2004-2008, 2011-2016 the TortoiseSVN team
5+// Copyright (C) 2004-2008, 2011-2016, 2019 the TortoiseSVN team
66 // This file is distributed under the same license as TortoiseSVN
77 //
88 // Last commit by:
@@ -68,6 +68,8 @@
6868 try
6969 {
7070 word = WScript.CreateObject("Word.Application");
71+ // disable macros
72+ word.AutomationSecurity = 3; //msoAutomationSecurityForceDisable
7173 }
7274 catch (e)
7375 {
Show on old repository browser