diff options
| author | Jesús Corrius <jcorrius@gmail.com> | 2013-08-20 11:23:02 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-08-20 09:28:00 +0000 |
| commit | c4d5b148340932df9ac0360e6831169e945566fe (patch) | |
| tree | 9973ae64f710481e27777fe904cc8da1f9124b21 /scp2 | |
| parent | fbf8ae82411d56189f844f9f00ccc6cf6b0827bf (diff) | |
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@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'scp2')
| -rwxr-xr-x | scp2/inc/macros.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 4d588a4d0e69..75d2778c0947 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) \ |