summaryrefslogtreecommitdiff
path: root/scp2/source
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2020-01-11 13:32:00 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2020-01-11 15:03:22 +0100
commit01fa2b022e4d5b7392b02181d9bb9bfc76272d62 (patch)
tree7f5eed6513ad81ab8c4898eb98bd9acdce7fd099 /scp2/source
parentc000c6026d2b3286d2aaebc903e5cf65a06be286 (diff)
Use registry key to track installed state of gm_SharePointSupport_SubstMSO
Without that, after initial installation, the state of the feature is undefined, and following uninstallation can't define that it needs to be uninstalled, unregistering SharePoint.OpenDocuments class. Change-Id: Ib7455833fb397c332735eb4c8ab63f763b4e469b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86598 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'scp2/source')
-rw-r--r--scp2/source/spsupp/module_spsupp.scp19
1 files changed, 15 insertions, 4 deletions
diff --git a/scp2/source/spsupp/module_spsupp.scp b/scp2/source/spsupp/module_spsupp.scp
index b97a84a699d5..ba1ec4602028 100644
--- a/scp2/source/spsupp/module_spsupp.scp
+++ b/scp2/source/spsupp/module_spsupp.scp
@@ -23,10 +23,10 @@ Module gid_Module_Optional_SharePointSupport
End
/*
- * This is an *empty* feature disabled by default, that controls custom action registering
- * SharePoint.OpenDocuments class, which replaces registration of that class from MSO.
- * It is disabled to allow co-existing with MS Office. To install, a transform must be
- * used that would set its level to non-0 value, or a command line like
+ * This is a feature with a single registry item, disabled by default, that controls custom action
+ * registering SharePoint.OpenDocuments class, which replaces registration of that class from MSO.
+ * It is disabled to allow co-existing with MS Office. To install, a transform must be used that
+ * would set its level to a non-0 value below INSTALLLEVEL, or a command line like
*
* msiexec.exe /i path-to-msi ADDLOCAL=gm_SharePointSupport_SubstMSO
*/
@@ -40,5 +40,16 @@ Module gid_Module_SharePointSupport_SubstMSO
Styles = (HIDDEN_ROOT);
End
+/*
+ * Create a component for the feature, with key path in registry, to track feature installed state
+ */
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_SharePointSupport_SubstMSO_Registered
+ ModuleID = gid_Module_SharePointSupport_SubstMSO;
+ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+ Subkey = "Software\%MANUFACTURER\%PRODUCTNAME\%PRODUCTVERSION\SharePointSupport\SubstMSO";
+ Name = "Registered";
+ Value = "1";
+End
+
#endif