• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28648 (tree)
Zeit2019-08-04 19:42:28
Autorstefankueng

Log Message

Merged revision(s) r28645, r28646, r28647 from trunk:
* Skip over deleted items when exporting.
* Don't change the url if the combobox is hidden.
* prevent office from executing macros in the diff scripts.

Ändern Zusammenfassung

Diff

--- branches/1.12.x/contrib/diff-scripts/diff-doc.js (revision 28647)
+++ branches/1.12.x/contrib/diff-scripts/diff-doc.js (revision 28648)
@@ -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.12.x/contrib/diff-scripts/diff-ppt.js (revision 28647)
+++ branches/1.12.x/contrib/diff-scripts/diff-ppt.js (revision 28648)
@@ -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.12.x/contrib/diff-scripts/diff-xls.js (revision 28647)
+++ branches/1.12.x/contrib/diff-scripts/diff-xls.js (revision 28648)
@@ -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.12.x/contrib/diff-scripts/merge-doc.js (revision 28647)
+++ branches/1.12.x/contrib/diff-scripts/merge-doc.js (revision 28648)
@@ -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 {
--- branches/1.12.x/src/Changelog.txt (revision 28647)
+++ branches/1.12.x/src/Changelog.txt (revision 28648)
@@ -1,4 +1,10 @@
1-Version 1.12.1
1+Version 1.12.2
2+- BUG: Exporting files from the log dialog
3+ stopped at deleted entries. (Stefan)
4+- BUG: the word/excel diff scripts allowed
5+ macros to be executed. (Stefan)
6+
7+Version 1.12.1
28 - BUG: Crash in the repo browser if externals
39 with relative paths were present. (Stefan)
410 - BUG: "save as..." from the log dialog saved
--- branches/1.12.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28647)
+++ branches/1.12.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28648)
@@ -7584,6 +7584,11 @@
75847584 progDlg.SetTime(true);
75857585 for (size_t i = 0; i < pCmi->ChangedLogPathIndices.size(); ++i)
75867586 {
7587+ if (m_currentChangedArray[pCmi->ChangedLogPathIndices[i]].GetAction() == LOGACTIONS_DELETED)
7588+ continue;
7589+ if (m_currentChangedArray[pCmi->ChangedLogPathIndices[i]].GetNodeKind() == svn_node_dir)
7590+ continue;
7591+
75877592 const CString& schangedlogpath = m_currentChangedArray[pCmi->ChangedLogPathIndices[i]].GetPath();
75887593
75897594 SVNRev getrev = pCmi->Rev1;
@@ -7598,6 +7603,8 @@
75987603 progDlg.SetLine(2, tempfile.GetWinPath(), true);
75997604 progDlg.SetProgress64(i, pCmi->ChangedLogPathIndices.size());
76007605 progDlg.ShowModeless(m_hWnd);
7606+ if (progDlg.HasUserCancelled())
7607+ break;
76017608
76027609 SHCreateDirectoryEx(m_hWnd, tempfile.GetContainingDirectory().GetWinPath(),
76037610 NULL);
--- branches/1.12.x/src/TortoiseProc/RepositoryBar.cpp (revision 28647)
+++ branches/1.12.x/src/TortoiseProc/RepositoryBar.cpp (revision 28648)
@@ -1,6 +1,6 @@
11 // TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2003-2018 - TortoiseSVN
3+// Copyright (C) 2003-2019 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -354,6 +354,8 @@
354354
355355 void CRepositoryBar::OnCbnSelEndOK()
356356 {
357+ if (!IsWindowVisible())
358+ return;
357359 int idx = m_cbxUrl.GetCurSel();
358360 if (idx >= 0)
359361 {
Show on old repository browser