[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - desktop/source scp2/inc scp2/source setup_native/source solenv/bin
Mike Kaganski
mike.kaganski at collabora.com
Thu Apr 6 20:53:17 UTC 2017
desktop/source/app/cmdlineargs.cxx | 1 +
scp2/inc/macros.inc | 9 ++++++---
scp2/source/calc/registryitem_calc.scp | 1 +
scp2/source/calc/registryitem_calc.ulf | 3 +++
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx | 7 ++++---
solenv/bin/modules/installer/windows/property.pm | 1 +
6 files changed, 16 insertions(+), 6 deletions(-)
New commits:
commit 14f3ca72d9f3bfb76f22e566cc4109ca38b3493c
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Thu Apr 6 10:02:33 2017 +0300
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 at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
(cherry picked from commit 0c547776340c3983a867890b34f4a931215f8f52)
Reviewed-on: https://gerrit.libreoffice.org/36203
Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 10ef770af9c8..07dee1b60aa8 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -244,6 +244,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 4de35db91e2e..da09c7c2c3d0 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"
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index e13ad91ff404..c6434e35106e 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -50,6 +50,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
".et", // Kingsoft Spreadsheet
".ett", // Kingsoft SpreadSheet Template
".ppt", // Microsoft Powerpoint
@@ -69,9 +70,9 @@ static const CHAR* g_Extensions[] =
static const int WORD_START = 0;
static const int EXCEL_START = 9;
-static const int POWERPOINT_START = 19;
-static const int VISIO_START = 29;
-static const int VISIO_END = 31;
+static const int POWERPOINT_START = 20;
+static const int VISIO_START = 30;
+static const int VISIO_END = 32;
// ".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");
More information about the Libreoffice-commits
mailing list