diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-04-06 10:02:33 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-04-06 13:08:06 +0000 |
commit | 9e5ca23884bde4d0afba99f5a6b02c00968069e4 (patch) | |
tree | c9c19725b4da0258b58e337319e17e839d2c174c | |
parent | 6e336c43a239f515cc882a3da1bad63e3507b230 (diff) |
tdf#106359: register .iqy in MSI and treat them as templates
Reviewed-on: https://gerrit.libreoffice.org/36188
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 0c547776340c3983a867890b34f4a931215f8f52)
Change-Id: I7ae94c7717fbea03d96c539e05eeb565bafefd9f
Reviewed-on: https://gerrit.libreoffice.org/36205
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
-rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 1 | ||||
-rw-r--r-- | scp2/inc/macros.inc | 9 | ||||
-rw-r--r-- | scp2/source/calc/registryitem_calc.scp | 1 | ||||
-rw-r--r-- | scp2/source/calc/registryitem_calc.ulf | 3 | ||||
-rw-r--r-- | setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx | 7 | ||||
-rw-r--r-- | solenv/bin/modules/installer/windows/property.pm | 1 |
6 files changed, 16 insertions, 6 deletions
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index dc7873cc570e..3f46b5255fb4 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -241,6 +241,7 @@ CommandLineEvent CheckWebQuery(/* in,out */ OUString& arg, CommandLineEvent curE xInput->closeInput(); arg = OUString::createFromAscii(aResult.getStr()); + return CommandLineEvent::ForceNew; } catch (...) { diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 86b221e57c6b..50ec89ae367d 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -356,7 +356,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) \ @@ -364,11 +364,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 96c10d701fef..db203b79d0c4 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" diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx index ebd8d27e08a4..e72416a5bc01 100644 --- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx +++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx @@ -48,6 +48,7 @@ static const CHAR* g_Extensions[] = ".xltx", // Office Excel 2007 XML template ".xltm", // Office Excel 2007 XML macro-enabled template ".xlsb", // Office Excel 2007 binary workbook (BIFF12) + ".iqy", // Microsoft Excel Web Query File ".ppt", // Microsoft Powerpoint ".pps", // Microsoft Powerpoint ".pot", // Microsoft Powerpoint Template @@ -63,9 +64,9 @@ static const CHAR* g_Extensions[] = static const int WORD_START = 0; static const int EXCEL_START = 7; -static const int POWERPOINT_START = 15; -static const int VISIO_START = 23; -static const int VISIO_END = 25; +static const int POWERPOINT_START = 16; +static const int VISIO_START = 24; +static const int VISIO_END = 26; // ".xlam", // Office Excel 2007 XML macro-enabled add-in // ".ppam", // Office PowerPoint 2007 macro-enabled XML add-in diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm index d96678b602e3..9c26024633fd 100644 --- a/solenv/bin/modules/installer/windows/property.pm +++ b/solenv/bin/modules/installer/windows/property.pm @@ -386,6 +386,7 @@ sub set_ms_file_types_properties push(@{$propertyfile}, "REGISTER_XLT" . "\t" . "0" . "\n"); push(@{$propertyfile}, "REGISTER_XLTX" . "\t" . "0" . "\n"); push(@{$propertyfile}, "REGISTER_XLTM" . "\t" . "0" . "\n"); + push(@{$propertyfile}, "REGISTER_IQY" . "\t" . "0" . "\n"); push(@{$propertyfile}, "REGISTER_NO_MSO_TYPES" . "\t" . "0" . "\n"); push(@{$propertyfile}, "REGISTER_ALL_MSO_TYPES" . "\t" . "0" . "\n"); |