# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # $(eval $(call gb_Module_Module,sd)) $(eval $(call gb_Module_add_targets,sd,\ Library_sd \ Library_sdd \ Library_sdfilt \ $(call gb_Helper_optional,DESKTOP,Library_sdui) \ Package_opengl \ Package_web \ Package_xml \ )) $(eval $(call gb_Module_add_l10n_targets,sd,\ AllLangResTarget_sd \ UIConfig_sdraw \ UIConfig_simpress \ )) ifeq ($(filter DRAGONFLY FREEBSD,$(OS)),) $(eval $(call gb_Module_add_check_targets,sd,\ $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \ CppunitTest_sd_uimpress) \ CppunitTest_sd_import_tests \ CppunitTest_sd_export_ooxml1 \ CppunitTest_sd_export_ooxml2 \ CppunitTest_sd_export_tests \ CppunitTest_sd_filters_test \ CppunitTest_sd_misc_tests \ CppunitTest_sd_html_export_tests \ )) endif ifeq ($(OS),LINUX) $(eval $(call gb_Module_add_check_targets,sd,\ CppunitTest_sd_svg_export_tests \ CppunitTest_sd_tiledrendering \ )) endif # screenshots $(eval $(call gb_Module_add_screenshot_targets,sd, \ CppunitTest_sd_dialogs_test \ )) $(eval $(call gb_Module_add_subsequentcheck_targets,sd,\ JunitTest_sd_unoapi \ )) # vim: set noet sw=4 ts=4: stro/cib/libreoffice-5-3'>distro/cib/libreoffice-5-3 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorNaeil ZOUEIDI <naeilzoueidi@ubuntu.com>2017-04-26 14:38:15 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2017-09-03 01:41:15 +0200
commitba0a94a914260c38abd8dc5af1104ba14734b8ef (patch)
treeb1816817f0073929bd62c3da9c0cf757b42b13c4 /scp2
parent9c165fe3084b7c054f9f04f3b065897abcbe2162 (diff)
tdf#63913 fix Win explorer multi-select open unnamed docs bug
Multi-select explorer action on Windows defaults FILEOPEN 2 different ODF file type documents as template - e.g. opening two different type of files (ie : ODS & ODF) then doesn't keep the original filenames. So now changing the open command for the different file extensions to the same one "soffice.exe -o %1", will keep the names of the _2_ files as they originally are when they are opened together. Change-Id: I2cd5fcb046f294742e59f69b7bf2a897a6ce0c29 Reviewed-on: https://gerrit.libreoffice.org/36995 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/calc/registryitem_calc.scp8
-rw-r--r--scp2/source/draw/registryitem_draw.scp8
-rw-r--r--scp2/source/impress/registryitem_impress.scp8
-rw-r--r--scp2/source/math/registryitem_math.scp4
-rw-r--r--scp2/source/writer/registryitem_writer.scp16
5 files changed, 22 insertions, 22 deletions
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index b79f1665fe46..beb890f472d9 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -352,7 +352,7 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Open_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "soffice.StarCalcDocument.6\shell\open\command";
- Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Print_Command
@@ -431,7 +431,7 @@ RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Open_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "soffice.StarCalcTemplate.6\shell\open\command";
ModuleID = gid_Module_Prg_Calc_Bin;
- Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Print_Command
@@ -788,7 +788,7 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Open_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "LibreOffice.CalcDocument.1\shell\open\command";
- Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
Styles = ();
End
@@ -957,7 +957,7 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Open_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "LibreOffice.CalcTemplate.1\shell\open\command";
ModuleID = gid_Module_Prg_Calc_Bin;
- Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Print_Command
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index ffa97849da03..93cadcaa1ca5 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -318,7 +318,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Open_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "soffice.StarDrawDocument.6\shell\open\command";
- Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Print_Command
@@ -431,7 +431,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Open_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "soffice.StarDrawTemplate.6\shell\open\command";
ModuleID = gid_Module_Prg_Draw_Bin;
- Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Print_Command
@@ -753,7 +753,7 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Open_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "LibreOffice.DrawDocument.1\shell\open\command";
- Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
Styles = ();
End
@@ -956,7 +956,7 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Open_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "LibreOffice.DrawTemplate.1\shell\open\command";
ModuleID = gid_Module_Prg_Draw_Bin;
- Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Print_Command
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index d236715e6a81..295f0b432ea0 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -352,7 +352,7 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Open_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "soffice.StarImpressDocument.6\shell\open\command";
- Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Print_Command
@@ -445,7 +445,7 @@ RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Open_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "soffice.StarImpressTemplate.6\shell\open\command";
ModuleID = gid_Module_Prg_Impress_Bin;
- Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Print_Command
@@ -802,7 +802,7 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "LibreOffice.ImpressDocument.1\shell\open\command";
- Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
Styles = ();
End
@@ -985,7 +985,7 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Open_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "LibreOffice.ImpressTemplate.1\shell\open\command";
ModuleID = gid_Module_Prg_Impress_Bin;
- Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Print_Command
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index 5ed9ae238b19..bf59735883d9 100644
--- a/