[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - scp2/inc

[Jesús Corrius]

 scp2/inc/macros.inc |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit c8b6437fb60e0428d615ca5c4b532f79b721785a
Author: Jesús Corrius <jcorrius at gmail.com>
Date:   Sat Aug 24 13:55:46 2013 +0200

    Create the AppUserModelID registry values correctly
    
    This commit is a backport from master.
    
    The original code is totally broken and creates useless
    registry values in a wrong place.
    
    The corrected patch allows LO to keep track of the MSO
    file types opened by our application in the shell's
    "recent documents" list.
    
    Change-Id: I5db0a7f166ef73fe21a5f3fc891f86a91e1914d5
    Reviewed-on: https://gerrit.libreoffice.org/5603
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index fa7c350..f0ed12a2 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -236,11 +236,12 @@ End
     End
 
 #define REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \
-    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,AppUserModelID) \
+    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_AppUserModelID) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        ComponentCondition = "VersionNT >= 600"; \
-        Subkey = STRING(AppUserModelID); \
+        ComponentCondition = STRING(VersionNT >= 601); \
+        Subkey = STRING(CONCAT2(LibreOffice.,name)); \
+        Name = STRING(AppUserModelID); \
         Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \
     End