summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesús Corrius <jcorrius@gmail.com>2013-08-04 14:45:59 +0200
committerTor Lillqvist <tml@iki.fi>2013-08-06 08:10:59 +0000
commit88d95183839b9100cb1dc2f93156f31bf1fd0e31 (patch)
tree9812820f2543185377c2036adc360c1d2b04303e
parentdf6c925fafabbc55693a945b47757bd799baac99 (diff)
Add AppUserModelID for all supported formats
Now only the ODF formats have AppUserModelID, but we need AppUserModelID for all supported formats so the Windows 7 recent documents works as expected. This patch only adds a few registry keys during the installation process on Windows. Change-Id: I2d7460c1ed8b4ba77da8bb1c5b0c696c521353c5 Reviewed-on: https://gerrit.libreoffice.org/5275 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
-rwxr-xr-xscp2/inc/macros.inc11
1 files changed, 11 insertions, 0 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 871ed534730c..fa7c350bf9f0 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -235,6 +235,15 @@ End
REG_VALUE_LNG(disp_name) \
End
+#define REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \
+ RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,AppUserModelID) \
+ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+ ModuleID = modid; \
+ ComponentCondition = "VersionNT >= 600"; \
+ Subkey = STRING(AppUserModelID); \
+ Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \
+ End
+
#define REGISTRY_ENTRY_ICON(name,modid,icon_id) \
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
@@ -324,6 +333,7 @@ End
REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \
CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
REGISTRY_ENTRY_DOC(name,modid,disp_name) \
+ REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \
REGISTRY_ENTRY_ICON(name,modid,icon_id) \
REGISTRY_ENTRY_SHELL(name,default,modid) \
REGISTRY_ENTRY_NEW_CMD(name,modid,app) \
@@ -338,6 +348,7 @@ End
REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \
CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
REGISTRY_ENTRY_DOC(name,modid,disp_name) \
+ REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \
REGISTRY_ENTRY_ICON(name,modid,icon_id) \
REGISTRY_ENTRY_SHELL(name,default,modid) \
REGISTRY_ENTRY_NEW_CMD(name,modid,app) \