subject:"\[Libreoffice\-commits\] core.git\: scp2\/source"

[Libreoffice-commits] core.git: scp2/source solenv/bin

2023-06-04 Thread Julien Nabet (via logerrit)

 scp2/source/calc/registryitem_calc.scp   |1 +
 scp2/source/calc/registryitem_calc.ulf   |3 +++
 solenv/bin/modules/installer/windows/property.pm |1 +
 3 files changed, 5 insertions(+)

New commits:
commit e7b1f93cd681e2d0094f5937f4132aa4e780ab9e
Author: Julien Nabet 
AuthorDate: Sun May 28 20:36:40 2023 +0200
Commit: Julien Nabet 
CommitDate: Sun Jun 4 14:31:23 2023 +0200

tdf#71096: xlr filetype not associated with Calc in Windows

Change-Id: Ifb9f74f2bd1532ebf364a3d554d303c1209393cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152360
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/scp2/source/calc/registryitem_calc.scp 
b/scp2/source/calc/registryitem_calc.scp
index 7e9dd8e8d488..b6cf9c3df5c3 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -1252,6 +1252,7 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc )
 
 // registering the mso file types
 
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlr, gid_Module_Prg_Calc_MSO_Reg, xlr, 
XLR, MS_WORKS, 3, scalc.exe, open, Calc )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_MSO_Reg, xls,  
XLS,  MS_EXCEL_WORKSHEET_OLD, 3, scalc.exe, open, Calc )
 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 )
diff --git a/scp2/source/calc/registryitem_calc.ulf 
b/scp2/source/calc/registryitem_calc.ulf
index e12714de682d..d3f7efbb14aa 100644
--- a/scp2/source/calc/registryitem_calc.ulf
+++ b/scp2/source/calc/registryitem_calc.ulf
@@ -54,3 +54,6 @@ en-US = "Lotus Quattro Pro Spreadsheet"
 
 [STR_REG_VAL_NUMBERS_SPREADSHEET]
 en-US = "Apple Numbers"
+
+[STR_REG_VAL_MS_WORKS]
+en-US = "Microsoft Works Spreadsheet with Excel format"
diff --git a/solenv/bin/modules/installer/windows/property.pm 
b/solenv/bin/modules/installer/windows/property.pm
index 60300e49ff58..701086af3a66 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -375,6 +375,7 @@ sub set_ms_file_types_properties
 push(@{$propertyfile}, "REGISTER_DOTM" . "\t" . "0" . "\n");
 push(@{$propertyfile}, "REGISTER_RTF"  . "\t" . "0" . "\n");
 
+push(@{$propertyfile}, "REGISTER_XLR"  . "\t" . "0" . "\n");
 push(@{$propertyfile}, "REGISTER_XLS"  . "\t" . "0" . "\n");
 push(@{$propertyfile}, "REGISTER_XLSX" . "\t" . "0" . "\n");
 push(@{$propertyfile}, "REGISTER_XLSM" . "\t" . "0" . "\n");

[Libreoffice-commits] core.git: scp2/source sfx2/inc sfx2/source

2022-10-01 Thread Rafael Lima (via logerrit)

 scp2/source/ooo/directory_ooo.scp |   29 ++---
 sfx2/inc/doctempl.hrc |6 --
 sfx2/source/doc/doctemplates.cxx  |6 --
 3 files changed, 2 insertions(+), 39 deletions(-)

New commits:
commit 5cf31e332ed835fd1755bda133cee7bbc328dc09
Author: Rafael Lima 
AuthorDate: Wed Sep 28 21:29:55 2022 +0200
Commit: Rafael Lima 
CommitDate: Sat Oct 1 18:27:56 2022 +0200

tdf#132576 Remove unused template categories

This patch removes the names of template categories that are not used. None 
of these template category names are reachable via the Templates Manager nor 
via the Save as Template function.

Change-Id: Ic2caf485106134de8554b93b5d6e14bdf7f382e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140610
Reviewed-by: Laurent Balland 
Tested-by: Jenkins

diff --git a/scp2/source/ooo/directory_ooo.scp 
b/scp2/source/ooo/directory_ooo.scp
index 71bc2f2f76eb..53dbbe5eec52 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -564,39 +564,14 @@ Directory gid_Dir_Template_Common
 DosName = "common";
 End
 
-Directory gid_Dir_Template_Common_Educate
-ParentID = gid_Dir_Template_Common;
-DosName = "educate";
-End
-
-Directory gid_Dir_Template_Common_Finance
-ParentID = gid_Dir_Template_Common;
-DosName = "finance";
-End
-
-Directory gid_Dir_Template_Common_Forms
-ParentID = gid_Dir_Template_Common;
-DosName = "forms";
-End
-
 Directory gid_Dir_Template_Common_Internal
 ParentID = gid_Dir_Template_Common;
 DosName = "internal";
 End
 
-Directory gid_Dir_Template_Common_Labels
-ParentID = gid_Dir_Template_Common;
-DosName = "labels";
-End
-
-Directory gid_Dir_Template_Common_Layout
-ParentID = gid_Dir_Template_Common;
-DosName = "layout";
-End
-
-Directory gid_Dir_Template_Common_Misc
+Directory gid_Dir_Template_Common_Draw
 ParentID = gid_Dir_Template_Common;
-DosName = "misc";
+DosName = "draw";
 End
 
 Directory gid_Dir_Template_Common_Officorr
diff --git a/sfx2/inc/doctempl.hrc b/sfx2/inc/doctempl.hrc
index 10a10d0de0c6..1e940cc6e1e2 100644
--- a/sfx2/inc/doctempl.hrc
+++ b/sfx2/inc/doctempl.hrc
@@ -31,13 +31,7 @@ const TranslateId TEMPLATE_LONG_NAMES_ARY[] =
 NC_("TEMPLATE_LONG_NAMES_ARY", "Business Correspondence"),
 NC_("TEMPLATE_LONG_NAMES_ARY", "Other Business Documents"),
 NC_("TEMPLATE_LONG_NAMES_ARY", "Personal Correspondence and Documents"),
-NC_("TEMPLATE_LONG_NAMES_ARY", "Forms and Contracts"),
-NC_("TEMPLATE_LONG_NAMES_ARY", "Finances"),
-NC_("TEMPLATE_LONG_NAMES_ARY", "Education"),
-NC_("TEMPLATE_LONG_NAMES_ARY", "Presentation Backgrounds"),
 NC_("TEMPLATE_LONG_NAMES_ARY", "Presentations"),
-NC_("TEMPLATE_LONG_NAMES_ARY", "Miscellaneous"),
-NC_("TEMPLATE_LONG_NAMES_ARY", "Labels"),
 NC_("TEMPLATE_LONG_NAMES_ARY", "Drawings")
 };
 
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 45d7d1015a97..e256b50ded6c 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -487,13 +487,7 @@ const char* TEMPLATE_SHORT_NAMES_ARY[] =
 "officorr",
 "offimisc",
 "personal",
-"forms",
-"finance",
-"educate",
-"layout",
 "presnt",
-"misc",
-"labels",
 "draw"
 };

[Libreoffice-commits] core.git: scp2/source

2022-09-14 Thread Samuel Mehrbrodt (via logerrit)

 scp2/source/draw/registryitem_draw.scp |1 +
 scp2/source/draw/registryitem_draw.ulf |2 ++
 2 files changed, 3 insertions(+)

New commits:
commit 35702fd6781542f5eefbd3710304ab9a25ac61fe
Author: Samuel Mehrbrodt 
AuthorDate: Mon Sep 12 15:54:47 2022 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Sep 15 07:29:42 2022 +0200

Add pdf file association to Windows installer

Draw can handle PDF files, so offer them in "Open with" menu

Change-Id: I1c8f9af8e38ee15490371074d02a2ccf35933076
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139802
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/scp2/source/draw/registryitem_draw.scp 
b/scp2/source/draw/registryitem_draw.scp
index 79440c00653b..515b55fb58f7 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -1093,6 +1093,7 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Xbm,  
gid_Module_Prg_Draw_Other_Reg, xbm,  X
 CONDITIONAL_REGISTER_DOC_EXTENSION( Xpm,  gid_Module_Prg_Draw_Other_Reg, xpm,  
XPM,  X_PIXMAP, 5, sdraw.exe, open, Draw )
 CONDITIONAL_REGISTER_DOC_EXTENSION( PCD,  gid_Module_Prg_Draw_Other_Reg, pcd,  
PCD,  KODAK_PHOTO_CD_IMAGE, 5, sdraw.exe, open, Draw )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Webp, gid_Module_Prg_Draw_Other_Reg, webp, 
WEBP, WEBP, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pdf,  gid_Module_Prg_Draw_Other_Reg, pdf, 
PDF, PDF, 5, sdraw.exe, open, Draw )
 
 // registering ms-visio URI scheme handler
 CONDITIONAL_REGISTER_URI_HANDLER( ms-visio, ms_visio, 
gid_Module_Prg_Draw_MSO_Reg, SELECT_VISIO )
diff --git a/scp2/source/draw/registryitem_draw.ulf 
b/scp2/source/draw/registryitem_draw.ulf
index f122dc7daf6d..5d1335bb8b25 100644
--- a/scp2/source/draw/registryitem_draw.ulf
+++ b/scp2/source/draw/registryitem_draw.ulf
@@ -115,3 +115,5 @@ en-US = "X Pixmap File"
 [STR_REG_VAL_KODAK_PHOTO_CD_IMAGE]
 en-US = "Kodak Photo CD Image File"
 
+[STR_REG_VAL_PDF]
+en-US = "PDF (Portable Document Format)"

[Libreoffice-commits] core.git: scp2/source

2022-09-12 Thread Samuel Mehrbrodt (via logerrit)

 scp2/source/calc/registryitem_calc.scp   |1 +
 scp2/source/calc/registryitem_calc.ulf   |2 ++
 scp2/source/impress/registryitem_impress.scp |1 +
 scp2/source/impress/registryitem_impress.ulf |2 ++
 scp2/source/writer/registryitem_writer.scp   |1 +
 scp2/source/writer/registryitem_writer.ulf   |2 ++
 6 files changed, 9 insertions(+)

New commits:
commit 700f92728478206b43177e09270bd7baee21dbe3
Author: Samuel Mehrbrodt 
AuthorDate: Thu Sep 1 15:29:31 2022 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Sep 12 15:39:20 2022 +0200

Add iWork file associations to Windows installer

Change-Id: I725f3dfae295de92712ccf5c7abaaf94d9aa316d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139208
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/scp2/source/calc/registryitem_calc.scp 
b/scp2/source/calc/registryitem_calc.scp
index 841316ec4f53..7e9dd8e8d488 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -1294,6 +1294,7 @@ End
 
 CONDITIONAL_REGISTER_DOC_EXTENSION( Uos, gid_Module_Prg_Calc_Other_Reg, uos, 
UOS, UNIFORM_OFFICE_FORMAT_SPREADSHEET, 3, scalc.exe, open, Calc )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Wb2, gid_Module_Prg_Calc_Other_Reg, wb2, 
WB2, QUATTROPRO_SPREADSHEET, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Numbers, gid_Module_Prg_Calc_Other_Reg, 
numbers, NUMBERS, NUMBERS_SPREADSHEET, 3, scalc.exe, open, Calc )
 
 // registering ms-excel URI scheme handler
 CONDITIONAL_REGISTER_URI_HANDLER( ms-excel, ms_excel, 
gid_Module_Prg_Calc_MSO_Reg, SELECT_EXCEL )
diff --git a/scp2/source/calc/registryitem_calc.ulf 
b/scp2/source/calc/registryitem_calc.ulf
index fb115e6a2235..e12714de682d 100644
--- a/scp2/source/calc/registryitem_calc.ulf
+++ b/scp2/source/calc/registryitem_calc.ulf
@@ -52,3 +52,5 @@ en-US = "Uniform Office Format Spreadsheet"
 [STR_REG_VAL_QUATTROPRO_SPREADSHEET]
 en-US = "Lotus Quattro Pro Spreadsheet"
 
+[STR_REG_VAL_NUMBERS_SPREADSHEET]
+en-US = "Apple Numbers"
diff --git a/scp2/source/impress/registryitem_impress.scp 
b/scp2/source/impress/registryitem_impress.scp
index be9ba5fea5b9..c0b173dc2f04 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -1140,6 +1140,7 @@ End
 
 CONDITIONAL_REGISTER_DOC_EXTENSION( Uop, gid_Module_Prg_Impress_Other_Reg, 
uop, UOP, UNIFORM_OFFICE_FORMAT_PRESENTATION, 7, simpress.exe, open, Impress )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Cgm, gid_Module_Prg_Impress_Other_Reg, 
cgm, CGM, COMPUTER_GRAPHICS_METAFILE, 7, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Keynote, gid_Module_Prg_Impress_Other_Reg, 
key, KEY, KEYNOTE_PRESENTATION, 3, simpress.exe, open, Impress )
 
 // registering ms-powerpoint URI scheme handler
 CONDITIONAL_REGISTER_URI_HANDLER( ms-powerpoint, ms_powerpoint, 
gid_Module_Prg_Impress_MSO_Reg, SELECT_POWERPOINT )
diff --git a/scp2/source/impress/registryitem_impress.ulf 
b/scp2/source/impress/registryitem_impress.ulf
index e201da0b44a6..5f9adf1eab4e 100644
--- a/scp2/source/impress/registryitem_impress.ulf
+++ b/scp2/source/impress/registryitem_impress.ulf
@@ -55,3 +55,5 @@ en-US = "Uniform Office Format Presentation"
 [STR_REG_VAL_COMPUTER_GRAPHICS_METAFILE]
 en-US = "Computer Graphics Metafile"
 
+[STR_REG_VAL_KEYNOTE_PRESENTATION]
+en-US = "Apple Keynote"
diff --git a/scp2/source/writer/registryitem_writer.scp 
b/scp2/source/writer/registryitem_writer.scp
index 48e2faa8f9df..e8b931314a90 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -1763,6 +1763,7 @@ End
 CONDITIONAL_REGISTER_DOC_EXTENSION( Uot,  gid_Module_Prg_Wrt_Other_Reg, uot,  
UOT,  UNIFORM_OFFICE_FORMAT_TEXT, 1, swriter.exe, open, Writer )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Lwp,  gid_Module_Prg_Wrt_Other_Reg, lwp,  
LWP,  WORDPRO_DOCUMENT, 1, swriter.exe, open, Writer )
 CONDITIONAL_REGISTER_DOC_EXTENSION( 602,  gid_Module_Prg_Wrt_Other_Reg, 602,  
602,  T602_TEXT_FILE, 1, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pages, gid_Module_Prg_Wrt_Other_Reg, 
pages, PAGES, PAGES_DOCUMENT, 1, swriter.exe, open, Writer )
 
 // registering ms-word URI scheme handler
 CONDITIONAL_REGISTER_URI_HANDLER( ms-word, ms_word, 
gid_Module_Prg_Wrt_MSO_Reg, SELECT_WORD )
diff --git a/scp2/source/writer/registryitem_writer.ulf 
b/scp2/source/writer/registryitem_writer.ulf
index 51e9cba9d9e2..db39d38ddd98 100644
--- a/scp2/source/writer/registryitem_writer.ulf
+++ b/scp2/source/writer/registryitem_writer.ulf
@@ -64,3 +64,5 @@ en-US = "Lotus Word Pro Document"
 [STR_REG_VAL_T602_TEXT_FILE]
 en-US = "T602 Text File"
 
+[STR_REG_VAL_PAGES_DOCUMENT]
+en-US = "Apple Pages"

[Libreoffice-commits] core.git: scp2/source

2022-09-12 Thread Samuel Mehrbrodt (via logerrit)

 scp2/source/calc/registryitem_calc.scp |4 ++--
 scp2/source/writer/registryitem_writer.scp |8 
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit fe8692b413ade1ade55b2a858b53661082a335a9
Author: Samuel Mehrbrodt 
AuthorDate: Thu Sep 1 15:33:33 2022 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Sep 12 08:50:07 2022 +0200

Remove trailing blanks

Change-Id: I6a44baa0069e25f7f2d79fbb59db05aa6b97e98d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139207
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/scp2/source/calc/registryitem_calc.scp 
b/scp2/source/calc/registryitem_calc.scp
index ca0fc58921cd..841316ec4f53 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -588,7 +588,7 @@ RegistryItem gid_Regitem_sxc_KindMap
 Value = "document";
 End
 
-// new ods file extension 
+// new ods file extension
 
 RegistryItem gid_Regitem_Ods_PersistentHandler
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -854,7 +854,7 @@ RegistryItem gid_Regitem_fods_KindMap
 Value = "document";
 End
 
-// new ots file extension 
+// new ots file extension
 
 RegistryItem gid_Regitem_Ots_PersistentHandler
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/writer/registryitem_writer.scp 
b/scp2/source/writer/registryitem_writer.scp
index 98859a881836..48e2faa8f9df 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -735,7 +735,7 @@ RegistryItem gid_Regitem_sxw_KindMap
 Value = "document";
 End
 
-// new odt file extension 
+// new odt file extension
 
 RegistryItem gid_Regitem_Odt_PersistentHandler
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -1024,7 +1024,7 @@ RegistryItem gid_Regitem_fodt_KindMap
 Value = "document";
 End
 
-// new ott file extension 
+// new ott file extension
 
 RegistryItem gid_Regitem_Ott_PersistentHandler
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -1167,7 +1167,7 @@ RegistryItem 
gid_Regitem_Openoffice_Writertemplate_1_Shell_Printto_Command
 Value = "\"\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
-// new odm file extension 
+// new odm file extension
 
 RegistryItem gid_Regitem_Odm_PersistentHandler
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -1317,7 +1317,7 @@ RegistryItem 
gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Printto_Command
 Value = "\"\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
-// new oth file extension 
+// new oth file extension
 
 RegistryItem gid_Regitem_Oth_PersistentHandler
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;

[Libreoffice-commits] core.git: scp2/source setup_native/Library_shlxtmsi.mk setup_native/source solenv/clang-format

2022-05-18 Thread Samuel Mehrbrodt (via logerrit)

 scp2/source/ooo/windowscustomaction_ooo.scp  |   
18 -
 setup_native/Library_shlxtmsi.mk |
1 
 setup_native/source/win32/customactions/shellextensions/shlxtmsi.def |
2 
 setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx |  
140 --
 solenv/clang-format/excludelist  |
1 
 5 files changed, 162 deletions(-)

New commits:
commit 955fd1c534c061b3b6992dfe034b62b46ee2e844
Author: Samuel Mehrbrodt 
AuthorDate: Wed May 18 10:28:01 2022 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed May 18 22:50:53 2022 +0200

tdf#149106 Remove RenamePrgFolder and RemovePrgFolder custom msi actions

This duplicates MSI functionality - if a folder cannot be written,
MSI should request a reboot automatically.

See https://bugs.documentfoundation.org/show_bug.cgi?id=149106#c17 for 
details.

Change-Id: I65f295ff6e3bb22afc616feb2ba529413f3e24c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134513
Reviewed-by: Mike Kaganski 
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Jenkins

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index 116b437b1ed3..41b78daad13b 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -18,24 +18,6 @@
 
 #include "macros.inc"
 
-WindowsCustomAction gid_Customaction_RenamePrgFolder
-   Name = "RenamePrgFolder";
-   Typ = "1";
-   Source = "shlxtmsi.dll";
-   Target = "RenamePrgFolder";
-   Inbinarytable = 1;
-   Assignment1 = ("InstallExecuteSequence", "OLDPRODUCTS And Not 
REMOVE=\"ALL\" And Not PATCH", "ValidateProductID");
-End
-
-WindowsCustomAction gid_Customaction_RemovePrgFolder
-   Name = "RemovePrgFolder";
-   Typ = "1";
-   Source = "shlxtmsi.dll";
-   Target = "RemovePrgFolder";
-   Inbinarytable = 1;
-   Assignment1 = ("InstallExecuteSequence", "OLDPRODUCTS And Not 
REMOVE=\"ALL\" And Not PATCH", "end");
-End
-
 WindowsCustomAction gid_Customaction_Regallmsdocdll
Name = "Regallmsdocdll";
Typ = "65";
diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk
index a4c2fccd2575..bea522c62a3a 100644
--- a/setup_native/Library_shlxtmsi.mk
+++ b/setup_native/Library_shlxtmsi.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_add_exception_objects,shlxtmsi,\
 setup_native/source/win32/customactions/shellextensions/migrateinstallpath 
\
 
setup_native/source/win32/customactions/shellextensions/completeinstallpath \
 setup_native/source/win32/customactions/shellextensions/checkdirectory \
-setup_native/source/win32/customactions/shellextensions/vistaspecial \
 setup_native/source/win32/customactions/shellextensions/checkpatches \
 ))
 
diff --git 
a/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def 
b/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def
index e0e667953d4f..57b6aa154f4d 100644
--- a/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def
+++ b/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def
@@ -7,5 +7,3 @@ EXPORTS
InstallStartmenuFolderIcon
DeinstallStartmenuFolderIcon
SetProductInstallMode
-   RenamePrgFolder
-   RemovePrgFolder
diff --git 
a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx 
b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
deleted file mode 100644
index 4009d7887ab1..
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "shlxtmsi.hxx"
-
-#include 
-
-#include 
-#include "../tools/seterror.hxx"
-
-static bool RemoveCompleteDirectoryW(const std::wstring& rPath)
-{
-bool bDirectoryRemoved = true;
-
-std::wstring sPattern = rPath + L"\\" + L"*.*";

[Libreoffice-commits] core.git: scp2/source

2022-02-19 Thread Julien Nabet (via logerrit)

 scp2/source/ooo/module_ooo.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f0a3678ef3b048d166179513670633e1bb3acfb8
Author: Julien Nabet 
AuthorDate: Fri Feb 18 17:42:01 2022 +0100
Commit: Julien Nabet 
CommitDate: Sat Feb 19 10:00:00 2022 +0100

Fix "Adding Central Kurdish(ckb) Spell Checker & Dictionary"

Change-Id: I494c515e91ddcab469941ce04d08e9b11974ee7f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130169
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index c900375278f8..9fcbda9fec88 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -103,7 +103,7 @@ en-US = "Catalan spelling dictionary, hyphenation rules, 
and thesaurus"
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_CKB]
 en-US = "Central Kurdish"
 
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_CS]
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_CKB]
 en-US = "Central Kurdish spelling dictionary"
 
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_CS]

[Libreoffice-commits] core.git: scp2/source

2021-08-23 Thread Julien Nabet (via logerrit)

 scp2/source/ooo/module_langpack.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6effefa574e169ed875a45ed442b2798d24b71f5
Author: Julien Nabet 
AuthorDate: Mon Aug 23 19:15:25 2021 +0200
Commit: Julien Nabet 
CommitDate: Mon Aug 23 22:15:27 2021 +0200

tdf#144031: fix description of STR_DESC_MODULE_LANGPACK_PT_BR

Change-Id: If12d27fba3a13a1053ac4a0a1afb891f7c2c6069
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120912
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/scp2/source/ooo/module_langpack.ulf 
b/scp2/source/ooo/module_langpack.ulf
index ecfedfb5c337..3ca2d5cf635e 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -80,7 +80,7 @@ en-US = "Installs the Portuguese user interface"
 en-US = "Portuguese (Brazil)"
 
 [STR_DESC_MODULE_LANGPACK_PT_BR]
-en-US = "Installs the Portuguese user interface"
+en-US = "Installs the Brazilian Portuguese user interface"
 
 [STR_NAME_MODULE_LANGPACK_JA]
 en-US = "Japanese"

[Libreoffice-commits] core.git: scp2/source

2021-01-24 Thread Stephan Bergmann (via logerrit)

 scp2/source/ooo/common_brand.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 42c33aebdc7c1136b487897f5d55a218518f6c91
Author: Stephan Bergmann 
AuthorDate: Fri Jan 22 16:47:00 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Sun Jan 24 10:04:39 2021 +0100

Switch http -> https also in scp2-based version ini-file

ba69036c8e889237da4bb312d7c5c94066abbfd3 "Upgrade update check and extension
URLs to https" had changed ExtensionUpdateURL only in the corresponding 
instdir/
version ini-file generated by instsetoo_native/CustomTarget_setup.mk.

Change-Id: Ia6281fceec649495681051093ce744edbfe1d225
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109823
Tested-by: Guilhem Moulin 
Tested-by: Jenkins
Reviewed-by: Guilhem Moulin 

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 213785bff077..5b8b907f2a9c 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -606,7 +606,7 @@ ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
 Order = 18;
 Key = "ExtensionUpdateURL";
 #if defined(ENABLE_EXTENSION_UPDATE)
-  Value = 
"http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update;;
+  Value = 
"https://updateexte.libreoffice.org/ExtensionUpdateService/check.Update;;
 #else
   Value = "";
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2021-01-24 Thread Stephan Bergmann (via logerrit)

 scp2/source/ooo/common_brand.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4ad4bfbfea8c324030a7085141c58fd6e9fe1805
Author: Stephan Bergmann 
AuthorDate: Fri Jan 22 16:37:07 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Sun Jan 24 10:04:06 2021 +0100

Switch ridl.jar -> libreoffice.jar also in scp2-based fundamental ini-file

35518c92365cc183ba6cce2a4d284a130c0ca13f "Move all public Java classes to
libreoffice.jar" had changed URE_MORE_JAVA_TYPES only in the corresponding
instdir/ fundamental ini-file generated by
instsetoo_native/CustomTarget_setup.mk.

Change-Id: I76c65b4f2fc5088b1b9bb1c0976d895b963108b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109822
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5eba313cdbc6..213785bff077 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -745,7 +745,7 @@ ProfileItem 
gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types
 ProfileID = gid_Brand_Profile_Fundamental_Ini;
 Section = "Bootstrap";
 Key = "URE_MORE_JAVA_TYPES";
-Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/ridl.jar 
${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/ScriptFramework.jar ${${$ORIGIN/" 
PROFILENAME(louno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" 
PROFILENAME(louno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" 
PROFILENAME(louno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}";
+Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/libreoffice.jar 
${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/ScriptFramework.jar ${${$ORIGIN/" 
PROFILENAME(louno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" 
PROFILENAME(louno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" 
PROFILENAME(louno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}";
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source setup_native/source

2020-12-17 Thread DaeHyun Sung (via logerrit)

 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   11 +++
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   15 +++
 setup_native/source/packinfo/spellchecker_selection.txt |2 +-
 5 files changed, 42 insertions(+), 1 deletion(-)

New commits:
commit 5d6cd2ee5876c86dc4dc976478a8b138c6c44f10
Author: DaeHyun Sung 
AuthorDate: Sun Nov 29 22:58:53 2020 +0900
Commit: Christian Lohmaier 
CommitDate: Thu Dec 17 14:27:33 2020 +0100

package Korean(ko-KR) dictionaries into installset

Change-Id: I30cc4bdf4283cefb5985dc5380e2db5660d7d6e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106840
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 0610c31bb188..7d2a1eed2f0e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -527,6 +527,15 @@ File gid_File_Extension_Dictionary_Kmr_Latn
 End
 #endif
 
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ko
+Dir = FILELIST_DIR;
+Name = "Dictionary/dict-ko.filelist";
+Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+TXT_FILE_BODY;
+End
+#endif
+
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Lo
Dir = FILELIST_DIR;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 0c1db4fd4aaf..ee8024fe8f21 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -445,6 +445,17 @@ Module gid_Module_Root_Extension_Dictionary_Kmr_Latn
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Ko
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_KO );
+Files = (gid_File_Extension_Dictionary_Ko);
+InstallOrder = "2000";
+Sortkey = "623";
+Spellcheckerlanguage = "ko";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Lt
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LT );
 Files = (gid_File_Extension_Dictionary_Lt);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 5f7609eba8d9..5aaa1dc05ccd 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -214,6 +214,12 @@ en-US = "Kurdish, Northern, Latin script"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_KMR_LATN]
 en-US = "Kurdish, Northern, Latin script spelling dictionary"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_KO]
+en-US = "Korean spelling dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_LO]
 en-US = "Lao"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index f3efd5afa4bf..a9e04d5a3870 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -792,6 +792,21 @@ destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
 
+Start
+module = "gid_Module_Root_Extension_Dictionary_Ko"
+solarispackagename = 
"%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ko"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ko"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2020 The Document Foundation"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "ko-KR dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
 Start
 module = "gid_Module_Root_Extension_Dictionary_Lo"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lo"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index 89dd8978e5c2..a5a7649e3317 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -58,7 +58,7 @@ is = "is"
 it = "it,de,fr"
 ja = "EMPTY"
 kmr-Latn = "kmr-Latn-TR"
-ko = "EMPTY"
+ko = "ko"
 lo = "lo"
 lt = "lt,de,pl,ru"
 lv = "lv"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source solenv/bin

2020-08-10 Thread Mike Kaganski (via logerrit)

 scp2/source/ooo/vc_redist.scp   |4 +
 solenv/bin/modules/installer/windows/mergemodule.pm |   43 +---
 2 files changed, 34 insertions(+), 13 deletions(-)

New commits:
commit 0872e8cc87d753e6bdda9fad510a6b71cf96565f
Author: Mike Kaganski 
AuthorDate: Mon Aug 10 13:58:57 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon Aug 10 15:06:14 2020 +0200

tdf#135579: Don't uninstall vc_redist: make it permanent

Redist is a system component, that includes a varying set of DLLs,
and those DLLs are ref-counted. Installing a newer redist - i.e.
updating and increasing refcount of existing DLLs - may add new
DLLs (with initial refcount 1) in addition to the updated old DLLs
that start depending on the newly added ones; at uninstall, the
newly added DLLs may get removed because their refcount gets 0,
while other redist DLLs are kept at the updated levels - so their
dependencies now are not met, and redist gets broken.

Just mark the redist components permanent, which, according to [1],
"registers an extra system client for the component in the Windows
Installer registry settings".

A downside is that uninstall doesn't restore the original system
state ideally.

[1] https://docs.microsoft.com/en-us/windows/win32/msi/component-table

Change-Id: I3fe82bcb5844f826f5b1df622273b4e3a1e3c436
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100426
Tested-by: Mike Kaganski 
Reviewed-by: Mike Kaganski 

diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index d32758312766..75ccf2b8d09d 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -32,22 +32,26 @@
 
 #if defined(WINDOWS_X86_MERGEMODULE)
 
+/* Attributes: msidbComponentAttributesPermanent = 0x10 */
 MergeModule WINDOWS_X86_MERGEMODULE
 Feature = gm_Root;
 Name = WINDOWS_X86_MERGEMODULE_FILE;
 RootDir = "TARGETDIR";
 ComponentCondition = "VC_REDIST=1";
+Attributes_Add = "0x10";
 End
 
 #endif
 
 #if defined(WINDOWS_X64) && defined(WINDOWS_X64_MERGEMODULE)
 
+/* Attributes: msidbComponentAttributesPermanent = 0x10 */
 MergeModule WINDOWS_X64_MERGEMODULE
 Feature = gm_Root;
 Name = WINDOWS_X64_MERGEMODULE_FILE;
 RootDir = "TARGETDIR";
 ComponentCondition = "VC_REDIST=1";
+Attributes_Add = "0x10";
 End
 
 #endif
diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm 
b/solenv/bin/modules/installer/windows/mergemodule.pm
index 68bb203f1053..defd59588c95 100644
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -294,6 +294,7 @@ sub merge_mergemodules_into_msi_database
 $onemergemodulehash{'filenumber'} = $filecounter;
 $onemergemodulehash{'componentnames'} = \%componentnames;
 $onemergemodulehash{'componentcondition'} = 
$mergemodule->{'ComponentCondition'};
+$onemergemodulehash{'attributes_add'} = 
$mergemodule->{'Attributes_Add'};
 $onemergemodulehash{'cabfilename'} = $cabfilename;
 $onemergemodulehash{'feature'} = $mergemodule->{'Feature'};
 $onemergemodulehash{'rootdir'} = $mergemodule->{'RootDir'};
@@ -405,7 +406,7 @@ sub merge_mergemodules_into_msi_database
 my $workingtables = "File Media Directory FeatureComponents"; # 
required tables
 # Optional tables can be added now
 if ( $mergemodulehash->{'hasmsiassemblies'} ) { $workingtables = 
$workingtables . " MsiAssembly"; }
-if ( $mergemodulehash->{'componentcondition'} ) { $workingtables = 
$workingtables . " Component"; }
+if ( ( $mergemodulehash->{'componentcondition'} ) || ( 
$mergemodulehash->{'attributes_add'} ) ) { $workingtables = $workingtables . " 
Component"; }
 
 # Table "Feature" has to be exported, but it is not necessary to 
import it.
 if ( $^O =~ /cygwin/i ) {
@@ -462,7 +463,7 @@ sub merge_mergemodules_into_msi_database
 change_msiassembly_table($mergemodulehash, $workdir);
 }
 
-if ( $mergemodulehash->{'componentcondition'} )
+if ( ( $mergemodulehash->{'componentcondition'} ) || ( 
$mergemodulehash->{'attributes_add'} ) )
 {
 
installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing 
Component table");
 change_component_table($mergemodulehash, $workdir);
@@ -1368,7 +1369,7 @@ sub change_featurecomponent_table
 }
 
 ###
-# In the components table, the conditions of merge modules should be updated
+# In the components table, the conditions or attributes of merge modules 
should be updated
 ###
 
 sub change_component_table
@@ -1388,25

[Libreoffice-commits] core.git: scp2/source setup_native/source

2020-07-02 Thread Muhammet Kara (via logerrit)

 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   11 +++
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   15 +++
 setup_native/source/packinfo/spellchecker_selection.txt |1 +
 5 files changed, 42 insertions(+)

New commits:
commit 42f7b3605351a9026f2ce6e4a71cba0444b06569
Author: Muhammet Kara 
AuthorDate: Wed Jul 1 23:07:00 2020 +0300
Commit: Andras Timar 
CommitDate: Thu Jul 2 09:04:02 2020 +0200

Add Turkish (tr) dictionary

Change-Id: Ibc1e7505e6a7492f4d0714c848a6d1eebcdf4a0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97661
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 50d5b1a0fdf7..0610c31bb188 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -716,6 +716,15 @@ File gid_File_Extension_Dictionary_Th
 End
 #endif
 
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Tr
+   Dir = FILELIST_DIR;
+   Name = "Dictionary/dict-tr.filelist";
+   Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+   TXT_FILE_BODY;
+End
+#endif
+
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Uk
Dir = FILELIST_DIR;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 509f4b401572..0c1db4fd4aaf 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -676,6 +676,17 @@ Module gid_Module_Root_Extension_Dictionary_Th
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Tr
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_TR );
+Files = (gid_File_Extension_Dictionary_Tr);
+InstallOrder = "2000";
+Sortkey = "505";
+Spellcheckerlanguage = "tr";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Uk
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_UK );
 Files = (gid_File_Extension_Dictionary_Uk);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 88f25615d061..5f7609eba8d9 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -340,6 +340,12 @@ en-US = "Thai"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_TH]
 en-US = "Thai spelling dictionary"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_TR]
+en-US = "Turkish spelling dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_UK]
 en-US = "Ukrainian"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index bcf4813c356e..f3efd5afa4bf 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -1107,6 +1107,21 @@ destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
 
+Start
+module = "gid_Module_Root_Extension_Dictionary_Tr"
+solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-tr"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-tr"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2014-2018 by Harun Resit Zafer, Muhammet Kara"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Tr dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
 Start
 module = "gid_Module_Root_Extension_Dictionary_Uk"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-uk"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index 881ba99246e0..89dd8978e5c2 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -83,6 +83,7 @@ sr-Latn = "sr"
 sw = "sw"
 te = "te"
 th = "th"
+tr = "tr"
 uk = "uk,ru"
 vi = "vi,fr"
 zh-TW = "EMPTY"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source solenv/inc

2020-02-28 Thread Christian Lohmaier (via logerrit)

 scp2/source/ooo/module_langpack.ulf |6 ++
 solenv/inc/langlist.mk  |1 +
 2 files changed, 7 insertions(+)

New commits:
commit 325f5bb3a6367f25e5bb737d4b066108ae9fedad
Author: Christian Lohmaier 
AuthorDate: Fri Feb 28 15:58:55 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Fri Feb 28 16:42:25 2020 +0100

add Friulian (fur) language pack

Change-Id: Idfcc1bf39360b49bbe1303317acc841f97d37f43

diff --git a/scp2/source/ooo/module_langpack.ulf 
b/scp2/source/ooo/module_langpack.ulf
index f35bf0144646..7cea9be5d0a8 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -40,6 +40,12 @@ en-US = "French"
 [STR_DESC_MODULE_LANGPACK_FR]
 en-US = "Installs the French user interface"
 
+[STR_NAME_MODULE_LANGPACK_FUR]
+en-US = "Friulian"
+
+[STR_DESC_MODULE_LANGPACK_FUR]
+en-US = "Installs the Friulian user interface"
+
 [STR_NAME_MODULE_LANGPACK_FY]
 en-US = "Frisian"
 
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 7391ed2661fe..c087091c9941 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -50,6 +50,7 @@ eu \
 fa \
 fi \
 fr \
+fur \
 fy \
 ga \
 gd \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2020-01-11 Thread Mike Kaganski (via logerrit)

 scp2/source/spsupp/module_spsupp.scp |   19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 01fa2b022e4d5b7392b02181d9bb9bfc76272d62
Author: Mike Kaganski 
AuthorDate: Sat Jan 11 13:32:00 2020 +0300
Commit: Mike Kaganski 
CommitDate: Sat Jan 11 15:03:22 2020 +0100

Use registry key to track installed state of gm_SharePointSupport_SubstMSO

Without that, after initial installation, the state of the feature is
undefined, and following uninstallation can't define that it needs to
be uninstalled, unregistering SharePoint.OpenDocuments class.

Change-Id: Ib7455833fb397c332735eb4c8ab63f763b4e469b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86598
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/scp2/source/spsupp/module_spsupp.scp 
b/scp2/source/spsupp/module_spsupp.scp
index b97a84a699d5..ba1ec4602028 100644
--- a/scp2/source/spsupp/module_spsupp.scp
+++ b/scp2/source/spsupp/module_spsupp.scp
@@ -23,10 +23,10 @@ Module gid_Module_Optional_SharePointSupport
 End
 
 /*
- * This is an *empty* feature disabled by default, that controls custom action 
registering
- * SharePoint.OpenDocuments class, which replaces registration of that class 
from MSO.
- * It is disabled to allow co-existing with MS Office. To install, a transform 
must be
- * used that would set its level to non-0 value, or a command line like
+ * This is a feature with a single registry item, disabled by default, that 
controls custom action
+ * registering SharePoint.OpenDocuments class, which replaces registration of 
that class from MSO.
+ * It is disabled to allow co-existing with MS Office. To install, a transform 
must be used that
+ * would set its level to a non-0 value below INSTALLLEVEL, or a command line 
like
  *
  * msiexec.exe /i path-to-msi ADDLOCAL=gm_SharePointSupport_SubstMSO
  */
@@ -40,5 +40,16 @@ Module gid_Module_SharePointSupport_SubstMSO
 Styles = (HIDDEN_ROOT);
 End
 
+/*
+ * Create a component for the feature, with key path in registry, to track 
feature installed state
+ */
+RegistryItem 
gid_Regitem_Software_Manufacturer_Productname_Productversion_SharePointSupport_SubstMSO_Registered
+ModuleID = gid_Module_SharePointSupport_SubstMSO;
+ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+Subkey = 
"Software\%MANUFACTURER\%PRODUCTNAME\%PRODUCTVERSION\SharePointSupport\SubstMSO";
+Name = "Registered";
+Value = "1";
+End
+
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2019-12-05 Thread Kelemen Gábor (via logerrit)

 scp2/source/ooo/file_ooo.scp |1 +
 scp2/source/ooo/module_lang_template.scp |1 +
 2 files changed, 2 insertions(+)

New commits:
commit a36a3f65d19497a0f6f13780b8e2bf0068c94c18
Author: Kelemen Gábor 
AuthorDate: Thu Dec 5 15:37:25 2019 +0100
Commit: Andras Timar 
CommitDate: Fri Dec 6 08:57:30 2019 +0100

tdf#126192 tdf#126030 (related) Package translations of oox

Now that there are some available, new mo files need to be added
to the installer.
Tested with Spanish on Windows to work.

Change-Id: Id70305fa5a674bc9e302aa6937a03c4573888da4
Reviewed-on: https://gerrit.libreoffice.org/84569
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 0f34c027d85d..50d5b1a0fdf7 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -191,6 +191,7 @@ MO_FILELIST_ALL_LANG(for)
 MO_FILELIST_ALL_LANG(fps)
 MO_FILELIST_ALL_LANG(frm)
 MO_FILELIST_ALL_LANG(fwk)
+MO_FILELIST_ALL_LANG(oox)
 MO_FILELIST_ALL_LANG(pcr)
 MO_FILELIST_ALL_LANG(rpt)
 MO_FILELIST_ALL_LANG(sb)
diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index 0455a4e75133..76003780f19a 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -63,6 +63,7 @@ Module gid_Module_Langpack_Basis_Template
  gid_File_Res_fps_Lang,
  gid_File_Res_frm_Lang,
  gid_File_Res_fwk_Lang,
+ gid_File_Res_oox_Lang,
  gid_File_Res_pcr_Lang,
  gid_File_Res_rpt_Lang,
  gid_File_Res_sb_Lang,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2019-07-25 Thread Adolfo Jayme Barrientos (via logerrit)

 scp2/source/winexplorerext/module_winexplorerext.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8f8917af5b430b4bb1c35313e81ca60022984f73
Author: Adolfo Jayme Barrientos 
AuthorDate: Thu Jul 25 23:11:18 2019 -0500
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Jul 25 23:11:42 2019 -0500

Correct a fragmented sentence

A verb was missing for parallelism.

Change-Id: If6452e576a71b2634934f98a814d9459f4b74e78

diff --git a/scp2/source/winexplorerext/module_winexplorerext.ulf 
b/scp2/source/winexplorerext/module_winexplorerext.ulf
index 9da17602abc0..163210809685 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.ulf
+++ b/scp2/source/winexplorerext/module_winexplorerext.ulf
@@ -20,7 +20,7 @@
 en-US = "Windows Explorer Extension"
 
 [STR_DESC_MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS]
-en-US = "Enables the Microsoft Windows Explorer to show information about 
%PRODUCTNAME documents, such as thumbnail previews, and full-text search."
+en-US = "Enables the Microsoft File Explorer to show information about 
%PRODUCTNAME documents, such as thumbnail previews, and perform full-text 
search."
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2019-05-24 Thread Mike Kaganski (via logerrit)

 scp2/source/winexplorerext/module_winexplorerext.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d89054b3b3acd6c914c6ec8c3e5a530f9058a85b
Author: Mike Kaganski 
AuthorDate: Fri May 24 10:39:19 2019 +0200
Commit: Mike Kaganski 
CommitDate: Fri May 24 13:58:46 2019 +0200

Shell extension also enables full-text search on Windows

Change-Id: I04adf5850fff872d27a8ddc344523de281448a80
Reviewed-on: https://gerrit.libreoffice.org/72895
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/scp2/source/winexplorerext/module_winexplorerext.ulf 
b/scp2/source/winexplorerext/module_winexplorerext.ulf
index 2b476351b575..9da17602abc0 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.ulf
+++ b/scp2/source/winexplorerext/module_winexplorerext.ulf
@@ -20,7 +20,7 @@
 en-US = "Windows Explorer Extension"
 
 [STR_DESC_MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS]
-en-US = "Enables the Microsoft Windows Explorer to show information about 
%PRODUCTNAME documents, such as thumbnail previews."
+en-US = "Enables the Microsoft Windows Explorer to show information about 
%PRODUCTNAME documents, such as thumbnail previews, and full-text search."
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2019-05-15 Thread Takeshi Abe (via logerrit)

 scp2/source/ooo/folderitem_ooo.scp |2 +-
 scp2/source/ooo/folderitem_ooo.ulf |3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5fbd5c9ba97a7ecacebc6bcc582a36dd1631a5b3
Author: Takeshi Abe 
AuthorDate: Mon May 13 10:32:05 2019 +0900
Commit: Andras Timar 
CommitDate: Wed May 15 12:38:30 2019 +0200

tdf#116431 Make the string "LibreOffice (Safe Mode)" translatable

Change-Id: I29f68f16c228c46841a7a3a50bb6dfe4f703403f
Reviewed-on: https://gerrit.libreoffice.org/72212
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/scp2/source/ooo/folderitem_ooo.scp 
b/scp2/source/ooo/folderitem_ooo.scp
index 2e67a6a6aea0..a9f68ffd3dea 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -67,7 +67,7 @@ FolderItemProperty gid_Fip_Soffice_Desktop_AppID
 End
 
 FolderItem gid_Folderitem_LibreOffice_SafeMode
-Name = "%PRODUCTNAME (Safe Mode)";
+ALL_LANG(Name, STR_FI_NAME_SAFEMODE);
 ModuleID = gid_Module_Root;
 #ifdef ENABLE_SILENT_MSI
 FolderID = PREDEFINED_STARTMENU;
diff --git a/scp2/source/ooo/folderitem_ooo.ulf 
b/scp2/source/ooo/folderitem_ooo.ulf
index 4295c5a2f0b2..22f8a37f7981 100644
--- a/scp2/source/ooo/folderitem_ooo.ulf
+++ b/scp2/source/ooo/folderitem_ooo.ulf
@@ -22,5 +22,8 @@ en-US = "From Template"
 [STR_FI_NAME_OPENDOCUMENT]
 en-US = "Open Document"
 
+[STR_FI_NAME_SAFEMODE]
+en-US = "%PRODUCTNAME (Safe Mode)"
+
 [STR_FI_TOOLTIP_SOFFICE]
 en-US = "LibreOffice, the office productivity suite provided by The Document 
Foundation. See https://www.documentfoundation.org;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2019-04-30 Thread Xisco Fauli (via logerrit)

 scp2/source/ooo/scpaction_ooo.scp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1d940ec1de349349b048056c4284223d6eea48f3
Author: Xisco Fauli 
AuthorDate: Sat Apr 27 14:51:08 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Apr 30 08:48:27 2019 +0200

Fix mac build with --with-package-format=dmg

Regression from 7a9f6df7fb83ec23d09cb5744c2c865fa22e7143

ERROR: The following errors occurred in packaging process:

ERROR: Source for LICENSE.html not found!
ERROR: Could not copy  to
 /Users/gerrit/lode/bibisect/core63/workdir/installation/LibreOfficeDev/dmg/

install/en-US_inprogress/LibreOfficeDev_6.3.0.0.alpha0_MacOS_x86-64/LICENSEs/LICENSE.html
 No such file or directory

Change-Id: I6c51a853238b1ecea64f900c0c60e7a9bb370dc9
Reviewed-on: https://gerrit.libreoffice.org/71417
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/scp2/source/ooo/scpaction_ooo.scp 
b/scp2/source/ooo/scpaction_ooo.scp
index ad15dfb8aaab..415963480734 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -20,8 +20,8 @@
 
 #ifdef MACOSX
 ScpAction scp_Copy_Thirdpartylicense_Readme_Html
-Copy = "LICENSE.html";
-Name= "LICENSE.html";
+Copy = "license.html";
+Name= "license.html";
 Subdir = "LICENSEs";
 End
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2019-03-29 Thread Takeshi Abe (via logerrit)

 scp2/source/ooo/registryitem_ooo.scp |2 +-
 scp2/source/ooo/registryitem_ooo.ulf |3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 9c607b61f4e66c78b0c36802a1dcc997bf39e307
Author: Takeshi Abe 
AuthorDate: Mon Feb 25 17:25:30 2019 +0900
Commit: Andras Timar 
CommitDate: Fri Mar 29 13:18:03 2019 +0100

tdf#114311 Translate "LibreOffice Extension" file type in Windows

Change-Id: I5e2f222449424d4a6498d8566f13aca7f07c0c51
Reviewed-on: https://gerrit.libreoffice.org/68303
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/scp2/source/ooo/registryitem_ooo.scp 
b/scp2/source/ooo/registryitem_ooo.scp
index ed93d2816100..9a7998ace432 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -573,7 +573,7 @@ RegistryItem gid_Regitem_Office_Extension_1
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 ModuleID = gid_Module_Root;
 Subkey = "office.Extension.1";
-Value = "%PRODUCTNAME Extension";
+REG_VALUE_LNG(EXTENSION)
 Styles = ();
 End
 
diff --git a/scp2/source/ooo/registryitem_ooo.ulf 
b/scp2/source/ooo/registryitem_ooo.ulf
index 8c073488f0e5..c07b641a0e0b 100644
--- a/scp2/source/ooo/registryitem_ooo.ulf
+++ b/scp2/source/ooo/registryitem_ooo.ulf
@@ -22,5 +22,8 @@ en-US = ""
 [STR_REG_VAL_SO60_CONFIGFILE]
 en-US = "%PRODUCTNAME Configuration File"
 
+[STR_REG_VAL_EXTENSION]
+en-US = "%PRODUCTNAME Extension"
+
 [STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]
 en-US = "LibreOffice"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2018-12-21 Thread Libreoffice Gerrit user

 scp2/source/calc/registryitem_calc.scp   |   18 ++
 scp2/source/impress/registryitem_impress.scp |   26 ++
 scp2/source/writer/registryitem_writer.scp   |   18 ++
 3 files changed, 62 insertions(+)

New commits:
commit 39b39f124a2bd6abe62e30bacac5d1326495d862
Author: Mike Kaganski 
AuthorDate: Sat Dec 22 01:41:55 2018 +0300
Commit: Mike Kaganski 
CommitDate: Sat Dec 22 06:17:15 2018 +0100

tdf#122266: Register default extensions for OOXML content types

This allows Windows/applications to pick OOXML editors (and thus
LibreOffice) when they lookup by content type, not by extension.

Change-Id: I0daca12f735035e6fc39484b5c788af37b81b575
Reviewed-on: https://gerrit.libreoffice.org/65563
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/scp2/source/calc/registryitem_calc.scp 
b/scp2/source/calc/registryitem_calc.scp
index 7464e701ca7c..a48a194522ed 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -1263,6 +1263,24 @@ CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt,  
gid_Module_Prg_Calc_MSO_Reg, x
 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 )
 
+// Registering OOXML MIME content types, to allow OS/applications to redirect 
such content to LO even if extension is unknown
+
+RegistryItem gid_Regitem_Xlsx_Mime_Database
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Calc_Bin;
+Subkey = "MIME\Database\Content 
Type\application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+Name = "Extension";
+Value = ".xlsx";
+End
+
+RegistryItem gid_Regitem_Xltx_Mime_Database
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Calc_Bin;
+Subkey = "MIME\Database\Content 
Type\application/vnd.openxmlformats-officedocument.spreadsheetml.template";
+Name = "Extension";
+Value = ".xltx";
+End
+
 // registering other supported types
 
 CONDITIONAL_REGISTER_DOC_EXTENSION( Uos, gid_Module_Prg_Calc_Other_Reg, uos, 
UOS, UNIFORM_OFFICE_FORMAT_SPREADSHEET, 3, scalc.exe, open, Calc )
diff --git a/scp2/source/impress/registryitem_impress.scp 
b/scp2/source/impress/registryitem_impress.scp
index 295f0b432ea0..be9ba5fea5b9 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -1110,6 +1110,32 @@ CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot,  
gid_Module_Prg_Impress_MSO_Reg
 CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, 
gid_Module_Prg_Impress_MSO_Reg, potx, POTX, MS_POWERPOINT_TEMPLATE, 8, 
simpress.exe, new, Impress )
 CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, 
gid_Module_Prg_Impress_MSO_Reg, potm, POTM, MS_POWERPOINT_TEMPLATE, 8, 
simpress.exe, new, Impress )
 
+// Registering OOXML MIME content types, to allow OS/applications to redirect 
such content to LO even if extension is unknown
+
+RegistryItem gid_Regitem_Pptx_Mime_Database
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Impress_Bin;
+Subkey = "MIME\Database\Content 
Type\application/vnd.openxmlformats-officedocument.presentationml.presentation";
+Name = "Extension";
+Value = ".pptx";
+End
+
+RegistryItem gid_Regitem_Ppsx_Mime_Database
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Impress_Bin;
+Subkey = "MIME\Database\Content 
Type\application/vnd.openxmlformats-officedocument.presentationml.slideshow";
+Name = "Extension";
+Value = ".ppsx";
+End
+
+RegistryItem gid_Regitem_Potx_Mime_Database
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Impress_Bin;
+Subkey = "MIME\Database\Content 
Type\application/vnd.openxmlformats-officedocument.presentationml.template";
+Name = "Extension";
+Value = ".potx";
+End
+
 // registering other supported types
 
 CONDITIONAL_REGISTER_DOC_EXTENSION( Uop, gid_Module_Prg_Impress_Other_Reg, 
uop, UOP, UNIFORM_OFFICE_FORMAT_PRESENTATION, 7, simpress.exe, open, Impress )
diff --git a/scp2/source/writer/registryitem_writer.scp 
b/scp2/source/writer/registryitem_writer.scp
index 7eb628a51721..98859a881836 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -1740,6 +1740,24 @@ CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, 
gid_Module_Prg_Wrt_MSO_Reg, do
 CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_MSO_Reg, 
dotm, DOTM, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf,  gid_Module_Prg_Wrt_MSO_Reg, rtf,  
RTF,  MS_RTF_DOCUMENT, 1, swriter.exe, open, Writer )
 
+// Registering OOXML MIME content types, to allow OS/applications to redirect 
such content to LO even if

[Libreoffice-commits] core.git: scp2/source solenv/bin

2018-12-20 Thread Libreoffice Gerrit user

 scp2/source/ooo/file_library_ooo.scp |2 +-
 scp2/source/ooo/ure.scp  |8 
 solenv/bin/modules/installer/windows/file.pm |6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 1ae12fe4b0c610f205b9e39d74276c55a03c4fca
Author: Andrea Gelmini 
AuthorDate: Wed Dec 19 22:29:46 2018 +0100
Commit: Julien Nabet 
CommitDate: Fri Dec 21 08:48:10 2018 +0100

Fix typo in code

It passed "make check" on Linux

Change-Id: Ic8b2adeb949bfc72830667b6928147ebd053d2f0
Reviewed-on: https://gerrit.libreoffice.org/65517
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index d014bf55c1a2..350b0363a763 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -63,7 +63,7 @@ End
 
 File gid_File_Lib_Policy_Cli_Oootypes_Config
 TXT_FILE_BODY;
-Styles = (PACKED, ASSIGNCOMPOMENT);
+Styles = (PACKED, ASSIGNCOMPONENT);
 Name = "cli_oootypes.config";
 Dir = gid_Brand_Dir_Program;
 AssignComponent = gid_File_Lib_Policy_Cli_Oootypes_Assembly;
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index a75aeb4dbb8f..09109ebc41e6 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -110,7 +110,7 @@ End
 
 File gid_File_Dl_Policy_Cli_Ure_Config
 TXT_FILE_BODY;
-Styles = (PACKED, ASSIGNCOMPOMENT);
+Styles = (PACKED, ASSIGNCOMPONENT);
 Name = "cli_ure.config";
 Dir = SCP2_URE_DL_DIR;
 AssignComponent = gid_File_Dl_Policy_Cli_Ure_Assembly;
@@ -144,7 +144,7 @@ End
 
 File gid_File_Dl_Policy_Cli_Basetypes_Config
 TXT_FILE_BODY;
-Styles = (PACKED, ASSIGNCOMPOMENT);
+Styles = (PACKED, ASSIGNCOMPONENT);
 Name = "cli_basetypes.config";
 Dir = SCP2_URE_DL_DIR;
 AssignComponent = gid_File_Dl_Policy_Cli_Basetypes_Assembly;
@@ -178,7 +178,7 @@ End
 
 File gid_File_Dl_Policy_Cli_Uretypes_Config
 TXT_FILE_BODY;
-Styles = (PACKED, ASSIGNCOMPOMENT);
+Styles = (PACKED, ASSIGNCOMPONENT);
 Name = "cli_uretypes.config";
 Dir = SCP2_URE_DL_DIR;
 AssignComponent = gid_File_Dl_Policy_Cli_Uretypes_Assembly;
@@ -212,7 +212,7 @@ End
 
 File gid_File_Lib_Policy_Cli_Cppuhelper_Config
 TXT_FILE_BODY;
-Styles = (PACKED, ASSIGNCOMPOMENT);
+Styles = (PACKED, ASSIGNCOMPONENT);
 Name = "cli_cppuhelper.config";
 Dir = SCP2_URE_DL_DIR;
 AssignComponent = gid_File_Lib_Policy_Cli_Cppuhelper_Assembly;
diff --git a/solenv/bin/modules/installer/windows/file.pm 
b/solenv/bin/modules/installer/windows/file.pm
index 081edde6db99..d3771fae0b94 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -199,11 +199,11 @@ sub get_file_component_name
 
 my $componentname = "";
 
-# Special handling for files with ASSIGNCOMPOMENT
+# Special handling for files with ASSIGNCOMPONENT
 
 my $styles = "";
 if ( $fileref->{'Styles'} ) { $styles = $fileref->{'Styles'}; }
-if ( $styles =~ /\bASSIGNCOMPOMENT\b/ )
+if ( $styles =~ /\bASSIGNCOMPONENT\b/ )
 {
 $componentname = 
get_component_from_assigned_file($fileref->{'AssignComponent'}, $filesref);
 }
@@ -333,7 +333,7 @@ sub get_file_component_name
 
 
 # Returning the component name for a defined file gid.
-# This is necessary for files with flag ASSIGNCOMPOMENT
+# This is necessary for files with flag ASSIGNCOMPONENT
 
 
 sub get_component_from_assigned_file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2018-11-09 Thread Libreoffice Gerrit user

 scp2/source/ooo/folderitem_ooo.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cacb495379ed7814688edfc0465d5c94c1b2fdc4
Author: Sophia Schröder 
AuthorDate: Thu Nov 8 12:29:15 2018 +0100
Commit: Olivier Hallot 
CommitDate: Fri Nov 9 11:49:07 2018 +0100

Related: tdf#121134: Changing http to https where possible

Change-Id: Ic222fbe902686efe75061d1354339e37671144b8
Reviewed-on: https://gerrit.libreoffice.org/63084
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/scp2/source/ooo/folderitem_ooo.ulf 
b/scp2/source/ooo/folderitem_ooo.ulf
index edf4b0233fc3..4295c5a2f0b2 100644
--- a/scp2/source/ooo/folderitem_ooo.ulf
+++ b/scp2/source/ooo/folderitem_ooo.ulf
@@ -23,4 +23,4 @@ en-US = "From Template"
 en-US = "Open Document"
 
 [STR_FI_TOOLTIP_SOFFICE]
-en-US = "LibreOffice, the office productivity suite provided by The Document 
Foundation. See http://www.documentfoundation.org;
+en-US = "LibreOffice, the office productivity suite provided by The Document 
Foundation. See https://www.documentfoundation.org;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source setup_native/source

2018-09-30 Thread Libreoffice Gerrit user

 scp2/source/gnome/module_gnome.ulf   |2 +-
 setup_native/source/packinfo/package_names.txt   |2 +-
 setup_native/source/packinfo/packinfo_office.txt |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1c0045688fee0916e652c235e3a3f474e8346849
Author: Matthias Seidel 
AuthorDate: Fri Sep 28 08:04:33 2018 +
Commit: Caolán McNamara 
CommitDate: Sun Sep 30 16:07:52 2018 +0200

Correcting description: Gnome -> GNOME

(cherry picked from commit 72b2299f3ec474a09e00f4966abc8c37bb972ec1)

Change-Id: I8bc06a07974f98707df39ff39d9e1a215cba9c52
Reviewed-on: https://gerrit.libreoffice.org/61156
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/scp2/source/gnome/module_gnome.ulf 
b/scp2/source/gnome/module_gnome.ulf
index 0f403b340100..54aaa0b1f190 100644
--- a/scp2/source/gnome/module_gnome.ulf
+++ b/scp2/source/gnome/module_gnome.ulf
@@ -20,5 +20,5 @@
 en-US = "GNOME Integration"
 
 [STR_DESC_MODULE_OPTIONAL_GNOME]
-en-US = "System integration of %PRODUCTNAME %PRODUCTVERSION into Gnome Desktop 
Environment."
+en-US = "System integration of %PRODUCTNAME %PRODUCTVERSION into GNOME Desktop 
Environment."
 
diff --git a/setup_native/source/packinfo/package_names.txt 
b/setup_native/source/packinfo/package_names.txt
index 37950a9f5421..980dc602a9ce 100644
--- a/setup_native/source/packinfo/package_names.txt
+++ b/setup_native/source/packinfo/package_names.txt
@@ -17,7 +17,7 @@
 %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-dict-vi   Vietnamese dictionary 
for %PRODUCTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-draw  Draw module for 
%PRODUCTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-emailmergeEmail mailmerge 
module for %PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-gnome-integratn   Gnome 
integration module for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-gnome-integratn   GNOME 
integration module for %PRODUCTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-graphicfilter Graphic filter 
module for %PRODUCTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-headless  Headless display module 
for %PRODUCTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-imagesImages module for 
%PRODUCTNAME %PRODUCTVERSION
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index ff128f991d79..b0284bf53acb 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -45,7 +45,7 @@ findrequires = ""
 copyright = "2018 The Document Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Gnome integration module for %PRODUCTNAME %PRODUCTVERSION"
+description = "GNOME integration module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source setup_native/source

2018-09-01 Thread Libreoffice Gerrit user

 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   11 +++
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   15 +++
 setup_native/source/packinfo/spellchecker_selection.txt |1 +
 5 files changed, 42 insertions(+)

New commits:
commit 6c08039ebec28b936dd4521139c9670f7fadf9f4
Author: Christian Lohmaier 
AuthorDate: Fri Aug 31 19:31:22 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Sat Sep 1 08:49:58 2018 +0200

package Indonesian (id) dictionaries into installset

Change-Id: I78b8c745b9d6e4a23fa13622188c5bd1776b0ac6
Reviewed-on: https://gerrit.libreoffice.org/59882
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 6b6f2b896afb..0f34c027d85d 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -491,6 +491,15 @@ End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Id
+Dir = FILELIST_DIR;
+Name = "Dictionary/dict-id.filelist";
+Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Is
 Dir = FILELIST_DIR;
 Name = "Dictionary/dict-is.filelist";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index abfd1a824cb1..509f4b401572 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -401,6 +401,17 @@ Module gid_Module_Root_Extension_Dictionary_Hr
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Id
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ID );
+Files = (gid_File_Extension_Dictionary_Id);
+InstallOrder = "2000";
+Sortkey = "607";
+Spellcheckerlanguage = "id";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Is
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_IS );
 Files = (gid_File_Extension_Dictionary_Is);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index a22df61068cd..88f25615d061 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -190,6 +190,12 @@ en-US = "Croatian"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_HR]
 en-US = "Croatian spelling dictionary, and hyphenation rules"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_ID]
+en-US = "Indonesian spelling dictionary, hyphenation rules, and thesaurus"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_IS]
 en-US = "Icelandic"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index f014aafdaa0b..ff128f991d79 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -727,6 +727,21 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
+module = "gid_Module_Root_Extension_Dictionary_Id"
+solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-id"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-id"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2018 The Document Foundation"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Indonesian dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
 module = "gid_Module_Root_Extension_Dictionary_Is"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-is"
 solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index cb2ed0c9a6bd..881ba99246e0 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -53,6 +53,7 @@ he = "he"
 hi = "hi"
 hu = "hu,de"
 hr = "hr,de"
+id = "id"
 is = "is"
 it = "it,de,fr"
 ja = "EMPTY"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] core.git: scp2/source

2018-08-25 Thread Libreoffice Gerrit user

 scp2/source/extensions/file_extensions.scp |   13 -
 1 file changed, 13 deletions(-)

New commits:
commit 8ecf5e1815b5459bc0bbcdfb398d3bd53b0c2861
Author: Eike Rathke 
AuthorDate: Sat Aug 25 16:30:52 2018 +0200
Commit: Eike Rathke 
CommitDate: Sat Aug 25 16:31:14 2018 +0200

Build fix, make install: mysql-connector-ooo extension is gone

Since

commit 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1
CommitDate: Fri Aug 24 17:19:51 2018 +0200

Moving mysqlc into connectivity as a library

Was used in #ifdef WITH_EXTENSION_MARIADBC

Change-Id: Ib95d81fbd79f253c4490dd3afdfd67962b5f1563

diff --git a/scp2/source/extensions/file_extensions.scp 
b/scp2/source/extensions/file_extensions.scp
index ebef87b8cf7b..b7c01529cfff 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -61,19 +61,6 @@ End
 
 #endif
 
-/* ** MySQL Connector ** */
-
-#ifdef WITH_EXTENSION_MARIADBC
-
-File gid_File_Oxt_MySQLConnector
-TXT_FILE_BODY;
-Styles = (PACKED, FILELIST);
-Dir = FILELIST_DIR;
-Name = "Extension/mysql-connector-ooo.filelist";
-End
-
-#endif
-
 /* ** Script provider for BeanShell ** */
 
 #if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source solenv/inc

2018-07-12 Thread Christian Lohmaier

 scp2/source/ooo/module_langpack.ulf |6 ++
 solenv/inc/langlist.mk  |1 +
 2 files changed, 7 insertions(+)

New commits:
commit 0b7ab07611ddaafe25e9e1914a49be2afe68ada9
Author: Christian Lohmaier 
Date:   Thu Jul 12 14:02:14 2018 +0200

tdf#118717 add Kabyle (kab) user interface package

Change-Id: I4b36d8700ad369b58205b699e0aff5591d2f1d6a

diff --git a/scp2/source/ooo/module_langpack.ulf 
b/scp2/source/ooo/module_langpack.ulf
index ca1c40b2a7db..7bb58e1fa98c 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -82,6 +82,12 @@ en-US = "Japanese"
 [STR_DESC_MODULE_LANGPACK_JA]
 en-US = "Installs the Japanese user interface"
 
+[STR_NAME_MODULE_LANGPACK_KAB]
+en-US = "Kabyle"
+
+[STR_DESC_MODULE_LANGPACK_KAB]
+en-US = "Installs the Kabyle user interface"
+
 [STR_NAME_MODULE_LANGPACK_KO]
 en-US = "Korean"
 
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index d0c5cb5cba78..4492cb295db1 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -65,6 +65,7 @@ is \
 it \
 ja \
 ka \
+kab \
 kk \
 km \
 kmr-Latn \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2018-05-30 Thread Tor Lillqvist

 scp2/source/writer/registryitem_writer.scp |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit 4d9159fac836904b8cb4f3672291367b4c258173
Author: Tor Lillqvist 
Date:   Tue Mar 6 17:08:29 2018 +0200

Add CLSID for Writer.Application and LocalServer32 for that

For Automation clients. Provided in extensions/source/ole/servprov.cxx
for an instance of ooo.vba.word.Application.

Change-Id: I277f461bf6206f3516b14fabe8b27dc4c06018b5
Reviewed-on: https://gerrit.libreoffice.org/55052
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/scp2/source/writer/registryitem_writer.scp 
b/scp2/source/writer/registryitem_writer.scp
index 1ca635159861..7eb628a51721 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -976,6 +976,21 @@ RegistryItem 
gid_Regitem_Openoffice_Writerwebdocument_1_Shell_Open_Command
 Styles = ();
 End
 
+RegistryItem gid_Regitem_WriterApplication
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Wrt_Bin;
+Subkey = "Writer.Application\CLSID";
+Value = "{82154421-0FBF-11d4-8313-005004526AB4}";
+Styles = ();
+End
+
+RegistryItem 
gid_Regitem_Clsid__82154421_0FBF_11d4_8313_005004526AB4__Localserver32
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Wrt_Bin;
+Subkey = "CLSID\{82154421-0FBF-11d4-8313-005004526AB4}\LocalServer32";
+Value = "\program\soffice.exe --nodefault --nologo";
+End
+
 // .fodt
 
 RegistryItem gid_Regitem__Fodt
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source setup_native/source

2017-10-24 Thread Aron Budea

 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   11 +++
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   15 +++
 setup_native/source/packinfo/spellchecker_selection.txt |1 +
 5 files changed, 42 insertions(+)

New commits:
commit 919be04e2c50ba62317c0b759b73923e37f5d542
Author: Aron Budea 
Date:   Mon Oct 23 08:00:14 2017 +0200

Add Albanian (sq) dictionary

Change-Id: I18b166ae8e08b4509154c2ba035d3e9811e947ec
Reviewed-on: https://gerrit.libreoffice.org/43707
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index ea8eddc16635..6b6f2b896afb 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -653,6 +653,15 @@ End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Sq
+   Dir = FILELIST_DIR;
+   Name = "Dictionary/dict-sq.filelist";
+   Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+   TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sr
Dir = FILELIST_DIR;
Name = "Dictionary/dict-sr.filelist";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index a1e1f46f201c..41b7e0ea7a4d 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -599,6 +599,17 @@ Module gid_Module_Root_Extension_Dictionary_Sl
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Sq
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SQ );
+Files = (gid_File_Extension_Dictionary_Sq);
+InstallOrder = "2000";
+Sortkey = "505";
+Spellcheckerlanguage = "sq";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Sr
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SR );
 Files = (gid_File_Extension_Dictionary_Sr);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 25c5400d6e1f..a22df61068cd 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -298,6 +298,12 @@ en-US = "Slovenian"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_SL]
 en-US = "Slovenian spelling dictionary, hyphenation rules, and thesaurus"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SQ]
+en-US = "Albanian spelling dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_SR]
 en-US = "Serbian"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index a38d6c1cf203..f9e02a1375b0 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -997,6 +997,21 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
+module = "gid_Module_Root_Extension_Dictionary_Sq"
+solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sq"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sq"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2011 by Luan Kelmendi"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Sq dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
 module = "gid_Module_Root_Extension_Dictionary_Sr"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sr"
 solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index 3a343b002b1a..cb2ed0c9a6bd 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -74,6 +74,7 @@ ru = "ru,de,uk"
 si = "si"
 sk = "sk"
 sl = "sl"
+sq = "sq"
 sv = "sv,de"
 sr = "sr"
 # ! Note the package 'sr' also holds the dictionaries for 'sr-Latn' (formerly 
'sh') !
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] core.git: scp2/source

2017-09-02 Thread Naeil ZOUEIDI

 scp2/source/calc/registryitem_calc.scp   |8 
 scp2/source/draw/registryitem_draw.scp   |8 
 scp2/source/impress/registryitem_impress.scp |8 
 scp2/source/math/registryitem_math.scp   |4 ++--
 scp2/source/writer/registryitem_writer.scp   |   16 
 5 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit ba0a94a914260c38abd8dc5af1104ba14734b8ef
Author: Naeil ZOUEIDI 
Date:   Wed Apr 26 14:38:15 2017 +0100

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 
Tested-by: Thorsten Behrens 

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 = "\"\program\scalc.exe\" -o \"%1\"";
+Value = "\"\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 = "\"\program\scalc.exe\" -o \"%1\"";
+Value = "\"\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 = "\"\program\scalc.exe\" -o \"%1\"";
+Value = "\"\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 = "\"\program\scalc.exe\" -o \"%1\"";
+Value = "\"\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 = "\"\program\sdraw.exe\" -o \"%1\"";
+Value = "\"\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 = "\"\program\sdraw.exe\" -o \"%1\"";
+Value = "\"\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 = "\"\program\sdraw.exe\" -o \"%1\"";
+Value = "\"\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 = "\"\program\sdraw.exe\" -o \"%1\"";
+Value = "\"\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Print_Command
diff --git

[Libreoffice-commits] core.git: scp2/source

2017-08-28 Thread Juergen Funk

 scp2/source/ooo/windowscustomaction_ooo.scp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a4b88947e5a56f39e80f8edf85b2b384a4f22bb3
Author: Juergen Funk 
Date:   Thu Jun 29 09:43:20 2017 +0200

tdf#106931 - LibreOffice 5.3 installer doesn't honor UI_LANGS property

The patch 0a76a41ae7a2ebd53f80f01ea9e2bcff3026d155 disable the CustomAction
"SelectLanguage" when the MSI-Property ADDLOCAL is set,
This patch set the the CustomAction when the Property
"UI_LANGS" is set, then the CustomAction execute

Change-Id: I254a44909e32fb7969a6e9f71adf4659d376523c
Reviewed-on: https://gerrit.libreoffice.org/39379
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index dfafc1611a53..39a0d52cbd54 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -189,8 +189,8 @@ WindowsCustomAction gid_Customaction_SelectLanguage
 Source = "sellangmsi.dll";
 Target = "SelectLanguage";
 Inbinarytable = 1;
-Assignment1 = ("InstallExecuteSequence", "NOT Installed And 
ADDLOCAL=\"\"", "MigrateFeatureStates");
-Assignment2 = ("InstallUISequence", "NOT Installed And ADDLOCAL=\"\"", 
"MigrateFeatureStates");
+Assignment1 = ("InstallExecuteSequence", "NOT Installed And (ADDLOCAL=\"\" 
Or NOT UI_LANGS=\"\")", "MigrateFeatureStates");
+Assignment2 = ("InstallUISequence", "NOT Installed And (ADDLOCAL=\"\" Or 
NOT UI_LANGS=\"\")", "MigrateFeatureStates");
 End
 
 WindowsCustomAction gid_Customaction_SortTree
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source solenv/bin

2017-08-20 Thread Markus Mohrhard

 scp2/source/ooo/common_brand.scp|9 +
 solenv/bin/modules/installer/scriptitems.pm |   21 +
 2 files changed, 30 insertions(+)

New commits:
commit ad21f8ec355dd356bdfe72c67ebf3c4c5cf3f235
Author: Markus Mohrhard 
Date:   Mon Aug 21 03:10:33 2017 +0200

updater: also write channel to version.ini outside of instdir

Change-Id: Ibb087fc9cd17e50accf78f805e0fec4f202334b1

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index e39a65e19ef1..1eef7833f2d0 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -565,6 +565,15 @@ ProfileItem gid_Brand_Profileitem_Version_Updateurl
   #endif
 End
 
+ProfileItem gid_Brand_Profileitem_Version_UpdateChannel
+ProfileID = gid_Brand_Profile_Version_Ini;
+ModuleID = gid_Module_Root_Brand;
+Section = "Version";
+Order = 19;
+Key = "UpdateChannel";
+Value = "";
+End
+
 ProfileItem gid_Brand_Profileitem_Version_Updateid
 ProfileID = gid_Brand_Profile_Version_Ini;
 ModuleID = gid_Module_Root_Brand;
diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index 58ca3fe7c5af..98b41f7b484a 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -656,6 +656,26 @@ sub replace_setup_variables
 my $updateid = $productname . "_" . $libo_version_major . "_" . 
$$languagestringref;
 $updateid =~ s/ /_/g;
 
+my $updatechannel = "";
+if ( $ENV{'UPDATE_CONFIG'} && $ENV{'UPDATE_CONFIG'} ne "")
+{
+open(CONFIG, $ENV{'UPDATE_CONFIG'});
+while ()
+{
+chomp;
+if (/^s*(\S+)=(\S+)$/)
+{
+$key = $1;
+$val = $2;
+if ($key eq "channel")
+{
+$updatechannel = $val;
+}
+}
+}
+close(CONFIG);
+}
+
 for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
 {
 my $oneitem = ${$itemsarrayref}[$i];
@@ -669,6 +689,7 @@ sub replace_setup_variables
 $value =~ s/\/$languagesstring/;
 $value =~ s/\/$installer::globals::build/;
 $value =~ s/\/$updateid/;
+$value =~ s/\/$updatechannel/;
 $value =~ s/\/$installer::globals::packageformat/;
 $ENV{'OOO_VENDOR'} = "" if !defined $ENV{'OOO_VENDOR'};
 $value =~ s/\/$ENV{'OOO_VENDOR'}/;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2017-06-16 Thread Caolán McNamara

 scp2/source/ooo/module_lang_template.scp |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 2e0b0d471417fb7b5bb7f2732ed6715822340438
Author: CaolÃ¡n McNamara 
Date:   Fri Jun 16 12:55:50 2017 +0100

Tubes is gone

Change-Id: I5622786c5192ea7a5225f3b9cd81a4b6a0dae594
Reviewed-on: https://gerrit.libreoffice.org/38877
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index 6711999a0d1f..2b2f86f0342b 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -95,7 +95,6 @@ Module gid_Module_Langpack_Resource_Template
  gid_File_Res_Sw,
  gid_File_Res_Tk,
  gid_File_Res_Acc,
- gid_File_Res_Tubes,
  gid_File_Res_Uui,
  gid_File_Res_Vcl,
  gid_File_Res_Writerperfect,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2017-05-25 Thread Jochen Nitschke

 scp2/source/ooo/file_resource_ooo.scp|6 --
 scp2/source/ooo/module_lang_template.scp |3 ---
 2 files changed, 9 deletions(-)

New commits:
commit cd003c3f6298c49d66ddd718b61a7ab33b148cb7
Author: Jochen Nitschke 
Date:   Thu May 25 20:19:29 2017 +0200

fix packaging

after commit da543e4efbb53e25a60f8557a0b8cd307e46ebf4
convert starbasic wizards to .properties for translations

Change-Id: Iccc7a39776781c85d1c2f3160ff03876ae6c5762
Reviewed-on: https://gerrit.libreoffice.org/38040
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/scp2/source/ooo/file_resource_ooo.scp 
b/scp2/source/ooo/file_resource_ooo.scp
index 1ccf56babe5a..77ab890567d9 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -38,8 +38,6 @@ STD_RES_FILE( gid_File_Res_Dbw, dbw )
 
 STD_RES_FILE( gid_File_Res_Dkt, dkt)
 
-STD_RES_FILE( gid_File_Res_Eur, eur )
-
 STD_RES_FILE( gid_File_Res_Frm, frm)
 
 STD_RES_FILE( gid_File_Res_Fwe, fwe)
@@ -48,8 +46,6 @@ STD_RES_FILE( gid_File_Res_Fps_Office, fps_office)
 
 STD_RES_FILE( gid_File_Res_Gal, gal )
 
-STD_RES_FILE( gid_File_Res_Imp, imp )
-
 STD_RES_FILE( gid_File_Res_Deployment, deployment )
 STD_RES_FILE( gid_File_Res_DeploymentGui, deploymentgui )
 
@@ -85,8 +81,6 @@ STD_RES_FILE( gid_File_Res_Sw, sw )
 
 STD_RES_FILE( gid_File_Res_Acc, acc )
 
-STD_RES_FILE( gid_File_Res_Tpl, tpl )
-
 STD_RES_FILE( gid_File_Res_Uui, uui )
 
 STD_RES_FILE( gid_File_Res_Vcl, vcl )
diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index dbc6c4eb5603..78a2b51232f6 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -73,14 +73,12 @@ Module gid_Module_Langpack_Resource_Template
  gid_File_Res_Dbw,
  gid_File_Res_Dkt,
  gid_File_Res_Editeng,
- gid_File_Res_Eur,
  gid_File_Res_For,
  gid_File_Res_Forui,
  gid_File_Res_Fps_Office,
  gid_File_Res_Frm,
  gid_File_Res_Fwe,
  gid_File_Res_Gal,
- gid_File_Res_Imp,
  gid_File_Res_Deployment,
  gid_File_Res_DeploymentGui,
  gid_File_Res_Ofa,
@@ -98,7 +96,6 @@ Module gid_Module_Langpack_Resource_Template
  gid_File_Res_Sw,
  gid_File_Res_Tk,
  gid_File_Res_Acc,
- gid_File_Res_Tpl,
  gid_File_Res_Tubes,
  gid_File_Res_Uui,
  gid_File_Res_Vcl,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2017-04-29 Thread Caolán McNamara

 scp2/source/ooo/module_lang_template.scp |1 +
 scp2/source/ooo/module_ooo.scp   |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 0baffd648fa495045d17bd14b8306875e9c4ac10
Author: CaolÃ¡n McNamara 
Date:   Sat Apr 29 21:49:41 2017 +0100

some other places uiconfig_editeng should appear

Change-Id: I38f734af566e954532c288434be84a8553e76b9c

diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index fcce8a415603..dbc6c4eb5603 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -31,6 +31,7 @@ Module gid_Module_Langpack_Basis_Template
  gid_File_Share_Config_Sofficecfg_uiconfig_spropctrlr_Lang,
 #endif
  gid_File_Share_Config_Sofficecfg_uiconfig_desktop_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_editeng_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_filter_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_formula_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_fps_Lang,
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 3a7234427323..a1e1f46f201c 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -68,6 +68,7 @@ Module gid_Module_Root
  gid_File_Share_Config_Sofficecfg_uiconfig_dbtdata,
 #endif
  gid_File_Share_Config_Sofficecfg_uiconfig_desktop,
+ gid_File_Share_Config_Sofficecfg_uiconfig_editeng,
  gid_File_Share_Config_Sofficecfg_uiconfig_filter,
  gid_File_Share_Config_Sofficecfg_uiconfig_formula,
  gid_File_Share_Config_Sofficecfg_uiconfig_fps,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2017-04-29 Thread Caolán McNamara

 scp2/source/ooo/file_ooo.scp |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 3a8e111fa3ed538018de98ac3a6a480555e7b204
Author: CaolÃ¡n McNamara 
Date:   Sat Apr 29 20:56:04 2017 +0100

tdf#107464 editeng ui files not packed in install sets

Change-Id: I8b4c2753e56c79348e42f8b9b56f19d7424dd70c
Reviewed-on: https://gerrit.libreoffice.org/37104
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 548a76685def..31e73feda512 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -147,6 +147,7 @@ UI_FILELIST(dbtable, "UIConfig/modules/dbtable.filelist")
 UI_FILELIST(dbtdata, "UIConfig/modules/dbtdata.filelist")
 #endif
 UI_FILELIST(desktop, "UIConfig/desktop.filelist")
+UI_FILELIST(editeng, "UIConfig/editeng.filelist")
 UI_FILELIST(filter, "UIConfig/filter.filelist")
 UI_FILELIST(formula, "UIConfig/formula.filelist")
 UI_FILELIST(fps, "UIConfig/fps.filelist")
@@ -185,6 +186,7 @@ UI_FILELIST_ALL_LANG(sbibliography, modules/sbibliography)
 UI_FILELIST_ALL_LANG(spropctrlr, modules/spropctrlr)
 #endif
 UI_FILELIST_ALL_LANG(desktop, desktop)
+UI_FILELIST_ALL_LANG(editeng, editeng)
 UI_FILELIST_ALL_LANG(filter, filter)
 UI_FILELIST_ALL_LANG(formula, formula)
 UI_FILELIST_ALL_LANG(fps, fps)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: scp2/source

2017-03-17 Thread Stephan Bergmann


On 03/16/2017 08:56 PM, Andras Timar wrote:

I don't remember exactly, but I think the problem was around signing /
App Store acceptance. App Store build did not have Java, so it was not
affected by the bug. OK to revert in master.


(unoinfo isn't just about Java, btw; C++ client code needs it too)

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: scp2/source

2017-03-16 Thread Stephan Bergmann

 scp2/source/ooo/common_brand.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3d30cdb332ea3e87736bf61928ed420e630b4b89
Author: Stephan Bergmann 
Date:   Thu Mar 16 23:19:31 2017 +0100

Remove extra space

Change-Id: I147e6a79dff0047be0878ef755e47e2d408cec02

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7d2a1239b538..3fe08f3359c9 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1118,7 +1118,7 @@ ProfileItem 
gid_Brand_Profileitem_Fundamental_Configuration_Layers
 ModuleID = gid_Module_Root_Brand;
 Section = "Bootstrap";
 Key = "CONFIGURATION_LAYERS";
-Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry 
res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry" 
CONFIGURATION_LAYERS_DCONF CONFIGURATION_LAYERS_WINREG " 
bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) 
":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) 
":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 userext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) 
":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 " CONFIGURATION_LAYERS_WINUSERREG " user:!${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER 
"/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu";
+Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry 
res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry" 
CONFIGURATION_LAYERS_DCONF CONFIGURATION_LAYERS_WINREG " 
bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) 
":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) 
":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 userext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) 
":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini"
 CONFIGURATION_LAYERS_WINUSERREG " user:!${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER 
"/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu";
 End
 #undef CONFIGURATION_LAYERS_DCONF
 #undef CONFIGURATION_LAYERS_WINREG
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: scp2/source

2017-03-16 Thread Andras Timar

Hi Stephan,

On 03/16/2017 06:31 PM, Stephan Bergmann wrote:
> On 03/16/2017 05:07 PM, Stephan Bergmann wrote:
>> commit 3e5aa33ef4ea8f5839e358dd62acdc09fe64dda8
>> Author: Stephan Bergmann 
>> Date:   Thu Mar 16 17:05:09 2017 +0100
>>
>> Revert "Don't package unoinfo in case of Mac OS X like app structure"
>>
>> This reverts commit 3a663f7a4580b97518aee4e0c797b549c67ef1a5. 
>> Whatever that
>> commit was supposed to be good for, not packaging unoinfo on macOS
>> breaks
>> functionality, see e.g.
>> 
>> comment 10 to
>> "XMessageBox#execute() in Java fails to draw a window on macOS
>> Sierra".
> 
> Had there been any specific reason for the original commit,
> ?
> 
> 
>> diff --git a/scp2/source/ooo/common_brand.scp
>> b/scp2/source/ooo/common_brand.scp
>> index b4c260f17432..7d2a1239b538 100644
>> --- a/scp2/source/ooo/common_brand.scp
>> +++ b/scp2/source/ooo/common_brand.scp
>> @@ -475,7 +475,7 @@ File gid_Brand_File_Desktophelper_Txt
>>  End
>>  #endif
>>
>> -#if !defined WNT && !defined MACOSX
>> +#if !defined WNT
>>  File gid_Brand_File_Bin_Unoinfo
>>  BIN_FILE_BODY;
>>  Dir = gid_Brand_Dir_Program;
> 

I don't remember exactly, but I think the problem was around signing /
App Store acceptance. App Store build did not have Java, so it was not
affected by the bug. OK to revert in master.

Thanks,
Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-commits] core.git: scp2/source

2017-03-16 Thread Stephan Bergmann


On 03/16/2017 05:07 PM, Stephan Bergmann wrote:

commit 3e5aa33ef4ea8f5839e358dd62acdc09fe64dda8
Author: Stephan Bergmann 
Date:   Thu Mar 16 17:05:09 2017 +0100

Revert "Don't package unoinfo in case of Mac OS X like app structure"

This reverts commit 3a663f7a4580b97518aee4e0c797b549c67ef1a5.  Whatever that
commit was supposed to be good for, not packaging unoinfo on macOS breaks
functionality, see e.g.
 comment 10 
to
"XMessageBox#execute() in Java fails to draw a window on macOS Sierra".


Had there been any specific reason for the original commit, 
?



diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index b4c260f17432..7d2a1239b538 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -475,7 +475,7 @@ File gid_Brand_File_Desktophelper_Txt
 End
 #endif

-#if !defined WNT && !defined MACOSX
+#if !defined WNT
 File gid_Brand_File_Bin_Unoinfo
 BIN_FILE_BODY;
 Dir = gid_Brand_Dir_Program;


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: scp2/source

2017-03-16 Thread Stephan Bergmann

 scp2/source/ooo/common_brand.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e5aa33ef4ea8f5839e358dd62acdc09fe64dda8
Author: Stephan Bergmann 
Date:   Thu Mar 16 17:05:09 2017 +0100

Revert "Don't package unoinfo in case of Mac OS X like app structure"

This reverts commit 3a663f7a4580b97518aee4e0c797b549c67ef1a5.  Whatever that
commit was supposed to be good for, not packaging unoinfo on macOS breaks
functionality, see e.g.
 comment 10 
to
"XMessageBox#execute() in Java fails to draw a window on macOS Sierra".

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index b4c260f17432..7d2a1239b538 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -475,7 +475,7 @@ File gid_Brand_File_Desktophelper_Txt
 End
 #endif
 
-#if !defined WNT && !defined MACOSX
+#if !defined WNT
 File gid_Brand_File_Bin_Unoinfo
 BIN_FILE_BODY;
 Dir = gid_Brand_Dir_Program;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2017-01-27 Thread Samuel Mehrbrodt

 scp2/source/ooo/common_brand.scp |   41 +++
 1 file changed, 41 insertions(+)

New commits:
commit ab28f1291a7cd4806f310c04e7b92f7e29cca8e1
Author: Samuel Mehrbrodt 
Date:   Thu Jan 26 14:21:28 2017 +0100

SafeMode: Add Backup config to installation

has been only active in instdir so far

Change-Id: I1028d1acb2186347448a1f86aaa864c3ba88f75d
Reviewed-on: https://gerrit.libreoffice.org/33584
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index ff562ea..b4c260f1 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -774,6 +774,47 @@ ProfileItem gid_Brand_Profileitem_Soffice_CrashDirectory
 Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) 
":UserInstallation}/crash";
 End
 
+ProfileItem gid_Brand_Profileitem_Soffice_SecureUserConfig
+ProfileID = gid_Brand_Profile_Soffice_Ini;
+ModuleID = gid_Module_Root_Brand;
+Section = "Bootstrap";
+Key = "SecureUserConfig";
+Value = "true";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_SecureUserConfigCompress
+ProfileID = gid_Brand_Profile_Soffice_Ini;
+ModuleID = gid_Module_Root_Brand;
+Section = "Bootstrap";
+Key = "SecureUserConfigCompress";
+Value = "true";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_SecureUserConfigNumCopies
+ProfileID = gid_Brand_Profile_Soffice_Ini;
+ModuleID = gid_Module_Root_Brand;
+Section = "Bootstrap";
+Key = "SecureUserConfigNumCopies";
+Value = "2";
+End
+
+
+ProfileItem gid_Brand_Profileitem_Soffice_SecureUserConfigMode
+ProfileID = gid_Brand_Profile_Soffice_Ini;
+ModuleID = gid_Module_Root_Brand;
+Section = "Bootstrap";
+Key = "SecureUserConfigMode";
+Value = "1";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_SecureUserConfigExtensions
+ProfileID = gid_Brand_Profile_Soffice_Ini;
+ModuleID = gid_Module_Root_Brand;
+Section = "Bootstrap";
+Key = "SecureUserConfigExtensions";
+Value = "true";
+End
+
 ProfileItem gid_Brand_Profileitem_Version_Buildid
 ProfileID = gid_Brand_Profile_Version_Ini;
 ModuleID = gid_Module_Root_Brand;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2017-01-07 Thread David Ostrovsky

 scp2/source/ooo/vc_redist.scp |   22 --
 1 file changed, 22 deletions(-)

New commits:
commit 252e42cb5448f40c4bb26dbdf732168ff466b8ea
Author: David Ostrovsky 
Date:   Fri Jan 6 22:04:17 2017 +0100

Clean up stale merge modules

Change-Id: I2489238d5295650a3c51581a037185440f641005
Reviewed-on: https://gerrit.libreoffice.org/32797
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 23214f0..8f21124 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -18,28 +18,6 @@
 
 #include "macros.inc"
 
-#if defined(WITH_VC100_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86
-Feature = gm_Root;
-Name = "Microsoft_VC100_CRT_x86.msm";
-RootDir = "TARGETDIR";
-ComponentCondition = "VC_REDIST=1";
-End
-
-#endif
-
-#if defined(WITH_VC110_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC110_CRT_x86
-Feature = gm_Root;
-Name = "Microsoft_VC110_CRT_x86.msm";
-RootDir = "TARGETDIR";
-ComponentCondition = "VC_REDIST=1";
-End
-
-#endif
-
 #if defined(WITH_VC120_REDIST)
 
 #if defined WINDOWS_X64
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source setup_native/source

2016-11-22 Thread Aron Budea

 scp2/source/ooo/common_brand.scp|5 +
 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   11 +++
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   15 +++
 setup_native/source/packinfo/spellchecker_selection.txt |1 +
 6 files changed, 47 insertions(+)

New commits:
commit fc88ed47a66e76d279471c1da1193ce90ad8e9e5
Author: Aron Budea 
Date:   Tue Nov 22 23:15:28 2016 +0100

tdf#103922: Add Tibetan (bo) dictionary

Change-Id: Ief1a83bb87d03e46a3d3fa7702ab852401d3ed89
Reviewed-on: https://gerrit.libreoffice.org/31089
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7cd7733..6424960 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -183,6 +183,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Bn
 DosName = "dict-bn";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Bo
+ParentID = gid_Brand_Dir_Share_Extensions;
+DosName = "dict-bo";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Br
 ParentID = gid_Brand_Dir_Share_Extensions;
 DosName = "dict-br";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 4f6a1ee..f0542fc 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -421,6 +421,15 @@ End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Bo
+   Dir = FILELIST_DIR;
+   Name = "Dictionary/dict-bo.filelist";
+   Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+   TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Br
Dir = FILELIST_DIR;
Name = "Dictionary/dict-br.filelist";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 7819b24..0d781e1 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -225,6 +225,17 @@ Module gid_Module_Root_Extension_Dictionary_Bn
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Bo
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BO );
+Files = (gid_File_Extension_Dictionary_Bo);
+InstallOrder = "2000";
+Sortkey = "525";
+Spellcheckerlanguage = "bo";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Br
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BR );
 Files = (gid_File_Extension_Dictionary_Br);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 6c1c894..25c5400 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -76,6 +76,12 @@ en-US = "Bengali"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_BN]
 en-US = "Bengali spelling dictionary"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_BO]
+en-US = "Classical Tibetan"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_BO]
+en-US = "Classical Tibetan syllable spelling dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_BR]
 en-US = "Breton"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 613c79b..47e5817 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -442,6 +442,21 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
+module = "gid_Module_Root_Extension_Dictionary_Bo"
+solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-bo"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-bo"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2016 Elie Roux"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Bo dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
 module = "gid_Module_Root_Extension_Dictionary_Br"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-br"
 solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt

[Libreoffice-commits] core.git: scp2/source

2016-10-13 Thread Samuel Mehrbrodt

 scp2/source/ooo/folderitem_ooo.scp |   23 +++
 1 file changed, 23 insertions(+)

New commits:
commit 1ffc0ddfef403bd7cae3e43a4af368a4db7cc9f7
Author: Samuel Mehrbrodt 
Date:   Thu Oct 13 11:17:44 2016 +0200

Add windows start menu entry for Safe Mode

Change-Id: I66ad4c5e5a8f338d741e1f21cb927b00038e3f28
Reviewed-on: https://gerrit.libreoffice.org/29755
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/scp2/source/ooo/folderitem_ooo.scp 
b/scp2/source/ooo/folderitem_ooo.scp
index ff8a371..3c0423b 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -65,3 +65,26 @@ FolderItemProperty gid_Fip_Soffice_Desktop_AppID
 Key = "System.AppUserModel.ID";
 Value = "TheDocumentFoundation.LibreOffice.Startcenter";
 End
+
+FolderItem gid_Folderitem_LibreOffice_SafeMode
+Name = "%PRODUCTNAME (Safe Mode)";
+ModuleID = gid_Module_Root;
+#ifdef ENABLE_SILENT_MSI
+FolderID = PREDEFINED_STARTMENU;
+#else
+FolderID = gid_Folder_Staroffice51;
+#endif
+FileID = auto_brand_exe_soffice;
+IconFile = auto_brand_exe_soffice;
+IconID = 0;
+WkDir = gid_Brand_Dir_Program;
+Parameter = "--safe-mode";
+Styles = (NON_ADVERTISED);
+ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
+End
+
+FolderItemProperty gid_Fip_LibreOffice_SafeMode
+ShortcutID = gid_Folderitem_LibreOffice_SafeMode;
+Key = "System.AppUserModel.ID";
+Value = "TheDocumentFoundation.LibreOffice.SafeMode";
+End
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2016-09-22 Thread Andras Timar

 scp2/source/ooo/registryitem_ooo.scp |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 131446b38311b3437daa187ac534a0d05a9df9ee
Author: Andras Timar 
Date:   Tue Sep 20 18:38:59 2016 +0200

tdf#93237 different Windows Uninstall DisplayName for 32-bit and 64-bit 
builds

Change-Id: I6c7f9dd6e64a448b60904d8ee57fd45a45153f01
Reviewed-on: https://gerrit.libreoffice.org/29102
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/scp2/source/ooo/registryitem_ooo.scp 
b/scp2/source/ooo/registryitem_ooo.scp
index 6a80966..033b3c1 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -180,7 +180,11 @@ RegistryItem 
gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
 Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME 
%PRODUCTVERSION";
 ModuleID = gid_Module_Root;
 Name = "DisplayName";
-Value = "%PRODUCTNAME %PRODUCTVERSION";
+#if defined WINDOWS_X64
+Value = "%PRODUCTNAME %PRODUCTVERSION 64-bit";
+#else
+Value = "%PRODUCTNAME %PRODUCTVERSION 32-bit";
+#endif
 End
 
 RegistryItem 
gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Displayname2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2016-08-16 Thread Caolán McNamara

 scp2/source/ooo/file_extra_ooo.scp |7 +++
 scp2/source/ooo/module_ooo.scp |1 +
 2 files changed, 8 insertions(+)

New commits:
commit 76de7bbf3625efd9f4eeb2183bb0bd22e7a795db
Author: CaolÃ¡n McNamara 
Date:   Tue Aug 16 13:41:07 2016 +0100

Resolves: tdf#101511 package the emoji config stuff into install

Change-Id: I02416f6b977fbe52ddf04ab1b12127c76797629c

diff --git a/scp2/source/ooo/file_extra_ooo.scp 
b/scp2/source/ooo/file_extra_ooo.scp
index 3f09fc9..59a408c 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -74,6 +74,13 @@ File gid_File_Extra_Databasebiblio
 Name = "extras_databasebiblio.filelist";
 End
 
+File gid_File_Extra_Emojiconfig
+Dir = FILELIST_DIR;
+USER_FILE_BODY;
+Styles = (FILELIST, WORKSTATION);
+Name = "sfx2_emojiconfig.filelist";
+End
+
 #ifdef USING_X11
 
 File gid_File_Extra_Fontunxppds
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 35fd16c..7819b24 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -53,6 +53,7 @@ Module gid_Module_Root
  gid_File_Extra_Palettes,
  gid_File_Extra_Database,
  gid_File_Extra_Databasebiblio,
+ gid_File_Extra_Emojiconfig,
  gid_File_Extra_Gallsound,
  gid_File_Extra_Autocorr,
  gid_File_Extra_Autocorr_Lang,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2016-07-19 Thread Juergen Funk

 scp2/source/ooo/windowscustomaction_ooo.scp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0a76a41ae7a2ebd53f80f01ea9e2bcff3026d155
Author: Juergen Funk 
Date:   Fri Jul 15 11:56:02 2016 +0200

tdf#100929 - Windows Installer: "ADDLOCAL=ALL" doesn't set all features

The CustomAction "SelectLangauge" overrides the ADDLOCAL-switch.
When ADDLOCAL is set, skip the CustomAction "SelectLanguage"

Change-Id: I716349a0645e2f8dd193103b35028e493ca8e3a1
Reviewed-on: https://gerrit.libreoffice.org/27230
Reviewed-by: Andras Timar 
Tested-by: Thorsten Behrens 

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index 056fba8..dfafc16 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -189,8 +189,8 @@ WindowsCustomAction gid_Customaction_SelectLanguage
 Source = "sellangmsi.dll";
 Target = "SelectLanguage";
 Inbinarytable = 1;
-Assignment1 = ("InstallExecuteSequence", "NOT Installed", 
"MigrateFeatureStates");
-Assignment2 = ("InstallUISequence", "NOT Installed", 
"MigrateFeatureStates");
+Assignment1 = ("InstallExecuteSequence", "NOT Installed And 
ADDLOCAL=\"\"", "MigrateFeatureStates");
+Assignment2 = ("InstallUISequence", "NOT Installed And ADDLOCAL=\"\"", 
"MigrateFeatureStates");
 End
 
 WindowsCustomAction gid_Customaction_SortTree
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2016-07-12 Thread Christian Lohmaier

 scp2/source/ooo/file_extra_ooo.scp |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 4364e93bd71912b4b003c3260aaa6d86ff60ce79
Author: Christian Lohmaier 
Date:   Tue Jul 12 11:15:53 2016 +0200

fix installation set creation after 24e2ee04 broke it

Change-Id: Id9ec8bfbe21e76294e0d84c78318d20cda33c969

diff --git a/scp2/source/ooo/file_extra_ooo.scp 
b/scp2/source/ooo/file_extra_ooo.scp
index 11c6ffa..3f09fc9 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -164,13 +164,6 @@ File gid_File_Extra_Palettes
 Name = "extras_palettes.filelist";
 End
 
-File gid_File_Extra_Tpllayoutimpr
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_tpllayoutimpr.filelist";
-End
-
 File gid_File_Extra_Tplofficorr
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2016-03-15 Thread Christian Lohmaier

 scp2/source/ooo/common_brand.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ce08a8e24edb9a9371642d666ae9a983b16d02bd
Author: Christian Lohmaier 
Date:   Tue Mar 15 14:31:28 2016 +0100

Update-check: optional reporting of H/W and OS info also for installsets

expands 56a9594649872f4076b6891f917138d2b1e8d028 to also apply to
installation sets, not only instdir

Change-Id: I962b63feac02ac6dd06c77be660dd74d876c985e

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 1097950..3bf3c91 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -921,7 +921,7 @@ ProfileItem gid_Brand_Profileitem_Version_Useragent
 Section = "Version";
 Order = 17;
 Key = "UpdateUserAgent";
-Value = " (${buildid}; ${_OS}; ${_ARCH})";
+Value = " (${buildid}; ${_OS}; ${_ARCH}; )";
 End
 
 ProfileItem gid_Brand_Profileitem_Version_Vendor
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2016-03-14 Thread Christian Lohmaier

 scp2/source/ooo/common_brand.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6c47de46613b531bd975d073cf31c3fda6f8b8da
Author: Christian Lohmaier 
Date:   Mon Mar 14 12:36:23 2016 +0100

User-Agent: disable reporting of languages - also for installsets

extends 2a9095570a2430568f5c5e1c91edd6a717e099a6 to not only apply to
instdir, but also to packaged installers (that use data from scp2)

Change-Id: I446c521ce2b95549c2930275bee917c120c19e9b

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index c3667de..1097950 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -921,7 +921,7 @@ ProfileItem gid_Brand_Profileitem_Version_Useragent
 Section = "Version";
 Order = 17;
 Key = "UpdateUserAgent";
-Value = " (${buildid}; ${_OS}; ${_ARCH}; 
BundledLanguages=${AllLanguages})";
+Value = " (${buildid}; ${_OS}; ${_ARCH})";
 End
 
 ProfileItem gid_Brand_Profileitem_Version_Vendor
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source shell/Module_shell.mk shell/Package_scripts_kde.mk shell/Package_scripts.mk shell/Package_scripts_tde.mk

2016-03-02 Thread Michael Stahl

 scp2/source/kde/module_kde.scp |4 +---
 scp2/source/ooo/file_ooo.scp   |   25 -
 scp2/source/ooo/module_ooo.scp |3 +--
 scp2/source/tde/module_tde.scp |4 +---
 shell/Module_shell.mk  |3 ---
 shell/Package_scripts.mk   |   12 
 shell/Package_scripts_kde.mk   |   12 
 shell/Package_scripts_tde.mk   |   12 
 8 files changed, 3 insertions(+), 72 deletions(-)

New commits:
commit 16a87cb29ec007ae7bed8d4116f1d6e3dd36a175
Author: Michael Stahl 
Date:   Wed Mar 2 17:28:43 2016 +0100

shell, scp2: clean up empty script packages

Change-Id: I93abddac491578d470f85bf3e814a0d7a91f0351

diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index 2bf6ac5..6fa6155 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -26,7 +26,5 @@ Module gid_Module_Optional_Kde
 PackageInfo = "packinfo_office.txt";
 MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
 Styles = ();
-Files = (auto_kde_ALL,
-gid_File_Bin_Kde_Open_Url
-);
+Files = (auto_kde_ALL);
 End
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index b98ed64..ce009dd 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -59,31 +59,6 @@ End
 
 #endif
 
-#if defined UNX && ! defined MACOSX && ! defined LIBO_HEADLESS
-
-File gid_File_shell_scripts
-BIN_FILE_BODY;
-Dir = FILELIST_DIR;
-Name = "shell_scripts.filelist";
-Styles = (FILELIST, PACKED);
-End
-
-File gid_File_Bin_Kde_Open_Url
-BIN_FILE_BODY;
-Dir = FILELIST_DIR;
-Name = "shell_scripts_kde.filelist";
-Styles = (FILELIST, PACKED);
-End
-
-File gid_File_Bin_Tde_Open_Url
-BIN_FILE_BODY;
-Dir = FILELIST_DIR;
-Name = "shell_scripts_tde.filelist";
-Styles = (FILELIST, PACKED);
-End
-
-#endif
-
 #if defined UNX
 File gid_File_Bin_Senddoc
 BIN_FILE_BODY;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index e975fe8..35fd16c 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -23,8 +23,7 @@ Module gid_Module_Root
 PackageInfo = "packinfo_office.txt";
 InstallOrder = "20";
 MOD_NAME_DESC(MODULE_ROOT_OSL);
-Files = (gid_File_shell_scripts,
- gid_File_Bin_Senddoc,
+Files = (gid_File_Bin_Senddoc,
  gid_File_Script_Gengal,
  gid_File_Txt_Pagein_Common,
  gid_File_Txt_Pagein_Calc,
diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp
index 8e273ab..24725de 100644
--- a/scp2/source/tde/module_tde.scp
+++ b/scp2/source/tde/module_tde.scp
@@ -19,8 +19,6 @@ Module gid_Module_Optional_Tde
 PackageInfo = "packinfo_office.txt";
 MOD_NAME_DESC(MODULE_OPTIONAL_TDE);
 Styles = ();
-Files = (auto_tde_ALL,
-gid_File_Bin_Tde_Open_Url
-);
+Files = (auto_tde_ALL);
 End
 
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index d0a3318..17661e9 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -105,9 +105,6 @@ endif
 ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_Module_add_targets,shell,\
Library_recentfile \
-   Package_scripts \
-   Package_scripts_kde \
-   Package_scripts_tde \
 ))
 endif
 
diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk
deleted file mode 100644
index 6962fe5..000
--- a/shell/Package_scripts.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- 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_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk
deleted file mode 100644
index 4dc1cf5..000
--- a/shell/Package_scripts_kde.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- 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_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_scripts_tde.mk b/shell/Package_scripts_tde.mk
deleted file mode 100644
index d73d824..000
--- a/shell/Package_scripts_tde.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- 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
-#

[Libreoffice-commits] core.git: scp2/source

2016-01-23 Thread Bryan Quigley

 scp2/source/activex/module_activex.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 09ffa9515ed7baa7e91d591fa24bf112c7c74b1c
Author: Bryan Quigley 
Date:   Mon Jan 18 00:14:13 2016 -0500

Show that ActiveX support is deprecated

This just adds deprecated before activex support and mentions
to the user to check the release notes for more details.

Change-Id: I4bb7d577fb8f9e2618691e5418b1ddc4a4330ae2
Reviewed-on: https://gerrit.libreoffice.org/21563
Tested-by: Jenkins 
Tested-by: jan iversen 
Reviewed-by: jan iversen 

diff --git a/scp2/source/activex/module_activex.ulf 
b/scp2/source/activex/module_activex.ulf
index 9bc08c6..eb8a045 100644
--- a/scp2/source/activex/module_activex.ulf
+++ b/scp2/source/activex/module_activex.ulf
@@ -20,7 +20,7 @@
 en-US = "ActiveX Control"
 
 [STR_DESC_MODULE_OPTIONAL_ACTIVEXCONTROL]
-en-US = "Component to enable Microsoft Internet Explorer to display 
%PRODUCTNAME documents."
+en-US = "Deprecated Component (see release notes) to enable Microsoft Internet 
Explorer to display %PRODUCTNAME documents."
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2016-01-05 Thread Sean Young

 scp2/source/writer/registryitem_writer.scp |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 72ac13eb648fdc87d78d458a81b79c5b7ce0d82e
Author: Sean Young 
Date:   Fri Dec 11 12:41:24 2015 +

Register LibreOffice as able to open MS Write files

Change-Id: I9d2962214e048e489c063b9a364dbfa207740949
Reviewed-on: https://gerrit.libreoffice.org/20643
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/scp2/source/writer/registryitem_writer.scp 
b/scp2/source/writer/registryitem_writer.scp
index 80cbbdd..a1db1ef 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -1577,6 +1577,15 @@ RegistryItem gid_Regitem_OpenOffice_WPS_OpenWith_Writer
 Value = " ";
 End
 
+// .WRI
+RegistryItem gid_Regitem_OpenOffice_WRI_OpenWith_Writer
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+Subkey = ".wri\OpenWithProgIDs";
+ModuleID = gid_Module_Prg_Wrt_Bin;
+Name = "LibreOffice.WriterDocument.1";
+Value = " ";
+End
+
 // .HWP
 RegistryItem gid_Regitem_OpenOffice_HWP_OpenWith_Writer
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source shell/Module_shell.mk shell/Package_scripts_gnome.mk shell/source sysui/desktop

2015-12-17 Thread Bryan Quigley

 scp2/source/ooo/file_ooo.scp   |7 ---
 shell/Module_shell.mk  |1 -
 shell/Package_scripts_gnome.mk |   14 --
 shell/source/unix/misc/gnome-open-url.sh   |4 
 shell/source/unix/misc/senddoc.sh  |2 --
 sysui/desktop/apparmor/program.senddoc |1 -
 sysui/desktop/apparmor/program.soffice.bin |1 -
 7 files changed, 30 deletions(-)

New commits:
commit eaa7f30102df4df01171e5daf83cdddae1bb0cda
Author: Bryan Quigley 
Date:   Wed Dec 2 00:02:59 2015 -0500

Remove gnome-open support

Gnome-open has been deprecate for some time.  xdg-open replaces it.

Change-Id: I7fc0f32a1f2fbadbe3d1cee58d0089213665c3a5
Reviewed-on: https://gerrit.libreoffice.org/20347
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 9dc5038..ad78407 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -61,13 +61,6 @@ End
 
 #if defined UNX && ! defined MACOSX && ! defined LIBO_HEADLESS
 
-File gid_File_Bin_Gnome_Open_Url
-BIN_FILE_BODY;
-Dir = FILELIST_DIR;
-Name = "shell_scripts_gnome.filelist";
-Styles = (FILELIST, PACKED);
-End
-
 File gid_File_shell_scripts
 BIN_FILE_BODY;
 Dir = FILELIST_DIR;
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 44d0a61..d0a3318 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -106,7 +106,6 @@ ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_Module_add_targets,shell,\
Library_recentfile \
Package_scripts \
-   Package_scripts_gnome \
Package_scripts_kde \
Package_scripts_tde \
 ))
diff --git a/shell/Package_scripts_gnome.mk b/shell/Package_scripts_gnome.mk
deleted file mode 100644
index 794ed87..000
--- a/shell/Package_scripts_gnome.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- 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_Package_Package,shell_scripts_gnome,$(SRCDIR)/shell/source/unix/misc))
-
-$(eval $(call 
gb_Package_add_file,shell_scripts_gnome,$(LIBO_BIN_FOLDER)/gnome-open-url,gnome-open-url.sh))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/source/unix/misc/gnome-open-url.sh 
b/shell/source/unix/misc/gnome-open-url.sh
deleted file mode 100755
index bffe6f2..000
--- a/shell/source/unix/misc/gnome-open-url.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# use xdg-open or gnome-open if available, falling back to our own open-url
-xdg-open "$1" 2>/dev/null || gnome-open "$1" 2>/dev/null || `dirname 
"$0"`/open-url "$1" 2>/dev/null
diff --git a/shell/source/unix/misc/senddoc.sh 
b/shell/source/unix/misc/senddoc.sh
index a642546..169af25 100755
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -389,8 +389,6 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
 MAILER=${DESKTOP_LAUNCH}
 elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] ; then
 MAILER=/usr/bin/kde-open
-elif [ -n "$GNOME_DESKTOP_SESSION_ID" -a -x /usr/bin/gnome-open ] ; 
then
-MAILER=/usr/bin/gnome-open
 elif [ -x /usr/bin/xdg-open ] ; then
 MAILER=/usr/bin/xdg-open
 else
diff --git a/sysui/desktop/apparmor/program.senddoc 
b/sysui/desktop/apparmor/program.senddoc
index deb1fff..f258114 100644
--- a/sysui/desktop/apparmor/program.senddoc
+++ b/sysui/desktop/apparmor/program.senddoc
@@ -26,7 +26,6 @@ profile libreoffice-senddoc 
INSTDIR-/usr/lib{,32,64}/libreoffice/program/senddoc
   /bin/grep rmix,
   /bin/unamermix,
   /usr/bin/xdg-open Cxr -> sanitized_helper,
-  /usr/bin/gnome-open   Cxr -> sanitized_helper,
   /dev/null rw,
   INSTDIR-program/uri-encode rmPUx,
   /usr/share/libreoffice/share/config/* r,
diff --git a/sysui/desktop/apparmor/program.soffice.bin 
b/sysui/desktop/apparmor/program.soffice.bin
index c74fcc6..bbb0100 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -122,7 +122,6 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
   /usr/lib{,32,64}/jvm/**   r,
   INSTDIR-**ra,
   INSTDIR-**.so rm,
-  INSTDIR-program/gnome-open-urlrmPUx,  #This doesn't seem to be used on 
my install
   INSTDIR-program/soffice.bin   rmix,
   INSTDIR-program/xpdfimportrPx,
   INSTDIR-program/open-url  rPx,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] core.git: scp2/source

2015-06-25 Thread Riccardo Magliocchetti

 scp2/source/ooo/file_ooo.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 64b636b814ddd65b90459c75a49cc5e743a2785c
Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Date:   Wed Jun 24 17:01:56 2015 +0200

Avoid errors with stuff not build on --without-x

Reported by by Abhimanyu Singh

Change-Id: I02bd2a2b85b9d55f0b237d3a1141801245473cd2
Reviewed-on: https://gerrit.libreoffice.org/16453
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a682256..b0f3382 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -59,7 +59,7 @@ End
 
 #endif
 
-#if defined UNX  ! defined MACOSX
+#if defined UNX  ! defined MACOSX  ! defined LIBO_HEADLESS
 
 File gid_File_Bin_Gnome_Open_Url
 BIN_FILE_BODY;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2015-06-06 Thread Adolfo Jayme Barrientos

 scp2/source/ooo/file_font_ooo.scp |   28 
 1 file changed, 28 deletions(-)

New commits:
commit d79fcb26fa39d3d4151c540b5574e1be3a3222c1
Author: Adolfo Jayme Barrientos fit...@ubuntu.com
Date:   Sat Jun 6 13:54:07 2015 -0500

Remove WITH_AGFA_MONOTYPE_FONTS

Undefined since 62bf424fa84b0ccd0828a474a1351b0134f27eab
and 0789ee23ae6a417d141098c411224a8af9f626d0.

Weâve never bundled these proprietary fonts.

Change-Id: I6ad6e7294504093cd0d64755ec72decf2bacc3f0
Reviewed-on: https://gerrit.libreoffice.org/16125
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com

diff --git a/scp2/source/ooo/file_font_ooo.scp 
b/scp2/source/ooo/file_font_ooo.scp
index 597d5af..3ff8daa 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -76,31 +76,3 @@ File gid_File_FcLocal_Conf
 End
 #endif
 #endif
-
-#ifdef WNT
-#ifdef WITH_AGFA_MONOTYPE_FONTS
-STD_FONTWIN_FILE( gid_File_Fnt_albw, albw.ttf, AlbanyAMT)
-STD_FONTWIN_FILE( gid_File_Fnt_albwb, albwb.ttf, AlbanyAMT Bold)
-STD_FONTWIN_FILE( gid_File_Fnt_albwbi, albwbi.ttf, AlbanyAMT Bold Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_albwi, albwi.ttf, AlbanyAMT Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_andybol, andybol_.ttf, AndyMT Bold)
-STD_FONTWIN_FILE( gid_File_Fnt_andyreg, andyreg_.ttf, AndyMT)
-STD_FONTWIN_FILE( gid_File_Fnt_ans, ans_.ttf, Andale Sans)
-STD_FONTWIN_FILE( gid_File_Fnt_ansb, ansb.ttf, Andale Sans Bold)
-STD_FONTWIN_FILE( gid_File_Fnt_ansbi, ansbi___.ttf, Andale Sans Bold Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_ansi, ansi.ttf, Andale Sans Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_bl, bl__.ttf, BellMT)
-STD_FONTWIN_FILE( gid_File_Fnt_blb, blb_.ttf, BellMT Bold)
-STD_FONTWIN_FILE( gid_File_Fnt_blbi, blbi.ttf, BellMT Bold Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_bli, bli_.ttf, BellMT Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_cumbwb, cumbwb__.ttf, CumberlandAMT Bold)
-STD_FONTWIN_FILE( gid_File_Fnt_cumbwbi, cumbwbi_.ttf, CumberlandAMT Bold 
Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_cumbwi, cumbwi__.ttf, CumberlandAMT Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_cumbwr, cumbwr__.ttf, CumberlandAMT)
-STD_FONTWIN_FILE( gid_File_Fnt_mtsorts, mtsorts_.ttf, Monotype Sorts)
-STD_FONTWIN_FILE( gid_File_Fnt_thowb, thowb___.ttf, ThorndaleAMT Bold)
-STD_FONTWIN_FILE( gid_File_Fnt_thowbi, thowbi__.ttf, ThorndaleAMT Bold Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_thowi, thowi___.ttf, ThorndaleAMT Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_thowr, thowr___.ttf, ThorndaleAMT)
-#endif
-#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2015-05-18 Thread Andras Timar

 scp2/source/python/module_python.scp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3aeeaee1178c6f6041405fc230db5acd6862
Author: Andras Timar andras.ti...@collabora.com
Date:   Sun May 17 23:20:00 2015 +0200

scp2: fix --disable-python

Change-Id: Iec27f9d9efb506d67de6bc20eb0a8eef46a58ebf
Reviewed-on: https://gerrit.libreoffice.org/15778
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Andras Timar andras.ti...@collabora.com

diff --git a/scp2/source/python/module_python.scp 
b/scp2/source/python/module_python.scp
index c4a2915..3589234 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -18,11 +18,11 @@
 
 #include macros.inc
 
+#ifndef DISABLE_PYUNO
+
 #include AutoInstall/python
 #include AutoInstall/python_scriptprovider
 
-#ifndef DISABLE_PYUNO
-
 Module gid_Module_Pyuno
 PackageInfo = packinfo_office.txt;
 ParentID = gid_Module_Root_Brand;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2015-05-13 Thread Andras Timar

 scp2/source/ooo/common_brand.scp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cb5a0b03bef4eb8ab0d8689ec73ed83bb73ef5c0
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu May 14 00:01:17 2015 +0200

do not set unix executable bit for CREDITS.fodt, LICENSE.fodt and NOTICE

Change-Id: Iab15ca1479d39e480369a18a7b043675d319f2ca

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 9650c18..e850714 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1267,7 +1267,7 @@ File gid_License_Txt
 End
 
 File gid_License_Odt
-BIN_FILE_BODY;
+TXT_FILE_BODY;
 #if defined MACOSX
 Dir = gid_Dir_Bundle_Contents_Resources;
 #else
@@ -1278,7 +1278,7 @@ File gid_License_Odt
 End
 
 File gid_Credits_Odt
-BIN_FILE_BODY;
+TXT_FILE_BODY;
 #if defined MACOSX
 Dir = gid_Dir_Bundle_Contents_Resources;
 #else
@@ -1289,7 +1289,7 @@ File gid_Credits_Odt
 End
 
 File gid_Apache_Notice
-BIN_FILE_BODY;
+TXT_FILE_BODY;
 #if defined MACOSX
 Dir = gid_Dir_Bundle_Contents_Resources;
 #else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2015-04-30 Thread Andras Timar

 scp2/source/ooo/file_ooo.scp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 415c62dc3c3e66f837ec0c89c5bc2d65e17641a7
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Apr 30 23:18:57 2015 +0200

tdf#89152 add missing .ui localizations to install script

Change-Id: I32368329edfff18ea2a73de9a4cf60b2f734a54d

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 5427fe7..9a479ff 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -306,6 +306,7 @@ UI_FILELIST_ALL_LANG(formula, formula)
 UI_FILELIST_ALL_LANG(fps, fps)
 UI_FILELIST_ALL_LANG(sabpilot, modules/sabpilot)
 UI_FILELIST_ALL_LANG(scalc, modules/scalc)
+UI_FILELIST_ALL_LANG(scanner, modules/scanner)
 UI_FILELIST_ALL_LANG(schart, modules/schart)
 UI_FILELIST_ALL_LANG(sdraw, modules/sdraw)
 UI_FILELIST_ALL_LANG(sfx, sfx)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2015-04-30 Thread Andras Timar

 scp2/source/ooo/module_lang_template.scp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0ecf20cd185813327613c01bc6cbff9721cef1f1
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri May 1 07:17:10 2015 +0200

scp2: add scanner ui files to language pack template

Change-Id: I10105770a119db8a21a3d09642f99b556440a57d

diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index e5b8752..ce8ee9d 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -36,6 +36,7 @@ Module gid_Module_Langpack_Basis_Template
  gid_File_Share_Config_Sofficecfg_uiconfig_fps_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_sabpilot_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_scalc_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_scanner_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_schart_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_sdraw_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_sfx_Lang,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2015-04-20 Thread Matúš Kukan

 scp2/source/ooo/module_ooo.scp   |   14 --
 scp2/source/writer/module_writer.scp |7 +--
 2 files changed, 1 insertion(+), 20 deletions(-)

New commits:
commit 7a8f48ba8739c491b5bae23bc9947e44f1813926
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Fri Apr 17 21:03:03 2015 +0200

scp2: remove unused gids

Change-Id: I723e752ff4bab9e36b3f3a08fc1fe8d10511d774

diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 09dcd34..73214d7 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -32,32 +32,18 @@ Module gid_Module_Root
  gid_File_Txt_Pagein_Impress,
  gid_File_Txt_Pagein_Writer,
  gid_File_extras_newfiles,
- gid_File_Jar_Letter,
  gid_File_Wizards_Common,
  gid_File_Wizards_Fax,
- gid_File_Jar_Agenda,
- gid_File_Jar_Web,
  gid_File_Rdb_Offapi,
  gid_Starregistry_Services_Rdb,
  auto_ooo_ALL,
  auto_ooobinarytable_ALL,
- gid_File_Lib_Bib,
- gid_File_Lib_J,
- gid_File_Lib_Zip,
  gid_Unixlink_File_Lib_Curl,
- gid_File_Lib_Recentfile,
- gid_File_Lib_Tab,
- gid_File_Lib_Tab2,
  gid_Unixlink_File_Lib_Raptor,
  gid_Unixlink_File_Lib_Rasqal,
  gid_Unixlink_File_Lib_Rdf,
- gid_File_Lib_Sndfile,
- gid_File_Lib_Neon,
  gid_Unixlink_File_Lib_Xslt,
  gid_Unixlink_File_Lib_eXslt,
- gid_File_Lib_I18n,
- gid_File_Lib_Accessbridge,
- gid_File_Lib_Dl,
  GID_FILE_LIB_WPD,
  gid_File_Lib_Cli_Oootypes_Assembly,
  gid_File_Lib_Policy_Cli_Oootypes_Assembly,
diff --git a/scp2/source/writer/module_writer.scp 
b/scp2/source/writer/module_writer.scp
index 6256c10..91786895 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -35,12 +35,7 @@ Module gid_Module_Prg_Wrt_Bin
 Sortkey = 100;
 Default = YES;
 Styles = (HIDDEN_ROOT);
-Files = 
(gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
-gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
-auto_writer_ALL,
-gid_File_Jar_Email, 
-gid_File_Jar_Mail, 
-gid_File_Jar_Activation,
+Files = (auto_writer_ALL,
 gid_File_Share_Registry_Writer_Xcd,
 gid_File_Tmp_Userinstall_Wrt_Inf);
 End
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2015-03-05 Thread Stanislav Horacek

 scp2/source/accessories/module_samples_accessories.ulf   |2 +-
 scp2/source/accessories/module_templates_accessories.ulf |2 +-
 scp2/source/ooo/module_helppack.ulf  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d143c3b5a851890c7454dbb8d436906bec1d37bd
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Wed Mar 4 21:59:13 2015 +0100

add country to strings refering to Brazilian Portuguese

Change-Id: If4487d7157adb949aca9ed0ca0739a00152e6955
Reviewed-on: https://gerrit.libreoffice.org/14747
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/scp2/source/accessories/module_samples_accessories.ulf 
b/scp2/source/accessories/module_samples_accessories.ulf
index 709f208..8415a9e 100644
--- a/scp2/source/accessories/module_samples_accessories.ulf
+++ b/scp2/source/accessories/module_samples_accessories.ulf
@@ -70,7 +70,7 @@ en-US = Installs Portuguese support in %PRODUCTNAME 
%PRODUCTVERSION
 en-US = Portuguese (Brazil)
 
 [STR_DESC_MODULE_LANGPACK_PT_BR]
-en-US = Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION
+en-US = Installs Portuguese (Brazil) support in %PRODUCTNAME %PRODUCTVERSION
 
 [STR_NAME_MODULE_LANGPACK_JA]
 en-US = Japanese
diff --git a/scp2/source/accessories/module_templates_accessories.ulf 
b/scp2/source/accessories/module_templates_accessories.ulf
index 7ba6ba3..4e03484 100644
--- a/scp2/source/accessories/module_templates_accessories.ulf
+++ b/scp2/source/accessories/module_templates_accessories.ulf
@@ -65,7 +65,7 @@ en-US = Installs Portuguese support in %PRODUCTNAME 
%PRODUCTVERSION
 en-US = Portuguese (Brazil)
 
 [STR_DESC_MODULE_LANGPACK_PT_BR]
-en-US = Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION
+en-US = Installs Portuguese (Brazil) support in %PRODUCTNAME %PRODUCTVERSION
 
 [STR_NAME_MODULE_LANGPACK_JA]
 en-US = Japanese
diff --git a/scp2/source/ooo/module_helppack.ulf 
b/scp2/source/ooo/module_helppack.ulf
index bc70e6c..18a1a0e 100644
--- a/scp2/source/ooo/module_helppack.ulf
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -68,7 +68,7 @@ en-US = Installs Portuguese help in %PRODUCTNAME 
%PRODUCTVERSION
 en-US = Portuguese (Brazil)
 
 [STR_DESC_MODULE_HELPPACK_PT_BR]
-en-US = Installs Portuguese help in %PRODUCTNAME %PRODUCTVERSION
+en-US = Installs Portuguese (Brazil) help in %PRODUCTNAME %PRODUCTVERSION
 
 [STR_NAME_MODULE_HELPPACK_JA]
 en-US = Japanese
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2015-02-03 Thread Maxime de Roucy

 scp2/source/winexplorerext/registryitem_winexplorerext.scp |   18 +
 1 file changed, 18 insertions(+)

New commits:
commit 25686bbcd2d39000640e2b9db835b5b4bea653c1
Author: Maxime de Roucy mdero...@linagora.com
Date:   Mon Dec 22 13:57:55 2014 +0100

fdo#67534 Fix Property Handler shared lock

As explained in the following link, access mode should be set to
EnableShareDenyNone to avoid blocking others process to access the
file opened by the Property Handler.

http://msdn.microsoft.com/en-us/library/windows/desktop/dd894084%28v=vs.85%29.aspx

Change-Id: I61cc251078c20f6a8cf7fa052c222a86e4e383b3
Reviewed-on: https://gerrit.libreoffice.org/13596
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp 
b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 32c83bc..38a09fd 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -410,6 +410,15 @@ RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
 Value = %PRODUCTNAME Property Handler;
 End
 
+RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Optional_Winexplorerext;
+ComponentCondition = VersionNT = 600;
+Subkey = CLSID\{AE424E85-F6DF-4910-A6A9-438797986431};
+Name = EnableShareDenyNone;
+Value = #1;
+End
+
 #ifdef BUILD_X64
 
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
@@ -420,6 +429,15 @@ RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
 Value = %PRODUCTNAME Property Handler;
 End
 
+RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite_x64
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Optional_Winexplorerext_x64;
+ComponentCondition = VersionNT = 600;
+Subkey = CLSID\{AE424E85-F6DF-4910-A6A9-438797986431};
+Name = EnableShareDenyNone;
+Value = #1;
+End
+
 #endif
 
 RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2015-01-07 Thread David Tardon

 scp2/source/ooo/file_extra_ooo.scp |   28 
 scp2/source/ooo/module_ooo.scp |4 
 2 files changed, 32 insertions(+)

New commits:
commit 9da59f23a0b100454bdc4c663db82a61f1d7ec30
Author: David Tardon dtar...@redhat.com
Date:   Thu Jan 8 00:02:32 2015 +0100

install the new templates too

Change-Id: I503d2cf750f844999635c517b33788ba5f186788

diff --git a/scp2/source/ooo/file_extra_ooo.scp 
b/scp2/source/ooo/file_extra_ooo.scp
index e4d5e88..c2cc985 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -171,6 +171,34 @@ File gid_File_Extra_Tpllayoutimpr
 Name = extras_tpllayoutimpr.filelist;
 End
 
+File gid_File_Extra_Tplofficorr
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = extras_tplofficorr.filelist;
+End
+
+File gid_File_Extra_Tploffimisc
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = extras_tploffimisc.filelist;
+End
+
+File gid_File_Extra_Tplpresnt
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = extras_tplpresnt.filelist;
+End
+
+File gid_File_Extra_Tplpersonal
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = extras_tplpersonal.filelist;
+End
+
 File gid_File_Extra_Tplwizbitmap
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index e70e471..a8d10c2 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -91,6 +91,10 @@ Module gid_Module_Root
  gid_File_Extra_Gallwwwback,
  gid_File_Extra_Gallwwwgraf,
  gid_File_Extra_Tpllayoutimpr,
+ gid_File_Extra_Tplofficorr,
+ gid_File_Extra_Tploffimisc,
+ gid_File_Extra_Tplpresnt,
+ gid_File_Extra_Tplpersonal,
  gid_File_Extra_Tplwizbitmap,
  gid_File_Extra_Tplwizletter,
  gid_File_Scripts_Beanshell,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-12-22 Thread Andras Timar

 scp2/source/impress/module_ogltrans.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 48d0ca8560d10a56a7280fad3a631985b02a56b9
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Dec 22 12:44:58 2014 +0100

scp2: typo in source/impress/module_ogltrans.ulf

Change-Id: I3f2849784107a046bcf05e6cfb3b0b8d2f535912

diff --git a/scp2/source/impress/module_ogltrans.ulf 
b/scp2/source/impress/module_ogltrans.ulf
index 98ef95f..349bc60 100644
--- a/scp2/source/impress/module_ogltrans.ulf
+++ b/scp2/source/impress/module_ogltrans.ulf
@@ -20,5 +20,5 @@
 [STR_NAME_MODULE_OPTIONAL_OGLTRANS]
 en-US = OpenGL slide transitions for %PRODUCTNAME Impress
 
-[STR_DESC_MODULE_MODULE_OPTIONAL_OGLTRANS]
+[STR_DESC_MODULE_OPTIONAL_OGLTRANS]
 en-US = OpenGL slide transitions for %PRODUCTNAME Impress.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-11-25 Thread Stephan Bergmann

 scp2/source/ooo/ure.scp |   11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 836a93e24e4b1db3aa508ed8554ab13bc8788e74
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Nov 25 10:38:12 2014 +0100

Simplify some #if

Change-Id: I9d3239bdbb92f715b050fd91238add5588969bf0

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 6dd8e7e..9da2e26 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -20,23 +20,18 @@
 
 #include AutoInstall/ure
 
-#ifndef MACOSX
+#if !defined MACOSX
+
 Directory gid_Dir_Common_Ure
   #ifdef WNT
 ParentID = gid_Dir_Brand_Root;
-  #else
-ParentID = PREDEFINED_PROGDIR;
-  #endif
-  #ifdef WNT
 HostName = URE;
   #else
+ParentID = PREDEFINED_PROGDIR;
 HostName = ure;
   #endif
 Styles = (UREDIRECTORY);
 End
-#endif
-
-#if !defined MACOSX
 
 Directory gid_Dir_Ure_Bin
 ParentID = gid_Dir_Common_Ure;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-11-25 Thread Stephan Bergmann

 scp2/source/ooo/profileitem_ooo.scp |   76 
 1 file changed, 76 deletions(-)

New commits:
commit bee4c09ba233fa269aa70461537b4cc8dea769f6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Nov 26 08:32:53 2014 +0100

Remove gid_Profile_Setup_Ini junk

884bb65da9414f9217cbbc77ae6fb9a2e4c41f4f INTEGRATION: CWS native141: 
#i87732#
version number in package names removed gid_Profile_Setup_Ini and
b857e4618b2ca37798a9aaa3121c5ff926df346f INTEGRATION: CWS native141: 
#i87732#
version number in package names removed its nine correpsonding
gid_Profileitems, but 00de796b0253e7374cf65ad59ef6d391dbdafaa7 
INTEGRATION: CWS
odfversion241_DEV300 brought back seven of the gid_Profileitems (but not 
the
gid _Profile_Setup_Ini itself; probably due to a merge conflict; then
fd1db0b8eba8e86c5a7e1a3c685e76975d21d93c Undo basis/brand split: move
program/classes/ from basis to brand removed one of the gid_Profileitems
again).  Now remove the remaining six.

Change-Id: I464ac1258217b2ecf8e94b2c7e59b795306d5b06

diff --git a/scp2/source/ooo/profileitem_ooo.scp 
b/scp2/source/ooo/profileitem_ooo.scp
index 210aedc..6ca5dba 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -27,82 +27,6 @@ Profile gid_Profile_Louno_ini
 Styles = (NETWORK);
 End
 
-ProfileItem gid_Profileitem_Setup_Uno_Services
-ProfileID = gid_Profile_Setup_Ini;
-ModuleID = gid_Module_Root;
-Section = Bootstrap;
-Order = 2;
-Key = UNO_SERVICES;
-Value = $ORIGIN/setup_services.rdb;
-End
-
-ProfileItem gid_Profileitem_Setup_Uno_Types
-ProfileID = gid_Profile_Setup_Ini;
-ModuleID = gid_Module_Root;
-Section = Bootstrap;
-Order = 3;
-Key = UNO_TYPES;
-Value = $ORIGIN/types.rdb;
-End
-
-#ifdef WNT
-
-ProfileItem gid_Profileitem_Setup_Alluserset
-ProfileID = gid_Profile_Setup_Ini;
-ModuleID = gid_Module_Root;
-Section = Bootstrap;
-Order = 4;
-Key = ALLUSERS;
-Value = [ALLUSERS];
-Inifiletablekey = AllUsersSet;
-Inifiletableaction = 1;
-Styles = (INIFILETABLE);
-End
-
-#endif
-
-#ifdef WNT
-
-ProfileItem gid_Profileitem_Setup_Findproduct
-ProfileID = gid_Profile_Setup_Ini;
-ModuleID = gid_Module_Root;
-Section = Bootstrap;
-Order = 5;
-Key = FINDPRODUCT;
-Value = [FINDPRODUCT];
-Inifiletablekey = FindProductSet;
-Inifiletableaction = 1;
-Styles = (INIFILETABLE);
-End
-
-#endif
-
-#ifdef WNT
-
-ProfileItem gid_Profileitem_Setup_Productcode
-ProfileID = gid_Profile_Setup_Ini;
-ModuleID = gid_Module_Root;
-Section = Bootstrap;
-Order = 6;
-Key = ProductCode;
-Value = productcode;
-End
-
-#endif
-
-#ifdef WNT
-
-ProfileItem gid_Profileitem_Setup_Upgradecode
-ProfileID = gid_Profile_Setup_Ini;
-ModuleID = gid_Module_Root;
-Section = Bootstrap;
-Order = 7;
-Key = UpgradeCode;
-Value = upgradecode;
-End
-
-#endif
-
 ProfileItem gid_Profileitem_Louno_Uno_Bundled_Extensions
 ProfileID = gid_Profile_Louno_ini;
 ModuleID = gid_Module_Root;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-11-24 Thread Stephan Bergmann

 scp2/source/ooo/ure.scp |8 
 1 file changed, 8 deletions(-)

New commits:
commit b94c9e0d82c7430ad7c2f3b10b60651a141100a2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 24 17:49:27 2014 +0100

These are inside an !defined MACOSX block

Change-Id: I09e2db009801c046cf8dd331c7e07cb83f9e3f20

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 18a15d7..6dd8e7e 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -45,22 +45,14 @@ End
 
 #if !defined WNT
 Directory gid_Dir_Ure_Lib
-#if defined MACOSX
-ParentID = gid_Dir_UreLink;
-#else
 ParentID = gid_Dir_Common_Ure;
-#endif
 DosName = lib;
 End
 #endif
 
 #if !defined WNT
 Directory gid_Dir_Ure_Share
-#if defined MACOSX
-ParentID = gid_Dir_UreLink;
-#else
 ParentID = gid_Dir_Common_Ure;
-#endif
 DosName = share;
 End
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-11-14 Thread Andras Timar

 scp2/source/ooo/vc_redist.scp  |   11 +++
 scp2/source/winexplorerext/file_winexplorerext.scp |   20 
 2 files changed, 31 insertions(+)

New commits:
commit ef7e29998c5e86c4174e9dbe16c157705f9dc129
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Nov 14 14:11:13 2014 +0100

add redist files for VS 2013

Change-Id: I07c7af3b9b7d3335074d712c35cef9d7828a271b

diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index e1c114c..b9ee3f2 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -40,3 +40,14 @@ End
 
 #endif
 
+#if defined(WITH_VC120_REDIST)
+
+MergeModule gid_MergeModule_Microsoft_VC120_CRT_x86
+Feature = gm_Root;
+Name = Microsoft_VC120_CRT_x86.msm;
+RootDir = TARGETDIR;
+ComponentCondition = VC_REDIST=1;
+End
+
+#endif
+
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp 
b/scp2/source/winexplorerext/file_winexplorerext.scp
index c7fcd69..7567896 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -65,4 +65,24 @@ End
 
 #endif
 
+#if defined(WITH_VC120_REDIST)
+
+File gid_File_Lib_Msvcr120
+LIB_FILE_BODY;
+Styles = (PACKED);
+Dir = gid_Dir_Shlxthdl;
+Name = msvcr120.dll;
+ComponentCondition = VersionNT64;
+End
+
+File gid_File_Lib_Msvcp120
+LIB_FILE_BODY;
+Styles = (PACKED);
+Dir = gid_Dir_Shlxthdl;
+Name = msvcp120.dll;
+ComponentCondition = VersionNT64;
+End
+
+#endif
+
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-11-06 Thread Andras Timar

 scp2/source/ooo/registryitem_ooo.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ed4be8e55d1bea480a9f76daa86073beb1a376e
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Nov 6 12:04:05 2014 +0100

use %PRODUCTNAME in Windows registry keys of config files

Change-Id: I532a1b059239b51009ea7025fb348dcd865748ff

diff --git a/scp2/source/ooo/registryitem_ooo.ulf 
b/scp2/source/ooo/registryitem_ooo.ulf
index d4b5aa4..8c07348 100644
--- a/scp2/source/ooo/registryitem_ooo.ulf
+++ b/scp2/source/ooo/registryitem_ooo.ulf
@@ -20,7 +20,7 @@
 en-US = Install
 
 [STR_REG_VAL_SO60_CONFIGFILE]
-en-US = %SXWFORMATNAME %SXWFORMATVERSION Configuration File
+en-US = %PRODUCTNAME Configuration File
 
 [STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]
 en-US = LibreOffice
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-11-05 Thread Stephan Bergmann

 scp2/source/ooo/common_brand.scp   |   15 ++-
 scp2/source/ooo/file_ooo.scp   |2 +-
 scp2/source/python/file_python.scp |2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 167ff1e7318fca51409b8b486e5b011e2c9cd72f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Nov 5 13:07:28 2014 +0100

Mac OS X: Add back into installset LibreOffice.app/Contents/MacOS/ files

...that were erroneously removed with 
6492c8576e0393f7ee548cd938e84c80e8d37127
Make the 'Mac-like' or 'canonical' app bundle structure always used on OS 
X:

* gengal script (ultimately calling gengal.bin); this script still needs
  adaption to the new LibreOffice.app layout, though!

* python script (ultimately calling Python.app)

* unoinfo script

* unopkg symlink to unopkg.bin (which could be dropped for Mac by renaming
  unopkg.bin to just unopkg, similarly to soffice/soffice.bin)

Change-Id: Ic3eb340a183388939b1c812faf7fb509c9f53a8a

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 01c072d..a866929 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -89,6 +89,9 @@ Module gid_Module_Root_Brand
 git_License_Odt,
 gid_Credits_Odt,
 gid_Apache_Notice);
+#if defined MACOSX
+Unixlinks = (gid_Brand_Unixlink_Unopkg);
+#endif
 End
 
 // Language specific brand module
@@ -514,7 +517,7 @@ File gid_Brand_File_Desktophelper_Txt
 End
 #endif
 
-#if !defined MACOSX  !defined WNT
+#if !defined WNT
 File gid_Brand_File_Bin_Unoinfo
 BIN_FILE_BODY;
 Dir = gid_Brand_Dir_Program;
@@ -532,6 +535,16 @@ File gid_Brand_File_Script_Unopkg
 End
 #endif
 
+#if defined MACOSX
+Unixlink gid_Brand_Unixlink_Unopkg
+BIN_FILE_BODY;
+Dir = gid_Brand_Dir_Program;
+Name = unopkg;
+Target = unopkg.bin;
+Styles = ();
+End
+#endif
+
 File gid_Brand_File_Bmp_IntroAboutShell
 TXT_FILE_BODY;
 Dir = FILELIST_DIR;
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index ce9d533..86128d0 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -122,7 +122,7 @@ File gid_File_Basic_Tutorials
 Name = wizards_basicsrvtutorials.filelist;
 End
 
-#if defined UNX  !defined MACOSX
+#if defined UNX
 
 File gid_File_Script_Gengal
 BIN_FILE_BODY;
diff --git a/scp2/source/python/file_python.scp 
b/scp2/source/python/file_python.scp
index e5bebef..4ffee8f 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -43,7 +43,7 @@ End
 
 #ifndef SYSTEM_PYTHON
 
-#if !defined MACOSX  !defined WNT
+#if !defined WNT
 File gid_File_Py_Bin_Python
 BIN_FILE_BODY;
 Name = python_shell.filelist;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-10-24 Thread Andras Timar

 scp2/source/ooo/module_helppack.ulf |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit af24b627370f2eecc9222b555fc5c1ef393f5850
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Oct 22 21:42:18 2014 +0200

scp2: fix language codes for sr-Latn and ca-valencia

Change-Id: I0fe5d3b305c5105e987fcae90f2733b373fecc73

diff --git a/scp2/source/ooo/module_helppack.ulf 
b/scp2/source/ooo/module_helppack.ulf
index 13e9ddd..2fcc6e5 100644
--- a/scp2/source/ooo/module_helppack.ulf
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -15,7 +15,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
- 
+
 [STR_NAME_MODULE_ROOT_HELPPACK]
 en-US = Additional help packs
 
@@ -286,10 +286,10 @@ en-US = Catalan
 [STR_DESC_MODULE_HELPPACK_CA]
 en-US = Installs Catalan help in %PRODUCTNAME %PRODUCTVERSION
 
-[STR_NAME_MODULE_HELPPACK_CA_XV]
+[STR_NAME_MODULE_HELPPACK_CA_VALENCIA]
 en-US = Catalan (Valencian)
 
-[STR_DESC_MODULE_HELPPACK_CA_XV]
+[STR_DESC_MODULE_HELPPACK_CA_VALENCIA]
 en-US = Installs Catalan (Valencian) help in %PRODUCTNAME %PRODUCTVERSION
 
 [STR_NAME_MODULE_HELPPACK_DA]
@@ -400,10 +400,10 @@ en-US = Galician
 [STR_DESC_MODULE_HELPPACK_GL]
 en-US = Installs Galician help in %PRODUCTNAME %PRODUCTVERSION
 
-[STR_NAME_MODULE_HELPPACK_SH]
+[STR_NAME_MODULE_HELPPACK_SR_LATN]
 en-US = Serbian (Latin)
 
-[STR_DESC_MODULE_HELPPACK_SH]
+[STR_DESC_MODULE_HELPPACK_SR_LATN]
 en-US = Installs Serbian (Latin) help in %PRODUCTNAME %PRODUCTVERSION
 
 [STR_NAME_MODULE_HELPPACK_GA]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-09-17 Thread Tor Lillqvist

 scp2/source/ooo/common_brand.scp |6 ++
 scp2/source/ooo/ure.scp  |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 21c1e55cd4ac022144b683bd2e611dba904eaf2a
Author: Tor Lillqvist t...@collabora.com
Date:   Sat Sep 13 07:36:33 2014 +0300

Correct the location of the URE unorc in scp2 for OS X

The URE unorc should be in Resources/ure/etc also when constructing an
app bundle from scp2 data.

Change-Id: Id33d20bda0175018b8340c686ae9cd47525cd401

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index ce7bbc5..0551e95 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -45,6 +45,7 @@ Module gid_Module_Root_Brand
 gid_Brand_Dir_Share_Uno_Packages,
 gid_Brand_Dir_Share_Uno_Packages_Cache,
 gid_Brand_Dir_Share_Ure,
+gid_Brand_Dir_Share_Ure_Etc,
 gid_Brand_Dir_Share_Ure_Share,
 gid_Brand_Dir_Share_Glade,
 gid_Brand_Dir_Share_Labels,
@@ -446,6 +447,11 @@ Directory gid_Brand_Dir_Share_Ure
 DosName = ure;
 End
 
+Directory gid_Brand_Dir_Share_Ure_Etc
+ParentID = gid_Brand_Dir_Share_Ure;
+DosName = etc;
+End
+
 Directory gid_Brand_Dir_Share_Ure_Share
 ParentID = gid_Brand_Dir_Share_Ure;
 DosName = share;
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 1f551ce7..01e2cbd 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -160,7 +160,7 @@ End
 Profile gid_Profile_Dl_Uno_Ini
 ModuleID = gid_Module_Root_Ure_Hidden;
 #if defined MACOSX
-Dir = gid_Brand_Dir_Share_Ure;
+Dir = gid_Brand_Dir_Share_Ure_Etc;
 #else
 Dir = SCP2_URE_DL_DIR;
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-08-15 Thread Tor Lillqvist

 scp2/source/ooo/ure.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5794fcad10df4d6ac8388627662ea830dde7e629
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Aug 15 09:01:00 2014 +0300

Typo

Change-Id: I9ba1a5679eb636103ccf7b34f120ed0d03903e76

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 173e669..26d7dba 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -91,7 +91,7 @@ Directory gid_Dir_Ure_Share_Misc
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 ParentID = gid_Brand_Dir_Share_Ure_Share;
 #else
-ParentID = gir_Dir_Ure_Share;
+ParentID = gid_Dir_Ure_Share;
 #endif
 DosName = misc;
 End
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-08-15 Thread Tor Lillqvist

 scp2/source/ooo/ure.scp |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 8605fcbf8e2a89afda675775b2302d9f58333e74
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Aug 15 09:41:06 2014 +0300

Blind fix attempt for WNT

Change-Id: Iee1c5a5a1c9db5114b2b31cfac66d1a2d673a585

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 26d7dba..a30a1fc 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -87,6 +87,7 @@ End
 
 #endif // !ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 
+#if !defined WNT
 Directory gid_Dir_Ure_Share_Misc
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 ParentID = gid_Brand_Dir_Share_Ure_Share;
@@ -95,6 +96,7 @@ Directory gid_Dir_Ure_Share_Misc
 #endif
 DosName = misc;
 End
+#endif
 
 // Public Dynamic Libraries:
 
@@ -412,14 +414,22 @@ End
 
 File gid_File_Misc_TypesRdb
 TXT_FILE_BODY;
+#ifdef WNT
+Dir = gid_Dir_Ure_Misc;
+#else
 Dir = gid_Dir_Ure_Share_Misc;
+#endif
 Name = types.rdb;
 Styles = (PACKED);
 End
 
 File gid_File_Misc_ServicesRdb
 TXT_FILE_BODY;
+#ifdef WNT
+Dir = gid_Dir_Ure_Misc;
+#else
 Dir = gid_Dir_Ure_Share_Misc;
+#endif
 Name = services.rdb;
 Styles = (PACKED);
 End
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-08-15 Thread Tor Lillqvist

 scp2/source/ooo/ure.scp |8 
 1 file changed, 8 insertions(+)

New commits:
commit 2c75925a809796e4177e5accaf6dfea566ea91bc
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Aug 15 09:59:49 2014 +0300

Another blind fix attempt for WNT

Change-Id: I369f3db3d72c93531e753b16fbd97abce4e1c0ed

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index a30a1fc..ae538f3 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -98,6 +98,13 @@ Directory gid_Dir_Ure_Share_Misc
 End
 #endif
 
+#ifdef WNT
+Directory gid_Dir_Ure_Misc
+ParentID = SCP2_URE_SHARE_DIR;
+DosName = misc;
+End
+#endif
+
 // Public Dynamic Libraries:
 
 #ifdef AIX
@@ -447,6 +454,7 @@ Module gid_Module_Root_Ure_Hidden
Styles = (HIDDEN_ROOT);
 Dirs = (gid_Dir_Ure_Bin,
 gid_Dir_Ure_Lib,
+gid_Dir_Ure_Misc,
 gid_Dir_Ure_Share,
 gid_Dir_Ure_Java,
 gid_Dir_Ure_Share_Misc);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-08-10 Thread Maxim Monastirsky

 scp2/source/ooo/file_ooo.scp |2 ++
 scp2/source/ooo/module_hidden_ooo.scp|1 +
 scp2/source/ooo/module_lang_template.scp |1 +
 3 files changed, 4 insertions(+)

New commits:
commit b73ee73da55c5a00acc9adffc825157dd5b375e6
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Sun Aug 10 12:10:00 2014 +0300

fdo#78845 Packaging of fpicker ui files

Change-Id: I5edb560dc511f6f0e47984303ce41488806e9e20

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 6c75c79..dec9411 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -499,6 +499,7 @@ UI_FILELIST(dbtdata, UIConfig/modules/dbtdata.filelist)
 UI_FILELIST(desktop, UIConfig/desktop.filelist)
 UI_FILELIST(filter, UIConfig/filter.filelist)
 UI_FILELIST(formula, UIConfig/formula.filelist)
+UI_FILELIST(fps, UIConfig/fps.filelist)
 UI_FILELIST(sabpilot, UIConfig/modules/sabpilot.filelist)
 UI_FILELIST(scanner, UIConfig/modules/scanner.filelist)
 #ifdef DBCONNECTIVITY
@@ -538,6 +539,7 @@ UI_FILELIST_ALL_LANG(spropctrlr, modules/spropctrlr)
 UI_FILELIST_ALL_LANG(desktop, desktop)
 UI_FILELIST_ALL_LANG(filter, filter)
 UI_FILELIST_ALL_LANG(formula, formula)
+UI_FILELIST_ALL_LANG(fps, fps)
 UI_FILELIST_ALL_LANG(sabpilot, modules/sabpilot)
 UI_FILELIST_ALL_LANG(scalc, modules/scalc)
 UI_FILELIST_ALL_LANG(schart, modules/schart)
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index c4db019..9bab7b4 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -239,6 +239,7 @@ Module gid_Module_Root_Files_6
 gid_File_Share_Config_Sofficecfg_uiconfig_desktop,
 gid_File_Share_Config_Sofficecfg_uiconfig_filter,
 gid_File_Share_Config_Sofficecfg_uiconfig_formula,
+gid_File_Share_Config_Sofficecfg_uiconfig_fps,
 #ifdef DBCONNECTIVITY
 gid_File_Share_Config_Sofficecfg_uiconfig_sbibliography,
 #endif
diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index 58c8e54..6b2538b 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -33,6 +33,7 @@ Module gid_Module_Langpack_Basis_Template
  gid_File_Share_Config_Sofficecfg_uiconfig_desktop_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_filter_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_formula_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_fps_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_sabpilot_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_scalc_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_schart_Lang,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-07-18 Thread David Tardon

 scp2/source/ooo/module_pdfimport.scp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8e44fb80f761b4c72ff705352ce6b02231d4c643
Author: David Tardon dtar...@redhat.com
Date:   Fri Jul 18 18:04:06 2014 +0200

fix build

Change-Id: Ic370d7a2443543b83677280394bfd796365392c6

diff --git a/scp2/source/ooo/module_pdfimport.scp 
b/scp2/source/ooo/module_pdfimport.scp
index 2b81713..b882570 100644
--- a/scp2/source/ooo/module_pdfimport.scp
+++ b/scp2/source/ooo/module_pdfimport.scp
@@ -25,7 +25,7 @@
 
 #include macros.inc
 
-#include AutoInstall/pdfimport
+#include AutoInstall/xpdfimport
 
 Module gid_Module_Pdfimport
 Name = PDF Import;
@@ -59,7 +59,7 @@ File gid_File_Exe_Xpdfimport
 Styles = (PACKED);
 End
 
-rile gid_File_Xcd_Pdfimport
+File gid_File_Xcd_Pdfimport
 TXT_FILE_BODY;
 Dir = gid_Brand_Dir_Share_Registry;
 Name = pdfimport.xcd;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-07-17 Thread Maxim Monastirsky

 scp2/source/ooo/file_ooo.scp |2 ++
 scp2/source/ooo/module_hidden_ooo.scp|1 +
 scp2/source/ooo/module_lang_template.scp |1 +
 3 files changed, 4 insertions(+)

New commits:
commit b875362cd576b29aee4da899335b8d8f6c74d192
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Thu Jul 17 11:54:33 2014 +0300

fdo#8 Package formula ui files

Change-Id: Ie73f3ea4eff4dc8400d2ba3736c162d728c277d3
Reviewed-on: https://gerrit.libreoffice.org/10365
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 811071e..6c75c79 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -498,6 +498,7 @@ UI_FILELIST(dbtdata, UIConfig/modules/dbtdata.filelist)
 #endif
 UI_FILELIST(desktop, UIConfig/desktop.filelist)
 UI_FILELIST(filter, UIConfig/filter.filelist)
+UI_FILELIST(formula, UIConfig/formula.filelist)
 UI_FILELIST(sabpilot, UIConfig/modules/sabpilot.filelist)
 UI_FILELIST(scanner, UIConfig/modules/scanner.filelist)
 #ifdef DBCONNECTIVITY
@@ -536,6 +537,7 @@ UI_FILELIST_ALL_LANG(spropctrlr, modules/spropctrlr)
 #endif
 UI_FILELIST_ALL_LANG(desktop, desktop)
 UI_FILELIST_ALL_LANG(filter, filter)
+UI_FILELIST_ALL_LANG(formula, formula)
 UI_FILELIST_ALL_LANG(sabpilot, modules/sabpilot)
 UI_FILELIST_ALL_LANG(scalc, modules/scalc)
 UI_FILELIST_ALL_LANG(schart, modules/schart)
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index d7dd6e0..e3d2bb7 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -239,6 +239,7 @@ Module gid_Module_Root_Files_6
 #endif
 gid_File_Share_Config_Sofficecfg_uiconfig_desktop,
 gid_File_Share_Config_Sofficecfg_uiconfig_filter,
+gid_File_Share_Config_Sofficecfg_uiconfig_formula,
 #ifdef DBCONNECTIVITY
 gid_File_Share_Config_Sofficecfg_uiconfig_sbibliography,
 #endif
diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index 5390a2e..58c8e54 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -32,6 +32,7 @@ Module gid_Module_Langpack_Basis_Template
 #endif
  gid_File_Share_Config_Sofficecfg_uiconfig_desktop_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_filter_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_formula_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_sabpilot_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_scalc_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_schart_Lang,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-07-04 Thread Andras Timar

 scp2/source/ooo/file_font_ooo.scp |   10 +++---
 scp2/source/ooo/module_hidden_ooo.scp |2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 97f63c17f7bc069a12e3afc3975f09897731a693
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Jul 4 14:29:01 2014 +0200

add Carlito/Caladea fonts to install script

They were added in libreoffice-4-1 branch but not anywhere else.
See 2158e8bf85e139fd3cf59d00059ed2e2026f6a4a

Change-Id: I2dcec7898590b526161be7eec1afe4610e6fe534

diff --git a/scp2/source/ooo/file_font_ooo.scp 
b/scp2/source/ooo/file_font_ooo.scp
index e7a2da35..597d5af 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -1,7 +1,7 @@
 /*
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 STD_FONT_FILELIST( gid_File_Fnt_Opensymb, extras_fonts.filelist )
 
-#ifndef WITHOUT_FONTS 
+#ifndef WITHOUT_FONTS
 
 // DejaVu fonts
 STD_FONT_FILELIST(gid_File_Fnt_DejaVu, fonts_dejavu.filelist)
@@ -58,12 +58,16 @@ STD_FONT_FILELIST(gid_File_Fnt_SourceSans, 
fonts_sourcesans.filelist)
 // Source Code Pro fonts
 STD_FONT_FILELIST(gid_File_Fnt_SourceCode, fonts_sourcecode.filelist)
 
+//Carlito and Caladea fonts
+STD_FONT_FILELIST(gid_File_Fnt_Carlito, fonts_carlito.filelist)
+STD_FONT_FILELIST(gid_File_Fnt_Caladea, fonts_caladea.filelist)
+
 #endif
 
 // fontconfig updates to allow proper use of local fonts
 
 #ifdef UNX
-#ifndef WITHOUT_FONTS 
+#ifndef WITHOUT_FONTS
 File gid_File_FcLocal_Conf
 Dir = FILELIST_DIR;
 USER_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index e01c2c3..d7dd6e0 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -315,6 +315,8 @@ Module gid_Module_Root_Fonts_OOo_Hidden
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Fnt_Opensymb,
+   gid_File_Fnt_Caladea,
+   gid_File_Fnt_Carlito,
gid_File_Fnt_DejaVu,
gid_File_Fnt_Gentium,
gid_File_Fnt_LibSansNarrow,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-07-03 Thread Andras Timar

 scp2/source/ooo/file_ooo.scp |4 
 1 file changed, 4 insertions(+)

New commits:
commit e09931ce4d413929b9cbdbbf1f71ac5941ec25ba
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Jul 3 18:14:17 2014 +0200

fdo#80535 add missing .ui localizations to install script

Change-Id: Ie7e60522df6aff8fc68b36daddd1c84d0a97cd59

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 63219dc..811071e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -530,9 +530,13 @@ UI_FILELIST_ALL_LANG(basicide, modules/BasicIDE)
 UI_FILELIST_ALL_LANG(cui, cui)
 #ifdef DBCONNECTIVITY
 UI_FILELIST_ALL_LANG(dbaccess, dbaccess)
+UI_FILELIST_ALL_LANG(dbreport, modules/dbreport)
+UI_FILELIST_ALL_LANG(sbibliography, modules/sbibliography)
+UI_FILELIST_ALL_LANG(spropctrlr, modules/spropctrlr)
 #endif
 UI_FILELIST_ALL_LANG(desktop, desktop)
 UI_FILELIST_ALL_LANG(filter, filter)
+UI_FILELIST_ALL_LANG(sabpilot, modules/sabpilot)
 UI_FILELIST_ALL_LANG(scalc, modules/scalc)
 UI_FILELIST_ALL_LANG(schart, modules/schart)
 UI_FILELIST_ALL_LANG(sdraw, modules/sdraw)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-07-03 Thread Andras Timar

 scp2/source/ooo/module_lang_template.scp |4 
 1 file changed, 4 insertions(+)

New commits:
commit 1f90cae1debed4b45bb51ced21a03aacd7973cff
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Jul 3 20:10:02 2014 +0200

fdo#80535 add missing .ui localizations to install script

Change-Id: I248838633e99ac0ce51950db9049dd451394b558

diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index 8e3a1a7..fb3cdcc 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -26,9 +26,13 @@ Module gid_Module_Langpack_Basis_Template
  gid_File_Share_Config_Sofficecfg_uiconfig_cui_Lang,
 #ifdef DBCONNECTIVITY
  gid_File_Share_Config_Sofficecfg_uiconfig_dbaccess_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_dreport_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_sbibliography_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_spropctrlr_Lang,
 #endif
  gid_File_Share_Config_Sofficecfg_uiconfig_desktop_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_filter_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_sabpilot_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_scalc_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_schart_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_sdraw_Lang,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-07-03 Thread Andras Timar

 scp2/source/ooo/module_lang_template.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e52b3a2be08b8811f76e1f2bbb1e2438dcfbb3b3
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Jul 3 11:18:16 2014 -0700

typo: dreport - dbreport

Change-Id: I7d6208a4ac170adb815ec02364076c5b49cfab9a

diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index fb3cdcc..5390a2e 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -26,7 +26,7 @@ Module gid_Module_Langpack_Basis_Template
  gid_File_Share_Config_Sofficecfg_uiconfig_cui_Lang,
 #ifdef DBCONNECTIVITY
  gid_File_Share_Config_Sofficecfg_uiconfig_dbaccess_Lang,
- gid_File_Share_Config_Sofficecfg_uiconfig_dreport_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_dbreport_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_sbibliography_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_spropctrlr_Lang,
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-06-11 Thread Bjoern Michaelsen

 scp2/source/extensions/module_extensions.scp |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 8ff029893ec9ad3e9811eb6107768156d48a997a
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Jun 11 23:06:32 2014 +0200

do no try to install bsh/js when not building them

Change-Id: Ic1521ad9a67c9930e2e4561eacb1e78905310613

diff --git a/scp2/source/extensions/module_extensions.scp 
b/scp2/source/extensions/module_extensions.scp
index 6da685c..ce72b5f 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -18,8 +18,6 @@
 
 #include macros.inc
 
-#include AutoInstall/extensions_bsh
-#include AutoInstall/extensions_rhino
 
 Module gid_Module_Optional_Extensions
 MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS);
@@ -245,6 +243,8 @@ End
 
 #if defined ENABLE_JAVA  !defined WITHOUT_SCRIPTING_BEANSHELL
 
+#include AutoInstall/extensions_bsh
+
 Module gid_Module_Optional_Extensions_Script_Provider_For_BS
 PackageInfo = packinfo_extensions.txt;
 MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL);
@@ -262,6 +262,8 @@ End
 
 #if defined ENABLE_JAVA  !defined WITHOUT_SCRIPTING_JAVASCRIPT
 
+#include AutoInstall/extensions_rhino
+
 Module gid_Module_Optional_Extensions_Script_Provider_For_JS
 PackageInfo = packinfo_extensions.txt;
 MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-06-09 Thread David Tardon

 scp2/source/ooo/file_library_ooo.scp |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 534015ad4fd08823b4393dab1ad5d42dedd7bf62
Author: David Tardon dtar...@redhat.com
Date:   Mon Jun 9 09:45:29 2014 +0200

kdefilepicker is autoinstalled now

Change-Id: Ief3d602b81c0c8ea3ea931077141856199ac47bd

diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 6c27cf2..ae52ec6 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -81,15 +81,6 @@ File gid_File_Bin_TdeFilePicker
 End
 #endif
 
-#ifdef ENABLE_KDE
-File gid_File_Bin_KdeFilePicker
-BIN_FILE_BODY;
-Styles = (PACKED);
-Dir = gid_Brand_Dir_Program;
-Name = kdefilepicker;
-End
-#endif
-
 #ifdef ENABLE_GTK
 File gid_File_Bin_XidFullscreen
 BIN_FILE_BODY;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-06-09 Thread Tor Lillqvist

 scp2/source/ooo/file_library_ooo.scp |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f73a8785bd8a37cb17168456f8f03668ef74e32b
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Jun 9 12:01:55 2014 +0300

We build no avmediaQuickTime library in the sandboxed (i.e. App Store) case

Change-Id: I373e435037279d14bde819ffaa38e510ced9a029

diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index ae52ec6..06c0e1e 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -93,10 +93,13 @@ End
 #endif
 
 #ifdef MACOSX
+
+#ifndef ENABLE_MACOSX_SANDBOX
 File gid_File_Lib_avmediaQuickTime
PACKED_LIB_FILE_BODY;
Name = LIBNAME(avmediaQuickTime);
 End
+#endif
 
 #if MAXOSX_SDK_VERSION = 1070
 File gid_File_Lib_avmediaMacAVF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-05-31 Thread Rene Engelhard

 scp2/source/python/module_python.scp |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 2f531243f35e0d311d2eaca54d8c06750a1ac23e
Author: Rene Engelhard r...@debian.org
Date:   Sat May 31 20:31:17 2014 +0200

fix pyuno.so install to correctly end up in gid_Module_Pyuno

... as the (empty in this case) auto_python_ALL makes the second entry
ignored

Change-Id: I1b39595b3ab8da429f45f49098d6fc7bdc4c1cba

diff --git a/scp2/source/python/module_python.scp 
b/scp2/source/python/module_python.scp
index 26c16b1..a4a152a 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -38,7 +38,13 @@ Module gid_Module_Pyuno
 gid_Dir_Py_PythonCore,
 gid_Dir_Py_PythonCore_Bin,
 gid_Dir_Py_PythonCore_Lib);
-Files = (auto_python_ALL,
+/* right now auto_python_ALL just seems to contain the python core, which we 
don't need
+   with system-python -  and if this is empty the next one (gid_File_Pyuno) 
apparently doesn't
+   correctly end up here. */
+Files = (
+#ifndef SYSTEM_PYTHON
+ auto_python_ALL,
+#endif
  gid_File_Pyuno,
  gid_File_Pyuno_Rdb,
  gid_File_Lib_Pyuno,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-05-02 Thread Andras Timar

 scp2/source/ooo/module_ooo.ulf |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bd14194a2c3c4459aa30948b909cff47028b28f2
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri May 2 20:17:39 2014 +0200

fdo#67842 Brazilian Portuguese - Portuguese (Brazil)

Change-Id: I9c99937d247b9642a01aea259d7509128cd7b98d

diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index adc8be9..6c1c894 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -251,10 +251,10 @@ en-US = Polish
 en-US = Polish spelling dictionary, hyphenation rules, and thesaurus
 
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_PT_BR]
-en-US = Brazilian Portuguese
+en-US = Portuguese (Brazil)
 
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_PT_BR]
-en-US = Brazilian Portuguese spelling Dictionary (1990 Spelling Agreement), 
and hyphenation rules
+en-US = Portuguese (Brazil) spelling Dictionary (1990 Spelling Agreement), 
and hyphenation rules
 
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_PT_PT]
 en-US = Portuguese
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-03-21 Thread Caolán McNamara

 scp2/source/ooo/file_extra_ooo.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c9d88b02c729c27d39d345b36a73c746104b46ac
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Mar 21 20:59:02 2014 +

we don't need psprint.conf or the generic ppds on MacOSX and iOS

I think

Change-Id: I876018d663bcfab0bfff52829637f85da3dc72bd

diff --git a/scp2/source/ooo/file_extra_ooo.scp 
b/scp2/source/ooo/file_extra_ooo.scp
index 69eed78..43cf3bb 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -74,7 +74,7 @@ File gid_File_Extra_Databasebiblio
 Name = extras_databasebiblio.filelist;
 End
 
-#ifdef UNX
+#ifdef GUIBASE_UNX
 
 #ifndef WITHOUT_PPDS
 File gid_File_Extra_Fontunxppds
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-03-04 Thread Andras Timar

 scp2/source/ooo/registryitem_ooo.ulf |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 0529742403ad5522d69e0d45046e9156a23efd10
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Mar 4 09:42:38 2014 +0100

remove unused strings

Change-Id: I5de065e1701da119e15934a07d0e63d538a9f53c

diff --git a/scp2/source/ooo/registryitem_ooo.ulf 
b/scp2/source/ooo/registryitem_ooo.ulf
index 2756686..d4b5aa4 100644
--- a/scp2/source/ooo/registryitem_ooo.ulf
+++ b/scp2/source/ooo/registryitem_ooo.ulf
@@ -16,17 +16,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-[STR_REG_VAL_NEW]
-en-US = New
-
 [STR_REG_VAL_INSTALL]
 en-US = Install
 
 [STR_REG_VAL_SO60_CONFIGFILE]
 en-US = %SXWFORMATNAME %SXWFORMATVERSION Configuration File
 
-[STR_REG_VAL_SO50_TEMPLATE_OOO]
-en-US = StarOffice 5.0 Template
-
 [STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]
 en-US = LibreOffice
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2014-01-09 Thread Marcos Paulo de Souza

 scp2/source/ooo/file_library_ooo.scp |  120 ---
 1 file changed, 28 insertions(+), 92 deletions(-)

New commits:
commit 913bf64b0bf1330a5055c26770faedf2ad7fc3c5
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Wed Jan 8 12:20:15 2014 -0200

Use filelist in some packages

Change-Id: Ifeaa0b6acb9911fee27cadbfdc420028b9ac0227
Reviewed-on: https://gerrit.libreoffice.org/7311
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 9c50501..f9aa5c4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -135,20 +135,10 @@ End
 #ifndef SYSTEM_LCMS2
 
 File gid_File_Lib_Lcms2
-PACKED_LIB_FILE_BODY;
-  #ifdef UNX
-#ifdef MACOSX
-   Name = STRING(CONCAT3(liblcms2,.2,UNXSUFFIX));
-#else
-   Name = STRING(CONCAT3(liblcms2,UNXSUFFIX,.2));
-#endif
-  #elif defined(WNT)
-#ifdef _gcc3
-   Name = liblcms2-2.dll;
-#else
-   Name = lcms2.dll;
-#endif
-  #endif
+LIB_FILE_BODY;
+Styles = (FILELIST);
+Dir = FILELIST_DIR;
+Name = lcms2.filelist;
 End
 
 #endif
@@ -156,33 +146,19 @@ End
 #ifdef NEED_CAIRO
 
 File gid_File_Lib_Cairo
-PACKED_LIB_FILE_BODY;
-  #ifdef UNX
-#ifdef MACOSX
-   Name = STRING(CONCAT3(libcairo,.2,UNXSUFFIX));
-#else
-   Name = STRING(CONCAT3(libcairo,UNXSUFFIX,.2));
-#endif
-  #elif defined(WNT)
-#ifdef _gcc3
-   Name = libcairo-2.dll;
-#else
-   Name = cairo.dll;
-#endif
-  #endif
+LIB_FILE_BODY;
+Styles = (FILELIST);
+Dir = FILELIST_DIR;
+Name = cairo.filelist;
 End
 
 #ifndef WNT
 
 File gid_File_Lib_Pixman
-PACKED_LIB_FILE_BODY;
-  #ifdef UNX
-#ifdef MACOSX
-   Name = STRING(CONCAT2(libpixman-1,UNXSUFFIX));
-#else
-   Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
-#endif
-  #endif
+LIB_FILE_BODY;
+Styles = (FILELIST);
+Dir = FILELIST_DIR;
+Name = pixman.filelist;
 End
 
 #endif
@@ -296,20 +272,10 @@ End
 
 #ifndef SYSTEM_LIBXSLT
 File gid_File_Lib_Xslt
-PACKED_LIB_FILE_BODY;
-  #ifdef UNX
-#ifdef MACOSX
-   Name = STRING(CONCAT4(libxslt,.,LIBXSLT_MAJOR,UNXSUFFIX));
-#else
-   Name = STRING(CONCAT4(libxslt,UNXSUFFIX,.,LIBXSLT_MAJOR));
-#endif
-  #else
-   #ifdef _gcc3
-Name = libxslt-1.dll;
-   #else
-Name = libxslt.dll;
-   #endif
-  #endif
+LIB_FILE_BODY;
+Styles = (FILELIST);
+Dir = FILELIST_DIR;
+Name = libxslt.filelist;
 End
 File gid_File_Lib_eXslt
 PACKED_LIB_FILE_BODY;
@@ -404,54 +370,24 @@ End
 
 #ifndef SYSTEM_REDLAND
 File gid_File_Lib_Raptor
-PACKED_LIB_FILE_BODY;
-  #ifdef UNX
-#ifdef MACOSX
-   Name = STRING(CONCAT4(libraptor2-lo,.,RAPTOR_MAJOR,UNXSUFFIX));
-#else
-   Name = STRING(CONCAT4(libraptor2-lo,UNXSUFFIX,.,RAPTOR_MAJOR));
-#endif
-  #else
-   #ifdef _gcc3
-Name = libraptor2-1.dll;
-   #else
-Name = raptor2.dll;
-   #endif
-  #endif
+LIB_FILE_BODY;
+Styles = (FILELIST);
+Dir = FILELIST_DIR;
+Name = raptor.filelist;
 End
 
 File gid_File_Lib_Rasqal
-PACKED_LIB_FILE_BODY;
-  #ifdef UNX
-#ifdef MACOSX
-   Name = STRING(CONCAT4(librasqal-lo,.,RASQAL_MAJOR,UNXSUFFIX));
-#else
-   Name = STRING(CONCAT4(librasqal-lo,UNXSUFFIX,.,RASQAL_MAJOR));
-#endif
-  #else
-   #ifdef _gcc3
-   Name = STRING(CONCAT3(librasqal-,RASQAL_MAJOR,.dll));
-   #else
-Name = rasqal.dll;
-   #endif
-  #endif
+LIB_FILE_BODY;
+Styles = (FILELIST);
+Dir = FILELIST_DIR;
+Name = rasqal.filelist;
 End
 
 File gid_File_Lib_Rdf
-PACKED_LIB_FILE_BODY;
-  #ifdef UNX
-#ifdef MACOSX
-   Name = STRING(CONCAT4(librdf-lo,.,REDLAND_MAJOR,UNXSUFFIX));
-#else
-   Name = STRING(CONCAT4(librdf-lo,UNXSUFFIX,.,REDLAND_MAJOR));
-#endif
-  #else
-   #ifdef _gcc3
-Name = librdf-0.dll;
-   #else
-Name = librdf.dll;
-   #endif
-  #endif
+LIB_FILE_BODY;
+Styles = (FILELIST);
+Dir = FILELIST_DIR;
+Name = redland.filelist;
 End
 #endif // SYSTEM_REDLAND
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source solenv/bin

2014-01-09 Thread Christian Lohmaier

 scp2/source/ooo/directory_ooo_macosx.scp  |1 -
 solenv/bin/modules/installer.pm   |2 --
 solenv/bin/modules/installer/scriptitems.pm   |   15 ---
 solenv/bin/modules/installer/simplepackage.pm |   25 -
 4 files changed, 12 insertions(+), 31 deletions(-)

New commits:
commit deb39c012031b7981360665cc19dc81d3342a3ad
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Fri Jan 10 00:50:10 2014 +0100

fix help packaging for Mac OS X language packs

helpcontent was not packaged into the tarball that is extracted into the
user's installation directory (and thus never was installed)

simplify the packaging by getting rid of the special collect dir
(LangPackHostName) that was the cause for the problem to begin with:
LanguagePack files were collected in LangPackHostName based directory,
while HelpPack files were collected in regular directory.
And that value wasn't even used for the actual path that is delivered to
the user, so get rid of it and the associated code.

Change-Id: Iadd24382a45722bbe8d58bd97be79609fd03021b

diff --git a/scp2/source/ooo/directory_ooo_macosx.scp 
b/scp2/source/ooo/directory_ooo_macosx.scp
index 6cd14ab..0bc7bfd 100644
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -22,7 +22,6 @@
 Directory gid_Dir_Bundle
 ParentID = PD_PROGDIR;
 HostName = %PRODUCTNAME.app;
-LangPackHostName = %PRODUCTNAME Language Pack.app;
 End
 
 Directory gid_Dir_Bundle_Contents
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index a081456..237947d 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -291,8 +291,6 @@ sub run {
 
 my $dirsinproductarrayref = 
installer::setupscript::get_all_items_from_script($setupscriptref, Directory);
 
-if ( $installer::globals::languagepack ) { 
installer::scriptitems::use_langpack_hostname($dirsinproductarrayref); }
-
 if ( $allvariableshashref-{'SHIFT_BASIS_INTO_BRAND_LAYER'} ) { 
$dirsinproductarrayref = 
installer::scriptitems::shift_basis_directory_parents($dirsinproductarrayref); }
 if ( $allvariableshashref-{'OFFICEDIRECTORYNAME'} ) { 
installer::scriptitems::set_officedirectory_name($dirsinproductarrayref, 
$allvariableshashref-{'OFFICEDIRECTORYNAME'}); }
 
diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index 3310951..4c384ce 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -489,21 +489,6 @@ sub get_children
 }
 
 

-# Using different HostName for language packs
-
-
-sub use_langpack_hostname
-{
-my ($dirsref) = @_;
-
-for ( my $i = 0; $i = $#{$dirsref}; $i++ )
-{
-my $onedir = ${$dirsref}[$i];
-if (( $onedir-{'LangPackHostName'} )  ( 
$onedir-{'LangPackHostName'} ne  )) { $onedir-{'HostName'} = 
$onedir-{'LangPackHostName'}; }
-}
-}
-
-
 # Using langpack copy action for language packs
 

 
diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index da58b40..118d420 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -289,23 +289,21 @@ sub create_package
 
 if (( $installer::globals::languagepack ) || ( 
$installer::globals::helppack ))
 {
+# LanguagePack and HelpPack files are collected in $srcfolder, 
packaged into
+# tarball.tar.bz2 and finally the Language Pack.app is assembled 
in $appfolder
 $localtempdir = $tempdir/$packagename;
-if ( $installer::globals::helppack ) { $volume_name = 
$volume_name Help Pack; }
-if ( $installer::globals::languagepack )
-{
-$volume_name = $volume_name Language Pack;
-$volume_name_classic = $volume_name_classic Language Pack;
-$volume_name_classic_app = $volume_name_classic_app Language 
Pack;
-}
+my $srcfolder = $localtempdir . / . $volume_name_classic_app . 
\.app;
+
+$volume_name .=  Language Pack;
+$volume_name_classic .=  Language Pack;
+$volume_name_classic_app .=  Language Pack;
 
-# Create tar ball named tarball.tar.bz2
-# my $appfolder = $localtempdir . / . $volume_name . \.app;
 my $appfolder = $localtempdir . / . $volume_name_classic_app . 
\.app;
 my $contentsfolder = $appfolder . /Contents;
 my $tarballname =

[Libreoffice-commits] core.git: scp2/source

2013-12-06 Thread Matúš Kukan

 scp2/source/ooo/ure.scp|2 +-
 scp2/source/python/file_python.scp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dd02446dff4066170a5947065379316111886eaa
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Fri Dec 6 15:30:36 2013 +0100

scp2: hopefully fix Windows build

Change-Id: Ib4ead1d64dc6b8e76bf2c7bf0f007e8962acb1e2

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 3e9983b..3cf19c2 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -404,7 +404,7 @@ End
 File gid_File_Lib_Cli_Cppuhelper_Assembly
 TXT_FILE_BODY;
 Styles = (PACKED, ASSEMBLY);
-Name = assembly/cli_cppuhelper.dll;
+Name = cli_cppuhelper.dll;
 Dir = SCP2_URE_DL_DIR;
 Assemblyname = cli_cppuhelper;
 PublicKeyToken = ce2cb7e279207b9e;
diff --git a/scp2/source/python/file_python.scp 
b/scp2/source/python/file_python.scp
index e4d5336..66e590d 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -60,7 +60,7 @@ End
 File gid_File_Py_Bin_Python
 BIN_FILE_BODY;
 #ifdef WNT
-Name = EXENAME(pyuno/python);
+Name = EXENAME(python);
 Dir = gid_Brand_Dir_Program;
 Styles = (PACKED);
 #else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2013-11-18 Thread Marcos Paulo de Souza

 scp2/source/ooo/file_library_ooo.scp |   18 +++---
 1 file changed, 3 insertions(+), 15 deletions(-)

New commits:
commit 6d9026f7a7ebad02b57fcd2dd15f66adeba361af
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Mon Nov 18 19:03:21 2013 -0200

Use filelist in curl

Change-Id: I6a5fa0f7c0c9184ff013e2630f8edcb6ba2aa942
Reviewed-on: https://gerrit.libreoffice.org/6713
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index d8245c9..c01b777 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -86,21 +86,9 @@ End
 
 File gid_File_Lib_Curl
 LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-#ifdef MACOSX
-   Name = STRING(CONCAT2(libcurl.4,UNXSUFFIX));
-#else
-   Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.4));
-#endif
-  #else
-   #ifdef _gcc3
-Name = libcurl-4.dll;
-   #else
-Name = libcurl.dll;
-   #endif
-  #endif
+Styles = (FILELIST);
+Dir = FILELIST_DIR;
+Name = curl.filelist;
 End
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2013-11-13 Thread Caolán McNamara

 scp2/source/graphicfilter/file_graphicfilter.scp |2 --
 scp2/source/ooo/module_lang_template.scp |1 -
 2 files changed, 3 deletions(-)

New commits:
commit fb38a4f71f615e786ad11fe03f15419f9a389752
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Nov 13 16:28:22 2013 +

there is no flash related .res anymore

Change-Id: I191642fd7f490a88bb75fb0943ba978582f20808

diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp 
b/scp2/source/graphicfilter/file_graphicfilter.scp
index 4d276d6..501d2fe 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -24,5 +24,3 @@ File gid_File_Share_Registry_Graphicfilter_Xcd
 Dir = gid_Brand_Dir_Share_Registry;
 Name = graphicfilter.xcd;
 End
-
-STD_RES_FILE( gid_File_Res_Flash, flash )
diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index 63f4169..a694d14 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -72,7 +72,6 @@ Module gid_Module_Langpack_Resource_Template
  gid_File_Res_Dkt,
  gid_File_Res_Editeng,
  gid_File_Res_Eur,
- gid_File_Res_Flash,
  gid_File_Res_For,
  gid_File_Res_Forui,
  gid_File_Res_Fps_Office,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

2013-11-08 Thread Stephan Bergmann

 scp2/source/accessories/file_gallery_accessories.scp   |   34 -
 scp2/source/accessories/file_templates_accessories.scp |   22 +--
 2 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 06ee49358e7314a1b1f2394ebb07e7c0c2b4d334
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 8 11:22:15 2013 +0100

Fix external/accessories filelist names

Change-Id: I1a2dc8d95e9d6037fe50d80ee87dbe35bed69fc9

diff --git a/scp2/source/accessories/file_gallery_accessories.scp 
b/scp2/source/accessories/file_gallery_accessories.scp
index 0ee01b6..953fa53 100644
--- a/scp2/source/accessories/file_gallery_accessories.scp
+++ b/scp2/source/accessories/file_gallery_accessories.scp
@@ -18,119 +18,119 @@ File gid_File_Extra_Gallery_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgallery.filelist;
+Name = accessories_accessoriesgallery.filelist;
 End
 
 File gid_File_Extra_Gallery_Draws_People_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgallerydrawspeople.filelist;
+Name = accessories_accessoriesgallerydrawspeople.filelist;
 End
 
 File gid_File_Extra_Gallery_Photos_Plants_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgalleryphotosplants.filelist;
+Name = accessories_accessoriesgalleryphotosplants.filelist;
 End
 
 File gid_File_Extra_Gallery_Photos_Celebration_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgalleryphotoscelebration.filelist;
+Name = accessories_accessoriesgalleryphotoscelebration.filelist;
 End
 
 File gid_File_Extra_Gallery_Photos_Fauna_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgalleryphotosfauna.filelist;
+Name = accessories_accessoriesgalleryphotosfauna.filelist;
 End
 
 File gid_File_Extra_Gallery_Photos_Flowers_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgalleryphotosflowers.filelist;
+Name = accessories_accessoriesgalleryphotosflowers.filelist;
 End
 
 File gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgalleryphotosfoodsanddrinks.filelist;
+Name = accessories_accessoriesgalleryphotosfoodsanddrinks.filelist;
 End
 
 File gid_File_Extra_Gallery_Photos_Humans_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgalleryphotoshumans.filelist;
+Name = accessories_accessoriesgalleryphotoshumans.filelist;
 End
 
 File gid_File_Extra_Gallery_Photos_Landscapes_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgalleryphotoslandscapes.filelist;
+Name = accessories_accessoriesgalleryphotoslandscapes.filelist;
 End
 
 File gid_File_Extra_Gallery_Photos_Buildings_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgalleryphotosbuildings.filelist;
+Name = accessories_accessoriesgalleryphotosbuildings.filelist;
 End
 
 File gid_File_Extra_Gallery_Photos_Objects_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgalleryphotosobjects.filelist;
+Name = accessories_accessoriesgalleryphotosobjects.filelist;
 End
 
 File gid_File_Extra_Gallery_Photos_Cities_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgalleryphotoscities.filelist;
+Name = accessories_accessoriesgalleryphotoscities.filelist;
 End
 
 File gid_File_Extra_Gallery_Photos_Space_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgalleryphotosspace.filelist;
+Name = accessories_accessoriesgalleryphotosspace.filelist;
 End
 
 File gid_File_Extra_Gallery_Photos_Statues_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgalleryphotosstatues.filelist;
+Name = accessories_accessoriesgalleryphotosstatues.filelist;
 End
 
 File gid_File_Extra_Gallery_Photos_Travel_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgalleryphotostravel.filelist;
+Name = accessories_accessoriesgalleryphotostravel.filelist;
 End
 
 File gid_File_Extra_Gallery_Elements_Bullets2_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
 Styles = (FILELIST);
-Name = extras_accessoriesgalleryelementsbullets2.filelist;
+Name = accessories_accessoriesgalleryelementsbullets2.filelist;
 End
 
 File gid_File_Extra_Gallery_NONFREE_Accessories
 Dir = FILELIST_DIR;

[Libreoffice-commits] core.git: scp2/source setup_native/Package_misc.mk setup_native/source solenv/bin

2013-10-25 Thread Andras Timar

 scp2/source/base/folderitem_base.scp  |3 
 scp2/source/calc/folderitem_calc.scp  |3 
 scp2/source/draw/folderitem_draw.scp  |3 
 scp2/source/impress/folderitem_impress.scp|3 
 scp2/source/math/folderitem_math.scp  |3 
 scp2/source/ooo/common_brand.scp  |   11 +++
 scp2/source/ooo/folderitem_ooo.scp|   13 ++--
 scp2/source/writer/folderitem_writer.scp  |3 
 setup_native/Package_misc.mk  |1 
 setup_native/source/win32/desktophelper.txt   |1 
 solenv/bin/modules/installer.pm   |2 
 solenv/bin/modules/installer/globals.pm   |2 
 solenv/bin/modules/installer/setupscript.pm   |   31 +
 solenv/bin/modules/installer/windows/component.pm |7 ++
 solenv/bin/modules/installer/windows/file.pm  |   24 +++
 solenv/bin/modules/installer/windows/property.pm  |3 
 solenv/bin/modules/installer/windows/registry.pm  |   38 
 solenv/bin/modules/installer/windows/shortcut.pm  |   69 +-
 solenv/bin/modules/installer/worker.pm|   28 
 solenv/bin/modules/t/installer-setupscript.t  |1 
 20 files changed, 233 insertions(+), 16 deletions(-)

New commits:
commit 7d97ec9a3eba9ceacbea631a56185e40b62fdec7
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Oct 25 06:38:06 2013 -0700

fdo#65102 respect user's choice not to install desktop icon

Using advertised shortcuts -- inspired by Intel AppUp Centre's
requirement -- was not a good idea after all. I revert this,
and  I also revert the commit that actually disabled it in
default Windows builds.

This reverts commit aa2450cb51cfc3805c7a596b6b89d70bb133821e.
This reverts commit b40012bd6d0b5387005253f1d3f03929ce4d1ac6.

diff --git a/scp2/source/base/folderitem_base.scp 
b/scp2/source/base/folderitem_base.scp
index 2da4321..51a940b 100644
--- a/scp2/source/base/folderitem_base.scp
+++ b/scp2/source/base/folderitem_base.scp
@@ -21,13 +21,14 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Sbase
 Name = %PRODUCTNAME Base;
-ModuleID = gid_Module_Brand_Prg_Base;
+ModuleID = gid_Module_Prg_Base_Bin;
 FolderID = gid_Folder_Staroffice51;
 FileID = gid_File_Exe_Sbase;
 IconFile = gid_File_Exe_Sbase;
 IconID = 0;
 WkDir = gid_Brand_Dir_Program;
 Parameter = ;
+Styles = (NON_ADVERTISED);
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
 End
 
diff --git a/scp2/source/calc/folderitem_calc.scp 
b/scp2/source/calc/folderitem_calc.scp
index 83dd82b..05db68f 100644
--- a/scp2/source/calc/folderitem_calc.scp
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -21,13 +21,14 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Scalc
 Name = %PRODUCTNAME Calc;
-ModuleID = gid_Module_Brand_Prg_Calc;
+ModuleID = gid_Module_Prg_Calc_Bin;
 FolderID = gid_Folder_Staroffice51;
 FileID = gid_File_Exe_Scalc;
 IconFile = gid_File_Exe_Scalc;
 IconID = 0;
 WkDir = gid_Brand_Dir_Program;
 Parameter = ;
+Styles = (NON_ADVERTISED);
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
 End
 
diff --git a/scp2/source/draw/folderitem_draw.scp 
b/scp2/source/draw/folderitem_draw.scp
index ba59ea7..f692707 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -21,13 +21,14 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Sdraw
 Name = %PRODUCTNAME Draw;
-ModuleID = gid_Module_Brand_Prg_Draw;
+ModuleID = gid_Module_Prg_Draw_Bin;
 FolderID = gid_Folder_Staroffice51;
 FileID = gid_File_Exe_Sdraw;
 IconFile = gid_File_Exe_Sdraw;
 IconID = 0;
 WkDir = gid_Brand_Dir_Program;
 Parameter = ;
+Styles = (NON_ADVERTISED);
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
 End
 
diff --git a/scp2/source/impress/folderitem_impress.scp 
b/scp2/source/impress/folderitem_impress.scp
index fb5c136..44adbbe 100644
--- a/scp2/source/impress/folderitem_impress.scp
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -21,13 +21,14 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Simpress
 Name = %PRODUCTNAME Impress;
-ModuleID = gid_Module_Brand_Prg_Impress;
+ModuleID = gid_Module_Prg_Impress_Bin;
 FolderID = gid_Folder_Staroffice51;
 FileID = gid_File_Exe_Simpress;
 IconFile = gid_File_Exe_Simpress;
 IconID = 0;
 WkDir = gid_Brand_Dir_Program;
 Parameter = ;
+Styles = (NON_ADVERTISED);
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
 End
 
diff --git a/scp2/source/math/folderitem_math.scp 
b/scp2/source/math/folderitem_math.scp
index 127773f..fb8bbcd 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -21,13 +21,14 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Smath
 Name = %PRODUCTNAME Math;
-ModuleID = gid_Module_Brand_Prg_Math;
+ModuleID = gid_Module_Prg_Math_Bin;

[Libreoffice-commits] core.git: scp2/source

2013-10-18 Thread Caolán McNamara

 scp2/source/gnome/module_gnome.scp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9c1170b25a9fab13084d2677aa4fc986db5ab675
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Oct 18 11:37:10 2013 +0100

move xid-fullscreen into gnome package

Change-Id: I2ad0838a12ce06b2c6e77b7f55cdc2cd0627a38b

diff --git a/scp2/source/gnome/module_gnome.scp 
b/scp2/source/gnome/module_gnome.scp
index 57a05c4..c124441 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -34,7 +34,8 @@ Module gid_Module_Optional_Gnome
   gid_File_Share_Registry_Gnome_Xcd,
 #endif
   gid_File_Bin_Gnome_Open_Url,
-  gid_File_Bin_Gnome_Open_Url_Bin
+  gid_File_Bin_Gnome_Open_Url_Bin,
+  gid_File_Bin_XidFullscreen
 );
 End
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 >

1 - 100 of 163 matches

Mail list logo