• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision13558 (tree)
Zeit2008-07-26 15:53:04
Autorstefankueng

Log Message

Merge r13557 from trunk:
* docx is only supported in office2007, so remove the checks for older office versions.

Ändern Zusammenfassung

Diff

--- branches/1.5.x/contrib/other/diff-scripts/merge-docx.js (revision 13557)
+++ branches/1.5.x/contrib/other/diff-scripts/merge-docx.js (revision 13558)
@@ -16,15 +16,7 @@
1616
1717 var objArgs,num,sTheirDoc,sMyDoc,sBaseDoc,sMergedDoc,objScript,word,baseDoc,WSHShell;
1818
19-// Microsoft Office versions for Microsoft Windows OS
20-var vOffice2000 = 9;
21-var vOffice2002 = 10;
22-var vOffice2003 = 11;
23-var vOffice2007 = 12;
24-// WdCompareTarget
25-var wdCompareTargetSelected = 0;
26-var wdCompareTargetCurrent = 1;
27-var wdCompareTargetNew = 2;
19+var vbExclamation = "!"; //+pa
2820
2921 objArgs = WScript.Arguments;
3022 num = objArgs.length;
@@ -36,7 +28,7 @@
3628
3729 sMergedDoc=objArgs(0);
3830 sTheirDoc=objArgs(1);
39-sMyDoc=objArgs(2);
31+sMyDoc=objArgs(2); //?? unused??
4032 sBaseDoc=objArgs(3);
4133
4234 objScript = new ActiveXObject("Scripting.FileSystemObject")
@@ -66,16 +58,12 @@
6658 word.visible = true
6759
6860 // Open the base document
69-baseDoc = word.Documents.Open(sTheirDoc);
61+baseDoc = word.Documents.Open(sTheirDoc); //?? base or their??
7062
7163 // Merge into the "My" document
72-if (Number(word.Version) < vOffice2000)
64+if (Number(word.Version) < 12)
7365 {
74- baseDoc.Compare(sMergedDoc);
75-}
76-else if (Number(word.Version) < vOffice2007)
77-{
78- baseDoc.Compare(sMergedDoc, "Comparison", wdCompareTargetNew, true, true);
66+ baseDoc.Compare(sMergedDoc);
7967 } else {
8068 baseDoc.Merge(sMergedDoc);
8169 }
Show on old repository browser