[Libreoffice-commits] core.git: scp2/source

[Mike Kaganski (via logerrit)]

 scp2/source/spsupp/module_spsupp.scp |   19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 01fa2b022e4d5b7392b02181d9bb9bfc76272d62
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sat Jan 11 13:32:00 2020 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat Jan 11 15:03:22 2020 +0100

    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 at collabora.com>

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