[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 2 commits - instsetoo_native/util scp2/inc scp2/source solenv/inc
Andras Timar
andras.timar at collabora.com
Wed Nov 26 02:12:24 PST 2014
instsetoo_native/util/openoffice.lst | 24 ++++++++++++------------
scp2/inc/macros.inc | 2 +-
scp2/source/calc/registryitem_calc.scp | 4 ++--
scp2/source/draw/registryitem_draw.scp | 4 ++--
scp2/source/impress/registryitem_impress.scp | 4 ++--
scp2/source/math/registryitem_math.scp | 4 ++--
scp2/source/writer/registryitem_writer.scp | 8 ++++----
solenv/inc/minor.mk | 4 ++--
8 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit a7dc1ecd176697051c30cea060b8c94277f714c8
Author: Andras Timar <andras.timar at collabora.com>
Date: Wed Nov 26 02:11:58 2014 -0800
bnc#901693 change shell command new for non-template types
Change-Id: I577ad11218c09f0aa8492e56aa685257a3020538
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index c10a136..00422eb 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -290,7 +290,7 @@ End
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new\command)); \
- Value = "\"<progpath>\program\\" STRING(app) "\" -n \"%1\""; \
+ Value = "\"<progpath>\program\\" STRING(app) "\" -o \"%1\""; \
End
#define REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index f9c2935..01bd206 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -355,7 +355,7 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_New_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "soffice.StarCalcDocument.6\shell\new\command";
- Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Open_Command
@@ -795,7 +795,7 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_New_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "LibreOffice.CalcDocument.1\shell\new\command";
- Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Open_Command
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 3673936..c475c58 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -321,7 +321,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_New_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "soffice.StarDrawDocument.6\shell\new\command";
- Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Open_Command
@@ -761,7 +761,7 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_New_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "LibreOffice.DrawDocument.1\shell\new\command";
- Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Open_Command
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index ee1bebf..2a96304 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -355,7 +355,7 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_New_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "soffice.StarImpressDocument.6\shell\new\command";
- Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Open_Command
@@ -810,7 +810,7 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_New_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "LibreOffice.ImpressDocument.1\shell\new\command";
- Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index 1486522..ab731b9 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -354,7 +354,7 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_New_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Math_Bin;
Subkey = "soffice.StarMathDocument.6\shell\new\command";
- Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_Open_Command
@@ -651,7 +651,7 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_New_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Math_Bin;
Subkey = "LibreOffice.MathDocument.1\shell\new\command";
- Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Open_Command
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 9537f1b..4525f2c 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -355,7 +355,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_New_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Wrt_Bin;
Subkey = "soffice.StarWriterDocument.6\shell\new\command";
- Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_Open_Command
@@ -442,7 +442,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_New_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "soffice.StarWriterGlobalDocument.6\shell\new\command";
ModuleID = gid_Module_Prg_Wrt_Bin;
- Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_Open_Command
@@ -945,7 +945,7 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_New_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Wrt_Bin;
Subkey = "LibreOffice.WriterDocument.1\shell\new\command";
- Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Open_Command
@@ -1293,7 +1293,7 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_New_Command
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "LibreOffice.WriterGlobalDocument.1\shell\new\command";
ModuleID = gid_Module_Prg_Wrt_Bin;
- Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+ Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
End
RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Open_Command
commit 6a49b02d12d9ac03b243f50af444808b23b5654f
Author: Andras Timar <andras.timar at collabora.com>
Date: Wed Nov 26 01:46:33 2014 -0800
Bump for 4.0-28
Change-Id: I98dc16d9aea5a6a7cead6427706aacd077edee42
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 666c19c..ef80548 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -33,7 +33,7 @@ Globals
CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
- WINDOWSPATCHLEVEL 27
+ WINDOWSPATCHLEVEL 28
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
BUILDIDCWS {buildidcws}
@@ -50,13 +50,13 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -27
+ PRODUCTEXTENSION -28
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
- ABOUTBOXPRODUCTVERSIONSUFFIX :build-327
+ ABOUTBOXPRODUCTVERSIONSUFFIX :build328
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -100,14 +100,14 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -27
+ PRODUCTEXTENSION -28
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
- ABOUTBOXPRODUCTVERSIONSUFFIX :build-327
+ ABOUTBOXPRODUCTVERSIONSUFFIX :build328
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -161,7 +161,7 @@ URE
PRODUCTVERSION 4.0
PACKAGEVERSION 4.0
PACKAGEREVISION 1
- PRODUCTEXTENSION -27
+ PRODUCTEXTENSION -28
BRANDPACKAGEVERSION 4.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -192,7 +192,7 @@ LibreOffice_SDK
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -27
+ PRODUCTEXTENSION -28
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
@@ -231,7 +231,7 @@ LibreOffice_Dev_SDK
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -27
+ PRODUCTEXTENSION -28
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
@@ -276,7 +276,7 @@ LibreOffice_Test
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -27
+ PRODUCTEXTENSION -28
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
@@ -315,7 +315,7 @@ LibreOffice_Dev_Test
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -27
+ PRODUCTEXTENSION -28
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
@@ -359,13 +359,13 @@ OxygenOffice
{
PRODUCTNAME OxygenOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -27
+ PRODUCTEXTENSION -28
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
- ABOUTBOXPRODUCTVERSIONSUFFIX :build-327
+ ABOUTBOXPRODUCTVERSIONSUFFIX :build328
BASEPRODUCTVERSION 4.0
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 712555a..bd0c90f 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
RSCVERSION=400
-RSCREVISION=400m1(Build:327)
-BUILD=327
+RSCREVISION=400m1(Build:328)
+BUILD=328
LAST_MINOR=m0
SOURCEVERSION=OOO400
More information about the Libreoffice-commits
mailing list