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

[Jesús Corrius]

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

New commits:
commit c4d5b148340932df9ac0360e6831169e945566fe
Author: Jesús Corrius <jcorrius at gmail.com>
Date:   Tue Aug 20 11:23:02 2013 +0200

    Registy item fix for AppUserModelID and use STRING macro for strings
    
    Change-Id: Id6434355aabdde4f39232ab5a839201a85ca4d29
    Reviewed-on: https://gerrit.libreoffice.org/5529
    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 4d588a4..75d2778 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -269,10 +269,10 @@ 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 >= 601"; \
+        ComponentCondition = STRING(VersionNT >= 601); \
         Subkey = STRING(AppUserModelID); \
         Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \
     End
@@ -355,10 +355,10 @@ End
     RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Explorer_KindMap_,name) \
         ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
         ModuleID = modid; \
-        ComponentCondition = "VersionNT >= 600"; \
+        ComponentCondition = STRING(VersionNT >= 600); \
         Subkey = STRING(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = "document"; \
+        Value = STRING(document); \
     End
 
 #define CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \