• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision10246 (tree)
Zeit2007-07-27 02:37:26
Autorstefankueng

Log Message

Merged revisions 10244 to HEAD from http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk:

........
r10245 | steveking

Patch from kippspan:
Fix Excel diff script for Office2003.
........

Ändern Zusammenfassung

Diff

--- branches/1.4.x/STATUS.txt (revision 10245)
+++ branches/1.4.x/STATUS.txt (revision 10246)
@@ -23,6 +23,7 @@
2323 10065 : crash with wrong regexes
2424 10113 : neon
2525 10208 : global ignore pattern in the status cache
26+10245 : excel diff script
2627
2728 version 1.4.4
2829 8697 : When refreshing the status list control missing files lost their check mark.
--- branches/1.4.x/contrib/other/diff-scripts/diff-xls.vbs (revision 10245)
+++ branches/1.4.x/contrib/other/diff-scripts/diff-xls.vbs (revision 10246)
@@ -38,10 +38,8 @@
3838 'Create a compare side by side view
3939 objExcelApp.Windows.CompareSideBySideWith(objExcelApp.Windows(2).Caption)
4040 If Err.Number <> 0 Then
41- objExcelApp.DisplayAlerts = False
42- objExcelApp.Quit()
43- Wscript.Echo "You must have Excel 2003 or later installed to use compare side-by-side feature."
44- Wscript.Quit 1
41+ objExcelApp.Application.WindowState = xlMaximized
42+ objExcelApp.Windows.Arrange(-4128)
4543 End If
4644
4745 'Mark differences in sNewDoc red
Show on old repository browser