• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28858 (tree)
Zeit2020-05-02 04:07:16
Autorstefankueng

Log Message

Remove .rtf as an extension to use the word diff/merge scripts.
Since .rtf files are basically text, it's better to use the default diff/merge tools for text.
While it is possible to check whether word is installed with:

CLSID clsid{};
CLSIDFromProgID(L"Word.Application", &clsid);
auto wordIsInstalled = clsid.Data1 != 0 || clsid.Data2 != 0 || clsid.Data3 != 0;

this also returns true if the user has the demo version of word installed (the Windows 10 app that usually is already installed by default, but reverts to readonly mode after a month). And with the demo version it's not possible to save the changes.
So it's better to leave it as is and let the user configure .rtf to use the word diff/merge script manually if they really want to.

Ändern Zusammenfassung

Diff

--- trunk/contrib/diff-scripts/diff-doc.js (revision 28857)
+++ trunk/contrib/diff-scripts/diff-doc.js (revision 28858)
@@ -1,4 +1,4 @@
1-// extensions: doc;docx;docm;rtf;odt;ods
1+// extensions: doc;docx;docm;odt;ods
22 //
33 // TortoiseSVN Diff script for Word Doc files
44 //
--- trunk/contrib/diff-scripts/merge-doc.js (revision 28857)
+++ trunk/contrib/diff-scripts/merge-doc.js (revision 28858)
@@ -1,4 +1,4 @@
1-// extensions: doc;docx;docm;rtf
1+// extensions: doc;docx;docm
22 //
33 // TortoiseSVN Merge script for Word Doc files
44 //
Show on old repository browser