From 0c547776340c3983a867890b34f4a931215f8f52 Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Thu, 6 Apr 2017 10:02:33 +0300
Subject: tdf#106359: register .iqy in MSI and treat them as templates

Change-Id: I7ae94c7717fbea03d96c539e05eeb565bafefd9f
Reviewed-on: https://gerrit.libreoffice.org/36188
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
---
 scp2/inc/macros.inc                    | 9 ++++++---
 scp2/source/calc/registryitem_calc.scp | 1 +
 scp2/source/calc/registryitem_calc.ulf | 3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'scp2')

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index a2e8daabe841..730b289779b2 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -368,7 +368,7 @@ End
         Styles = (); \
     End
 
-#define CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
+#define CONDITIONAL_REGISTER_DOC_OPEN_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
     CONDITIONAL_MODULE_ENTRY(name,modid) \
     REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \
     CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
@@ -376,11 +376,14 @@ End
     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) \
     REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
+    REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
+
+#define CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
+    CONDITIONAL_REGISTER_DOC_OPEN_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
+    REGISTRY_ENTRY_NEW_CMD(name,modid,app) \
     REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
     REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
-    REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
 
 #define CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
     CONDITIONAL_MODULE_ENTRY(name,modid) \
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 7259226eb9ff..2cb78210a2fa 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -1249,6 +1249,7 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_MSO_Reg, xls,  XLS
 CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLSX, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_OPEN_EXTENSION( Iqy, gid_Module_Prg_Calc_MSO_Reg, iqy, IQY, MS_EXCEL_WEBQUERY, 0, scalc.exe, open, Calc )
 CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt,  gid_Module_Prg_Calc_MSO_Reg, xlt,  XLT,  MS_EXCEL_TEMPLATE_OLD, 4, scalc.exe, new, Calc )
 CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
 CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
diff --git a/scp2/source/calc/registryitem_calc.ulf b/scp2/source/calc/registryitem_calc.ulf
index b7fe2c36609e..fb115e6a2235 100644
--- a/scp2/source/calc/registryitem_calc.ulf
+++ b/scp2/source/calc/registryitem_calc.ulf
@@ -37,6 +37,9 @@ en-US = "Microsoft Excel 97-2003 Worksheet"
 [STR_REG_VAL_MS_EXCEL_WORKSHEET]
 en-US = "Microsoft Excel Worksheet"
 
+[STR_REG_VAL_MS_EXCEL_WEBQUERY]
+en-US = "Microsoft Excel Web Query File"
+
 [STR_REG_VAL_MS_EXCEL_TEMPLATE_OLD]
 en-US = "Microsoft Excel 97-2003 Template"
 
-- 
cgit