subject:"\[Libreoffice\-commits\] core.git\: Branch 'aoo\/trunk' \- 2 commits \-"

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/sfx2 README sfx2/source

2019-07-31 Thread Matthias Seidel (via logerrit)

 README|2 +-
 default_images/sfx2/res/symphony/open_more_hc.png |binary
 sfx2/source/sidebar/Sidebar.src   |9 ++---
 sfx2/source/sidebar/Theme.cxx |6 --
 4 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 1546abf4013c61e38d14751e0445b5d3b3ce6d19
Author: Matthias Seidel 
AuthorDate: Wed Jul 31 15:38:28 2019 +
Commit: Matthias Seidel 
CommitDate: Wed Jul 31 15:38:28 2019 +

Updated download number to 275 million.

diff --git a/README b/README
index a35686a78ea6..d190ba495ede 100644
--- a/README
+++ b/README
@@ -19,7 +19,7 @@ Apache OpenOffice (AOO)
 FreeBSD
 OS/2
 
-OpenOffice is used by millions of users worldwide and with more than 270 
million
+OpenOffice is used by millions of users worldwide and with more than 275 
million
 downloads it is one of the most successful open source projects.
 
 Getting the latest sources via Subversion
commit 1eb57609d556201cac9fd44251f3dbe1a5668964
Author: Matthias Seidel 
AuthorDate: Wed Jul 31 15:21:55 2019 +
Commit: Matthias Seidel 
CommitDate: Wed Jul 31 15:21:55 2019 +

Added high contrast icon for sidebar menu

diff --git a/default_images/sfx2/res/symphony/open_more_hc.png 
b/default_images/sfx2/res/symphony/open_more_hc.png
new file mode 100644
index ..63c10cc68697
Binary files /dev/null and b/default_images/sfx2/res/symphony/open_more_hc.png 
differ
diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src
index aa0c348b6882..f47a895550fe 100644
--- a/sfx2/source/sidebar/Sidebar.src
+++ b/sfx2/source/sidebar/Sidebar.src
@@ -19,6 +19,8 @@
  *
  */
 
+
+
 #include "Sidebar.hrc"
 
 Resource RID_SIDEBAR_RESOURCE
@@ -60,7 +62,7 @@ Resource RID_SIDEBAR_RESOURCE
 
 Image IMAGE_SIDEBAR_MENU_HC
 {
-ImageBitmap = Bitmap { File = "menu_hc.png" ;};
+ImageBitmap = Bitmap { File = "symphony/open_more_hc.png" ;};
 };
 
 Image IMAGE_SIDEBAR_DETAIL_DIALOG
@@ -284,11 +286,11 @@ Resource RID_SIDEBAR_RESOURCE
 
 String STRING_CUSTOMIZATION
 {
-Text [en-US] = "Customization";
+Text [en-US] = "Customization";
 };
 String STRING_RESTORE
 {
-Text [en-US] = "Restore Default";
+Text [en-US] = "Restore Default";
 };
 };
 
@@ -307,3 +309,4 @@ String SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX
 Text [en-US] = "Panel: ";
 };
 
+// ** EOF
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index f9d51325e7b9..317a2a68b199 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -19,6 +19,8 @@
  *
  */
 
+
+
 #include "precompiled_sfx2.hxx"
 
 #include "sfx2/sidebar/Theme.hxx"
@@ -345,7 +347,7 @@ void Theme::UpdateTheme (void)
 setPropertyValue(
 maPropertyIdToNameMap[Paint_HorizontalBorder],
 Any(sal_Int32(aBorderColor.GetRGBColor(;
-//mbIsHighContrastMode ? 0x00ff00 :  0xe4e4e4)));
+//mbIsHighContrastMode ? 0x00ff00 : 0xe4e4e4)));
 setPropertyValue(
 maPropertyIdToNameMap[Paint_VerticalBorder],
 Any(sal_Int32(aBorderColor.GetRGBColor(;
@@ -373,7 +375,7 @@ void Theme::UpdateTheme (void)
 maPropertyIdToNameMap[Image_TabBarMenu],
 Any(
 mbIsHighContrastMode
-? A2S("private:graphicrepository/sfx2/res/menu_hc.png")
+? 
A2S("private:graphicrepository/sfx2/res/symphony/open_more_hc.png")
 : 
A2S("private:graphicrepository/sfx2/res/symphony/open_more.png")));
 setPropertyValue(
 maPropertyIdToNameMap[Image_PanelMenu],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/sw jvmfwk/distributions jvmfwk/plugins ooo_custom_images/classic

2019-07-27 Thread Damjan Jovanovic (via logerrit)

 default_images/sw/res/point.png   |binary
 default_images/sw/res/point_h.png |binary
 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml  |6 +-
 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml |7 ++-
 jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml|6 +-
 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml|6 +-
 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx  |4 +++-
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx  |1 +
 ooo_custom_images/classic/classic_images.tar.gz   |binary
 9 files changed, 25 insertions(+), 5 deletions(-)

New commits:
commit ff76cb4e0f3f8d0164570638742f140aa5b728ef
Author: Damjan Jovanovic 
AuthorDate: Sat Jul 27 15:50:09 2019 +
Commit: Damjan Jovanovic 
CommitDate: Sat Jul 27 15:50:09 2019 +

Add support for the AdoptOpenJDK Java distribution

(https://adoptopenjdk.net/).

Closes #i128157# Add support for AdoptOpenJDK JVM's.

Patch by: me

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index cbbc8d21c08d..80dd762cabb6 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -23,7 +23,7 @@
 http://openoffice.org/2004/java/framework/1.0;
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
 
- 2012-10-06
+ 2019-07-27
 
  
   
@@ -44,6 +44,9 @@
   
 1.5.0
   
+  
+1.8.0
+  
  
 
  
@@ -53,5 +56,6 @@
   vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so
   vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so
   vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so
+  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so
  
 
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 63eb024a9a5e..5bc909c3f265 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -23,7 +23,7 @@
 http://openoffice.org/2004/java/framework/1.0;
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
 
- 2013-01-01
+ 2019-07-27
 
  
   
@@ -35,10 +35,15 @@
  
 1.7.0
  
+ 
+1.8.0
+ 
  
+
  
   vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib
   vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib
   vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib
+  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib
  
 
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index f1f5fa284911..94268509cae6 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -23,7 +23,7 @@
 http://openoffice.org/2004/java/framework/1.0;
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
 
- 2011-01-07
+ 2019-07-27
 
  
   
@@ -32,10 +32,14 @@
   
 1.5.0
   
+  
+1.8.0
+  
  
 
  
   vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so
   vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so
+  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so
  
 
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index a0257444ae34..92c6d1988c87 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -23,7 +23,7 @@
 http://openoffice.org/2004/java/framework/1.0;
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
 
- 2012-10-06
+ 2019-07-27
 
  
   
@@ -35,11 +35,15 @@
   
 1.5.0
   
+  
+1.8.0
+  
  
 
  
   vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll
   vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll
   vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll
+  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll
  
 
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 
b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 5c0f0164675d..24b1835695e2 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -120,6 +120,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
 rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software 
Foundation, Inc."));
 rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD 
Foundation"));
+rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM("AdoptOpenJDK"));
 if ( ! (sVendor0.equals(pInfo->sVendor) == sal_True
 || sVendor1.equals(pInfo->sVendor) == sal_True
 || sVendor2.equals(pInfo->sVendor) == sal_True
@@ -128,7 +129,8 @@

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/svx default_images/sw ooo_custom_images/classic

2019-07-26 Thread Matthias Seidel (via logerrit)

 default_images/svx/res/slidezoomin_11.png   |binary
 default_images/svx/res/slidezoomout_11.png  |binary
 default_images/sw/res/point.png |binary
 default_images/sw/res/point_h.png   |binary
 ooo_custom_images/classic/classic_images.tar.gz |binary
 5 files changed

New commits:
commit f160722c9cd8052c1b0c92c0e00783a9fe765dfa
Author: Matthias Seidel 
AuthorDate: Fri Jul 26 23:50:48 2019 +
Commit: Matthias Seidel 
CommitDate: Fri Jul 26 23:50:48 2019 +

Updated graphics for (navigation) point

diff --git a/default_images/sw/res/point.png b/default_images/sw/res/point.png
index c58a792d8959..1c3c29421a27 100644
Binary files a/default_images/sw/res/point.png and 
b/default_images/sw/res/point.png differ
diff --git a/default_images/sw/res/point_h.png 
b/default_images/sw/res/point_h.png
index 75426c941aa9..c39971ffa840 100644
Binary files a/default_images/sw/res/point_h.png and 
b/default_images/sw/res/point_h.png differ
diff --git a/ooo_custom_images/classic/classic_images.tar.gz 
b/ooo_custom_images/classic/classic_images.tar.gz
index e9f8c1dd5ad3..c8f4085938e1 100644
Binary files a/ooo_custom_images/classic/classic_images.tar.gz and 
b/ooo_custom_images/classic/classic_images.tar.gz differ
commit 16736eb5d0b408ff6068096e6751bd70c99c494e
Author: Matthias Seidel 
AuthorDate: Fri Jul 26 23:23:53 2019 +
Commit: Matthias Seidel 
CommitDate: Fri Jul 26 23:23:53 2019 +

Updated graphics for zoom in/out

diff --git a/default_images/svx/res/slidezoomin_11.png 
b/default_images/svx/res/slidezoomin_11.png
index 1fb255901910..b39513376db5 100644
Binary files a/default_images/svx/res/slidezoomin_11.png and 
b/default_images/svx/res/slidezoomin_11.png differ
diff --git a/default_images/svx/res/slidezoomout_11.png 
b/default_images/svx/res/slidezoomout_11.png
index 131f45cfbe3e..c4fb23b27f67 100644
Binary files a/default_images/svx/res/slidezoomout_11.png and 
b/default_images/svx/res/slidezoomout_11.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/svx default_images/xmlsecurity ooo_custom_images/classic svx/source xmlsecurity/source

2019-07-15 Thread Matthias Seidel (via logerrit)

 default_images/svx/res/notcertificate_11x16.png   |binary
 default_images/svx/res/notcertificate_11x16_h.png |binary
 default_images/svx/res/signet_11x16.png   |binary
 default_images/svx/res/signet_11x16_h.png |binary
 default_images/xmlsecurity/res/notcertificate_11x16.png   |binary
 default_images/xmlsecurity/res/notcertificate_11x16_h.png |binary
 default_images/xmlsecurity/res/signet_11x16.png   |binary
 default_images/xmlsecurity/res/signet_11x16_h.png |binary
 ooo_custom_images/classic/classic_images.tar.gz   |binary
 svx/source/stbctrls/stbctrls.src  |6 +++---
 xmlsecurity/source/dialogs/digitalsignaturesdialog.src|6 +++---
 11 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e8d5f4b7d65f1e0d1d161a36f3c9b9c5866d009a
Author: Matthias Seidel 
AuthorDate: Mon Jul 15 16:03:07 2019 +
Commit: Matthias Seidel 
CommitDate: Mon Jul 15 16:03:07 2019 +

Added graphics for document signature

diff --git a/default_images/svx/res/notcertificate_11x16.png 
b/default_images/svx/res/notcertificate_11x16.png
new file mode 100644
index ..f4d24a6e4cfb
Binary files /dev/null and b/default_images/svx/res/notcertificate_11x16.png 
differ
diff --git a/default_images/svx/res/notcertificate_11x16_h.png 
b/default_images/svx/res/notcertificate_11x16_h.png
new file mode 100644
index ..11210166492d
Binary files /dev/null and b/default_images/svx/res/notcertificate_11x16_h.png 
differ
diff --git a/default_images/xmlsecurity/res/notcertificate_11x16.png 
b/default_images/xmlsecurity/res/notcertificate_11x16.png
new file mode 100644
index ..f4d24a6e4cfb
Binary files /dev/null and 
b/default_images/xmlsecurity/res/notcertificate_11x16.png differ
diff --git a/default_images/xmlsecurity/res/notcertificate_11x16_h.png 
b/default_images/xmlsecurity/res/notcertificate_11x16_h.png
new file mode 100644
index ..11210166492d
Binary files /dev/null and 
b/default_images/xmlsecurity/res/notcertificate_11x16_h.png differ
diff --git a/ooo_custom_images/classic/classic_images.tar.gz 
b/ooo_custom_images/classic/classic_images.tar.gz
index 561eedb495d5..d01e3879e387 100644
Binary files a/ooo_custom_images/classic/classic_images.tar.gz and 
b/ooo_custom_images/classic/classic_images.tar.gz differ
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 9a3b56aae9f6..6886c1539725 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -72,7 +72,7 @@ String RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY
 
 String RID_SVXSTR_XMLSEC_SIG_NOT_OK
 {
-Text [ en-US ] = "Digital Signature: The document signature does not match 
the document content. We strongly recommend you to do not trust this document." 
;
+Text [ en-US ] = "Digital Signature: The document signature does not match 
the document content. We strongly recommend you not to trust this document." ;
 };
 
 String RID_SVXSTR_XMLSEC_NO_SIG
@@ -236,7 +236,7 @@ Image RID_SVXBMP_SIGNET_NOTVALIDATED
 {
 ImageBitmap = Bitmap
 {
-File = "notcertificate_16.png" ;
+File = "notcertificate_11x16.png" ;
 };
 };
 Image RID_SVXBMP_SIGNET_H
@@ -257,7 +257,7 @@ Image RID_SVXBMP_SIGNET_NOTVALIDATED_H
 {
 ImageBitmap = Bitmap
 {
-File = "notcertificate_16_h.png" ;
+File = "notcertificate_11x16_h.png" ;
 };
 };
 
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src 
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
index 09b09b149f86..6a97db972cdb 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
@@ -127,7 +127,7 @@ ModalDialog RID_XMLSECDLG_DIGSIG
 Size = MAP_APPFONT ( 33, 22 ) ;
 Fixed = Image
 {
-ImageBitmap = Bitmap { File = "notcertificate_16.png"; } ;
+ImageBitmap = Bitmap { File = "notcertificate_11x16.png"; } ;
 };
 };
 FixedText FI_STATE_NOTVALIDATED
@@ -184,7 +184,7 @@ ModalDialog RID_XMLSECDLG_DIGSIG
 };
 Image IMG_STATE_NOTVALIDATED_HC
 {
-ImageBitmap = Bitmap { File = "notcertificate_16_h.png"; } ;
+ImageBitmap = Bitmap { File = "notcertificate_11x16_h.png"; } ;
 };
 };
 
@@ -194,7 +194,7 @@ ErrorBox RID_XMLSECDLG_OLD_ODF_FORMAT
 Buttons = WB_OK ;
 DefButton = WB_DEF_OK ;
 Message [ en-US ] = "This document contains signatures in ODF 1.1 format. 
Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format 
version. "
-"Thus no signatures can be added or removed to this document.\n\nSave 
document in ODF 1.2 format and add all desired signatures again." ;
+"Thus no signatures can be added or removed to this 
document.\n\nSave document in ODF 1.2 format and add all desired signatures 
again." ;
 };
 
 
commit

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/svx svx/source

2019-07-13 Thread Matthias Seidel (via logerrit)

 default_images/svx/res/slidezoomin_11.png|binary
 default_images/svx/res/slidezoomin_11_h.png  |binary
 default_images/svx/res/slidezoomout_11.png   |binary
 default_images/svx/res/slidezoomout_11_h.png |binary
 svx/source/stbctrls/stbctrls.src |   64 ++-
 5 files changed, 25 insertions(+), 39 deletions(-)

New commits:
commit b8a3c50b267ab2fa02778659b57cf44149f29e4a
Author: Matthias Seidel 
AuthorDate: Sat Jul 13 09:13:40 2019 +
Commit: Matthias Seidel 
CommitDate: Sat Jul 13 09:13:40 2019 +

Flattened graphics for zoom in/out: Next step incl. high contrast

diff --git a/default_images/svx/res/slidezoomin_11.png 
b/default_images/svx/res/slidezoomin_11.png
index c02ef45f6742..1fb255901910 100644
Binary files a/default_images/svx/res/slidezoomin_11.png and 
b/default_images/svx/res/slidezoomin_11.png differ
diff --git a/default_images/svx/res/slidezoomin_11_h.png 
b/default_images/svx/res/slidezoomin_11_h.png
index 94f5b66d6b5a..4a243d521db3 100644
Binary files a/default_images/svx/res/slidezoomin_11_h.png and 
b/default_images/svx/res/slidezoomin_11_h.png differ
diff --git a/default_images/svx/res/slidezoomout_11.png 
b/default_images/svx/res/slidezoomout_11.png
index 11c82caec4f6..131f45cfbe3e 100644
Binary files a/default_images/svx/res/slidezoomout_11.png and 
b/default_images/svx/res/slidezoomout_11.png differ
diff --git a/default_images/svx/res/slidezoomout_11_h.png 
b/default_images/svx/res/slidezoomout_11_h.png
index 88535e8f2344..cca0a6e4ff42 100644
Binary files a/default_images/svx/res/slidezoomout_11_h.png and 
b/default_images/svx/res/slidezoomout_11_h.png differ
commit 4ad989c9360daeae46c4aa2981c903f0b6a7fff9
Author: Matthias Seidel 
AuthorDate: Sat Jul 13 09:03:19 2019 +
Commit: Matthias Seidel 
CommitDate: Sat Jul 13 09:03:19 2019 +

Cleaned up whitespace, removed MASKCOLOR, translated German comments, added 
strings to translation

diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index c02f38e07efb..9a3b56aae9f6 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -19,72 +19,73 @@
  *
  */
 
+
 
- // include ---
+// include ---
 #include 
 #include "helpid.hrc"
 #include "stbctrls.h"
- // pragma 
+// pragma 
 
- // Strings ---
+// Strings ---
 String RID_SVXSTR_INSERT_TEXT
 {
- // 'Einf"ugen' bzw. 'Insert' abgek"urzt auf h"ochstens 5 Zeichen
+// 'Insert' shortened to max. 5 characters
 Text [ en-US ] = "INSRT" ;
 };
 String RID_SVXSTR_OVERWRITE_TEXT
 {
- // '"Uberschreiben' bzw. 'Overwrite' abgek"urzt auf h"ochstens 5 Zeichen
+// 'Overwrite' shortened to max. 5 characters
 Text [ en-US ] = "OVER" ;
 };
 String RID_SVXSTR_SELMODE_STD
 {
- // 'Standard' abgek"urzt auf h"ochstens 3 Zeichen
+// 'Standard' shortened to max. 3 characters
 Text [ en-US ] = "STD" ;
 };
 String RID_SVXSTR_SELMODE_ER
 {
- // 'Erweitert' bzw. 'Extended' abgek"urzt auf h"ochstens 3 Zeichen
+// 'Extended' shortened to max. 3 characters
 Text [ en-US ] = "EXT" ;
 };
 String RID_SVXSTR_SELMODE_ERG
 {
- // 'Erg"anzend' bzw. 'Added' abgek"urzt auf h"ochstens 3 Zeichen
+// 'Added' shortened to max. 3 characters
 Text [ en-US ] = "ADD" ;
 };
 
 String RID_SVXSTR_SELMODE_BLK
 {
- // 'Block' shortened to max. 3 chararcters
+// 'Block' shortened to max. 3 characters
 Text [ en-US ] = "BLK" ;
 };
 
 String RID_SVXSTR_XMLSEC_SIG_OK
 {
-Text [ en-US ] = "Digital Signature: The document signature is OK.";
+Text [ en-US ] = "Digital Signature: The document signature is OK." ;
 };
 
 String RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY
 {
-Text [ en-US ] = "Digital Signature: The document signature is OK, but the 
certificates could not be validated.";
+Text [ en-US ] = "Digital Signature: The document signature is OK, but the 
certificates could not be validated." ;
 };
 
 String RID_SVXSTR_XMLSEC_SIG_NOT_OK
 {
-Text [ en-US ] = "Digital Signature: The document signature does not match 
the document content. We strongly recommend you to do not trust this document.";
+Text [ en-US ] = "Digital Signature: The document signature does not match 
the document content. We strongly recommend you to do not trust this document." 
;
 };
 
 String RID_SVXSTR_XMLSEC_NO_SIG
 {
-Text [ en-US ] = "Digital Signature: The document is not signed.";
+Text [ en-US ] = "Digital Signature: The document is not signed." ;
 };
 
 String RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG
 {
-Text [ en-US ]

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/inc svtools/source

2019-06-23 Thread Matthias Seidel (via logerrit)

 solenv/inc/langlist.mk  |1 +
 svtools/source/misc/langtab.src |4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b4e6c3ad1bec0044ea7bf8efc1b0654d25706f86
Author: Matthias Seidel 
AuthorDate: Sun Jun 23 23:01:09 2019 +
Commit: Matthias Seidel 
CommitDate: Sun Jun 23 23:01:09 2019 +

Added Amharic (am) to language list

diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index c3281f285ec1..2a6eee6ca7ec 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -22,6 +22,7 @@
 
 
 completelangiso=af \
+am \
 ar \
 as \
 as-IN \
commit f121c536505d13447c069a2fa3b2c7e968098711
Author: Matthias Seidel 
AuthorDate: Sun Jun 23 19:34:06 2019 +
Commit: Matthias Seidel 
CommitDate: Sun Jun 23 19:34:06 2019 +

Cleaned up whitespace

diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index ddc6be324cdc..97e116c70ec4 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -21,7 +21,7 @@
 
 
 
- // include ---
+// include ---
 #include 
 
 #define RSC_RESOURCE_USAGE 1
@@ -29,7 +29,7 @@
 
 #define PairedList ItemList
 
- // STR_ARR_SVT_LANGUAGE_TABLE 

+// STR_ARR_SVT_LANGUAGE_TABLE 

 StringArray STR_ARR_SVT_LANGUAGE_TABLE
 {
 PairedList [ en-US ] =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - dbaccess/source setup_native/source

2019-06-19 Thread Matthias Seidel (via logerrit)

 dbaccess/source/ui/dlg/AutoControls_tmpl.hrc   |3 +--
 setup_native/source/win32/msi-encodinglist.txt |3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit cffc33706f6eb1d85f6da8600a98f4ef9f5c43a8
Author: Matthias Seidel 
AuthorDate: Wed Jun 19 23:54:32 2019 +
Commit: Matthias Seidel 
CommitDate: Wed Jun 19 23:54:32 2019 +

Removed some whitespace, changed String

diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc 
b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
index e8ac2e31746e..5380419ac6d9 100644
--- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
+++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
@@ -21,7 +21,6 @@
 
 
 
-
 #ifndef _DBAUI_AUTOCONTROLS_HRC_
 #define _DBAUI_AUTOCONTROLS_HRC_
 
@@ -92,7 +91,7 @@
  Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; 
 \
   HelpId = AUTO_HID2;  
 \
 TabStop = TRUE ;   
 \
- Text[ en-US ]  = "Browse";
  \
+ Text[ en-US ]  = "Browse..."; 
 \
 };
 
 // 
--
commit 1ef42d9e4d96b2010ff569eb51a2207c0e755e1d
Author: Matthias Seidel 
AuthorDate: Wed Jun 19 23:23:20 2019 +
Commit: Matthias Seidel 
CommitDate: Wed Jun 19 23:23:20 2019 +

Removed empty lines introduced in my last commit.

diff --git a/setup_native/source/win32/msi-encodinglist.txt 
b/setup_native/source/win32/msi-encodinglist.txt
index 687a133d76cc..f78899d12a03 100644
--- a/setup_native/source/win32/msi-encodinglist.txt
+++ b/setup_native/source/win32/msi-encodinglist.txt
@@ -18,9 +18,6 @@
 #  under the License.
 #
 # *
-
-
-
 # Syntax: language ANSI-Codepage LCID
 # comment lines begin with hash
 af1252  1078   # Afrikaans
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/source scripting/README

2019-06-04 Thread Matthias Seidel (via logerrit)

 cui/source/tabpages/frmdirlbox.src |   38 ++---
 scripting/README   |4 +--
 2 files changed, 9 insertions(+), 33 deletions(-)

New commits:
commit 1f21ba2f2a1bc287cd869b0a03eac6e8a90eb21f
Author: Matthias Seidel 
AuthorDate: Tue Jun 4 11:10:30 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Jun 4 11:10:30 2019 +

Fixed typo

diff --git a/scripting/README b/scripting/README
index 686e4ad30f25..bcf92f38fa11 100644
--- a/scripting/README
+++ b/scripting/README
@@ -1,6 +1,6 @@
 This module provides the source code for the Scripting Framework. For
 more information on the Scripting Framework, see the project web page:
-http://framework.openoffice.org/scripting/
+https://framework.openoffice.org/scripting/
 
 Source Code Structure
 =
@@ -31,7 +31,7 @@ UNO dialogs from various languages
 - java/com/sun/star/script/framework/provider
 
 Implementation of an abstract base class ScriptProvider which provides
-core methods for implementing Java based LanguageScriptProvider implemetations
+core methods for implementing Java based LanguageScriptProvider implementations
 
 - java/com/sun/star/script/framework/provider/*
 
commit 99c696980cf2a97ea08ed630cf1be2af795a3b0b
Author: Matthias Seidel 
AuthorDate: Tue Jun 4 11:07:44 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Jun 4 11:07:44 2019 +

Cleaned up whitespace

diff --git a/cui/source/tabpages/frmdirlbox.src 
b/cui/source/tabpages/frmdirlbox.src
index a90758f1a442..816820609c42 100644
--- a/cui/source/tabpages/frmdirlbox.src
+++ b/cui/source/tabpages/frmdirlbox.src
@@ -27,63 +27,39 @@
 
 String RID_SVXSTR_FRAMEDIR_LTR
 {
-Text [ en-US ] = "Left-to-right";
+Text [ en-US ] = "Left-to-right" ;
 };
 
 String RID_SVXSTR_FRAMEDIR_RTL
 {
-Text [ en-US ] = "Right-to-left";
+Text [ en-US ] = "Right-to-left" ;
 };
 
 String RID_SVXSTR_FRAMEDIR_SUPER
 {
-Text [ en-US ] = "Use superordinate object settings";
+Text [ en-US ] = "Use superordinate object settings" ;
 };
 
 // page direction -
 
 String RID_SVXSTR_PAGEDIR_LTR_HORI
 {
-Text [ en-US ] = "Left-to-right (horizontal)";
+Text [ en-US ] = "Left-to-right (horizontal)" ;
 };
 
 String RID_SVXSTR_PAGEDIR_RTL_HORI
 {
-Text [ en-US ] = "Right-to-left (horizontal)";
+Text [ en-US ] = "Right-to-left (horizontal)" ;
 };
 
 String RID_SVXSTR_PAGEDIR_RTL_VERT
 {
-Text [ en-US ] = "Right-to-left (vertical)";
+Text [ en-US ] = "Right-to-left (vertical)" ;
 };
 
 String RID_SVXSTR_PAGEDIR_LTR_VERT
 {
-Text [ en-US ] = "Left-to-right (vertical)";
+Text [ en-US ] = "Left-to-right (vertical)" ;
 };
 
 // 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - filter/source i18npool/source

2019-05-20 Thread Matthias Seidel (via logerrit)

 filter/source/config/cache/querytokenizer.hxx |   10 ++--
 i18npool/source/localedata/data/lv_LV.xml |   59 ++
 2 files changed, 38 insertions(+), 31 deletions(-)

New commits:
commit 78d3e4d1261b9e6923e989a2e419ca004ea33a1f
Author: Matthias Seidel 
AuthorDate: Mon May 20 21:18:10 2019 +
Commit: Matthias Seidel 
CommitDate: Mon May 20 21:18:10 2019 +

Fixed typos

diff --git a/filter/source/config/cache/querytokenizer.hxx 
b/filter/source/config/cache/querytokenizer.hxx
index 0d1d3c173bd8..c642527a830e 100644
--- a/filter/source/config/cache/querytokenizer.hxx
+++ b/filter/source/config/cache/querytokenizer.hxx
@@ -53,8 +53,8 @@ namespace filter{
 
 uses this schema.
 
-@attention  This class is not threadsafe implemented. Because its not 
necessary.
-But you have to make shure, that ist not used as such :-)
+@attention  This class is not threadsafe implemented. Because it's not 
necessary.
+But you have to make sure, that it's not used as such :-)
  */
 class QueryTokenizer : public ::std::hash_map< ::rtl::OUString 
   ,
::rtl::OUString 
   ,
@@ -69,7 +69,7 @@ class QueryTokenizer : public ::std::hash_map< ::rtl::OUString
 /** @short  Because the given query can contain errors,
 it should be checked outside.
 
-TODOMay its a good idea to describe the real problem
+TODOMaybe it's a good idea to describe the real problem
 more detailed ...
  */
 sal_Bool m_bValid;
@@ -82,9 +82,9 @@ class QueryTokenizer : public ::std::hash_map< ::rtl::OUString
 /** @short  create a new tokenizer instance with a
 a new query.
 
-@descr  The given query is immidiatly analyzed
+@descr  The given query is immediately analyzed
 and separated into its token, which can
-be access by some specialized method later.
+be accessed by some specialized method later.
 
 @param  sQuery
 the query string.
commit ff5b97cafcf7438dae4e07b432803eb2da89fa37
Author: Matthias Seidel 
AuthorDate: Mon May 20 20:27:00 2019 +
Commit: Matthias Seidel 
CommitDate: Mon May 20 20:27:00 2019 +

Set default currency to Euro in Latvian locale

diff --git a/i18npool/source/localedata/data/lv_LV.xml 
b/i18npool/source/localedata/data/lv_LV.xml
index 2bf704261b3f..a3d4cdb6b5e9 100644
--- a/i18npool/source/localedata/data/lv_LV.xml
+++ b/i18npool/source/localedata/data/lv_LV.xml
@@ -55,52 +55,52 @@
 metric
   
   
-
+
   Standard
 
-
+
   0
 
-
+
   0,00
 
-
+
   # ##0
 
-
+
   # ##0,00
 
-
+
   # ###,00
 
-
+
   0,00E+000
 
-
+
   0,00E+00
 
-
+
   0%
 
-
+
   0,00%
 
-
+
   [$Ls-426] # ##0;[$Ls-426] -# ##0
 
-
+
   [$Ls-426] # ##0,00;[$Ls-426] -# ##0,00
 
-
+
   [$Ls-426] # ##0;[RED][$Ls-426] -# ##0
 
-
+
   [$Ls-426] # ##0,00;[RED][$Ls-426] -# ##0,00
 
-
+
   # ##0,00 CCC
 
-
+
   [$Ls-426] # ##0,--;[RED][$Ls-426] -# ##0,--
 
 
@@ -168,31 +168,31 @@
 
   WW
 
-
+
   HH:MM
 
-
+
   HH:MM:SS
 
-
+
   HH:MM AM/PM
 
-
+
   HH:MM:SS AM/PM
 
-
+
   [HH]:MM:SS
 
-
+
   MM:SS,00
 
-
+
   [HH]:MM:SS,00
 
-
+
   DD.MM.YY HH:MM
 
-
+
   DD.MM. HH:MM:SS
 
   
@@ -335,7 +335,14 @@
 
   
   
-
+
+  EUR
+  €
+  EUR
+  euro
+  2
+
+
   LVL
   Ls
   LVL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - framework/inc

2019-05-19 Thread Matthias Seidel (via logerrit)

 framework/inc/threadhelp/lockhelper.hxx  |   20 ++--
 framework/inc/threadhelp/transactionbase.hxx |8 
 2 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 2c6a517e53b89fc923691f59e0435949db5e28eb
Author: Matthias Seidel 
AuthorDate: Sun May 19 11:59:15 2019 +
Commit: Matthias Seidel 
CommitDate: Sun May 19 11:59:15 2019 +

Fixed typos

diff --git a/framework/inc/threadhelp/lockhelper.hxx 
b/framework/inc/threadhelp/lockhelper.hxx
index b6d49e68d683..4f2e16cce891 100644
--- a/framework/inc/threadhelp/lockhelper.hxx
+++ b/framework/inc/threadhelp/lockhelper.hxx
@@ -55,10 +55,10 @@ namespace framework{
 
//_
 
 
/*-//**
-@descr  If you use a lock or mutex as a member of your class and 
whish to use it earlier then other ones
+@descr  If you use a lock or mutex as a member of your class and 
wish to use it earlier than other ones
 you should have a look on this implementation. You must 
use it as the first base class
 of your implementation - because base classes are 
initialized by his order and before your
-member! Thats why ist a good place to declare your thread 
help member so.
+member! Thats why it is a good place to declare your 
thread help member so.
 
*//*-*/
 enum ELockType
 {
@@ -72,21 +72,21 @@ enum ELockType
 #define FALLBACK_LOCKTYPE   E_SOLARMUTEX
 
 
//_
-//  declarations
+// declarations
 
//_
 
 
/*-//**
 @short  helper to set right lock in right situation
 @descr  This helper support different types of locking:
 a)  no locks - transparent for user!
-This could be useful for simluation or single 
threaded environments!
+This could be useful for simulation or single 
threaded environments!
 b)  own mutex
-An object use his own osl-mutex to be threadsafe. 
Useful for easy and exclusiv locking.
+An object use his own osl-mutex to be threadsafe. 
Useful for easy and exclusive locking.
 c)  solar mutex
-An object use our solar mutex and will be a part 
of a greater safed "threadsafe code block".
+An object use our solar mutex and will be a part 
of a greater saved "threadsafe code block".
 Could be useful for simulation and testing of 
higher modules!
 d)  fair rw-lock
-An object use an implementation of a fair rw-lock. 
This increase granularity of t hreadsafe mechanism
+An object use an implementation of a fair rw-lock. 
This increase granularity of threadsafe mechanism
 and should be used for high performance threadsafe 
code!
 
 @attention  We support two interfaces - "IMutex" and "IRWLock". Don't 
mix using of it!
@@ -157,8 +157,8 @@ class FWI_DLLPUBLIC LockHelper : public  IMutex
 // ii ) Otherwise you have no osl 
mutex ... so you must create "m_pShareableOslMutex" and use it twice!
 //  In this case you must lock 
two members every time - "m_pShareableMutex" AND "m_pFairRWLock" or 
"m_pSolarMutex" or ...
 //  It isn't really fine - but 
the only possible way.
-// iii) There exist another 
special case - E_NOTHING is set! Then we should create this shareable mutex ...
-//  nad you can use it ... but 
this implmentation ignore it.
+// iii) There exists another 
special case - E_NOTHING is set! Then we should create this shareable mutex ...
+//  and you can use it ... but 
this implementation ignores it.
 
//-
 private:
 
@@ -171,6 +171,6 @@ class FWI_DLLPUBLIC LockHelper : public  IMutex
 mutable sal_Bool

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - config.guess config.sub extras/source

2019-05-08 Thread Matthias Seidel (via logerrit)

 config.guess |  218 +--
 config.sub   |   46 +--
 extras/source/misc_config/wizard/web/styles/beige.css|9 
 extras/source/misc_config/wizard/web/styles/bg.css   |9 
 extras/source/misc_config/wizard/web/styles/bgr.css  |9 
 extras/source/misc_config/wizard/web/styles/bgrey.css|9 
 extras/source/misc_config/wizard/web/styles/bwb.css  |9 
 extras/source/misc_config/wizard/web/styles/bwo.css  |9 
 extras/source/misc_config/wizard/web/styles/dark.css |9 
 extras/source/misc_config/wizard/web/styles/dp.css   |9 
 extras/source/misc_config/wizard/web/styles/forest.css   |9 
 extras/source/misc_config/wizard/web/styles/green.css|9 
 extras/source/misc_config/wizard/web/styles/greenred.css |9 
 extras/source/misc_config/wizard/web/styles/grey.css |9 
 extras/source/misc_config/wizard/web/styles/ibg.css  |9 
 extras/source/misc_config/wizard/web/styles/ice.css  |9 
 extras/source/misc_config/wizard/web/styles/marine.css   |9 
 extras/source/misc_config/wizard/web/styles/orange.css   |9 
 extras/source/misc_config/wizard/web/styles/pc_old.css   |  112 ---
 extras/source/misc_config/wizard/web/styles/red.css  |9 
 extras/source/misc_config/wizard/web/styles/rgb.css  |   25 -
 extras/source/misc_config/wizard/web/styles/strange.css  |9 
 extras/source/misc_config/wizard/web/styles/violet.css   |9 
 extras/source/misc_config/wizard/web/styles/water.css|9 
 24 files changed, 314 insertions(+), 267 deletions(-)

New commits:
commit bbd329211b80fa107d93f1a2363512a872b8d6df
Author: Matthias Seidel 
AuthorDate: Wed May 8 19:17:39 2019 +
Commit: Matthias Seidel 
CommitDate: Wed May 8 19:17:39 2019 +

Updated to the latest version:

- config.guess: 2019-04-28
- config.sub: 2019-01-05

diff --git a/config.guess b/config.guess
index b33c9e890e0c..4cd9454b35c4 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2019 Free Software Foundation, Inc.
 
-timestamp='2018-08-29'
+timestamp='2019-04-28'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2019 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -96,8 +96,7 @@ fi
 
 tmp=
 # shellcheck disable=SC2172
-trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
-trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
 
 set_cc_for_build() {
 : "${TMPDIR=/tmp}"
@@ -392,15 +391,20 @@ case 
"$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
echo i386-pc-auroraux"$UNAME_RELEASE"
exit ;;
 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-   UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
-   case `isainfo -b` in
-   32)
-   echo i386-pc-solaris2"$UNAME_REL"
-   ;;
-   64)
-   echo x86_64-pc-solaris2"$UNAME_REL"
-   ;;
-   esac
+   set_cc_for_build
+   SUN_ARCH=i386
+   # If there is a compiler, see if it is configured for 64-bit objects.
+   # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+   # This test works for both compilers.
+   if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+   if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+   grep IS_64BIT_ARCH >/dev/null
+   then
+   SUN_ARCH=x86_64
+   fi
+   fi
+   echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
 sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
@@ -890,7 +894,7 @@ EOF
echo "$UNAME_MACHINE"-pc-uwin
exit ;;
 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-   echo x86_64-unknown-cygwin
+   echo x86_64-pc-cygwin
exit ;;
 prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 
's/[^.]*//'`"
@@ -981,22 +985,50 @@ EOF
exit ;;
 mips:Linux:*:* | mips64:Linux:*:*)
set_cc_for_build
+   IS_GLIBC=0
+   test x"${LIBC}" = xgnu && IS_GLIBC=1
sed 's/^//' << EOF > "$dummy.c"
#undef CPU
-   #undef ${UNAME_MACHINE}
-   #undef ${UNAME_MACHINE}el
+   #undef mips
+   #undef

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - comphelper/inc udkapi/com

2019-05-01 Thread Matthias Seidel (via logerrit)

 comphelper/inc/comphelper/namedvaluecollection.hxx |4 ++--
 udkapi/com/sun/star/container/XNamedEx.idl |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 229623ec69f002e75afc07229dab85ca760c7c92
Author: Matthias Seidel 
AuthorDate: Thu May 2 00:24:03 2019 +
Commit: Matthias Seidel 
CommitDate: Thu May 2 00:24:03 2019 +

Fixed typos

diff --git a/comphelper/inc/comphelper/namedvaluecollection.hxx 
b/comphelper/inc/comphelper/namedvaluecollection.hxx
index d22446b8eaf1..6c1c3a60675d 100644
--- a/comphelper/inc/comphelper/namedvaluecollection.hxx
+++ b/comphelper/inc/comphelper/namedvaluecollection.hxx
@@ -158,7 +158,7 @@ namespace comphelper
 
 @return
  if there is a value with the given name, which could 
successfully
-be extraced. In this case, _out_rValue will contain 
the requested
+be extracted. In this case, _out_rValue will 
contain the requested
 value.
 , if there is no value with the given name.
 @throws IllegalArgumentException
@@ -178,7 +178,7 @@ namespace comphelper
 }
 
 /** retrieves a value with a given name, or defaults it to a given 
value, if its not present
-in the colllection
+in the collection
 */
 template < typename VALUE_TYPE >
 VALUE_TYPE  getOrDefault( const sal_Char* _pAsciiValueName, const 
VALUE_TYPE& _rDefault ) const
commit 05da77c638dd0f190c362a7a00fd0192e79fe6d5
Author: Matthias Seidel 
AuthorDate: Thu May 2 00:06:33 2019 +
Commit: Matthias Seidel 
CommitDate: Thu May 2 00:06:33 2019 +

Added missing #endif

diff --git a/udkapi/com/sun/star/container/XNamedEx.idl 
b/udkapi/com/sun/star/container/XNamedEx.idl
index b59c50428118..f794cafc47cb 100644
--- a/udkapi/com/sun/star/container/XNamedEx.idl
+++ b/udkapi/com/sun/star/container/XNamedEx.idl
@@ -29,6 +29,7 @@
 
 #ifndef __com_sun_star_container_XNamed_idl__
 #include 
+#endif
 
 //=
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - automation/source

2019-04-29 Thread Mechtilde Stehmann (via logerrit)

 automation/source/server/statemnt.cxx |   85 --
 1 file changed, 42 insertions(+), 43 deletions(-)

New commits:
commit 8bd973400a4b29476fd12ab1787ce2be0c901f5e
Author: Mechtilde Stehmann 
AuthorDate: Mon Apr 29 19:12:20 2019 +
Commit: Mechtilde Stehmann 
CommitDate: Mon Apr 29 19:12:20 2019 +

translated comments into en-US the second part

diff --git a/automation/source/server/statemnt.cxx 
b/automation/source/server/statemnt.cxx
index f312631e4bed..946b81a22abf 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -4700,8 +4700,7 @@ sal_Bool StatementControl::Execute()
 
 /*  leads to problems because settext sets the text whereas typekeys adds to 
the text.
 if ( bDoTypeKeysDelay && nMethodId == M_SetText && ( nParams & 
PARAM_STR_1 ) )
-{   // Hier wird das Statement auf ein TypeKeys umgebogen
-nMethodId = M_TypeKeys;
+{   // Here the statement is bent to a TypeKeys
 nParams = PARAM_BOOL_1 | PARAM_STR_1;
 bBool1 = sal_True;
 pControl->GrabFocus();
@@ -4745,7 +4744,7 @@ sal_Bool StatementControl::Execute()
 pRet->GenReturn ( RET_Value, aUId, Id2Str( 
((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetUniqueOrHelpId()
 ) );
 break;
 case M_SetPage :
-{   // Wegen lokaler Variablen
+{   // Due to local variables
 TabControl *pTControl = 
((TabControl*)pControl);
 sal_uInt16 nActive = pTControl->GetCurPageId();
 sal_uInt16 i,anz;
@@ -4776,7 +4775,7 @@ sal_Bool StatementControl::Execute()
 i++;
 if ( i >= pTControl->GetPageCount() )
 i = 0;
-if ( !MaybeDoTypeKeysDelay( pTControl ) || 
!MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) )   // 
3 Mal aufrufen
+if ( !MaybeDoTypeKeysDelay( pTControl ) || 
!MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) )   // 
Call up 3 times
 break;
 }
 if ( !aID.equals( aWantedID ) )
@@ -4975,7 +4974,7 @@ sal_Bool StatementControl::Execute()
 if ( bUnselectBeforeSelect )
 pLB->SetNoSelection();
 pLB->SelectEntryPos( nPos, bBool1 
);
-if ( pLB->IsEntryPosSelected( nPos 
) ? !bBool1 : bBool1 )   // XOR rein mit BOOL
+if ( pLB->IsEntryPosSelected( nPos 
) ? !bBool1 : bBool1 )   // XOR into with BOOL
 ReportError( aUId, 
GEN_RES_STR2( S_METHOD_FAILED, MethodString( nMethodId ), aString1 ) );
 }
 }
@@ -4988,7 +4987,7 @@ sal_Bool StatementControl::Execute()
 if ( bUnselectBeforeSelect )
 pLB->SetNoSelection();
 pLB->SelectEntryPos( nNr1-1, 
bBool1 );
-if ( pLB->IsEntryPosSelected( 
nNr1-1 ) ? !bBool1 : bBool1 ) // XOR rein mit BOOL
+if ( pLB->IsEntryPosSelected( 
nNr1-1 ) ? !bBool1 : bBool1 ) // XOR into with BOOL
 ReportError( aUId, 
GEN_RES_STR2( S_METHOD_FAILED, MethodString( nMethodId ), 
UniString::CreateFromInt32( nNr1 ) ) );
 }
 }
@@ -5232,7 +5231,7 @@ sal_Bool StatementControl::Execute()
 if ( !aUId.equals( pTB->GetUniqueOrHelpId() ) ) // So 
we found a Button on the ToolBox
 {
 if ( (nParams == PARAM_NONE) || (nParams == 
PARAM_USHORT_1) )
-{   // Wir f�lschen einen Parameter
+{   // We fake a parameter
 nParams |= PARAM_STR_1;
 aString1 = Id2Str( aUId );
 }
@@ -5303,7 +5302,7 @@ sal_Bool StatementControl::Execute()
 case M_Click :
 {
 FIND_ITEM;
-if ( bItemFound )   // FIND_ITEM 
Erfolgreich
+if ( bItemFound )   // FIND_ITEM

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - vcl/inc

2019-04-29 Thread Matthias Seidel (via logerrit)

 vcl/inc/unx/x11_cursors/ase_mask.h  |1 +
 vcl/inc/unx/x11_cursors/null_curs.h |   10 +-
 vcl/inc/unx/x11_cursors/null_mask.h |   10 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 22838948d7f1682bc8f892ba02c489edd617f269
Author: Matthias Seidel 
AuthorDate: Mon Apr 29 15:55:38 2019 +
Commit: Matthias Seidel 
CommitDate: Mon Apr 29 15:55:38 2019 +

Fixed error introduced in my last commit.

diff --git a/vcl/inc/unx/x11_cursors/null_curs.h 
b/vcl/inc/unx/x11_cursors/null_curs.h
index f99e0543e691..13ed507f74c6 100644
--- a/vcl/inc/unx/x11_cursors/null_curs.h
+++ b/vcl/inc/unx/x11_cursors/null_curs.h
@@ -20,9 +20,9 @@
  */
 
 
-#define null_curs_width 4
-#define null_curs_height 4
-#define null_curs_x_hot 2
-#define null_curs_y_hot 2
+#define nullcurs_width 4
+#define nullcurs_height 4
+#define nullcurs_x_hot 2
+#define nullcurs_y_hot 2
 
-static const unsigned char null_curs_bits[] = {0x00,0x00};
+static const unsigned char nullcurs_bits[] = {0x00,0x00};
diff --git a/vcl/inc/unx/x11_cursors/null_mask.h 
b/vcl/inc/unx/x11_cursors/null_mask.h
index ea648d54026f..5e4d6841e104 100644
--- a/vcl/inc/unx/x11_cursors/null_mask.h
+++ b/vcl/inc/unx/x11_cursors/null_mask.h
@@ -20,9 +20,9 @@
  */
 
 
-#define null_mask_width 4
-#define null_mask_height 4
-#define null_mask_x_hot 2
-#define null_mask_y_hot 2
+#define nullmask_width 4
+#define nullmask_height 4
+#define nullmask_x_hot 2
+#define nullmask_y_hot 2
 
-static const unsigned char null_mask_bits[] = {0x00,0x00};
+static const unsigned char nullmask_bits[] = {0x00,0x00};
commit 9ac6e891a23c99f06794473e43d24ddc3ce9a3a6
Author: Matthias Seidel 
AuthorDate: Mon Apr 29 15:49:19 2019 +
Commit: Matthias Seidel 
CommitDate: Mon Apr 29 15:49:19 2019 +

Fixed missing line

diff --git a/vcl/inc/unx/x11_cursors/ase_mask.h 
b/vcl/inc/unx/x11_cursors/ase_mask.h
index 9c2a3c2e7e63..e1610cdc983f 100644
--- a/vcl/inc/unx/x11_cursors/ase_mask.h
+++ b/vcl/inc/unx/x11_cursors/ase_mask.h
@@ -57,3 +57,4 @@ static const unsigned char ase_mask_bits[] = {
 0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - avmedia/source default_images/sfx2

2019-04-21 Thread Matthias Seidel (via logerrit)

 avmedia/source/framework/mediacontrol.hrc |1 
 avmedia/source/framework/mediacontrol.src |   92 +++---
 avmedia/source/viewer/mediawindow.src |   16 ++---
 default_images/sfx2/res/closedoc.png  |binary
 4 files changed, 58 insertions(+), 51 deletions(-)

New commits:
commit af6fe636711841e1ebe22d7aa0c5a3712e5dcb09
Author: Matthias Seidel 
AuthorDate: Sun Apr 21 10:16:51 2019 +
Commit: Matthias Seidel 
CommitDate: Sun Apr 21 10:16:51 2019 +

Updated graphic

diff --git a/default_images/sfx2/res/closedoc.png 
b/default_images/sfx2/res/closedoc.png
index 410982a21b05..875b59190e6b 100644
Binary files a/default_images/sfx2/res/closedoc.png and 
b/default_images/sfx2/res/closedoc.png differ
commit 4820583166d892919fad9efea65288915fac1526
Author: Matthias Seidel 
AuthorDate: Sun Apr 21 10:16:02 2019 +
Commit: Matthias Seidel 
CommitDate: Sun Apr 21 10:16:02 2019 +

Cleaned up files for media controls, re-added entries for maskcolor

diff --git a/avmedia/source/framework/mediacontrol.hrc 
b/avmedia/source/framework/mediacontrol.hrc
index 6cd2a18d04cc..efbe71bf1891 100644
--- a/avmedia/source/framework/mediacontrol.hrc
+++ b/avmedia/source/framework/mediacontrol.hrc
@@ -47,3 +47,4 @@
 #define AVMEDIA_IMGLST_HC   3073
 #define AVMEDIA_IMGLST_L3074
 #define AVMEDIA_IMGLST_L_HC 3075
+
diff --git a/avmedia/source/framework/mediacontrol.src 
b/avmedia/source/framework/mediacontrol.src
index 4074be8d2a3b..43c8b72c2368 100644
--- a/avmedia/source/framework/mediacontrol.src
+++ b/avmedia/source/framework/mediacontrol.src
@@ -25,7 +25,7 @@
 
 String AVMEDIA_STR_OPEN
 {
-Text [en-US] = "Open" ;
+Text [ en-US ] = "Open" ;
 };
 
 // 
--
@@ -39,77 +39,77 @@ String AVMEDIA_STR_INSERT
 
 String AVMEDIA_STR_PLAY
 {
-Text [en-US] = "Play" ;
+Text [ en-US ] = "Play" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_PAUSE
 {
-Text [en-US] = "Pause" ;
+Text [ en-US ] = "Pause" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_STOP
 {
-Text [en-US] = "Stop" ;
+Text [ en-US ] = "Stop" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_ENDLESS
 {
-Text [en-US] = "Repeat" ;
+Text [ en-US ] = "Repeat" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_MUTE
 {
-Text [en-US] = "Mute" ;
+Text [ en-US ] = "Mute" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_ZOOM
 {
-Text [en-US] = "View" ;
+Text [ en-US ] = "View" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_ZOOM_50
 {
-Text [en-US] = "50 %" ;
+Text [ en-US ] = "50 %" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_ZOOM_100
 {
-Text [en-US] = "100 %" ;
+Text [ en-US ] = "100 %" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_ZOOM_200
 {
-Text [en-US] = "200 %" ;
+Text [ en-US ] = "200 %" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_ZOOM_FIT
 {
-Text [en-US] = "Scaled" ;
+Text [ en-US ] = "Scaled" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_MEDIAPLAYER
 {
-Text [en-US] = "Media Player" ;
+Text [ en-US ] = "Media Player" ;
 };
 
 // 
--
@@ -117,17 +117,18 @@ String AVMEDIA_STR_MEDIAPLAYER
 ImageList AVMEDIA_IMGLST
 {
 Prefix = "av" ;
+MaskColor = Color{ Red = 0xff00; Green = 0x; Blue = 0xff00; };
 IdList =
 {
-AVMEDIA_IMG_OPEN;
-AVMEDIA_IMG_PLAY;
-AVMEDIA_IMG_PAUSE;
-AVMEDIA_IMG_STOP;
-AVMEDIA_IMG_ENDLESS;
-AVMEDIA_IMG_INSERT;
-AVMEDIA_IMG_MUTE;
+AVMEDIA_IMG_OPEN ;
+AVMEDIA_IMG_PLAY ;
+AVMEDIA_IMG_PAUSE ;
+AVMEDIA_IMG_STOP ;
+AVMEDIA_IMG_ENDLESS ;
+AVMEDIA_IMG_INSERT ;
+AVMEDIA_IMG_MUTE ;
 };
-IdCount = 7;
+IdCount = 7 ;
 };
 
 // 
--
@@ -135,17 +136,18 @@ ImageList AVMEDIA_IMGLST
 ImageList AVMEDIA_IMGLST_L
 {
 Prefix = "avl" ;
+MaskColor = Color{ Red = 0xff00; Green = 0x; Blue = 0xff00; };
 IdList =
 {
-AVMEDIA_IMG_OPEN;
-AVMEDIA_IMG_PLAY;
-AVMEDIA_IMG_PAUSE;
-AVMEDIA_IMG_STOP;
-AVMEDIA_IMG_ENDLESS;
-AVMEDIA_IMG_INSERT;
-

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - avmedia/source default_images/avmedia

2019-04-20 Thread Matthias Seidel (via logerrit)

 avmedia/source/framework/mediacontrol.src |   38 ++
 default_images/avmedia/res/avlh02053.png  |binary
 default_images/avmedia/res/avlh02054.png  |binary
 3 files changed, 18 insertions(+), 20 deletions(-)

New commits:
commit 00c49664c07ebdf242a957f6f83446c6bb0d08a4
Author: Matthias Seidel 
AuthorDate: Sat Apr 20 16:30:51 2019 +
Commit: Matthias Seidel 
CommitDate: Sat Apr 20 16:30:51 2019 +

Cleaned up resource file for media controls, removed entries for maskcolor

diff --git a/avmedia/source/framework/mediacontrol.src 
b/avmedia/source/framework/mediacontrol.src
index 91f166da8ed8..4074be8d2a3b 100644
--- a/avmedia/source/framework/mediacontrol.src
+++ b/avmedia/source/framework/mediacontrol.src
@@ -25,7 +25,7 @@
 
 String AVMEDIA_STR_OPEN
 {
-Text[en-US] = "Open";
+Text [en-US] = "Open" ;
 };
 
 // 
--
@@ -39,85 +39,84 @@ String AVMEDIA_STR_INSERT
 
 String AVMEDIA_STR_PLAY
 {
-Text[en-US] = "Play";
+Text [en-US] = "Play" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_PAUSE
 {
-Text[en-US] = "Pause";
+Text [en-US] = "Pause" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_STOP
 {
-Text[en-US] = "Stop";
+Text [en-US] = "Stop" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_ENDLESS
 {
-Text[en-US] = "Repeat";
+Text [en-US] = "Repeat" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_MUTE
 {
-Text[en-US] = "Mute";
+Text [en-US] = "Mute" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_ZOOM
 {
-Text[en-US] = "View";
+Text [en-US] = "View" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_ZOOM_50
 {
-Text[en-US] = "50 %";
+Text [en-US] = "50 %" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_ZOOM_100
 {
-Text[en-US] = "100 %";
+Text [en-US] = "100 %" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_ZOOM_200
 {
-Text[en-US] = "200 %";
+Text [en-US] = "200 %" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_ZOOM_FIT
 {
-Text[en-US] = "Scaled";
+Text [en-US] = "Scaled" ;
 };
 
 // 
--
 
 String AVMEDIA_STR_MEDIAPLAYER
 {
-Text[en-US] = "Media Player";
+Text [en-US] = "Media Player" ;
 };
 
 // 
--
 
 ImageList AVMEDIA_IMGLST
 {
-Prefix = "av";
-MaskColor = Color{ Red = 0xff00; Green = 0x; Blue = 0xff00; };
+Prefix = "av" ;
 IdList =
 {
 AVMEDIA_IMG_OPEN;
@@ -135,8 +134,7 @@ ImageList AVMEDIA_IMGLST
 
 ImageList AVMEDIA_IMGLST_L
 {
-Prefix = "avl";
-MaskColor = Color{ Red = 0xff00; Green = 0x; Blue = 0xff00; };
+Prefix = "avl" ;
 IdList =
 {
 AVMEDIA_IMG_OPEN;
@@ -154,8 +152,7 @@ ImageList AVMEDIA_IMGLST_L
 
 ImageList AVMEDIA_IMGLST_HC
 {
-Prefix = "avh";
-MaskColor = Color{ Red = 0xff00; Green = 0x; Blue = 0xff00; };
+Prefix = "avh" ;
 IdList =
 {
 AVMEDIA_IMG_OPEN;
@@ -173,8 +170,7 @@ ImageList AVMEDIA_IMGLST_HC
 
 ImageList AVMEDIA_IMGLST_L_HC
 {
-Prefix = "avlh";
-MaskColor = Color{ Red = 0xff00; Green = 0x; Blue = 0xff00; };
+Prefix = "avlh" ;
 IdList =
 {
 AVMEDIA_IMG_OPEN;
@@ -187,3 +183,5 @@ ImageList AVMEDIA_IMGLST_L_HC
 };
 IdCount = 7;
 };
+
+// ** EOF
commit 99ff40a4a156daf370ec931a83097a8d03143053
Author: Matthias Seidel 
AuthorDate: Sat Apr 20 16:08:44 2019 +
Commit: Matthias Seidel 
CommitDate: Sat Apr 20 16:08:44 2019 +

Converted remaining AV graphics from indexed color to RGB

diff --git a/default_images/avmedia/res/avlh02053.png 
b/default_images/avmedia/res/avlh02053.png
index da66f475f95b..6070bed34859 100644
Binary files a/default_images/avmedia/res/avlh02053.png and 
b/default_images/avmedia/res/avlh02053.png differ
diff --git a/default_images/avmedia/res/avlh02054.png 
b/default_images/avmedia/res/avlh02054.png
index 79d29616c754..7f0ea17f0382 100644
Binary files a/default_images/avmedia/res/avlh02054.png and 
b/default_images/avmedia/res/avlh02054.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/framework default_images/introabout desktop/zipintro ooo_custom_images/dev

2019-03-16 Thread Libreoffice Gerrit user

 default_images/framework/res/dev/backing.png |binary
 default_images/framework/res/dev/backing_hc.png  |binary
 default_images/framework/res/dev/backing_rtl_left.png|binary
 default_images/framework/res/dev/backing_rtl_left_hc.png |binary
 default_images/introabout/dev/intro.png  |binary
 desktop/zipintro/makefile.mk |4 ++--
 dev/null |binary
 7 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fc47e30b340396afbba925c66f071d436be793ea
Author: Matthias Seidel 
AuthorDate: Sat Mar 16 14:23:47 2019 +
Commit: Matthias Seidel 
CommitDate: Sat Mar 16 14:23:47 2019 +

Relocate intro/about graphics for Developer Build from /ooo_custom_images 
to /default_images

diff --git a/ooo_custom_images/dev/introabout/about.png 
b/default_images/introabout/dev/about.png
similarity index 100%
rename from ooo_custom_images/dev/introabout/about.png
rename to default_images/introabout/dev/about.png
diff --git a/ooo_custom_images/dev/introabout/intro.png 
b/default_images/introabout/dev/intro.png
old mode 100755
new mode 100644
similarity index 100%
rename from ooo_custom_images/dev/introabout/intro.png
rename to default_images/introabout/dev/intro.png
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index 3a82e7725781..3e65dfcf7f93 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -32,8 +32,8 @@ TARGET=zipintro
 DEFAULT_FLAVOURS=dev dev_nologo nologo intro beta
 
 ZIP1LIST= \
-$(null,$(INTRO_BITMAPS) 
$(MISC)$/ooo_custom_images$/dev$/introabout$/intro.png $(INTRO_BITMAPS)) \
-$(null,$(ABOUT_BITMAPS) 
$(MISC)$/ooo_custom_images$/dev$/introabout$/about.png $(ABOUT_BITMAPS)) \
+$(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/dev$/intro.png 
$(INTRO_BITMAPS)) \
+$(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/dev$/about.png 
$(ABOUT_BITMAPS)) \
 $(MISC)$/$(RSCDEFIMG)$/introabout$/logo.png
 ZIP2LIST= \
 $(null,$(INTRO_BITMAPS) 
$(MISC)$/ooo_custom_images$/dev_nologo$/introabout$/intro.png $(INTRO_BITMAPS)) 
\
commit 372b3d210849aa125794ec044efa20763b5332d1
Author: Matthias Seidel 
AuthorDate: Sat Mar 16 13:45:27 2019 +
Commit: Matthias Seidel 
CommitDate: Sat Mar 16 13:45:27 2019 +

Updated graphics for Developer build.

diff --git a/default_images/framework/res/dev/backing.png 
b/default_images/framework/res/dev/backing.png
index 1de76d4114c1..03ea6fa27eb8 100644
Binary files a/default_images/framework/res/dev/backing.png and 
b/default_images/framework/res/dev/backing.png differ
diff --git a/default_images/framework/res/dev/backing_hc.png 
b/default_images/framework/res/dev/backing_hc.png
index 7c16a2e9b91b..50d42b4d35f8 100755
Binary files a/default_images/framework/res/dev/backing_hc.png and 
b/default_images/framework/res/dev/backing_hc.png differ
diff --git a/default_images/framework/res/dev/backing_rtl_left.png 
b/default_images/framework/res/dev/backing_rtl_left.png
index e4239921a77b..7655b6be2b23 100755
Binary files a/default_images/framework/res/dev/backing_rtl_left.png and 
b/default_images/framework/res/dev/backing_rtl_left.png differ
diff --git a/default_images/framework/res/dev/backing_rtl_left_hc.png 
b/default_images/framework/res/dev/backing_rtl_left_hc.png
index 0478a7335436..a22ba7803e93 100755
Binary files a/default_images/framework/res/dev/backing_rtl_left_hc.png and 
b/default_images/framework/res/dev/backing_rtl_left_hc.png differ
diff --git a/ooo_custom_images/dev/introabout/intro.png 
b/ooo_custom_images/dev/introabout/intro.png
index 7c60f941e9ab..be3933722b2e 100755
Binary files a/ooo_custom_images/dev/introabout/intro.png and 
b/ooo_custom_images/dev/introabout/intro.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - desktop/zipintro filter/source ooo_custom_images/dev

2019-03-10 Thread Libreoffice Gerrit user

 desktop/zipintro/makefile.mk   |   16 
 filter/source/pdf/impdialog.src|  826 ++---
 filter/source/pdf/pdf.src  |   35 -
 ooo_custom_images/dev/introabout/about.png |binary
 4 files changed, 425 insertions(+), 452 deletions(-)

New commits:
commit aa91b06c25d9a26f48942ca55f374a4178913adc
Author: Matthias Seidel 
AuthorDate: Sun Mar 10 09:03:03 2019 +
Commit: Matthias Seidel 
CommitDate: Sun Mar 10 09:03:03 2019 +

Added graphic for Developer build

diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index 9ff1751da478..3a82e7725781 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -1,5 +1,5 @@
 #**
-#  
+#
 #  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
@@ -7,16 +7,16 @@
 #  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
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**
 
 
@@ -27,13 +27,13 @@ PRJNAME=desktop
 TARGET=zipintro
 # --- Settings ---
 
-.INCLUDE :  settings.mk
+.INCLUDE : settings.mk
 
 DEFAULT_FLAVOURS=dev dev_nologo nologo intro beta
 
 ZIP1LIST= \
 $(null,$(INTRO_BITMAPS) 
$(MISC)$/ooo_custom_images$/dev$/introabout$/intro.png $(INTRO_BITMAPS)) \
-$(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png 
$(ABOUT_BITMAPS)) \
+$(null,$(ABOUT_BITMAPS) 
$(MISC)$/ooo_custom_images$/dev$/introabout$/about.png $(ABOUT_BITMAPS)) \
 $(MISC)$/$(RSCDEFIMG)$/introabout$/logo.png
 ZIP2LIST= \
 $(null,$(INTRO_BITMAPS) 
$(MISC)$/ooo_custom_images$/dev_nologo$/introabout$/intro.png $(INTRO_BITMAPS)) 
\
@@ -67,7 +67,7 @@ ZIP4DEPS=$(ZIP4LIST)
 ZIP5TARGET=beta_intro
 ZIP5DEPS=$(ZIP5LIST)
 
-.INCLUDE :  target.mk
+.INCLUDE : target.mk
 
 ALLTAR : $(foreach,i,$(DEFAULT_FLAVOURS) $(COMMONBIN)$/$i$/intro.zip)
 
@@ -103,3 +103,5 @@ $(MISC)$/%.bmp : $(SOLARSRC)$/%.bmp
 $(MISC)$/%.png : $(SOLARSRC)$/%.png
 @@-$(MKDIRHIER) $(@:d)
 $(COPY) $< $@
+
+# vim: set noet ts=4 sw=4:
diff --git a/ooo_custom_images/dev/introabout/about.png 
b/ooo_custom_images/dev/introabout/about.png
new file mode 100755
index ..a4b3a3b9f004
Binary files /dev/null and b/ooo_custom_images/dev/introabout/about.png differ
commit 4d4cce1760759d6b83f87bb8a7cb93218b2f3265
Author: Matthias Seidel 
AuthorDate: Sat Mar 9 13:21:34 2019 +
Commit: Matthias Seidel 
CommitDate: Sat Mar 9 13:21:34 2019 +

Cleaned up resource files for PDF export

diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index 9694b6e6edec..14b246f03fb3 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -24,98 +24,98 @@
 #include "impdialog.hrc"
 
 #define TAB_PDF_SIZE Size = MAP_APPFONT ( 352, 190 )
-//string for TabDialog standard buttons
+// string for TabDialog standard buttons
 String STR_PDF_EXPORT
 {
-Text[ en-US ] = "E~xport";
+Text [ en-US ] = "E~xport" ;
 };
 
-//strings used in encryption UI
+// strings used in encryption UI
 
-//password dialog title
+// password dialog title
 String STR_PDF_EXPORT_UDPWD
 {
-Text[ en-US ] = "Set open password";
+Text [ en-US ] = "Set open password" ;
 };
 
-//password dialog title
+// password dialog title
 String STR_PDF_EXPORT_ODPWD
 {
-Text[ en-US ] = "Set permission password";
+Text [ en-US ] = "Set permission password" ;
 };
 
 //
-//tab page for PDF Export, general preferences
-TabPage  RID_PDF_TAB_GENER
+// tab page for PDF Export, general preferences
+TabPage RID_PDF_TAB_GENER
 {
 HelpId = HID_FILTER_PDF_OPTIONS ;
 Hide = TRUE ;
-Text[ en-US ] = "General";
-TAB_PDF_SIZE;
+Text [ en-US ] = "General" ;
+TAB_PDF_SIZE ;
 
 FixedLine FL_PAGES
 {
-Pos = MAP_APPFONT ( 6 , 5 ) ;
-Size = MAP_APPFONT ( 164 , 8 ) ;
-Text[ en-US ] = "Range";
+Pos = MAP_APPFONT ( 6, 5 ) ;
+Size = MAP_APPFONT ( 164, 8 ) ;
+Text [ en-US ] = "Range" ;
 };
 RadioButton RB_ALL
 {
-HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_ALL";
-Pos = MAP_APPFONT ( 12 , 16 ) ;
-Size = MAP_APPFONT ( 158 , 10 ) ;
-

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - apple_remote/Library_AppleRemote.mk solenv/gbuild starmath/source

2019-02-20 Thread Libreoffice Gerrit user

 apple_remote/Library_AppleRemote.mk |3 
 solenv/gbuild/Library.mk|4 
 solenv/gbuild/LinkTarget.mk |   93 +++-
 solenv/gbuild/platform/macosx.mk|   23 
 starmath/source/smres.src   |  830 +---
 5 files changed, 530 insertions(+), 423 deletions(-)

New commits:
commit 2da607d7e099f4a651d4ee1d7c6c8673a166679e
Author: Jim Jagielski 
AuthorDate: Wed Feb 20 17:00:44 2019 +
Commit: Jim Jagielski 
CommitDate: Wed Feb 20 17:00:44 2019 +

Get apple_remote to build under gbuild, but still not yet working

(see dev@ thread)

diff --git a/apple_remote/Library_AppleRemote.mk 
b/apple_remote/Library_AppleRemote.mk
index 8c7aedd2679e..01e0385e3790 100644
--- a/apple_remote/Library_AppleRemote.mk
+++ b/apple_remote/Library_AppleRemote.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_libs,AppleRemote,\
-framework IOKit \
 ))
 
-$(eval $(call gb_Library_add_objcxxobjects,AppleRemote,\
+$(eval $(call gb_Library_add_objcobjects,AppleRemote,\
apple_remote/source/AppleRemote \
apple_remote/source/RemoteControl \
apple_remote/source/RemoteControlContainer \
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_add_objcxxobjects,AppleRemote,\
apple_remote/source/HIDRemoteControlDevice \
apple_remote/source/MultiClickRemoteBehavior \
apple_remote/source/RemoteMainController \
+   apple_remote/source/KeyspanFrontRowControl \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 591b5392a089..42c78fda2ba4 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -113,6 +113,8 @@ $(eval $(foreach method,\
add_cobjects \
add_cxxobject \
add_cxxobjects \
+   add_objcobject \
+   add_objcobjects \
add_objcxxobject \
add_objcxxobjects \
add_exception_objects \
@@ -125,6 +127,8 @@ $(eval $(foreach method,\
set_cflags \
add_cxxflags \
set_cxxflags \
+   add_objcflags \
+   set_objcflags \
add_objcxxflags \
set_objcxxflags \
add_defs \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index f19910e17bf2..c67c1c5f15f9 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -25,6 +25,7 @@
 # CPPFLAGS
 # CFLAGS
 # CXXFLAGS
+# OBJCFLAGS
 # OBJCXXFLAGS
 # JAVAFLAGS
 # LDFLAGS
@@ -34,11 +35,13 @@
 ifeq ($(gb_DEBUGGING),TRUE)
 CFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
 CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
+OBJCFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
 OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
 JAVAFLAGS ?= -g
 else
 CFLAGS ?= $(gb_COMPILEROPTFLAGS)
 CXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
+OBJCFLAGS ?= $(gb_COMPILEROPTFLAGS)
 OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
 endif
 
@@ -206,6 +209,38 @@ endif
 gb_GenCxxObject_GenCxxObject =
 
 
+
+# ObjCObject class
+#
+gb_ObjCObject_REPOS := $(gb_REPOS)
+
+gb_ObjCObject_get_source = $(1)/$(2).m
+# defined by platform
+#  gb_ObjCObject__command
+
+define gb_ObjCObject__rules
+$$(call gb_ObjCObject_get_target,%) : $$(call gb_ObjCObject_get_source,$(1),%)
+   $$(call gb_ObjCObject__command,$$@,$$*,$$<,$$(call 
gb_ObjCObject_get_dep_target,$$*))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$$(call gb_ObjCObject_get_dep_target,%) : $$(call gb_ObjCObject_get_target,%)
+   $$(if $$(wildcard $$@),touch $$@,\
+ $$(call gb_Object__command_dep,$$@,$$(call 
gb_ObjCObject_get_target,$$*)))
+endif
+
+endef
+
+$(foreach repo,$(gb_ObjCObject_REPOS),$(eval $(call 
gb_ObjCObject__rules,$(repo
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_ObjCObject_get_dep_target,%) :
+   $(eval $(call gb_Output_error,Unable to find Objective C file $(call 
gb_ObjCObject_get_source,,$*) in repositories: $(gb_ObjCObject_REPOS)))
+endif
+
+gb_ObjCObject_ObjCObject =
+
+
+
 # ObjCxxObject class
 #
 gb_ObjCxxObject_REPOS := $(gb_REPOS)
@@ -255,6 +290,8 @@ $(call gb_LinkTarget_get_clean_target,%) :
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_dep_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_dep_target,$(object))) \
+   $(foreach object,$(OBJCOBJECTS),$(call 
gb_ObjCObject_get_target,$(object))) \
+   $(foreach object,$(OBJCOBJECTS),$(call 
gb_ObjCObject_get_dep_target,$(object))) \
$(foreach object,$(OBJCXXOBJECTS),$(call 
gb_ObjCxxObject_get_target,$(object))) \
$(foreach object,$(OBJCXXOBJECTS),$(call 
gb_ObjCxxObject_get_dep_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
@@ -279,9 +316,10 @@ $(call gb_Helper_abbreviate_dirs,\
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
$(foreach object,$(3),$(call

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits -

2019-02-19 Thread Libreoffice Gerrit user

 0 files changed

New commits:
commit d423e4d9dcf6d5d247a016a6e508822b2b3a3abb
Author: Jim Jagielski 
AuthorDate: Tue Feb 19 20:43:17 2019 +
Commit: Jim Jagielski 
CommitDate: Tue Feb 19 20:43:17 2019 +

revert back to orig ObjC files

diff --git a/apple_remote/source/AppleRemote.mm 
b/apple_remote/source/AppleRemote.m
similarity index 100%
rename from apple_remote/source/AppleRemote.mm
rename to apple_remote/source/AppleRemote.m
diff --git a/apple_remote/source/GlobalKeyboardDevice.mm 
b/apple_remote/source/GlobalKeyboardDevice.m
similarity index 100%
rename from apple_remote/source/GlobalKeyboardDevice.mm
rename to apple_remote/source/GlobalKeyboardDevice.m
diff --git a/apple_remote/source/HIDRemoteControlDevice.mm 
b/apple_remote/source/HIDRemoteControlDevice.m
similarity index 100%
rename from apple_remote/source/HIDRemoteControlDevice.mm
rename to apple_remote/source/HIDRemoteControlDevice.m
diff --git a/apple_remote/source/KeyspanFrontRowControl.mm 
b/apple_remote/source/KeyspanFrontRowControl.m
similarity index 100%
rename from apple_remote/source/KeyspanFrontRowControl.mm
rename to apple_remote/source/KeyspanFrontRowControl.m
diff --git a/apple_remote/source/MultiClickRemoteBehavior.mm 
b/apple_remote/source/MultiClickRemoteBehavior.m
similarity index 100%
rename from apple_remote/source/MultiClickRemoteBehavior.mm
rename to apple_remote/source/MultiClickRemoteBehavior.m
diff --git a/apple_remote/source/RemoteControl.mm 
b/apple_remote/source/RemoteControl.m
similarity index 100%
rename from apple_remote/source/RemoteControl.mm
rename to apple_remote/source/RemoteControl.m
diff --git a/apple_remote/source/RemoteControlContainer.mm 
b/apple_remote/source/RemoteControlContainer.m
similarity index 100%
rename from apple_remote/source/RemoteControlContainer.mm
rename to apple_remote/source/RemoteControlContainer.m
diff --git a/apple_remote/source/RemoteMainController.mm 
b/apple_remote/source/RemoteMainController.m
similarity index 100%
rename from apple_remote/source/RemoteMainController.mm
rename to apple_remote/source/RemoteMainController.m
commit 7376b2a283b85f4d755fca64fcdc2d5ac4274648
Author: Jim Jagielski 
AuthorDate: Tue Feb 19 19:53:21 2019 +
Commit: Jim Jagielski 
CommitDate: Tue Feb 19 19:53:21 2019 +

ObjCxx files (actually ObjC but that's OK)

diff --git a/apple_remote/source/AppleRemote.m 
b/apple_remote/source/AppleRemote.mm
similarity index 100%
rename from apple_remote/source/AppleRemote.m
rename to apple_remote/source/AppleRemote.mm
diff --git a/apple_remote/source/GlobalKeyboardDevice.m 
b/apple_remote/source/GlobalKeyboardDevice.mm
similarity index 100%
rename from apple_remote/source/GlobalKeyboardDevice.m
rename to apple_remote/source/GlobalKeyboardDevice.mm
diff --git a/apple_remote/source/HIDRemoteControlDevice.m 
b/apple_remote/source/HIDRemoteControlDevice.mm
similarity index 100%
rename from apple_remote/source/HIDRemoteControlDevice.m
rename to apple_remote/source/HIDRemoteControlDevice.mm
diff --git a/apple_remote/source/KeyspanFrontRowControl.m 
b/apple_remote/source/KeyspanFrontRowControl.mm
similarity index 100%
rename from apple_remote/source/KeyspanFrontRowControl.m
rename to apple_remote/source/KeyspanFrontRowControl.mm
diff --git a/apple_remote/source/MultiClickRemoteBehavior.m 
b/apple_remote/source/MultiClickRemoteBehavior.mm
similarity index 100%
rename from apple_remote/source/MultiClickRemoteBehavior.m
rename to apple_remote/source/MultiClickRemoteBehavior.mm
diff --git a/apple_remote/source/RemoteControl.m 
b/apple_remote/source/RemoteControl.mm
similarity index 100%
rename from apple_remote/source/RemoteControl.m
rename to apple_remote/source/RemoteControl.mm
diff --git a/apple_remote/source/RemoteControlContainer.m 
b/apple_remote/source/RemoteControlContainer.mm
similarity index 100%
rename from apple_remote/source/RemoteControlContainer.m
rename to apple_remote/source/RemoteControlContainer.mm
diff --git a/apple_remote/source/RemoteMainController.m 
b/apple_remote/source/RemoteMainController.mm
similarity index 100%
rename from apple_remote/source/RemoteMainController.m
rename to apple_remote/source/RemoteMainController.mm
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - desktop/source officecfg/registry

2019-02-15 Thread Libreoffice Gerrit user

 desktop/source/migration/wizard.src|3 
++-
 officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu |6 
++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit ed04784ebca3aadda1c438c22b567e93d2c91da1
Author: Matthias Seidel 
AuthorDate: Fri Feb 15 21:38:52 2019 +
Commit: Matthias Seidel 
CommitDate: Fri Feb 15 21:38:52 2019 +

Sometimes the frame toolbar is missing from Writer when selecting a frame.

This should fix it.

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 0c2a00be3502..e7ed23a96050 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -304,6 +304,12 @@
 
 
 
+
+0,1
+
+
+0
+
 
 Frame
 
commit cd54f70ec9c5ab371cd26efb75545f97cd817119
Author: Matthias Seidel 
AuthorDate: Fri Feb 15 21:10:02 2019 +
Commit: Matthias Seidel 
CommitDate: Fri Feb 15 21:10:02 2019 +

This is no longer a registration wizard, so changing the wording.

diff --git a/desktop/source/migration/wizard.src 
b/desktop/source/migration/wizard.src
index f6be7c0055fb..4317906a2b00 100644
--- a/desktop/source/migration/wizard.src
+++ b/desktop/source/migration/wizard.src
@@ -82,7 +82,7 @@ String STR_WELCOME_MIGRATION
 
 String STR_WELCOME_WITHOUT_LICENSE
 {
-Text [ en-US ] = "This wizard will guide you through the registration of 
%PRODUCTNAME.\n\nClick 'Next' to continue.";
+Text [ en-US ] = "This wizard will guide you through the setup of 
%PRODUCTNAME.\n\nClick 'Next' to continue.";
 };
 
 String STR_FINISH
@@ -436,3 +436,4 @@ TabPage TP_REGISTRATION
 };
 };
 
+// ** EOF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - bean/java officecfg/registry

2019-02-12 Thread Libreoffice Gerrit user

 
bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java 
   |   15 +++--
 
bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
   |2 -
 
bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
 |1 
 officecfg/registry/data/org/openoffice/Office/UI/makefile.mk   
|   16 +-
 4 files changed, 14 insertions(+), 20 deletions(-)

New commits:
commit af053aa10a25381ca98b79134e98047e0bb36ed6
Author: Matthias Seidel 
AuthorDate: Tue Feb 12 10:40:56 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Feb 12 10:40:56 2019 +

Removed whitespace, added vim modeline

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk 
b/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
index f1b446db9b43..d7c5fd604a87 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
@@ -1,5 +1,5 @@
 #**
-#  
+#
 #  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
@@ -7,16 +7,16 @@
 #  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
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**
 
 
@@ -26,12 +26,11 @@ PRJNAME=officecfg
 TARGET=data_ooOUI
 PACKAGE=org.openoffice.Office.UI
 
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 
 # --- Targets --
 
-
 LOCALIZEDFILES= \
 BasicIDECommands.xcu \
 BibliographyCommands.xcu \
@@ -72,5 +71,6 @@ XCUFILES= \
 Factories.xcu \
 GlobalSettings.xcu
 
-.INCLUDE :  target.mk
+.INCLUDE : target.mk
 
+# vim: set noet ts=4 sw=4:
commit 0feda93d32f102aa538b4ff0cb6889c73e494d1b
Author: Matthias Seidel 
AuthorDate: Tue Feb 12 10:34:11 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Feb 12 10:34:11 2019 +

Removed whitespace, fixed typos

diff --git 
a/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
 
b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
index f6b198c8e8c2..89e5abc242ed 100644
--- 
a/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
+++ 
b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
@@ -23,14 +23,13 @@
 
 package com.sun.star.comp.beans;
 
-
 //---
-/** Helper class to watch calls into OOo with a timeout.
+/** Helper class to watch calls into AOO with a timeout.
  */
-//Do not add the thread instances to a threadgroup. When testing the bean in
-//an applet it turned out the the ThreadGroup was in an inconsistent state
-//after navigating off the site that contains the applet and back to it.
-//That was tested with a Sun JRE 1.4.2_06
+// Do not add the thread instances to a threadgroup. When testing the bean in
+// an applet it turned out the the ThreadGroup was in an inconsistent state
+// after navigating off the site that contains the applet and back to it.
+// That was tested with a Sun JRE 1.4.2_06
 public class CallWatchThread extends Thread
 {
 private static boolean DEBUG = false;
@@ -118,7 +117,3 @@ public class CallWatchThread extends Thread
 System.err.println( "OOoBean: " + aMessage );
 }
 }
-
-
-
-
diff --git 
a/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
 
b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
index ba8ab5b7fac3..f546739969c1 100644
--- 
a/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
+++ 
b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
@@ -26,7 +26,7 @@ package com.sun.star.comp.beans;
 import java.awt.Container;
 
 /**
- * This interface reprecents an AWT container factory.
+ * This interface represents an AWT container factory.
  *
  * @deprecated
  *
diff --git 
a/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
 
b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
index 8dbcf90b420d..f43bb2741ec2 100644
---

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - i18npool/Library_localedata_en.mk Module_ooo.mk ure/Makefile ure/Module_ure.mk ure/Package_services_rdb.mk ure/Package_ure.mk ure/Packa

2019-02-09 Thread Libreoffice Gerrit user

 Module_ooo.mk |1 
 i18npool/Library_localedata_en.mk |6 ++---
 ure/Makefile  |   32 +++
 ure/Module_ure.mk |   33 
 ure/Package_services_rdb.mk   |   35 ++
 ure/Package_ure.mk|   30 +
 ure/Package_uretest_zip.mk|   29 +
 ure/prj/build.lst |2 -
 ure/prj/d.lst |   10 
 ure/prj/makefile.mk   |   44 ++
 ure/source/services.input |   41 +++
 11 files changed, 249 insertions(+), 14 deletions(-)

New commits:
commit 3576a2b554fb699e7752c9c7bf6e48c8adad31d6
Author: Damjan Jovanovic 
AuthorDate: Sat Feb 9 16:02:33 2019 +
Commit: Damjan Jovanovic 
CommitDate: Sat Feb 9 16:02:33 2019 +

Port main/ure to gbuild.

Patch by: me

diff --git a/Module_ooo.mk b/Module_ooo.mk
index ac0723ea1c6a..77b30275d797 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -109,6 +109,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 unodevtools \
 unotools \
 unoxml \
+ure \
 uui \
 vbahelper \
 vcl \
diff --git a/ure/Makefile b/ure/Makefile
new file mode 100644
index ..c1d144cbd4c9
--- /dev/null
+++ b/ure/Makefile
@@ -0,0 +1,32 @@
+#**
+#  
+#  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
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath 
$(firstword $(MAKEFILE_LIST/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk
new file mode 100644
index ..ac93aea828a4
--- /dev/null
+++ b/ure/Module_ure.mk
@@ -0,0 +1,33 @@
+#**
+#  
+#  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
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**
+
+
+
+$(eval $(call gb_Module_Module,ure))
+
+$(eval $(call gb_Module_add_targets,ure,\
+   Package_services_rdb \
+   Package_ure \
+   Package_uretest_zip \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/ure/Package_services_rdb.mk b/ure/Package_services_rdb.mk
new file mode 100644
index ..f1cee1be0e63
--- /dev/null
+++ b/ure/Package_services_rdb.mk
@@ -0,0 +1,35 @@
+#**
+#  
+#  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
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - dtrans/source rsc/source

2019-02-05 Thread Libreoffice Gerrit user

 dtrans/source/inc/MtaOleClipb.hxx  |6 +++---
 dtrans/source/win32/mtaole/MtaOleClipb.cxx |   16 
 rsc/source/rscpp/cpp3.c|   10 +++---
 3 files changed, 14 insertions(+), 18 deletions(-)

New commits:
commit 7595a809d2a4aea9299633546ca95f709133dee8
Author: Damjan Jovanovic 
AuthorDate: Tue Feb 5 18:51:13 2019 +
Commit: Damjan Jovanovic 
CommitDate: Tue Feb 5 18:51:13 2019 +

Win64 fixes for dtrans.

Patch by: me

diff --git a/dtrans/source/inc/MtaOleClipb.hxx 
b/dtrans/source/inc/MtaOleClipb.hxx
index ea7f06506083..58400388cf6f 100644
--- a/dtrans/source/inc/MtaOleClipb.hxx
+++ b/dtrans/source/inc/MtaOleClipb.hxx
@@ -81,9 +81,9 @@ private:
 // from a different thread context!
 //---
 
-LRESULT  onSetClipboard( IDataObject* pIDataObject );
-LRESULT  onGetClipboard( LPSTREAM* ppStream );
-LRESULT  onFlushClipboard( );
+HRESULT  onSetClipboard( IDataObject* pIDataObject );
+HRESULT  onGetClipboard( LPSTREAM* ppStream );
+HRESULT  onFlushClipboard( );
 sal_Bool onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t 
pfncClipViewerCallback );
 
 // win32 clipboard-viewer support
diff --git a/dtrans/source/win32/mtaole/MtaOleClipb.cxx 
b/dtrans/source/win32/mtaole/MtaOleClipb.cxx
index 9a8f6557bb0d..c9214cbbdea9 100644
--- a/dtrans/source/win32/mtaole/MtaOleClipb.cxx
+++ b/dtrans/source/win32/mtaole/MtaOleClipb.cxx
@@ -540,16 +540,16 @@ sal_Bool CMtaOleClipboard::onRegisterClipViewer( 
LPFNC_CLIPVIEWER_CALLBACK_t pfn
 //
 //
 
-LRESULT CMtaOleClipboard::onSetClipboard( IDataObject* pIDataObject )
+HRESULT CMtaOleClipboard::onSetClipboard( IDataObject* pIDataObject )
 {
-return static_cast( OleSetClipboard( pIDataObject ) );
+return OleSetClipboard( pIDataObject );
 }
 
 //
 //
 //
 
-LRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream )
+HRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream )
 {
 OSL_ASSERT(NULL != ppStream);
 
@@ -562,16 +562,16 @@ LRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* 
ppStream )
 hr = MarshalIDataObjectInStream(pIDataObject.get(), ppStream);
 OSL_ENSURE(SUCCEEDED(hr), "marshalling cliboard data object failed");
 }
-return static_cast(hr);
+return hr;
 }
 
 //
 // flush the ole-clipboard
 //
 
-LRESULT CMtaOleClipboard::onFlushClipboard( )
+HRESULT CMtaOleClipboard::onFlushClipboard( )
 {
-return static_cast( OleFlushClipboard( ) );
+return OleFlushClipboard( );
 }
 
 //
@@ -585,7 +585,7 @@ LRESULT CMtaOleClipboard::onChangeCBChain( HWND hWndRemove, 
HWND hWndNext )
 else if ( IsWindow( m_hwndNextClipViewer ) )
 {
 // forward the message to the next one
-DWORD dwResult;
+DWORD_PTR dwResult;
 SendMessageTimeoutA(
 m_hwndNextClipViewer,
 WM_CHANGECBCHAIN,
@@ -620,7 +620,7 @@ LRESULT CMtaOleClipboard::onDrawClipboard( )
 // forward the message to the next viewer in the chain
 if ( IsWindow( m_hwndNextClipViewer ) )
 {
-DWORD dwResult;
+DWORD_PTR dwResult;
 SendMessageTimeoutA(
 m_hwndNextClipViewer,
 WM_DRAWCLIPBOARD,
commit 66620d1521b9d9a31ab5c552c268b2c55c4639c4
Author: Damjan Jovanovic 
AuthorDate: Tue Feb 5 18:08:21 2019 +
Commit: Damjan Jovanovic 
CommitDate: Tue Feb 5 18:08:21 2019 +

Use native time_t instead of a 32-bit-capped long, which breaks on Win64.

From source/rscpp/cppdef.h:
* OK_DATE  Predefines the compilation date if set TRUE.
*  Not permitted by the Nov. 12, 1984 Draft Standard.


In 1984 there might have been reason to doubt whether time_t will
exist on various systems, but in 2019 we can be certain that it does.

Patch by: me

diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c
index b7294d022ff5..1ee7b267ae91 100644
--- a/rsc/source/rscpp/cpp3.c
+++ b/rsc/source/rscpp/cpp3.c
@@ -20,10 +20,6 @@
  */
 
 
-#if defined(_MSC_VER) && (_MSC_VER > 1310)
-#define _USE_32BIT_TIME_T
-#endif
-
 #include
 #ifdef UNX
 #include
@@ -462,7 +458,7 @@ void initdefines()
 register char   *tp;
 register DEFBUF *dp;
 int i;
-longtvec;
+time_t  tvec;
 
 #if !defined( ZTC ) && !defined( WNT ) && !defined(BLC) && !defined(G3)
 extern char

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - i18npool/Executable_gencoll_rule.mk i18npool/Executable_genconv_dict.mk i18npool/Executable_gendict.mk i18npool/Executable_genindex_dat

2019-02-04 Thread Libreoffice Gerrit user

 Module_ooo.mk |1 
 Repository.mk |   16 +
 RepositoryExternal.mk |   54 +++-
 RepositoryFixes.mk|   28 --
 i18npool/Executable_gencoll_rule.mk   |   54 
 i18npool/Executable_genconv_dict.mk   |   45 +++
 i18npool/Executable_gendict.mk|   45 +++
 i18npool/Executable_genindex_data.mk  |   54 
 i18npool/Executable_saxparser.mk  |   73 ++
 i18npool/Library_collator_data.mk |   62 +
 i18npool/Library_dict_ja.mk   |   53 
 i18npool/Library_dict_zh.mk   |   53 
 i18npool/Library_i18nisolang1.mk  |   59 +
 i18npool/Library_i18npaper.mk |   60 +
 i18npool/Library_i18npool.mk  |  203 ++
 i18npool/Library_i18nsearch.mk|   67 +
 i18npool/Library_index_data.mk|   54 
 i18npool/Library_localedata_en.mk |  100 
 i18npool/Library_localedata_es.mk |   76 ++
 i18npool/Library_localedata_euro.mk   |  130 +++
 i18npool/Library_localedata_others.mk |  141 
 i18npool/Library_textconv_dict.mk |   66 +
 i18npool/Makefile |   32 ++
 i18npool/Module_i18npool.mk   |   81 +++
 i18npool/Package_inc.mk   |   28 ++
 i18npool/Package_version.mk   |   27 ++
 i18npool/Package_xml.mk   |   38 +++
 i18npool/inc/pch/precompiled_i18nisolang.cxx  |   25 ++
 i18npool/inc/pch/precompiled_i18nisolang.hxx  |   28 ++
 i18npool/inc/pch/precompiled_i18npaper.cxx|   25 ++
 i18npool/inc/pch/precompiled_i18npaper.hxx|   28 ++
 i18npool/inc/pch/precompiled_search.cxx   |   25 ++
 i18npool/inc/pch/precompiled_search.hxx   |   28 ++
 i18npool/prj/build.lst|   26 --
 i18npool/prj/d.lst|   52 
 i18npool/prj/makefile.mk  |   44 +++
 i18npool/source/breakiterator/gendict.cxx |   10 
 i18npool/source/breakiterator/makefile.mk |2 
 i18npool/source/collator/gencoll_rule.cxx |2 
 i18npool/source/indexentry/genindex_data.cxx  |2 
 i18npool/source/isolang/insys.cxx |2 
 i18npool/source/isolang/inunx.cxx |2 
 i18npool/source/isolang/inwnt.cxx |2 
 i18npool/source/isolang/isolang.cxx   |2 
 i18npool/source/isolang/mslangid.cxx  |2 
 i18npool/source/localedata/filewriter.cxx |   16 -
 i18npool/source/registerservices/registerservices.cxx |4 
 i18npool/source/search/levdis.cxx |2 
 i18npool/source/search/textsearch.cxx |6 
 i18npool/source/textconversion/genconv_dict.cxx   |   42 +--
 icu/icuversion.mk |6 
 lingucomponent/Library_spell.mk   |6 
 postprocess/packcomponents/makefile.mk|4 
 solenv/gbuild/Executable.mk   |1 
 solenv/gbuild/Library.mk  |2 
 solenv/gbuild/LinkTarget.mk   |   53 
 solenv/gbuild/StaticLibrary.mk|1 
 solenv/gbuild/TargetLocations.mk  |2 
 solenv/gbuild/platform/freebsd.mk |5 
 solenv/gbuild/platform/linux.mk   |5 
 solenv/gbuild/platform/macosx.mk  |5 
 solenv/gbuild/platform/os2.mk |5 
 solenv/gbuild/platform/solaris.mk |5 
 solenv/gbuild/platform/windows.mk |4 
 solenv/gbuild/platform/winmingw.mk|6 
 tools/inc/tools/stream.hxx|2 
 tools/source/stream/strmunx.cxx   |2 
 67 files changed, 2018 insertions(+), 173 deletions(-)

New commits:
commit ff3d5a2c5bafdafae641c7e7287df67c182767ef
Author: Damjan Jovanovic 
AuthorDate: Tue Feb 5 05:54:10 2019 +
Commit: Damjan Jovanovic 
CommitDate: Tue Feb 5 05:54:10 2019 +

Stream file handles have to be 64 bits to support Win64.

Patch by: me

diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 9466b261f592..2e859196d433 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -733,7 +733,7 @@ private:
 String  aFilename;
 sal_uInt16

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - odk/source sal/osl

2019-01-31 Thread Libreoffice Gerrit user

 odk/source/unoapploader/unx/unoapploader.c |8 
 sal/osl/unx/nlsupport.c|   11 +++
 2 files changed, 19 insertions(+)

New commits:
commit b0b289f53eb1fca99aefc4e6f97e0ce612ca86dc
Author: Jim Jagielski 
AuthorDate: Thu Jan 31 17:36:53 2019 +
Commit: Jim Jagielski 
CommitDate: Thu Jan 31 17:36:53 2019 +

Additional env setup for https://bz.apache.org/ooo/show_bug.cgi?id=127966 
fix

diff --git a/odk/source/unoapploader/unx/unoapploader.c 
b/odk/source/unoapploader/unx/unoapploader.c
index 1fb1540134f3..0152badd0db3 100644
--- a/odk/source/unoapploader/unx/unoapploader.c
+++ b/odk/source/unoapploader/unx/unoapploader.c
@@ -220,6 +220,14 @@ int main( int argc, char *argv[] )
 }
 strcat( envstr, "/usr/local/bin" ); /* We are adding at the end */
 putenv( envstr );
+
+/* https://bz.apache.org/ooo/show_bug.cgi?id=127966 */
+value = getenv ( "HOME" );
+if ( value && *value ) {
+  chdir ( value );
+} else {
+chdir ( "/tmp" );
+}
 #endif
 }
 else
commit 485bdc2130fb47589186076235c534ba8f10d6f6
Author: Jim Jagielski 
AuthorDate: Thu Jan 31 17:34:26 2019 +
Commit: Jim Jagielski 
CommitDate: Thu Jan 31 17:34:26 2019 +

Fix https://bz.apache.org/ooo/show_bug.cgi?id=127966 in a location where we 
know environments are setup

Set the CWD to $HOME or to /tmp as a backup on macOS

diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index dc640a38ce7c..0a4c47eef172 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -878,6 +878,9 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
  * we need to update PATH on macOS. Doing it here ensures
  * that it's done but it's not the right location to be doing
  * this.
+ *
+ * Also address https://bz.apache.org/ooo/show_bug.cgi?id=127966
+ * here as well :/
  */
 opath = getenv ( "PATH" );
 slen = strlen( "/usr/local/bin" ) + 1;
@@ -893,6 +896,14 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
 setenv("PATH", npath, 1 );
 free(npath);
 
+/* https://bz.apache.org/ooo/show_bug.cgi?id=127966 */
+opath = getenv ( "HOME" );
+if ( opath && *opath ) {
+chdir ( opath );
+} else {
+chdir ( "/tmp" );
+}
+
 #ifdef DEBUG
 fprintf( stderr, "nlsupport.c:  _imp_getProcessLocale() returning %s as 
current locale.\n", locale );
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - automation/inc default_images/formula

2019-01-29 Thread Libreoffice Gerrit user

 automation/inc/automation/commdefines.hxx |   10 +-
 default_images/formula/res/fapopen.png|binary
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a2fb9e962b539d4fe2f86c46dcba5af4c000780a
Author: Matthias Seidel 
AuthorDate: Tue Jan 29 12:17:12 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Jan 29 12:17:12 2019 +

Fixed icon (file open -> opened folder)

diff --git a/default_images/formula/res/fapopen.png 
b/default_images/formula/res/fapopen.png
index 832c09c40634..2492a6ca63cb 100644
Binary files a/default_images/formula/res/fapopen.png and 
b/default_images/formula/res/fapopen.png differ
commit d1d0ca794f6f8f84fa397a9a5792bb772750cb89
Author: Matthias Seidel 
AuthorDate: Tue Jan 29 11:07:22 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Jan 29 11:07:22 2019 +

Fixed typos

diff --git a/automation/inc/automation/commdefines.hxx 
b/automation/inc/automation/commdefines.hxx
index 090112ac0052..9831460cdde3 100644
--- a/automation/inc/automation/commdefines.hxx
+++ b/automation/inc/automation/commdefines.hxx
@@ -24,7 +24,7 @@
 /*
  *
  *ATTENTION
- *This file is intended to work inside and outside the StarOffice 
environment.
+ *This file is intended to work inside and outside the OpenOffice 
environment.
  *Only adaption of file commtypes.hxx should be necessary. Else it is a 
bug!
  *
  /
@@ -86,11 +86,11 @@
 #endif // OSL_LITENDIAN
 
 /**
-Es gibt zwei arten von Datenpaketen
-die erste enth�lt in den ersten 4 Byte die L�ngenangabe und in den 
Darauffolgenden die Daten
+Es gibt zwei Arten von Datenpaketen
+Die erste enth�lt in den ersten 4 Byte die L�ngenangabe und in den 
darauffolgenden die Daten.
 Die L�ngenangabe bezieht sich nur auf die Daten ohne die L�ngenangabe 
selbst.
 
-Die Zweite Art von Datenpaketen enth�lt Header mit weitere Informationen
+Die zweite Art von Datenpaketen enth�lt Header mit weiteren Informationen
 wie unten beschrieben.
 
 Umgeschaltet wird mit dem Boolean bUseMultiChannel im Konstruktor des 
Managers.
@@ -136,7 +136,7 @@ typedef comm_USHORT CommunicationOption;
 #define CH_SUPPORT_OPTIONS  ((HandshakeType)0x0103)
 #define OPT_USE_SHUTDOWN_PROTOCOL   ((CommunicationOption)0x0001)
 
-/// these are for making sure all Data is read prior to shutting sown the link
+/// these are for making sure all Data is read prior to shutting down the link
 #define CH_REQUEST_ShutdownLink ((HandshakeType)0x0104) /// Request to 
Shutdown this link
 #define CH_ShutdownLink ((HandshakeType)0x0105) /// Shutdown this 
link
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - bridges/Library_cpp_uno.mk bridges/source qadevOOo/makefile.mk solenv/gbuild

2019-01-25 Thread Libreoffice Gerrit user

 bridges/Library_cpp_uno.mk   |   21 
 bridges/source/cpp_uno/msvc_win64_x86-64/abi.cxx |   90 ++
 bridges/source/cpp_uno/msvc_win64_x86-64/abi.hxx |   46 +
 bridges/source/cpp_uno/msvc_win64_x86-64/call.asm|  249 +++
 bridges/source/cpp_uno/msvc_win64_x86-64/cpp2uno.cxx |  592 
 bridges/source/cpp_uno/msvc_win64_x86-64/dllinit.cxx |   54 +
 bridges/source/cpp_uno/msvc_win64_x86-64/except.cxx  |  663 +++
 bridges/source/cpp_uno/msvc_win64_x86-64/mscx.hxx|   53 +
 bridges/source/cpp_uno/msvc_win64_x86-64/uno2cpp.cxx |  365 ++
 qadevOOo/makefile.mk |2 
 solenv/gbuild/platform/windows.mk|5 
 11 files changed, 2139 insertions(+), 1 deletion(-)

New commits:
commit 7c094e8e0f0e5e9aa2951207e831160e12031e12
Author: Damjan Jovanovic 
AuthorDate: Sat Jan 26 01:17:44 2019 +
Commit: Damjan Jovanovic 
CommitDate: Sat Jan 26 01:17:44 2019 +

Fix building with Java 9, which doesn't support "-source 1.5" any more.

Our baseline is Java 7 anyway.

Patch by: me

diff --git a/qadevOOo/makefile.mk b/qadevOOo/makefile.mk
index 98322c699639..2e19a2493676 100644
--- a/qadevOOo/makefile.mk
+++ b/qadevOOo/makefile.mk
@@ -37,7 +37,7 @@ TST:
 
 .IF "$(SOLAR_JAVA)"=="TRUE"
 .IF "$(ANT_HOME)"!="NO_ANT_HOME"
-ANT_FLAGS+=-Dbuild.source=1.5
+ANT_FLAGS+=-Dbuild.source=1.6
 .IF "$(L10N_framework)"==""
 ALLTAR: ANTBUILD
 .ENDIF
commit 372333a4072053843b2be7521dc393e744422ad9
Author: Damjan Jovanovic 
AuthorDate: Sat Jan 26 01:15:17 2019 +
Commit: Damjan Jovanovic 
CommitDate: Sat Jan 26 01:15:17 2019 +

Add a preliminary Windows AMD64 UNO-C++ bridge.

Largely based on a mixture of the Linux64 and Win32 bridges,
with significant AMD64 assembly language also used, it was
challenging to develop but luckily not too long.

Some links and stacks/register diagrams have been left
in the code for easy reference.

It compiles and links, but how well it works remains to be tested. At
least it's no longer holding up the Win64 port. The exception handling
is the least certain, although stack alignments for the assembly language
could also have issues.

Also patched gbuild to use the 64 bit MASM for building assembly language
files on Win64.

Patch by: me

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index e4c214a4bb1a..cec9f012e38d 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -608,6 +608,27 @@ $(eval $(call gb_Library_add_defs,$(COMNAME)_uno,\
 ))
 endif
 
+#
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),WNT-X86_64-mscx)
+#
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+   bridges/source/cpp_uno/msvc_win64_x86-64/abi \
+   bridges/source/cpp_uno/msvc_win64_x86-64/cpp2uno \
+   bridges/source/cpp_uno/msvc_win64_x86-64/dllinit \
+   bridges/source/cpp_uno/msvc_win64_x86-64/except \
+   bridges/source/cpp_uno/msvc_win64_x86-64/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+   bridges/source/cpp_uno/msvc_win64_x86-64/except \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+$(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
+   bridges/source/cpp_uno/msvc_win64_x86-64/call \
+))
+
 #
 else
 #
diff --git a/bridges/source/cpp_uno/msvc_win64_x86-64/abi.cxx 
b/bridges/source/cpp_uno/msvc_win64_x86-64/abi.cxx
new file mode 100644
index ..a909bdde9c41
--- /dev/null
+++ b/bridges/source/cpp_uno/msvc_win64_x86-64/abi.cxx
@@ -0,0 +1,90 @@
+/**
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_bridges.hxx"
+
+#include "abi.hxx"
+
+#include 
+
+using namespace x86_64;
+
+bool x86_64::return_in_hidden_param(

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sal/osl

2019-01-25 Thread Libreoffice Gerrit user

 sal/osl/unx/nlsupport.c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2a8c9c8197a8ca209ba42aa95fce0b0736ae41f1
Author: Jim Jagielski 
AuthorDate: Fri Jan 25 13:42:54 2019 +
Commit: Jim Jagielski 
CommitDate: Fri Jan 25 13:42:54 2019 +

save some cycles

diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index 4832e1874b5c..dc640a38ce7c 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -883,7 +883,8 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
 slen = strlen( "/usr/local/bin" ) + 1;
 if ( opath != NULL )
 slen += strlen( ":" ) + strlen( opath );
-npath = calloc( slen );
+npath = malloc( slen );
+*npath = '\0';
 if ( opath != NULL ) {
 strcat( npath, opath );
 strcat( npath, ":" );
commit 004f5594fb4f54494eab3991c34c43c70a9521d7
Author: Jim Jagielski 
AuthorDate: Fri Jan 25 13:17:40 2019 +
Commit: Jim Jagielski 
CommitDate: Fri Jan 25 13:17:40 2019 +

ensure NULL

diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index 0f3dd7f17747..4832e1874b5c 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -883,7 +883,7 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
 slen = strlen( "/usr/local/bin" ) + 1;
 if ( opath != NULL )
 slen += strlen( ":" ) + strlen( opath );
-npath = malloc( slen );
+npath = calloc( slen );
 if ( opath != NULL ) {
 strcat( npath, opath );
 strcat( npath, ":" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extras/source solenv/bin

2019-01-24 Thread Libreoffice Gerrit user

 extras/source/templates/presnt/lang/bg/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/bg/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/cs/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/cs/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/da/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/da/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/de/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/de/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/en-GB/prs-novelty.otp  |binary
 extras/source/templates/presnt/lang/en-GB/prs-strategy.otp |binary
 extras/source/templates/presnt/lang/en-US/prs-novelty.otp  |binary
 extras/source/templates/presnt/lang/en-US/prs-strategy.otp |binary
 extras/source/templates/presnt/lang/es/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/es/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/eu/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/eu/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/fr/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/fr/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/hu/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/hu/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/it/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/it/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/ja/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/ja/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/km/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/km/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/ko/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/ko/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/lt/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/lt/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/nl/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/nl/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/pl/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/pl/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/pt-BR/prs-novelty.otp  |binary
 extras/source/templates/presnt/lang/pt-BR/prs-strategy.otp |binary
 extras/source/templates/presnt/lang/pt/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/pt/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/ru/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/ru/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/sk/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/sk/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/sl/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/sl/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/sv/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/sv/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/tr/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/tr/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/vi/prs-novelty.otp |binary
 extras/source/templates/presnt/lang/vi/prs-strategy.otp|binary
 extras/source/templates/presnt/lang/zh-CN/prs-novelty.otp  |binary
 extras/source/templates/presnt/lang/zh-CN/prs-strategy.otp |binary
 extras/source/templates/presnt/lang/zh-TW/prs-novelty.otp  |binary
 extras/source/templates/presnt/lang/zh-TW/prs-strategy.otp |binary
 solenv/bin/modules/installer/strip.pm  |4 ++--
 55 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e50d4c88a194dccc2b3de451503a10903e3ab006
Author: Matthias Seidel 
AuthorDate: Thu Jan 24 10:33:06 2019 +
Commit: Matthias Seidel 
CommitDate: Thu Jan 24 10:33:06 2019 +

Removed whitespace

diff --git a/solenv/bin/modules/installer/strip.pm 
b/solenv/bin/modules/installer/strip.pm
index d821caa5e415..e9a333da29a3 100644
--- a/solenv/bin/modules/installer/strip.pm
+++ b/solenv/bin/modules/installer/strip.pm
@@ -79,7 +79,7 @@ sub do_strip
 }
 
 #
-# Resolving all variables in the packagename.
+# Resolving all variables in the packagename
 #
 
 sub strip_libraries
@@ -116,7 +116,7 @@ sub strip_libraries
 if ($onelanguage eq "") { $onelanguage = "00"; }
 
 my $strippeddir = $strippeddirbase . 
$installer::globals::separator . $onelanguage;
-installer::systemactions::create_directory($strippeddir);   # 
creating language specific subdirectories
+installer::systemactions::create_directory($strippeddir); # 
creating language specific subdirectories
 
 my

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - set_soenv.in setup_native/scripts solenv/bin sysui/desktop

2019-01-16 Thread Libreoffice Gerrit user

 set_soenv.in |1 +
 setup_native/scripts/source/getuid.c |7 ---
 solenv/bin/modules/installer/download.pm |   22 +++---
 solenv/bin/modules/installer/epmfile.pm  |   16 +---
 solenv/bin/modules/installer/worker.pm   |   14 --
 sysui/desktop/debian/makefile.mk |8 +++-
 6 files changed, 56 insertions(+), 12 deletions(-)

New commits:
commit 25ff67a743487f42a43079c261c3f0b01824d5b6
Author: Jim Jagielski 
AuthorDate: Wed Jan 16 14:33:38 2019 +
Commit: Jim Jagielski 
CommitDate: Wed Jan 16 14:33:38 2019 +

As long as we have the full path, use it

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index 0f75e7b138d1..7142f69df2d0 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -305,7 +305,7 @@ sub tar_package
 my $ldpreloadstring = "";
 
 if ($ENV{'FAKEROOT'} ne "no") {
-$ldpreloadstring = "fakeroot"
+$ldpreloadstring = $ENV{'FAKEROOT'};
 } else {
 if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . 
$getuidlibrary; }
 }
@@ -376,7 +376,7 @@ sub create_tar_gz_file_from_package
 my $ldpreloadstring = "";
 
 if ($ENV{'FAKEROOT'} ne "no") {
-$ldpreloadstring = "fakeroot"
+$ldpreloadstring = $ENV{'FAKEROOT'};
 } else {
 if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . 
$getuidlibrary; }
 }
@@ -801,7 +801,7 @@ sub create_tar_gz_file_from_directory
 my $ldpreloadstring = "";
 
 if ($ENV{'FAKEROOT'} ne "no") {
-$ldpreloadstring = "fakeroot"
+$ldpreloadstring = $ENV{'FAKEROOT'};
 } else {
 if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . 
$getuidlibrary; }
 }
diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index 87a42f891968..f5cdd055e3b4 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -893,7 +893,7 @@ sub get_ld_preload_string
 
 if ($ENV{'FAKEROOT'} ne "no") {
 
-$ldpreloadstring = "fakeroot"
+$ldpreloadstring = $ENV{'FAKEROOT'};
 
 } else {
 
diff --git a/solenv/bin/modules/installer/worker.pm 
b/solenv/bin/modules/installer/worker.pm
index 4046ad83e937..1849d4359012 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -3201,7 +3201,7 @@ sub tar_package
 my $ldpreloadstring = "";
 
 if ($ENV{'FAKEROOT'} ne "no") {
-$ldpreloadstring = "fakeroot"
+$ldpreloadstring = $ENV{'FAKEROOT'};
 } else {
 if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . 
$getuidlibrary; }
 }
@@ -3245,7 +3245,7 @@ sub untar_package
 my $ldpreloadstring = "";
 
 if ($ENV{'FAKEROOT'} ne "no") {
-$ldpreloadstring = "fakeroot"
+$ldpreloadstring = $ENV{'FAKEROOT'};
 } else {
 if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . 
$getuidlibrary; }
 }
diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk
index 8ca9a0b30716..afed0c828171 100644
--- a/sysui/desktop/debian/makefile.mk
+++ b/sysui/desktop/debian/makefile.mk
@@ -46,7 +46,7 @@ DEBFILES=$(foreach,i,{$(PRODUCTLIST)} 
$(PKGDIR)$/$i4.2-$(TARGET)-menus_$(PKGVERS
 .ENDIF
 
 .IF "$(FAKEROOT)"!="no"
-FAKEROOT2="fakeroot"
+FAKEROOT2="$(FAKEROOT)"
 .ELSE
 FAKEROOT2="LD_PRELOAD=$(SOLARBINDIR)/getuid.so"
 .ENDIF
commit 741beaedaf0e14867cabf1b0181bc98c05dc662e
Author: Jim Jagielski 
AuthorDate: Wed Jan 16 13:50:09 2019 +
Commit: Jim Jagielski 
CommitDate: Wed Jan 16 13:50:09 2019 +

Use fakeroot instead of our custom getuid.c LD_PRELOAD hack if available 
when creating Debian packages. This is because epm and dpkg (et.al.) need to be 
fooled into thinking that root is creating these packages for the correct 
permissions.

diff --git a/set_soenv.in b/set_soenv.in
index 00c09466b9a1..5f75d3c3aad7 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1806,6 +1806,7 @@ ToFile( "ENABLE_HYPHEN",  "@ENABLE_HYPHEN@", "e" );
 ToFile( "PERL",  $PERL,  "e" );
 ToFile( "RPM",   "@RPM@","e" );
 ToFile( "DPKG",  "@DPKG@",   "e" );
+ToFile( "FAKEROOT",  "@FAKEROOT@",   "e" );
 ToFile( "PKGMK", "@PKGMK@",  "e" );
 ToFile( "GNUMAKE",   "@GNUMAKE@","e" );
 ToFile( "GNUTAR","@GNUTAR@", "e" );
diff --git a/setup_native/scripts/source/getuid.c 
b/setup_native/scripts/source/getuid.c
index 7417c3018212..33f52b9bb22a 100644
--- a/setup_native/scripts/source/getuid.c
+++ b/setup_native/scripts/source/getuid.c
@@ -111,10 +111,11 @@ int fstatat64(int fildes, const char *path, struct stat64 
 *buf, int flag)
 }
 #elif  defined LINUX
 
-uid_t getuid  (void) {return 0;}
-uid_t geteuid (void) {return 0;}

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - vcl/inc vcl/os2

2019-01-13 Thread Libreoffice Gerrit user

 vcl/inc/unx/x11_cursors/assw_mask.h |   10 +-
 vcl/os2/source/src/chain.ptr|binary
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0906c985dbb1ab292155d1b7eb2b1908fbf6752d
Author: Matthias Seidel 
AuthorDate: Sun Jan 13 18:39:03 2019 +
Commit: Matthias Seidel 
CommitDate: Sun Jan 13 18:39:03 2019 +

OS/2 has black pointer

diff --git a/vcl/os2/source/src/chain.ptr b/vcl/os2/source/src/chain.ptr
index 13a0aa2440ff..8ac5f9032357 100644
Binary files a/vcl/os2/source/src/chain.ptr and b/vcl/os2/source/src/chain.ptr 
differ
commit 81b26cc1eccd270591f1ad741dde24f9ec4004c6
Author: Matthias Seidel 
AuthorDate: Sun Jan 13 18:02:13 2019 +
Commit: Matthias Seidel 
CommitDate: Sun Jan 13 18:02:13 2019 +

Corrected mask for X11 pointer (autoscroll south west)

diff --git a/vcl/inc/unx/x11_cursors/assw_mask.h 
b/vcl/inc/unx/x11_cursors/assw_mask.h
index 0c629f20cf7e..4b2780170ff7 100644
--- a/vcl/inc/unx/x11_cursors/assw_mask.h
+++ b/vcl/inc/unx/x11_cursors/assw_mask.h
@@ -29,8 +29,8 @@ static const unsigned char assw_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x0e,0x00,0x00,0x00,0x1f,0x00,0x00,0x00,0x1f,0x00,0x00,0x10,0x1f,
- 0x00,0x00,0x18,0x0e,0x00,0x00,0x38,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0xfc,
- 0x00,0x00,0x00,0xfc,0x03,0x00,0x00,0xfc,0x01,0x00,0x00,0x3c,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x00,
+ 0x00,0x00,0x1F,0x00,0x00,0x80,0x3F,0x00,0x00,0x90,0x3F,0x00,0x00,0xB8,0x3F,
+ 0x00,0x00,0x3C,0x1F,0x00,0x00,0x7C,0x0E,0x00,0x00,0xFC,0x00,0x00,0x00,0xFE,
+ 0x03,0x00,0x00,0xFE,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xFE,0x01,0x00,0x00,
+ 0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cppuhelper/source cppu/prj cppu/util desktop/source mysqlc/source odk/setsdkenv_unix.sh.in odk/settings salhelper/source sal/inc sal/pr

2019-01-11 Thread Libreoffice Gerrit user

 cppu/prj/d.lst |4 +-
 cppu/util/makefile.mk  |2 -
 cppuhelper/source/makefile.mk  |4 +-
 desktop/source/deployment/misc/dp_platform.cxx |2 -
 mysqlc/source/makefile.mk  |2 -
 odk/setsdkenv_unix.sh.in   |   39 +
 odk/settings/settings.mk   |   16 +-
 sal/inc/osl/module.h   |2 -
 sal/prj/d.lst  |3 -
 sal/util/makefile.mk   |2 +
 salhelper/source/makefile.mk   |2 -
 scp2/inc/macros.inc|2 +
 scp2/source/ooo/ure.scp|   36 +++
 solenv/bin/macosx-change-install-names.pl  |4 +-
 solenv/gbuild/platform/macosx.mk   |   20 +---
 solenv/inc/unxmacc.mk  |   10 ++
 solenv/inc/unxmacx.mk  |   10 ++
 store/util/makefile.mk |2 +
 vcl/win/source/src/assw.cur|binary
 19 files changed, 101 insertions(+), 61 deletions(-)

New commits:
commit 1170f10906a9bca78782df6ab1b6a4e20cf0435a
Author: Matthias Seidel 
AuthorDate: Fri Jan 11 22:52:36 2019 +
Commit: Matthias Seidel 
CommitDate: Fri Jan 11 22:52:36 2019 +

Corrected hotspot for pointer (autoscroll south west)

diff --git a/vcl/win/source/src/assw.cur b/vcl/win/source/src/assw.cur
index fddaf3f57cbf..46ee06d16849 100644
Binary files a/vcl/win/source/src/assw.cur and b/vcl/win/source/src/assw.cur 
differ
commit c50f8b48d9c8ffac93ce8ba682bb7102d2d173f6
Author: Jim Jagielski 
AuthorDate: Fri Jan 11 21:44:17 2019 +
Commit: Jim Jagielski 
CommitDate: Fri Jan 11 21:44:17 2019 +

Get macOS building and packaging again. Following changes/fixes:

o Stop pretending/forcing *Nix shared lib versioning on macOS
o Use smaller and more easily manageable temp temps by leveraging 
--headerpad dyld option
o misc gbuild fixes

diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst
index 6775c0353218..13d0d15f50c4 100644
--- a/cppu/prj/d.lst
+++ b/cppu/prj/d.lst
@@ -57,10 +57,12 @@ mkdir: %_DEST%\inc%_EXT%\uno
 ..\%__SRC%\lib\cppu*.lib %_DEST%\lib%_EXT%\*
 ..\%__SRC%\bin\cppu* %_DEST%\bin%_EXT%\*
 ..\%__SRC%\lib\libuno_cppu.*.* %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libuno_cppu.dylib %_DEST%\lib%_EXT%\libuno_cppu.dylib
 
 ..\%__SRC%\lib\ipurpenvhelper*%_DEST%\lib%_EXT%\*
 ..\%__SRC%\bin\purpe*.dll %_DEST%\bin%_EXT%\*
 ..\%__SRC%\lib\libuno_purpenvhelper*.*.* %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libuno_purpenvhelper*.dylib %_DEST%\lib%_EXT%\*
 
 ..\%__SRC%\bin\unsafe_u*.dll%_DEST%\bin%_EXT%\*
 ..\%__SRC%\lib\libunsafe_uno_uno.*%_DEST%\lib%_EXT%\*
@@ -72,4 +74,4 @@ mkdir: %_DEST%\inc%_EXT%\uno
 ..\%__SRC%\lib\liblog_uno_uno.*   %_DEST%\lib%_EXT%\*
 
 linklib: libuno_cppu.*.*
-linklib: libuno_purpenvhelper*.*.*
+linklib: libuno_purpenvhelper*.*.*
\ No newline at end of file
diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk
index 46ee6ab0650c..26937bbc69d0 100644
--- a/cppu/util/makefile.mk
+++ b/cppu/util/makefile.mk
@@ -28,7 +28,7 @@ USE_DEFFILE=TRUE
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 
-.IF "$(OS)" != "WNT" && "$(OS)" != "OS2"
+.IF "$(OS)" != "WNT" && "$(OS)" != "OS2" && "$(OS)" != "MACOSX"
 UNIXVERSIONNAMES=UDK
 .ENDIF
 
diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk
index 325201006fe3..68d7413b064a 100644
--- a/cppuhelper/source/makefile.mk
+++ b/cppuhelper/source/makefile.mk
@@ -34,9 +34,9 @@ VISIBILITY_HIDDEN=TRUE
 # without "-L" (light) switch
 BOOTSTRAP_SERVICE=TRUE
 
-.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2"
+.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2" && "$(OS)" != "MACOSX"
 UNIXVERSIONNAMES=UDK
-.ENDIF # WNT
+.ENDIF # WNT OS2 MACOSX
 
 # --- Settings -
 
diff --git a/desktop/source/deployment/misc/dp_platform.cxx 
b/desktop/source/deployment/misc/dp_platform.cxx
index 9259981c6f53..2c2c15d2bc3e 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -180,7 +180,7 @@ namespace
 else if (token.equals(OUSTR(PLATFORM_MACOSX_X86)))
 ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86"));
 else if (token.equals(OUSTR(PLATFORM_MACOSX_X86_64)))
-ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("X86_64"));
+ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86_64"));
 else if (token.equals(OUSTR(PLATFORM_MACOSX_PPC)))
 ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("PowerPC"));
 else if (token.equals(OUSTR(PLATFORM_OS2_X86)))
diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk
index 35d8fde775a4..0e29eea1ab11 100644
--- a/mysqlc/source/makefile.mk
+++ b/mysqlc/source/makefile.mk
@@ -285,7 +285,7 @@

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cpputools/Executable_regcomp.mk cpputools/Executable_regsingleton.mk cpputools/Executable_sp2bv.mk cpputools/Executable_uno.mk cpputool

2019-01-08 Thread Libreoffice Gerrit user

 cpputools/Executable_regcomp.mk  |   51 
 cpputools/Executable_regsingleton.mk |   54 --
 cpputools/Executable_sp2bv.mk|   36 
 cpputools/Executable_uno.mk  |   63 ---
 cpputools/Makefile   |   32 -
 cpputools/Module_cpputools.mk|   42 ---
 cpputools/Package_bin.mk |   27 ---
 cpputools/prj/build.lst  |7 +++
 cpputools/prj/d.lst  |   10 +
 cpputools/prj/makefile.mk|   44 
 10 files changed, 16 insertions(+), 350 deletions(-)

New commits:
commit 562339ffebf2bef1be04c98b45e7f67445a27d84
Author: Jim Jagielski 
AuthorDate: Wed Jan 9 01:26:47 2019 +
Commit: Jim Jagielski 
CommitDate: Wed Jan 9 01:26:47 2019 +

And remove the added files

diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk
deleted file mode 100644
index e69de29bb2d1..
diff --git a/cpputools/Executable_regsingleton.mk 
b/cpputools/Executable_regsingleton.mk
deleted file mode 100644
index e69de29bb2d1..
diff --git a/cpputools/Executable_sp2bv.mk b/cpputools/Executable_sp2bv.mk
deleted file mode 100644
index e69de29bb2d1..
diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk
deleted file mode 100644
index e69de29bb2d1..
diff --git a/cpputools/Makefile b/cpputools/Makefile
deleted file mode 100644
index e69de29bb2d1..
diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk
deleted file mode 100644
index ccde29c8d44e..
--- a/cpputools/Module_cpputools.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#**
-#  
-#  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
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**
-
-
-
-$(eval $(call gb_Module_Module,cpputools))
-
-$(eval $(call gb_Module_add_targets,cpputools,\
-   Executable_regcomp \
-   Executable_regsingleton \
-   Executable_sp2bv \
-   Executable_uno \
-))
-
-ifeq ($(GUIBASE),WIN)
-else ifeq ($(GUIBASE),OS2)
-else
-$(eval $(call gb_Module_add_targets,cpputools,\
-   Package_bin \
-))
-endif
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/cpputools/Package_bin.mk b/cpputools/Package_bin.mk
deleted file mode 100644
index e69de29bb2d1..
commit 6eabe2919eed2b052c5ee2c1d791ad14f6984f69
Author: Jim Jagielski 
AuthorDate: Wed Jan 9 01:26:27 2019 +
Commit: Jim Jagielski 
CommitDate: Wed Jan 9 01:26:27 2019 +

Revert -r 1838934 which breaks macOS. Porting this to gbuild isn't needed 
so this is basically a safe no-op

diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk
index 3222f5d9cfd0..e69de29bb2d1 100644
--- a/cpputools/Executable_regcomp.mk
+++ b/cpputools/Executable_regcomp.mk
@@ -1,51 +0,0 @@
-#**
-#  
-#  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
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**
-
-
-
-$(eval $(call gb_Executable_Executable,regcomp))
-
-$(eval $(call gb_Executable_add_linked_libs,regcomp,\
-   cppu \
-   cppuhelper \
-   sal \
-   stl \
-$(gb_STDLIBS) \
-))
-
-$(eval $(call

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - filter/source offapi/com oox/source sfx2/source sw/source vcl/inc

2018-12-27 Thread Libreoffice Gerrit user

 filter/source/config/cache/typedetection.hxx  |2 +-
 filter/source/svg/svgwriter.cxx   |4 ++--
 offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl |2 +-
 oox/source/drawingml/chart/typegroupconverter.cxx |2 +-
 sfx2/source/doc/sfxmodelfactory.cxx   |2 +-
 sw/source/core/layout/tabfrm.cxx  |2 +-
 vcl/inc/vcl/field.hxx |4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit e08a9a9d79826a9193a9508b8af0454131dfd952
Author: Matthias Seidel 
AuthorDate: Fri Dec 28 00:30:07 2018 +
Commit: Matthias Seidel 
CommitDate: Fri Dec 28 00:30:07 2018 +

Fixed typos (bahaviour -> behaviour)

diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx 
b/oox/source/drawingml/chart/typegroupconverter.cxx
index afaffd81adc4..b617444820e2 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -277,7 +277,7 @@ Reference< XCoordinateSystem > 
TypeGroupConverter::createCoordinateSystem()
 Reference< XLabeledDataSequence > TypeGroupConverter::createCategorySequence()
 {
 Reference< XLabeledDataSequence > xLabeledSeq;
-/*  Find first existing category sequence. The bahaviour of Excel 2007 is
+/*  Find first existing category sequence. The behaviour of Excel 2007 is
 different to Excel 2003, which always used the category sequence of the
 first series, even if it was empty. */
 for( TypeGroupModel::SeriesVector::iterator aIt = 
mrModel.maSeries.begin(), aEnd = mrModel.maSeries.end(); !xLabeledSeq.is() && 
(aIt != aEnd); ++aIt )
diff --git a/sfx2/source/doc/sfxmodelfactory.cxx 
b/sfx2/source/doc/sfxmodelfactory.cxx
index 4a3b6f222c13..6e811b6b0ab2 100644
--- a/sfx2/source/doc/sfxmodelfactory.cxx
+++ b/sfx2/source/doc/sfxmodelfactory.cxx
@@ -177,7 +177,7 @@ namespace sfx2
 
 Reference< XInterface > xInstance( impl_createInstance( nCreationFlags 
) );
 
-// to mimic the bahaviour of the default factory's 
createInstanceWithArguments, we initialize
+// to mimic the behaviour of the default factory's 
createInstanceWithArguments, we initialize
 // the object with the given arguments, stripped by the three special 
ones
 Sequence< Any > aStrippedArguments( _rArguments.getLength() );
 Any* pStrippedArgs = aStrippedArguments.getArray();
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 18fc3843f618..31749d83a2fa 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -934,7 +934,7 @@ bool SwTabFrm::RemoveFollowFlowLine()
 pLastLine, "There should be a flowline in the follow" )
 
 // We have to reset the flag here, because lcl_MoveRowContent
-// calls a GrowFrm(), which has a different bahavior if
+// calls a GrowFrm(), which has a different behaviour if
 // this flag is set.
 SetFollowFlowLine( sal_False );
 
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index 0ca2c3802cdf..bee33c159680 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -398,7 +398,7 @@ public:
 
 If this is set to  (which is the default), then GetDate will 
always return a valid
 date, no matter whether the current text can really be interpreted as 
date. (Note: this
-is the compatible bahavior).
+is the compatible behaviour).
 
 If this is set to , the GetDate will return GetInvalidDate, in 
case the current text
 cannot be interpreted as date.
@@ -482,7 +482,7 @@ public:
 
 If this is set to  (which is the default), then GetTime will 
always return a valid
 time, no matter whether the current text can really be interpreted as 
time. (Note: this
-is the compatible bahavior).
+is the compatible behaviour).
 
 If this is set to , the GetTime will return GetInvalidTime, in 
case the current text
 cannot be interpreted as time.
commit d68d2cedca1870f3ee107432b0e28bc7112c3dff
Author: Matthias Seidel 
AuthorDate: Fri Dec 28 00:10:41 2018 +
Commit: Matthias Seidel 
CommitDate: Fri Dec 28 00:10:41 2018 +

Fixed typos (optinal -> optional)

diff --git a/filter/source/config/cache/typedetection.hxx 
b/filter/source/config/cache/typedetection.hxx
index 9aa41434fcf3..4460eef81656 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -206,7 +206,7 @@ class TypeDetection : public 
::cppu::ImplInheritanceHelper1< BaseContainer
 
 /** @short  seek a might existing stream to position 0.
 
-@descr  This is an optinal action to be more robust
+@descr  This is an optional action to be more robust
 in case any detect service doesn't make this seek ...

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - dbaccess/source wizards/source

2018-12-13 Thread Libreoffice Gerrit user

 dbaccess/source/ui/dlg/UserAdmin.src |  131 ++-
 wizards/source/euro/euro.src |5 -
 2 files changed, 57 insertions(+), 79 deletions(-)

New commits:
commit 4cb07fcff412200783dcd138ca67880f429e9ca8
Author: Matthias Seidel 
AuthorDate: Thu Dec 13 15:42:10 2018 +
Commit: Matthias Seidel 
CommitDate: Thu Dec 13 15:42:10 2018 +

Added missing space

diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index 3ec2ccee9792..136d63e9c071 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -28,6 +28,7 @@
 #define MESSAGES 1400
 #define CURRENCIES 1500
 #define STEP_LASTPAGE 1600
+
 // 
 String STEP_ZERO
 {
@@ -41,7 +42,7 @@ Text [ en-US ] = "~Help" ;
 
 String STEP_ZERO + 2
 {
-Text [ en-US ] = "<<~Back" ;
+Text [ en-US ] = "<< ~Back" ;
 };
 
 String STEP_ZERO + 3
@@ -66,7 +67,7 @@ Text [ en-US ] = "Currencies:" ;
 
 String STEP_ZERO + 7
 {
-Text [ en-US ] = "C~ontinue>>" ;
+Text [ en-US ] = "C~ontinue >>" ;
 };
 
 String STEP_ZERO + 8
commit a32dc56b942af998a497a59f28b52adfa1b95e98
Author: Matthias Seidel 
AuthorDate: Thu Dec 13 15:41:11 2018 +
Commit: Matthias Seidel 
CommitDate: Thu Dec 13 15:41:11 2018 +

Cleaned up resource file, removed double space

diff --git a/dbaccess/source/ui/dlg/UserAdmin.src 
b/dbaccess/source/ui/dlg/UserAdmin.src
index 0111e54cdc94..b8bf91bad2bf 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.src
+++ b/dbaccess/source/ui/dlg/UserAdmin.src
@@ -38,28 +38,28 @@ TabPage TAB_PAGE_USERADMIN
 {
 SVLook  = TRUE ;
 HelpId  = HID_TAB_PAGE_USERADMIN ;
-Size= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
-Hide = TRUE;
+Size= MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ;
+Hide = TRUE ;
 
 FixedLine FL_USER
 {
-Pos = MAP_APPFONT ( 6 , 3  ) ;
+Pos = MAP_APPFONT ( 6, 3 ) ;
 Size= MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ;
-Text [ en-US ]  = "User selection";
+Text [ en-US ]  = "User selection" ;
 };
 
 FixedText FT_USER
 {
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size= MAP_APPFONT ( 90 , 10 ) ;
-Text [ en-US ]  = "Us~er:";
+Pos = MAP_APPFONT ( 12, 14 ) ;
+Size= MAP_APPFONT ( 90, 10 ) ;
+Text [ en-US ]  = "Us~er:" ;
 };
 
 ListBox LB_USER
 {
 Border  = TRUE ;
-Pos = MAP_APPFONT ( 108 , 13) ;
-Size= MAP_APPFONT ( 105 , 97 ) ;
+Pos = MAP_APPFONT ( 108, 13) ;
+Size= MAP_APPFONT ( 105, 97 ) ;
 TabStop = TRUE ;
 HScroll = TRUE ;
 Sort= TRUE ;
@@ -70,45 +70,45 @@ TabPage TAB_PAGE_USERADMIN
 
 PushButton PB_NEWUSER
 {
-Pos = MAP_APPFONT ( 12 , 29 ) ;
-Size= MAP_APPFONT ( 70 , 14 ) ;
+Pos = MAP_APPFONT ( 12, 29 ) ;
+Size= MAP_APPFONT ( 70, 14 ) ;
 TabStop = TRUE ;
 DefButton   = TRUE ;
 HelpId  = HID_TAB_PAGE_PBUSER ;
-Text [ en-US ] = "~Add User...";
+Text [ en-US ] = "~Add User..." ;
 };
 
 PushButton PB_CHANGEPWD
 {
-Pos = MAP_APPFONT ( 95 , 29 ) ;
-Size= MAP_APPFONT ( 70 , 14 ) ;
+Pos = MAP_APPFONT ( 95, 29 ) ;
+Size= MAP_APPFONT ( 70, 14 ) ;
 TabStop = TRUE ;
 DefButton   = TRUE ;
 HelpId  = HID_TAB_PAGE_PBCHGPWD ;
-Text [ en-US ] = "Change ~Password...";
+Text [ en-US ] = "Change ~Password..." ;
 };
 
 PushButton PB_DELETEUSER
 {
-Pos = MAP_APPFONT ( WINDOW_SIZE_X - 82 , 29 ) ;
-Size= MAP_APPFONT ( 70 , 14 ) ;
+Pos = MAP_APPFONT ( WINDOW_SIZE_X - 82, 29 ) ;
+Size= MAP_APPFONT ( 70, 14 ) ;
 TabStop = TRUE ;
 DefButton   = TRUE ;
 HelpId  = HID_TAB_PAGE_PBUSERDELETE ;
-Text [ en-US ] = "~Delete User...";
+Text [ en-US ] = "~Delete User..." ;
 };
 
 FixedLine FL_TABLE_GRANTS
 {
-Pos = MAP_APPFONT ( 6 , 52  ) ;
+Pos = MAP_APPFONT ( 6, 52 ) ;
 Size= MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ;
-Text [ en-US ] = "Access rights for selected user";
+Text [ en-US ] = "Access rights for selected user" ;
 };
 
 Control CTRL_TABLE_GRANTS
 {
-Pos = MAP_APPFONT ( 12 , 63  ) ;
-Size= MAP_APPFONT (

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/source extras/source

2018-12-10 Thread Libreoffice Gerrit user

 cui/source/tabpages/page.src  |   93 +-
 extras/source/templates/layout/lang/lt/lyt-aqua.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-blackandwhite.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-bluegrey.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-bluelinesgrad.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-bluetitledown.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-book.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-brown.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-charglow.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-forest.otp |binary
 extras/source/templates/layout/lang/lt/lyt-frepa.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-glacier.otp|binary
 extras/source/templates/layout/lang/lt/lyt-greengradlines.otp |binary
 extras/source/templates/layout/lang/lt/lyt-keyboard.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-movwaves.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-numdark.otp|binary
 extras/source/templates/layout/lang/lt/lyt-ocean.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-organic.otp|binary
 extras/source/templates/layout/lang/lt/lyt-paper.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-rededges.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-roundedrect.otp|binary
 extras/source/templates/layout/lang/lt/lyt-sunrise.otp|binary
 extras/source/templates/layout/lang/lt/lyt-techpoly.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-tunnel.otp |binary
 extras/source/templates/layout/lang/lt/lyt-water.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-wine.otp   |binary
 26 files changed, 47 insertions(+), 46 deletions(-)

New commits:
commit 4bda1394bafa8757f77bff4281632da9226256d7
Author: Matthias Seidel 
AuthorDate: Mon Dec 10 19:57:29 2018 +
Commit: Matthias Seidel 
CommitDate: Mon Dec 10 19:57:29 2018 +

Cleaned up resource file

diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 65a1f1fc7022..e9f15ff7013b 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -21,7 +21,7 @@
 
 
 
- // include ---
+// include ---
 
 #include 
 #include "helpid.hrc"
@@ -29,7 +29,7 @@
 #include "page.h"
 #include 
 
- // RID_SVXPAGE_PAGE --
+// RID_SVXPAGE_PAGE --
 
 TabPage RID_SVXPAGE_PAGE
 {
@@ -46,11 +46,11 @@ TabPage RID_SVXPAGE_PAGE
 {
 Pos = MAP_APPFONT ( 12, 16 ) ;
 Size = MAP_APPFONT ( 35, 8 ) ;
-Text [ en-US ] = "~Format";
+Text [ en-US ] = "~Format" ;
 };
 ListBox LB_PAPER_SIZE
 {
-HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE";
+HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE" ;
 Pos = MAP_APPFONT ( 50, 14 ) ;
 Size = MAP_APPFONT ( 75, 64 ) ;
 DropDown = TRUE ;
@@ -65,7 +65,7 @@ TabPage RID_SVXPAGE_PAGE
 };
 MetricField ED_PAPER_WIDTH
 {
-HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH";
+HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH" ;
 Border = TRUE ;
 Pos = MAP_APPFONT ( 50, 30 ) ;
 Size = MAP_APPFONT ( 40, 12 ) ;
@@ -87,7 +87,7 @@ TabPage RID_SVXPAGE_PAGE
 };
 MetricField ED_PAPER_HEIGHT
 {
-HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT";
+HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT" ;
 Border = TRUE ;
 Pos = MAP_APPFONT ( 50, 46 ) ;
 Size = MAP_APPFONT ( 40, 12 ) ;
@@ -104,11 +104,11 @@ TabPage RID_SVXPAGE_PAGE
 {
 Pos = MAP_APPFONT ( 12, 62 ) ;
 Size = MAP_APPFONT ( 35, 8 ) ;
-Text [ en-US ] = "Orientation";
+Text [ en-US ] = "Orientation" ;
 };
 RadioButton RB_PORTRAIT
 {
-HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT";
+HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT" ;
 Pos = MAP_APPFONT ( 50, 62 ) ;
 Size = MAP_APPFONT ( 53, 10 ) ;
 Check = TRUE ;
@@ -116,10 +116,10 @@ TabPage RID_SVXPAGE_PAGE
 };
 RadioButton RB_LANDSCAPE
 {
-HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE";
+HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE" ;
 Pos = MAP_APPFONT ( 50, 74 ) ;
 Size = MAP_APPFONT ( 53, 10 ) ;
-Text [ en-US ] = "L~andscape";
+Text [ en-US ] = "L~andscape" ;
 };
 Window WN_BSP
 {
@@ -133,11 +133,11 @@ TabPage RID_SVXPAGE_PAGE
 Size = MAP_APPFONT ( 50, 8 ) ;
 Left = TRUE ;
 Hide = TRUE ;
-

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - accessibility/AllLangResTarget_acc.mk accessibility/Ant_java_uno_accessbridge.mk accessibility/bridge accessibility/inc accessibility/j

2018-11-27 Thread Libreoffice Gerrit user

 Module_ooo.mk  
 |1 
 Repository.mk  
 |2 
 accessibility/AllLangResTarget_acc.mk  
 |   34 --
 accessibility/Ant_java_uno_accessbridge.mk 
 |   29 ++
 accessibility/Library_acc.mk   
 |  142 ++
 accessibility/Library_java_uno_accessbridge.mk 
 |   61 
 accessibility/Makefile 
 |   32 ++
 accessibility/Module_accessibility.mk  
 |   39 ++
 accessibility/bridge/org/openoffice/java/accessibility/makefile.mk 
 |  111 ---
 accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
 |4 
 accessibility/bridge/source/java/exports.dxp   
 |4 
 accessibility/bridge/source/java/makefile.mk   
 |   66 
 accessibility/inc/accessibility/helper/acc_factory.hxx 
 |5 
 accessibility/inc/accessibility/helper/accessibilitydllapi.h   
 |   37 ++
 accessibility/inc/pch/precompiled_accessibility_accessbridge.cxx   
 |   25 +
 accessibility/inc/pch/precompiled_accessibility_accessbridge.hxx   
 |   33 ++
 accessibility/java/java_uno_accessbridge/build.xml 
 |   67 
 
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/java_uno_accessbridge.component
 |   28 +
 
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleRelationAdapter.java.old
 |   20 -
 accessibility/prj/build.lst
 |   18 -
 accessibility/prj/d.lst
 |8 
 accessibility/prj/makefile.mk  
 |   41 +-
 accessibility/source/extended/makefile.mk  
 |   77 -
 accessibility/source/standard/makefile.mk  
 |   74 -
 accessibility/util/makefile.mk 
 |   82 -
 postprocess/packcomponents/makefile.mk 
 |2 
 26 files changed, 547 insertions(+), 495 deletions(-)

New commits:
commit 41624b9b261a22a0e6f1d9848cdb8456dd4dfb6c
Author: Damjan Jovanovic 
AuthorDate: Tue Nov 27 19:21:36 2018 +
Commit: Damjan Jovanovic 
CommitDate: Tue Nov 27 19:21:36 2018 +

Complete my previous patch.

Patch by: me

diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst
index 5c823b6f9b6b..28b42bc52479 100644
--- a/accessibility/prj/build.lst
+++ b/accessibility/prj/build.lst
@@ -1,18 +1,2 @@
 ac  accessibility  :L10N:l10n tools jurt offapi unoil vcl 
javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
-ac accessibility   usr1-   
all ac_mkout NULL
-ac accessibility\inc   nmake   -   
all ac_inc NULL
-ac accessibility\bridge\org\openoffice\java\accessibility  nmake   -   
w   ac_ooja ac_inc NULL
-ac accessibility\bridge\org\openoffice\accessibility   nmake   -   
w   ac_ooa ac_ooja.w ac_inc NULL
-ac accessibility\bridge\source\javanmake   -   
w   ac_ooan ac_ooa.w ac_inc NULL
-ac  accessibility\inc   get -   all 
ac_inc NULL
-ac  accessibility\source\helper nmake   -   all 
ac_helper ac_inc NULL
-ac  accessibility\source\standard

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - rat-excludes solenv/ant solenv/gbuild

2018-11-26 Thread Libreoffice Gerrit user

 rat-excludes   |1 +
 solenv/ant/aoo-ant.xml |2 +-
 solenv/gbuild/Ant.mk   |3 +--
 solenv/gbuild/platform/freebsd.mk  |   10 ++
 solenv/gbuild/platform/linux.mk|   10 ++
 solenv/gbuild/platform/macosx.mk   |   10 ++
 solenv/gbuild/platform/os2.mk  |9 +
 solenv/gbuild/platform/solaris.mk  |   10 ++
 solenv/gbuild/platform/windows.mk  |   10 ++
 solenv/gbuild/platform/winmingw.mk |9 +
 10 files changed, 71 insertions(+), 3 deletions(-)

New commits:
commit 12a5af41357ade9fd8b966930ff36bf402eb0b2d
Author: Damjan Jovanovic 
AuthorDate: Tue Nov 27 00:51:01 2018 +
Commit: Damjan Jovanovic 
CommitDate: Tue Nov 27 00:51:01 2018 +

Fix the Ant dependency extraction for the case when

there are no dependencies.

Fix the format of Ant paths on Windows.

Patch by: me

diff --git a/solenv/ant/aoo-ant.xml b/solenv/ant/aoo-ant.xml
index 2fd708f2eb18..45fcb7fe30a1 100644
--- a/solenv/ant/aoo-ant.xml
+++ b/solenv/ant/aoo-ant.xml
@@ -102,7 +102,7 @@
 
 
 
-
+
 
 
 
diff --git a/solenv/gbuild/Ant.mk b/solenv/gbuild/Ant.mk
index 3fd2c32c4610..f45d70a86db2 100644
--- a/solenv/gbuild/Ant.mk
+++ b/solenv/gbuild/Ant.mk
@@ -66,8 +66,7 @@ $(eval $(call gb_Module_register_target,$(call 
gb_Jar_get_outdir_target,$(1)),$(
 $(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call 
gb_Ant_get_target,$(1)),$(1))
 $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Ant_get_target,$(1))
 
-__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v 
-Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
-$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call 
gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep
+$(call gb_Ant_add_dependencies,$(1),$(2))
 
 endef
 
diff --git a/solenv/gbuild/platform/freebsd.mk 
b/solenv/gbuild/platform/freebsd.mk
index 31c041274c58..e7f49f83ed6a 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -457,6 +457,16 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 
 endef
 
+
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v 
-Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call 
gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep
+
+endef
+
+
 # SdiTarget class
 
 gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 86710beab6df..4e9f4936b400 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -433,6 +433,16 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 
 endef
 
+
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v 
-Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call 
gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep
+
+endef
+
+
 # SdiTarget class
 
 gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index e7ea6d6c383f..84d84198b971 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -471,6 +471,16 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 
 endef
 
+
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v 
-Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call 
gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep
+
+endef
+
+
 # SdiTarget class
 
 gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk
index 0c783b898eb4..8bd8faf1c5ca 100644
--- a/solenv/gbuild/platform/os2.mk
+++ b/solenv/gbuild/platform/os2.mk
@@ -550,6 +550,15 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 endef
 
 
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -Ddependencies.outfile=`cygpath -m 
$(WORKDIR)/Ant/$(1)/deps` -f `cygpath -m $(2)` dependencies)
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call 
gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(shell cygpath -u 
$(dep)
+
+endef
+
+
 # SdiTarget class
 
 gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 60d6cf6f573a..d60eeb1da1f0 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -400,6 +400,16 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 
 endef
 
+
+# Ant class
+
+define gb_Ant_add_dependencies
+__ant_out:=$(shell

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - vcl/source wizards/source

2018-11-11 Thread Libreoffice Gerrit user

 vcl/source/glyphs/gcach_ftyp.cxx   |9 +
 wizards/source/euro/DlgConvert.xdl |   14 +++---
 2 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 3a4bcd943f772f1c284cdd01d5865df47886900b
Author: Matthias Seidel 
AuthorDate: Sun Nov 11 14:49:18 2018 +
Commit: Matthias Seidel 
CommitDate: Sun Nov 11 14:49:18 2018 +

Small changes to Euro Converter dialog

diff --git a/wizards/source/euro/DlgConvert.xdl 
b/wizards/source/euro/DlgConvert.xdl
index c76df2747e13..61f397d3b2c9 100644
--- a/wizards/source/euro/DlgConvert.xdl
+++ b/wizards/source/euro/DlgConvert.xdl
@@ -1,7 +1,7 @@
 
 
 
 http://openoffice.org/2000/dialog; 
xmlns:script="http://openoffice.org/2000/script; dlg:id="DialogConvert" 
dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="2" 
dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_DIALOG" dlg:closeable="true" 
dlg:moveable="true">
  
-  
+  
   

   
-  
+  

   
   
@@ -77,7 +77,7 @@
   
   
   
-  
+  
   
   
   
commit 9ec19c0d46d0dcb04388a986354a359531833275
Author: Matthias Seidel 
AuthorDate: Sun Nov 11 13:32:28 2018 +
Commit: Matthias Seidel 
CommitDate: Sun Nov 11 13:32:28 2018 +

i127929 - Fix for crash in Freetype code

Patch by: Arrigo Marchiori

Thank you for your contribution!

diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx
index 59447ba2f3ad..e6c1326becf6 100644
--- a/vcl/source/glyphs/gcach_ftyp.cxx
+++ b/vcl/source/glyphs/gcach_ftyp.cxx
@@ -1361,6 +1361,15 @@ void FreetypeServerFont::InitGlyphData( sal_GlyphId 
aGlyphId, GlyphData& rGD ) c
 
 FT_Glyph pGlyphFT;
 rc = FT_Get_Glyph( maFaceFT->glyph,  );
+if( rc != FT_Err_Ok )
+{
+// we get here e.g. when a PS font lacks the default glyph
+rGD.SetCharWidth( 0 );
+rGD.SetDelta( 0, 0 );
+rGD.SetOffset( 0, 0 );
+rGD.SetSize( Size( 0, 0 ) );
+return;
+}
 
 ApplyGlyphTransform( nGlyphFlags, pGlyphFT, false );
 if( mbArtBold && pFTEmbolden && (nFTVERSION < 2200) ) // #i71094# 
workaround staircase bug
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/res default_images/vcl vcl/source

2018-11-03 Thread Libreoffice Gerrit user

 default_images/res/printeradmin_16.png   |binary
 default_images/res/printeradmin_16_8.png |binary
 default_images/res/printeradmin_32.png   |binary
 default_images/res/printeradmin_32_8.png |binary
 default_images/res/printeradmin_48_8.png |binary
 default_images/vcl/res/checkmono.png |binary
 default_images/vcl/res/radiomono.png |binary
 dev/null |binary
 vcl/source/src/images.src|   38 +++
 9 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 08ae88d23ae14916ece612d3096b68969f837b25
Author: Matthias Seidel 
AuthorDate: Sat Nov 3 14:55:02 2018 +
Commit: Matthias Seidel 
CommitDate: Sat Nov 3 14:55:02 2018 +

Cleaning up image resources

diff --git a/default_images/vcl/res/checkmono.bmp 
b/default_images/vcl/res/checkmono.bmp
deleted file mode 100644
index 7e0610d5e9d8..
Binary files a/default_images/vcl/res/checkmono.bmp and /dev/null differ
diff --git a/default_images/vcl/res/checkmono.png 
b/default_images/vcl/res/checkmono.png
new file mode 100644
index ..2fe75777cffb
Binary files /dev/null and b/default_images/vcl/res/checkmono.png differ
diff --git a/default_images/vcl/res/radiomono.bmp 
b/default_images/vcl/res/radiomono.bmp
deleted file mode 100644
index 6c757c34bac8..
Binary files a/default_images/vcl/res/radiomono.bmp and /dev/null differ
diff --git a/default_images/vcl/res/radiomono.png 
b/default_images/vcl/res/radiomono.png
new file mode 100644
index ..f4bbc9f8dae2
Binary files /dev/null and b/default_images/vcl/res/radiomono.png differ
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index 35c5a4d65bfb..ed813e2c4e53 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -29,90 +29,90 @@
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_STDOFFSET)
 {
-File = "check.bmp";
+File = "check.png" ;
 };
 
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MONOOFFSET)
 {
-File = "checkmono.bmp";
+File = "checkmono.png" ;
 };
 
 Bitmap (SV_RESID_BITMAP_SCROLLBMP)
 {
-File = "scrbmp.bmp";
+File = "scrbmp.png" ;
 };
 
 Bitmap (SV_RESID_BITMAP_SCROLLMSK)
 {
-File = "scrmsk.bmp";
+File = "scrmsk.png" ;
 };
 
 // ---
 
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_STDOFFSET)
 {
-File = "radio.bmp";
+File = "radio.png" ;
 };
 
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MONOOFFSET)
 {
-File = "radiomono.bmp";
+File = "radiomono.png" ;
 };
 
 // ---
 
 Bitmap SV_RESID_BITMAP_MSGBOX
 {
-File = "msgbox.png";
+File = "msgbox.png" ;
 };
 
 // ---
 
 Bitmap SV_RESID_BITMAP_MSGBOX_HC
 {
-File = "msgbox_hc.png";
+File = "msgbox_hc.png" ;
 };
 
 // ---
 
 Bitmap SV_RESID_BITMAP_PIN
 {
-File = "pin.bmp";
+File = "pin.png" ;
 };
 
 // ---
 
 Bitmap SV_RESID_BITMAP_CLOSEDOC
 {
-File = "closedoc.bmp";
+File = "closedoc.png" ;
 };
 
 Bitmap SV_RESID_BITMAP_CLOSEDOCHC
 {
-File = "closedochc.bmp";
+File = "closedochc.png" ;
 };
 
 // ---
 
 Bitmap SV_RESID_BITMAP_SPLITHPIN
 {
-File = "splhpin.bmp";
+File = "splhpin.png" ;
 };
 
 Bitmap SV_RESID_BITMAP_SPLITVPIN
 {
-File = "splvpin.bmp";
+File = "splvpin.png" ;
 };
 
 Bitmap SV_RESID_BITMAP_SPLITHARW
 {
-File = "splharw.bmp";
+File = "splharw.png" ;
 };
 
 Bitmap SV_RESID_BITMAP_SPLITVARW
 {
-File = "splvarw.bmp";
+File = "splvarw.png" ;
 };
 
 // ---
@@ -787,21 +787,21 @@ Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_PRINTERADMIN)
 
 Bitmap SV_DISCLOSURE_PLUS
 {
-File = "plus.png";
+File = "plus.png" ;
 };
 
 Bitmap SV_DISCLOSURE_PLUS_HC
 {
-File = "plus_sch.png";
+File = "plus_sch.png" ;
 };
 
 Bitmap SV_DISCLOSURE_MINUS
 {
-File = "minus.png";
+File = "minus.png" ;
 };
 
 Bitmap SV_DISCLOSURE_MINUS_HC
 {
-File = "minus_sch.png";
+File = "minus_sch.png" ;
 };
 
commit 6ebf4c63636a28aada09388c4944276147efc4a0
Author: Matthias Seidel 
AuthorDate: Sat Nov 3 14:20:00 2018 +
Commit: Matthias Seidel 
CommitDate: Sat Nov 3 14:20:00 2018 +

Use flat Orb for printeradmin icon

diff --git a/default_images/res/printeradmin_16.png 
b/default_images/res/printeradmin_16.png
index 399076c9934d..1ea7d9e9f867 100644
Binary files a/default_images/res/printeradmin_16.png and 
b/default_images/res/printeradmin_16.png differ
diff --git a/default_images/res/printeradmin_16_8.png 
b/default_images/res/printeradmin_16_8.png
index 399076c9934d..1ea7d9e9f867 100644
Binary

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - NOTICE NOTICE_category_b readlicense_oo/docs

2018-11-03 Thread Libreoffice Gerrit user

 NOTICE |1 +
 NOTICE_category_b  |   12 ++--
 readlicense_oo/docs/readme.xsl |   10 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit bbea04f426008b3a9960595ed38e743c70fe5305
Author: Matthias Seidel 
AuthorDate: Sat Nov 3 13:04:56 2018 +
Commit: Matthias Seidel 
CommitDate: Sat Nov 3 13:04:56 2018 +

Shortened ASCII art for H1 to avoid line break on Windows

diff --git a/readlicense_oo/docs/readme.xsl b/readlicense_oo/docs/readme.xsl
index ba3409d67011..3be95373a63b 100644
--- a/readlicense_oo/docs/readme.xsl
+++ b/readlicense_oo/docs/readme.xsl
@@ -22,9 +22,9 @@
 
 http://www.w3.org/1999/XSL/Transform; version="1.0">
 
- 
-   
-  
+
+
+   



@@ -161,11 +161,11 @@



-   
==
+   
==



-   
==
+   
==



commit 0cf2034366b95c83da7e97cce20d8e0ef045d8cb
Author: Matthias Seidel 
AuthorDate: Sat Nov 3 13:03:52 2018 +
Commit: Matthias Seidel 
CommitDate: Sat Nov 3 13:03:52 2018 +

Removed whitespace

diff --git a/NOTICE b/NOTICE
index 683154a2c989..d7dc0e2a651c 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,3 +1,4 @@
+
 Apache OpenOffice (https://www.openoffice.org)
 Copyright 2011, 2018 The Apache Software Foundation
 
diff --git a/NOTICE_category_b b/NOTICE_category_b
index 066e59d2523d..7f12b624a713 100644
--- a/NOTICE_category_b
+++ b/NOTICE_category_b
@@ -10,17 +10,17 @@ ___
 
 Notices for CoinMP library:
 The Computational Infrastructure for Operations Research COIN_OR
-project developed the CoinMP library (a lightweight API and DLL 
+project developed the CoinMP library (a lightweight API and DLL
 for CLP, CBC, and CGL).
-It includes and depends on 
-- CoinUtils: COIN-OR utilities, utilities, data structures, and 
+It includes and depends on
+- CoinUtils: COIN-OR utilities, utilities, data structures, and
 linear algebra methods for COIN-OR projects
-- CLP: COIN-OR Graph Classes, a collection of network representations 
+- CLP: COIN-OR Graph Classes, a collection of network representations
 and algorithms
 - CBC: COIN-OR Branch and Cut, an LP-based branch-and-cut library
 - CGL: Cut Generator Library, a library of cutting-plane generators
-The source code of these dependencies which are available under 
-license EPL can found at 
+The source code of these dependencies which are available under
+license EPL can found at
 http://www.coin-or.org/download/source/CoinMP/
 
 ___
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/source tools/source

2018-10-31 Thread Libreoffice Gerrit user

 cui/source/dialogs/about.src   |   30 +++---
 tools/source/string/strimp.cxx |   10 --
 2 files changed, 23 insertions(+), 17 deletions(-)

New commits:
commit 1095c046a189a55e674660aa79036608fc5e84ad
Author: Matthias Seidel 
AuthorDate: Wed Oct 31 13:39:29 2018 +
Commit: Matthias Seidel 
CommitDate: Wed Oct 31 13:39:29 2018 +

Applying strimp.patch

diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx
index 119c994b96b2..408b8738b6ae 100644
--- a/tools/source/string/strimp.cxx
+++ b/tools/source/string/strimp.cxx
@@ -1148,7 +1148,10 @@ STRING& STRING::ConvertLineEnd( LineEnd eLineEnd )
 // Bei \r oder \n gibt es neuen Zeilenumbruch
 if ( (pStr[i] == _CR) || (pStr[i] == _LF) )
 {
-nLen = nLen + nLineEndLen;
+if( nLen <= STRING_MAXLEN - nLineEndLen )
+nLen = nLen + nLineEndLen;
+else
+nLen = STRING_MAXLEN;
 
 // Wenn schon gesetzt, dann brauchen wir keine aufwendige Abfrage
 if ( !bConvert )
@@ -1169,7 +1172,10 @@ STRING& STRING::ConvertLineEnd( LineEnd eLineEnd )
 ++i;
 }
 else
-++nLen;
+{
+if( nLen < STRING_MAXLEN )
+++nLen;
+}
 ++i;
 
 // Wenn String zu lang, dann konvertieren wir nicht
commit 0f274206d9bfa479e2a563506814bba3d8e0f489
Author: Matthias Seidel 
AuthorDate: Wed Oct 31 13:29:18 2018 +
Commit: Matthias Seidel 
CommitDate: Wed Oct 31 13:29:18 2018 +

Minor cleanup

diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 55b4c80f0a48..60c6a3f2ce48 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -32,17 +32,17 @@ ModalDialog RID_DEFAULTABOUT
 OutputSize = TRUE ;
 Moveable = TRUE ;
 SVLook = TRUE ;
-Size = MAP_APPFONT ( 200 , 150 ) ;
+Size = MAP_APPFONT ( 200, 150 ) ;
 Text [ en-US ] = "About %FULLPRODUCTNAME" ;
 OKButton RID_CUI_ABOUT_BTN_OK
 {
 DefButton = TRUE ;
-Size = MAP_APPFONT ( BTN_WIDTH , BTN_HEIGHT ) ;
+Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGHT ) ;
 };
 PushButton RID_CUI_ABOUT_BTN_README
 {
 DefButton = FALSE ;
-Size = MAP_APPFONT ( BTN_WIDTH , BTN_HEIGHT ) ;
+Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGHT ) ;
 Text [ en-US ] = "License..." ;
 };
 FixedText RID_CUI_ABOUT_FTXT_VERSION
@@ -51,7 +51,7 @@ ModalDialog RID_DEFAULTABOUT
 Text = "%FULLPRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;
 };
 MultiLineEdit RID_CUI_ABOUT_FTXT_BUILDDATA
-   {
+{
 //HelpID = "cui:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_BUILDDATA";
 Border = FALSE ;
 IgnoreTab = TRUE ;
@@ -73,19 +73,19 @@ ModalDialog RID_DEFAULTABOUT
 };
 String RID_CUI_ABOUT_STR_COPYRIGHT_VENDOR
 {
-Text[ en-US ] = "%OOOVENDOR";
+Text [ en-US ] = "%OOOVENDOR" ;
 };
 String RID_CUI_ABOUT_STR_CREATED
 {
-Text[ en-US ] = "This product was created by the OpenOffice 
community.";
+Text [ en-US ] = "This product was created by the OpenOffice 
community." ;
 };
 String RID_CUI_ABOUT_STR_CREATED_VENDOR
 {
-Text[ en-US ] = "This product was created by %OOOVENDOR, based on 
Apache OpenOffice.";
+Text [ en-US ] = "This product was created by %OOOVENDOR, based on 
Apache OpenOffice." ;
 };
 String RID_CUI_ABOUT_STR_ACKNOWLEDGE
 {
-Text[ en-US ] = "The OpenOffice community acknowledges all 
contributing members, especially those mentioned at";
+Text [ en-US ] = "The OpenOffice community acknowledges all 
contributing members, especially those mentioned at" ;
 };
 };
 
@@ -103,14 +103,14 @@ ModalDialog RID_CUI_README_DLG
 SvLook = TRUE ;
 Moveable = TRUE ;
 Closeable = TRUE;
-Size = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGHT ) ;
+Size = MAP_APPFONT ( DLG_WIDTH, DLG_HEIGHT ) ;
 Text [ en-US ] = "Readme, License and Notice" ;
 
 TabControl RID_CUI_README_TBCTL
 {
 OutputSize = TRUE ;
-Pos = MAP_APPFONT( CTRL_MARGIN , CTRL_MARGIN );
-Size = MAP_APPFONT( TAB_WIDTH , TAB_HEIGHT );
+Pos = MAP_APPFONT( CTRL_MARGIN, CTRL_MARGIN );
+Size = MAP_APPFONT( TAB_WIDTH, TAB_HEIGHT );
 PageList =
 {
 PageItem
@@ -138,7 +138,7 @@ ModalDialog RID_CUI_README_DLG
 {
 DefButton = TRUE ;
 Pos = MAP_APPFONT( 0, CTRL_MARGIN + TAB_HEIGHT + CTRL_MARGIN );
-Size = MAP_APPFONT ( BTN_WIDTH , BTN_HEIGHT ) ;
+Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGHT ) ;
 };
 };
 
@@ -147,15 +147,15 @@ TabPage RID_CUI_README_TBPAGE
 OutputSize = TRUE ;
 SVLook = TRUE ;
 Hide = TRUE ;
-Size = MAP_APPFONT ( TAB_WIDTH , TAB_HEIGHT ) ;
+Size = MAP_APPFONT ( TAB_WIDTH, TAB_HEIGHT ) ;
 
 MultiLineEdit

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/source default_images/svx

2018-10-20 Thread Libreoffice Gerrit user

 cui/source/options/optsave.src |4 ++--
 default_images/svx/res/tr10432.png |binary
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8df668da4c2897614e5d08b6f7a7c43365c55738
Author: Matthias Seidel 
AuthorDate: Sat Oct 20 11:27:12 2018 +
Commit: Matthias Seidel 
CommitDate: Sat Oct 20 11:27:12 2018 +

Moved ODF warning a bit

This warning was "pushed out" of the dialog with r1602143

diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index e743cc50ae88..e803303f6c9b 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -224,13 +224,13 @@ TabPage RID_SFXPAGE_SAVE
 };
 FixedImage FI_ODF_WARNING
 {
-Pos = MAP_APPFONT ( 12, 174 ) ;
+Pos = MAP_APPFONT ( 12, 177 ) ;
 Size = MAP_APPFONT ( 8, 8 ) ;
 Hide = TRUE ;
 };
 FixedText FT_WARN
 {
-Pos = MAP_APPFONT ( 23, 174 ) ;
+Pos = MAP_APPFONT ( 23, 177 ) ;
 Size = MAP_APPFONT ( 239, 8 ) ;
 Hide = TRUE ;
 Text [ en-US ] = "Not using ODF 1.2 Extended may cause information to 
be lost." ;
commit 3ac78ab3a0df02edd8984664c6df6c7a8131ced1
Author: Matthias Seidel 
AuthorDate: Sat Oct 20 11:10:40 2018 +
Commit: Matthias Seidel 
CommitDate: Sat Oct 20 11:10:40 2018 +

Replaced Orb in options dialog with flat one

diff --git a/default_images/svx/res/tr10432.png 
b/default_images/svx/res/tr10432.png
index 296c6f4c58b1..fa8ddfddb07f 100644
Binary files a/default_images/svx/res/tr10432.png and 
b/default_images/svx/res/tr10432.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - odk/index.html rsc/Executable_rsc2.mk rsc/Executable_rsc.mk rsc/Executable_rscpp.mk rsc/Module_rsc.mk rsc/Package_inc.mk

2018-10-11 Thread Libreoffice Gerrit user

 odk/index.html  |  120 
 rsc/Executable_rsc.mk   |8 +--
 rsc/Executable_rsc2.mk  |   12 ++--
 rsc/Executable_rscpp.mk |8 +--
 rsc/Module_rsc.mk   |1 
 rsc/Package_inc.mk  |2 
 6 files changed, 76 insertions(+), 75 deletions(-)

New commits:
commit 970fe081158a12d0db4fc6bad9449b8c9aa51f1d
Author: Matthias Seidel 
AuthorDate: Thu Oct 11 09:49:52 2018 +
Commit: Matthias Seidel 
CommitDate: Thu Oct 11 09:49:52 2018 +

Minor cleanup according to vim modeline

diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
index fbeff1d390ed..621e98619539 100644
--- a/rsc/Executable_rsc.mk
+++ b/rsc/Executable_rsc.mk
@@ -26,9 +26,9 @@ $(eval $(call gb_Executable_Executable,rsc))
 $(eval $(call 
gb_Executable_add_precompiled_header,rsc,$(SRCDIR)/rsc/inc/pch/precompiled_rsc))
 
 $(eval $(call gb_Executable_set_include,rsc,\
-$$(INCLUDE) \
--I$(SRCDIR)/rsc/inc \
--I$(SRCDIR)/rsc/inc/pch \
+   $$(INCLUDE) \
+   -I$(SRCDIR)/rsc/inc \
+   -I$(SRCDIR)/rsc/inc/pch \
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,rsc,\
@@ -37,7 +37,7 @@ $(eval $(call gb_Executable_add_linked_libs,rsc,\
tl \
vos3 \
stl \
-$(gb_STDLIBS) \
+   $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,rsc,\
diff --git a/rsc/Executable_rsc2.mk b/rsc/Executable_rsc2.mk
index 897f39b3d199..d1587a16ce59 100644
--- a/rsc/Executable_rsc2.mk
+++ b/rsc/Executable_rsc2.mk
@@ -26,14 +26,14 @@ $(eval $(call gb_Executable_Executable,rsc2))
 $(eval $(call 
gb_Executable_add_precompiled_header,rsc2,$(SRCDIR)/rsc/inc/pch/precompiled_rsc))
 
 $(eval $(call gb_Executable_set_include,rsc2,\
-$$(INCLUDE) \
--I$(SRCDIR)/rsc/inc \
--I$(SRCDIR)/rsc/inc/pch \
+   $$(INCLUDE) \
+   -I$(SRCDIR)/rsc/inc \
+   -I$(SRCDIR)/rsc/inc/pch \
 ))
 
 $(eval $(call gb_Executable_add_api,rsc2,\
-offapi \
-udkapi \
+   offapi \
+   udkapi \
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,rsc2,\
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_linked_libs,rsc2,\
tl \
vos3 \
stl \
-$(gb_STDLIBS) \
+   $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_add_bison_files,rsc2,\
diff --git a/rsc/Executable_rscpp.mk b/rsc/Executable_rscpp.mk
index 4011a52e2fbf..1b30d7ecf5c1 100644
--- a/rsc/Executable_rscpp.mk
+++ b/rsc/Executable_rscpp.mk
@@ -26,9 +26,9 @@ $(eval $(call gb_Executable_Executable,rscpp))
 $(eval $(call 
gb_Executable_add_precompiled_header,rscpp,$(SRCDIR)/rsc/inc/pch/precompiled_rsc))
 
 $(eval $(call gb_Executable_set_include,rscpp,\
-$$(INCLUDE) \
--I$(SRCDIR)/rsc/inc \
--I$(SRCDIR)/rsc/inc/pch \
+   $$(INCLUDE) \
+   -I$(SRCDIR)/rsc/inc \
+   -I$(SRCDIR)/rsc/inc/pch \
 ))
 
 $(eval $(call gb_Executable_add_defs,rscpp,\
@@ -47,7 +47,7 @@ $(eval $(call gb_Executable_add_linked_libs,rscpp,\
tl \
vos3 \
stl \
-$(gb_STDLIBS) \
+   $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_add_cobjects,rscpp,\
diff --git a/rsc/Module_rsc.mk b/rsc/Module_rsc.mk
index ef22d34dac0d..b75fc942ec89 100644
--- a/rsc/Module_rsc.mk
+++ b/rsc/Module_rsc.mk
@@ -30,5 +30,4 @@ $(eval $(call gb_Module_add_targets,rsc,\
Package_inc \
 ))
 
-
 # vim: set noet sw=4 ts=4:
diff --git a/rsc/Package_inc.mk b/rsc/Package_inc.mk
index 48c082d5afb0..bf24f85e749c 100644
--- a/rsc/Package_inc.mk
+++ b/rsc/Package_inc.mk
@@ -23,3 +23,5 @@
 
 $(eval $(call gb_Package_Package,rsc_inc,$(SRCDIR)/rsc/inc))
 $(eval $(call gb_Package_add_file,rsc_inc,inc/rsc/rscsfx.hxx,rsc/rscsfx.hxx))
+
+# vim: set noet ts=4 sw=4:
commit 1af1316ff68444084fa19402da483d223ed89503
Author: Matthias Seidel 
AuthorDate: Thu Oct 11 09:43:49 2018 +
Commit: Matthias Seidel 
CommitDate: Thu Oct 11 09:43:49 2018 +

Deleted whitespace, updated copyright year

diff --git a/odk/index.html b/odk/index.html
index 3469cbcb3c8c..a44101d8ffa9 100644
--- a/odk/index.html
+++ b/odk/index.html
@@ -45,146 +45,146 @@
   
   
 Apache OpenOffice %PRODUCT_RELEASE% software is a complete, 
feature-rich
-  office productivity suite that provides, in combination with 
this 
- SDK, all the essential tools for building and 
deploying custom 
- solutions that build on, or integrate with, the 
Apache OpenOffice %PRODUCT_RELEASE% suite 
+  office productivity suite that provides, in combination with this
+ SDK, all the essential tools for building and 
deploying custom
+ solutions that build on, or integrate with, the 
Apache OpenOffice %PRODUCT_RELEASE% suite
  of products.
-The SDK is a development kit for Apache OpenOffice 
%PRODUCT_RELEASE%, which 
- eases the development of office

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - RepositoryExternal.mk RepositoryFixes.mk scp2/source setup_native/source

2018-09-28 Thread Libreoffice Gerrit user

 RepositoryExternal.mk|3 +--
 RepositoryFixes.mk   |6 +++---
 scp2/source/gnome/module_gnome.ulf   |2 +-
 setup_native/source/packinfo/package_names.txt   |2 +-
 setup_native/source/packinfo/packinfo_office.txt |2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 72b2299f3ec474a09e00f4966abc8c37bb972ec1
Author: Matthias Seidel 
AuthorDate: Fri Sep 28 08:04:33 2018 +
Commit: Matthias Seidel 
CommitDate: Fri Sep 28 08:04:33 2018 +

Correcting description: Gnome -> GNOME

diff --git a/scp2/source/gnome/module_gnome.ulf 
b/scp2/source/gnome/module_gnome.ulf
index c8d84d45aa47..4a82fe2b805e 100644
--- a/scp2/source/gnome/module_gnome.ulf
+++ b/scp2/source/gnome/module_gnome.ulf
@@ -25,5 +25,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 86f3a8db438f..bc301ce00905 100644
--- a/setup_native/source/packinfo/package_names.txt
+++ b/setup_native/source/packinfo/package_names.txt
@@ -23,7 +23,7 @@
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-vi   Vietnamese dictionary 
for %PRODUCTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw  Draw module for 
%APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmergeEmail mailmerge 
module for %APACHEPROJECTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn   Gnome 
integration module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn   GNOME 
integration module for %APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter Graphic filter 
module for %APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless  Headless display module 
for %APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-imagesImages module for 
%APACHEPROJECTNAME %PRODUCTVERSION
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 984db61a9e04..16a438041042 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -49,7 +49,7 @@ findrequires = "find-requires-gnome.sh"
 copyright = "2012-2018 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Gnome integration module for %APACHEPROJECTNAME %PRODUCTVERSION"
+description = "GNOME integration module for %APACHEPROJECTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
commit 98abbd6a837436c18e360edae46cd603c1182bd6
Author: Matthias Seidel 
AuthorDate: Fri Sep 28 07:26:58 2018 +
Commit: Matthias Seidel 
CommitDate: Fri Sep 28 07:26:58 2018 +

Minor cleanup

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8cb3a5d5a4e5..669330608c8d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -371,7 +371,7 @@ $(call gb_LinkTarget_add_defs,$(1),\
 $(call gb_LinkTarget_set_include,$(1),\
 $$(INCLUDE) \
 $(APR_CFLAGS) \
-)   
+)
 $(call gb_LinkTarget_add_libs,$(1),$(APR_LIBS))
 endef
 
@@ -668,5 +668,4 @@ endef
 
 endif # SYSTEM_HUNSPELL
 
-
 # vim: set noet sw=4 ts=4:
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index dcdb0538313e..8bbed45f8ab7 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -107,8 +107,8 @@ gb_Library_FILENAMES := $(patsubst 
z:iz%,z:zlib%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
 
 # handle libraries in msvc format that don't use an "i" prefix for their 
import library
-# these are libraries built by OOo, but only a few of them
-# all other libraries built by OOo and all platform libraries (exceptions see 
below) are used without an import library
+# these are libraries built by AOO, but only a few of them
+# all other libraries built by AOO and all platform libraries (exceptions see 
below) are used without an import library
 # we link against their dlls in gcc format directly
 gb_Library_NOILIBFILENAMES:=\
 icudt \
@@ -193,7 +193,7 @@ gb_Library_DLLFILENAMES := $(patsubst 
z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
 endif # ifneq ($(USE_MINGW),)
 
-else  # ifeq ($(OS),WNT)
+else # ifeq ($(OS),WNT)
 
 gb_Library_FILENAMES := $(patsubst 
vbaobj:vbaobj.uno%,vbaobj:libvbaobj.uno%,$(gb_Library_FILENAMES))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sysui/desktop vcl/win vcl/WinResTarget_vcl.mk

2018-09-12 Thread Libreoffice Gerrit user

 sysui/desktop/icons/locolor/16x16/apps/main.png|binary
 sysui/desktop/icons/locolor/16x16/apps/startcenter.png |binary
 sysui/desktop/icons/locolor/32x32/apps/main.png|binary
 sysui/desktop/icons/locolor/32x32/apps/startcenter.png |binary
 vcl/WinResTarget_vcl.mk|2 
 vcl/win/source/src/salsrc.rc   |   90 -
 6 files changed, 46 insertions(+), 46 deletions(-)

New commits:
commit 62361c9127a394301ad4a080bb91f10285b50b29
Author: Matthias Seidel 
AuthorDate: Wed Sep 12 15:07:37 2018 +
Commit: Matthias Seidel 
CommitDate: Wed Sep 12 15:07:37 2018 +

Use correct locolor icons for startcenter/main

diff --git a/sysui/desktop/icons/locolor/16x16/apps/main.png 
b/sysui/desktop/icons/locolor/16x16/apps/main.png
new file mode 100644
index ..2381a82bd2f3
Binary files /dev/null and b/sysui/desktop/icons/locolor/16x16/apps/main.png 
differ
diff --git a/sysui/desktop/icons/locolor/16x16/apps/startcenter.png 
b/sysui/desktop/icons/locolor/16x16/apps/startcenter.png
index 347d030bc740..c2003664c2ba 100644
Binary files a/sysui/desktop/icons/locolor/16x16/apps/startcenter.png and 
b/sysui/desktop/icons/locolor/16x16/apps/startcenter.png differ
diff --git a/sysui/desktop/icons/locolor/32x32/apps/main.png 
b/sysui/desktop/icons/locolor/32x32/apps/main.png
new file mode 100644
index ..e06654658bab
Binary files /dev/null and b/sysui/desktop/icons/locolor/32x32/apps/main.png 
differ
diff --git a/sysui/desktop/icons/locolor/32x32/apps/startcenter.png 
b/sysui/desktop/icons/locolor/32x32/apps/startcenter.png
index cfaaaba07a60..baae82a7bc39 100644
Binary files a/sysui/desktop/icons/locolor/32x32/apps/startcenter.png and 
b/sysui/desktop/icons/locolor/32x32/apps/startcenter.png differ
commit d5dff5af77cb379ce3fc349776347f68743ee63f
Author: Matthias Seidel 
AuthorDate: Wed Sep 12 14:46:35 2018 +
Commit: Matthias Seidel 
CommitDate: Wed Sep 12 14:46:35 2018 +

Reverting to sd.ico (StarDesktop?)

diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
index 2d41e5448a9e..f0e7dda5b77f 100755
--- a/vcl/WinResTarget_vcl.mk
+++ b/vcl/WinResTarget_vcl.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
 vcl/win/source/src/copyf.cur \
 vcl/win/source/src/drect.cur \
 vcl/win/source/src/movef.cur \
-vcl/win/source/src/oo.ico \
+vcl/win/source/src/sd.ico \
 vcl/win/source/src/ase.cur \
 vcl/win/source/src/copyf2.cur \
 vcl/win/source/src/dtext.cur \
diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc
index 5adb26a9cb3f..dc05cb78eef4 100644
--- a/vcl/win/source/src/salsrc.rc
+++ b/vcl/win/source/src/salsrc.rc
@@ -28,67 +28,67 @@
 #include 
 #endif
 
-SAL_RESID_POINTER_NULL CURSOR  NULLPTR.CUR
+SAL_RESID_POINTER_NULL CURSOR  NULLPTR.CUR
 #if ( WINVER < 0x0400 )
-SAL_RESID_POINTER_HELP CURSOR  HELP.CUR
+SAL_RESID_POINTER_HELP CURSOR  HELP.CUR
 #endif
 #ifndef WNT
-SAL_RESID_POINTER_HSIZECURSOR  HSIZE.CUR
-SAL_RESID_POINTER_VSIZ CURSOR  VSIZE.CUR
-SAL_RESID_POINTER_NESWSIZE CURSOR  NESWSIZE.CUR
-SAL_RESID_POINTER_NWSESIZE CURSOR  NWSESIZE.CUR
+SAL_RESID_POINTER_HSIZECURSOR  
HSIZE.CUR
+SAL_RESID_POINTER_VSIZ CURSOR  VSIZE.CUR
+SAL_RESID_POINTER_NESWSIZE CURSOR  NESWSIZE.CUR
+SAL_RESID_POINTER_NWSESIZE CURSOR  NWSESIZE.CUR
 #endif
-SAL_RESID_POINTER_CROSSCURSOR  CROSS.CUR
-SAL_RESID_POINTER_MOVE CURSOR  MOVE.CUR
-SAL_RESID_POINTER_HSPLIT   CURSOR  HSPLIT.CUR
-SAL_RESID_POINTER_VSPLIT   CURSOR  VSPLIT.CUR
-SAL_RESID_POINTER_HSIZEBAR CURSOR  HSIZEBAR.CUR
-SAL_RESID_POINTER_VSIZEBAR CURSOR  VSIZEBAR.CUR
-SAL_RESID_POINTER_HAND CURSOR  HAND.CUR
-SAL_RESID_POINTER_REFHAND  CURSOR  REFHAND.CUR
-SAL_RESID_POINTER_PEN  CURSOR  PEN.CUR
-SAL_RESID_POINTER_MAGNIFY  CURSOR  MAGNIFY.CUR
-SAL_RESID_POINTER_FILL CURSOR  FILL.CUR
-SAL_RESID_POINTER_ROTATE   CURSOR  ROTATE.CUR
-SAL_RESID_POINTER_HSHEAR   CURSOR  HSHEAR.CUR
-SAL_RESID_POINTER_VSHEAR   CURSOR  VSHEAR.CUR
-SAL_RESID_POINTER_MIRROR   CURSOR  MIRROR.CUR
-SAL_RESID_POINTER_CROOKCURSOR  CROOK.CUR
-SAL_RESID_POINTER_CROP CURSOR  CROP.CUR
-SAL_RESID_POINTER_MOVEPOINTCURSOR  MOVEPT.CUR
+SAL_RESID_POINTER_CROSS

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - rsc/source xmlhelp/source

2018-09-09 Thread Libreoffice Gerrit user

 rsc/source/misc/makefile.mk |   41 
 rsc/source/parser/makefile.mk   |   63 -
 rsc/source/prj/makefile.mk  |   75 --
 rsc/source/res/makefile.mk  |   57 ---
 rsc/source/rsc/makefile.mk  |   37 ---
 rsc/source/rscpp/makefile.mk|   88 
 rsc/source/tools/makefile.mk|   41 
 xmlhelp/source/treeview/makefile.mk |   73 -
 8 files changed, 475 deletions(-)

New commits:
commit a9ac253db17a46829d53f2d60375f5c223288554
Author: Damjan Jovanovic 
AuthorDate: Sun Sep 9 13:28:13 2018 +
Commit: Damjan Jovanovic 
CommitDate: Sun Sep 9 13:28:13 2018 +

Delete unused dmake makefile.

Patch by: me

diff --git a/xmlhelp/source/treeview/makefile.mk 
b/xmlhelp/source/treeview/makefile.mk
deleted file mode 100644
index 3e086d6d442e..
--- a/xmlhelp/source/treeview/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#**
-#  
-#  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
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**
-
-
-
-PRJ=..$/..
-PRJNAME=xmlhelp
-TARGET=tvhlp
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-NO_BSYMBOLIC=TRUE
-
-# Version
-TVHLP_MAJOR=1
-
-.INCLUDE: settings.mk
-
-.IF "$(SYSTEM_EXPAT)" == "YES"
-CFLAGS+=-DSYSTEM_EXPAT
-.ENDIF
-
-SLOFILES=\
-$(SLO)$/tvfactory.obj  \
-$(SLO)$/tvread.obj
-
-LIB1TARGET=$(SLB)$/_$(TARGET).lib
-LIB1OBJFILES=$(SLOFILES)
-
-SHL1TARGET=$(TARGET)$(TVHLP_MAJOR)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(LIB1TARGET)
-SHL1IMPLIB=i$(TARGET)
-SHL1STDLIBS=\
-$(CPPUHELPERLIB) \
-$(CPPULIB) \
-$(COMPHELPERLIB) \
-$(EXPATASCII3RDLIB)  \
-$(SALLIB)  
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-DEF1DES=UCB : Treeview help
-
-
-.INCLUDE: target.mk
-
-
-
-ALLTAR : $(MISC)/tvhlp1.component
-
-$(MISC)/tvhlp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-tvhlp1.component
-$(XSLTPROC) --nonet --stringparam uri \
-'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-$(SOLARENV)/bin/createcomponent.xslt tvhlp1.component
commit 0b78f11b6ea44cfa7586a255282ece110568856d
Author: Damjan Jovanovic 
AuthorDate: Sun Sep 9 13:26:31 2018 +
Commit: Damjan Jovanovic 
CommitDate: Sun Sep 9 13:26:31 2018 +

Delete unused dmake makefiles.

Patch by: me

diff --git a/rsc/source/misc/makefile.mk b/rsc/source/misc/makefile.mk
deleted file mode 100644
index bdbc658b3873..
--- a/rsc/source/misc/makefile.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#**
-#  
-#  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
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**
-
-
-
-PRJ=..$/..
-
-PRJNAME=rsc
-TARGET=rscmis
-
-# --- Settings --
-
-.INCLUDE :  settings.mk
-
-# --- Files -
-
-CXXFILES=  rsclst.cxx  \
-rscdbl.cxx
-
-OBJFILES=  $(OBJ)$/rsclst.obj  \
-$(OBJ)$/rscdbl.obj
-
-.INCLUDE :  target.mk
diff --git a/rsc/source/parser/makefile.mk b/rsc/source/parser/makefile.mk
deleted file mode 100644
index

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - rsc/Executable_rscpp.mk solenv/gbuild

2018-09-08 Thread Libreoffice Gerrit user

 rsc/Executable_rscpp.mk |4 
 solenv/gbuild/LinkTarget.mk |3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2717421af58a66b3f2c75c22dde5884bb6ad6b89
Author: Damjan Jovanovic 
AuthorDate: Sat Sep 8 08:16:23 2018 +
Commit: Damjan Jovanovic 
CommitDate: Sat Sep 8 08:16:23 2018 +

When building other languages (--with-lang="..."), the build was breaking

because rsc couldn't compile certain resources (usually in main/sfx2).

Apparently the RSC preprocessor, rscpp, uses very small buffers by default.
When the SOLAR preprocessor definition is defined, it uses bigger buffers
instead. Previously dmake was explicitly passing "-DSOLAR" to the C compiler
but I missed it when porting main/rsc to gbuild. When added back,
main/sfx2 builds languages successfully.

Patch by: me

diff --git a/rsc/Executable_rscpp.mk b/rsc/Executable_rscpp.mk
index e55f1012bda0..4011a52e2fbf 100644
--- a/rsc/Executable_rscpp.mk
+++ b/rsc/Executable_rscpp.mk
@@ -31,6 +31,10 @@ $(eval $(call gb_Executable_set_include,rscpp,\
 -I$(SRCDIR)/rsc/inc/pch \
 ))
 
+$(eval $(call gb_Executable_add_defs,rscpp,\
+   -DSOLAR \
+))
+
 ifeq ($(GUI),UNX)
 $(eval $(call gb_Executable_add_defs,rscpp,\
-Dunix \
commit f57b17ed4cbe46f05c6c53db73f68ef49d160733
Author: Damjan Jovanovic 
AuthorDate: Sat Sep 8 08:13:10 2018 +
Commit: Damjan Jovanovic 
CommitDate: Sat Sep 8 08:13:10 2018 +

Strip carriage returns from the Bison source files.

This hasn't been necessary so far, but dmake did it, so let's be safe.

Patch by: me

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 78c3f7f021c6..62871966edfb 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -617,7 +617,8 @@ endif
 
 $(call gb_BisonTarget_get_target,$(1),$(2)) : $(call 
gb_BisonTarget_get_source,$(2))
mkdir -p $(dir $(call gb_BisonTarget_get_target,$(1),$(2))) && \
-   bison -d -o $(call gb_BisonTarget_get_target,$(1),$(2)) $(call 
gb_BisonTarget_get_source,$(2)) 
+   tr -d "\015" < $(call gb_BisonTarget_get_source,$(2)) > $(dir $(call 
gb_BisonTarget_get_target,$(1),$(2)))/stripped_$(notdir $(call 
gb_BisonTarget_get_source,$(2))) && \
+   bison -d -o $(call gb_BisonTarget_get_target,$(1),$(2)) $(dir $(call 
gb_BisonTarget_get_target,$(1),$(2)))/stripped_$(notdir $(call 
gb_BisonTarget_get_source,$(2)))
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - odk/docs odk/setsdkenv_windows.template

2018-09-02 Thread Libreoffice Gerrit user

 odk/docs/images/sdk_head-1.png |binary
 odk/setsdkenv_windows.template |6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 494f05f40eb4e5fed708d1f598ba5d63049dc07e
Author: Matthias Seidel 
AuthorDate: Sun Sep 2 21:54:19 2018 +
Commit: Matthias Seidel 
CommitDate: Sun Sep 2 21:54:19 2018 +

Fixed typo (tilte -> title)

diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template
index 9a31341e8965..9996da3e 100644
--- a/odk/setsdkenv_windows.template
+++ b/odk/setsdkenv_windows.template
@@ -57,7 +57,7 @@ REM Example: @set "OO_SDK_CPP_HOME=C:\Program Files\Microsoft 
Visual Studio 9.0\
 @set "CPP_WINDOWS_SDK="
 
 REM Directory of the C# and VB.NET compilers.
-REM Example: @set "OO_SDK_CLI_HOME=C:\WINXP\Microsoft.NET\Framework\v1.0.3705"
+REM Example: @set 
"OO_SDK_CLI_HOME=C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705"
 @set "OO_SDK_CLI_HOME="
 
 REM Java SDK installation directory.
@@ -103,7 +103,7 @@ if not defined OO_SDK_SED_HOME (
goto :error
  )
 
-REM Set library path. 
+REM Set library path.
 @set "LIB=%OO_SDK_HOME%\lib;%LIB%"
 if defined CPP_WINDOWS_SDK (
@set "LIB=%LIB%;%CPP_WINDOWS_SDK%\lib"
@@ -152,7 +152,7 @@ if defined OO_SDK_JAVA_HOME @set 
"PATH=%OO_SDK_JAVA_HOME%\bin;%OO_SDK_JAVA_HOME%
 REM Set environment for C++ compiler tools, if necessary.
 if defined OO_SDK_CPP_HOME call "%OO_SDK_CPP_HOME%\VCVARS32.bat"
 
-REM Set tilte to identify the prepared shell.
+REM Set title to identify the prepared shell.
 title Shell prepared for SDK
 
 REM Prepare shell with all necessary environment variables.
commit 08d960805bfa5d69ac0ddba22b883dd388995207
Author: Matthias Seidel 
AuthorDate: Sun Sep 2 20:09:40 2018 +
Commit: Matthias Seidel 
CommitDate: Sun Sep 2 20:09:40 2018 +

Updated header graphic for SDK, removed transparency layer

diff --git a/odk/docs/images/sdk_head-1.png b/odk/docs/images/sdk_head-1.png
index 6966042211ce..581d27f77a3b 100644
Binary files a/odk/docs/images/sdk_head-1.png and 
b/odk/docs/images/sdk_head-1.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/res ooo_custom_images/classic ooo_custom_images/industrial solenv/ant

2018-08-22 Thread Libreoffice Gerrit user

 default_images/res/commandimagelist/lc_alignbottom.png 
|binary
 default_images/res/commandimagelist/lc_alignhorizontalcenter.png   
|binary
 default_images/res/commandimagelist/lc_alignleft.png   
|binary
 default_images/res/commandimagelist/lc_alignright.png  
|binary
 default_images/res/commandimagelist/lc_aligntop.png
|binary
 default_images/res/commandimagelist/lc_alignverticalcenter.png 
|binary
 default_images/res/commandimagelist/lch_alignbottom.png
|binary
 default_images/res/commandimagelist/lch_alignhorizontalcenter.png  
|binary
 default_images/res/commandimagelist/lch_alignleft.png  
|binary
 default_images/res/commandimagelist/lch_alignright.png 
|binary
 default_images/res/commandimagelist/lch_aligntop.png   
|binary
 default_images/res/commandimagelist/lch_alignverticalcenter.png
|binary
 default_images/res/commandimagelist/sc_alignbottom.png 
|binary
 default_images/res/commandimagelist/sc_alignhorizontalcenter.png   
|binary
 default_images/res/commandimagelist/sc_alignleft.png   
|binary
 default_images/res/commandimagelist/sc_alignright.png  
|binary
 default_images/res/commandimagelist/sc_aligntop.png
|binary
 default_images/res/commandimagelist/sc_alignverticalcenter.png 
|binary
 default_images/res/commandimagelist/sch_alignbottom.png
|binary
 default_images/res/commandimagelist/sch_alignhorizontalcenter.png  
|binary
 default_images/res/commandimagelist/sch_alignleft.png  
|binary
 default_images/res/commandimagelist/sch_alignright.png 
|binary
 default_images/res/commandimagelist/sch_aligntop.png   
|binary
 default_images/res/commandimagelist/sch_alignverticalcenter.png
|binary
 ooo_custom_images/classic/classic_images.tar.gz
|binary
 ooo_custom_images/industrial/res/commandimagelist/lc_alignbottom.png   
|binary
 ooo_custom_images/industrial/res/commandimagelist/lc_alignhorizontalcenter.png 
|binary
 ooo_custom_images/industrial/res/commandimagelist/lc_alignleft.png 
|binary
 ooo_custom_images/industrial/res/commandimagelist/lc_alignright.png
|binary
 ooo_custom_images/industrial/res/commandimagelist/lc_aligntop.png  
|binary
 ooo_custom_images/industrial/res/commandimagelist/lc_alignverticalcenter.png   
|binary
 ooo_custom_images/industrial/res/commandimagelist/sc_alignbottom.png   
|binary
 ooo_custom_images/industrial/res/commandimagelist/sc_alignhorizontalcenter.png 
|binary
 ooo_custom_images/industrial/res/commandimagelist/sc_alignleft.png 
|binary
 ooo_custom_images/industrial/res/commandimagelist/sc_alignright.png
|binary
 ooo_custom_images/industrial/res/commandimagelist/sc_aligntop.png  
|binary
 ooo_custom_images/industrial/res/commandimagelist/sc_alignverticalcenter.png   
|binary
 solenv/ant/aoo-ant.xml 
|2 +-
 38 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2d01d342fc70dd943e0d30b4762e6e1830012ec
Author: Damjan Jovanovic 
AuthorDate: Wed Aug 22 19:58:13 2018 +
Commit: Damjan Jovanovic 
CommitDate: Wed Aug 22 19:58:13 2018 +

Fix typo in Ant property.

Patch by: me

diff --git a/solenv/ant/aoo-ant.xml b/solenv/ant/aoo-ant.xml
index 5e54f63e6660..92ef437d624a 100644
--- a/solenv/ant/aoo-ant.xml
+++ b/solenv/ant/aoo-ant.xml
@@ -138,7 +138,7 @@
 
 
 
-
+
 
 
 
commit e25ab255a5c767f6431435a7bb244dff19537f20
Author: Matthias Seidel 
AuthorDate: Wed Aug 22 19:46:47 2018 +
Commit: Matthias Seidel 
CommitDate: Wed Aug 22 19:46:47 2018 +

i113385 - Reverted all icon changes

diff --git a/default_images/res/commandimagelist/lc_alignbottom.png 
b/default_images/res/commandimagelist/lc_alignbottom.png
index fb29b1958470..4ddcc1e521f1 100644
Binary files a/default_images/res/commandimagelist/lc_alignbottom.png and 
b/default_images/res/commandimagelist/lc_alignbottom.png differ
diff --git a/default_images/res/commandimagelist/lc_alignhorizontalcenter.png 
b/default_images/res/commandimagelist/lc_alignhorizontalcenter.png
index ca4e3334ac48..947276d9dda5 100644
Binary files a/default_images/res/commandimagelist/lc_alignhorizontalcenter.png 
and b/default_images/res/commandimagelist/lc_alignhorizontalcenter.png differ
diff --git a/default_images/res/commandimagelist/lc_alignleft.png

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sc/uiconfig vcl/inc

2018-08-22 Thread Libreoffice Gerrit user

 sc/uiconfig/scalc/toolbar/formatobjectbar.xml |8 
 vcl/inc/glyphcache.hxx|4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d99603925cb7f4480d55ac96069a29c6869f343f
Author: Matthias Seidel 
AuthorDate: Wed Aug 22 17:54:11 2018 +
Commit: Matthias Seidel 
CommitDate: Wed Aug 22 17:54:11 2018 +

Small change to Calc toolbar

diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml 
b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index 52fcb4fe0cf1..770e46e5a521 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
@@ -41,16 +41,16 @@
  
  
  
+ 
+ 
+ 
+ 
  
  
  
  
  
  
- 
- 
- 
- 
  
  
  
commit 7b63e739fc22b8ade19cbd6fd5a343d0b457f751
Author: Don Lewis 
AuthorDate: Wed Aug 22 16:58:51 2018 +
Commit: Don Lewis 
CommitDate: Wed Aug 22 16:58:51 2018 +

Fix RemovingGlyph method parameter type mismatch between the base

and derived classes (int vs sal_GlyphId) and clean up a related
type mismatch involving this parameter in the base method implementation.

diff --git a/vcl/inc/glyphcache.hxx b/vcl/inc/glyphcache.hxx
index 26b4d5d78a7b..dfe137f98df7 100644
--- a/vcl/inc/glyphcache.hxx
+++ b/vcl/inc/glyphcache.hxx
@@ -221,7 +221,7 @@ protected:
 virtual ServerFontLayoutEngine* GetLayoutEngine() { return NULL; }
 
 private:
-typedef ::std::hash_map GlyphList;
+typedef ::std::hash_map GlyphList;
 mutable GlyphList   maGlyphList;
 
 const ImplFontSelectDatamaFontSelData;
@@ -304,7 +304,7 @@ protected:
 public:
 sal_Int32   GetByteCount() const { return mnBytesUsed; }
 virtual voidRemovingFont( ServerFont& ) {}
-virtual voidRemovingGlyph( ServerFont&, GlyphData&, int ) {}
+virtual voidRemovingGlyph( ServerFont&, GlyphData&, sal_GlyphId ) {}
 
 protected:
 sal_Int32   mnBytesUsed;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sal/inc scripting/source solenv/gbuild

2018-08-18 Thread Libreoffice Gerrit user

 sal/inc/osl/profile.hxx|8 
 scripting/source/stringresource/stringresource.cxx |2 +-
 solenv/gbuild/CustomTarget.mk  |1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 3cc7c171ef01fd267ae29f0f70d473e79d99c356
Author: Don Lewis 
AuthorDate: Sat Aug 18 07:25:26 2018 +
Commit: Don Lewis 
CommitDate: Sat Aug 18 07:25:26 2018 +

Arrays allocated with new [] should be freed using delete[].

diff --git a/sal/inc/osl/profile.hxx b/sal/inc/osl/profile.hxx
index 25bafed6d520..26f2ef9ae6df 100644
--- a/sal/inc/osl/profile.hxx
+++ b/sal/inc/osl/profile.hxx
@@ -103,7 +103,7 @@ namespace osl {
 }
 pStrings[ nItems ] = NULL;
 sal_uInt32 nRet = osl_readProfileIdent( profile, 
rSection.getStr(), rEntry.getStr(), nFirstId, pStrings, nDefault);
-delete pStrings;
+delete[] pStrings;
 return nRet;
 }
 
@@ -134,7 +134,7 @@ namespace osl {
 pStrings[ nItems ] = NULL;
 sal_Bool bRet =
 osl_writeProfileIdent( profile, rSection.getStr(), 
rEntry.getStr(), nFirstId, pStrings, nValue );
-delete pStrings;
+delete[] pStrings;
 return bRet;
 }
 
@@ -164,7 +164,7 @@ namespace osl {
 int nLen;
 for( n = 0; ( nLen = strlen( pBuf+n ) ); n += nLen+1 )
 aEntries.push_back( rtl::OString( pBuf+n ) );
-delete pBuf;
+delete[] pBuf;
 }
 
 return aEntries;
@@ -187,7 +187,7 @@ namespace osl {
 int nLen;
 for( n = 0; ( nLen = strlen( pBuf+n ) ); n += nLen+1 )
 aSections.push_back( rtl::OString( pBuf+n ) );
-delete pBuf;
+delete[] pBuf;
 }
 
 return aSections;
diff --git a/scripting/source/stringresource/stringresource.cxx 
b/scripting/source/stringresource/stringresource.cxx
index a9d6b0ba329b..ee15035becf3 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -2300,7 +2300,7 @@ bool 
StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale
 }
 }
 
-delete pIdPtrs;
+delete[] pIdPtrs;
 }
 
 bSuccess = true;
commit b4353325a7d41c97c31532b7e5ac3cebc8b3624e
Author: Damjan Jovanovic 
AuthorDate: Sat Aug 18 06:30:22 2018 +
Commit: Damjan Jovanovic 
CommitDate: Sat Aug 18 06:30:22 2018 +

Get gbuild's CustomTarget working.

Patch by: me

diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 58c96000953f..784fcecd4706 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -56,6 +56,7 @@ $(call gb_CustomTarget_get_target,$(1)) : \
   $(call gb_CustomTarget__get_makefile,$($(2)),$(1))
 $(call gb_CustomTarget_get_workdir,$(1))/% : \
   $(call gb_CustomTarget_get_target,$(1))
+$(eval $(call gb_Module_register_target,$(call 
gb_CustomTarget_get_target,$(1)),$(call gb_CustomTarget_get_clean_target,$(1
 endef
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - desktop/source odk/setsdkenv_unix.sh.in odk/settings sal/prj solenv/gbuild solenv/inc sw/source

2018-07-12 Thread Jim Jagielski

 desktop/source/pagein/makefile.mk |5 -
 odk/setsdkenv_unix.sh.in  |   10 +-
 odk/settings/settings.mk  |   34 +++
 sal/prj/d.lst |4 
 solenv/gbuild/platform/macosx.mk  |9 +-
 solenv/inc/libs.mk|   13 +-
 sw/source/ui/frmdlg/column.src|  170 +++---
 7 files changed, 121 insertions(+), 124 deletions(-)

New commits:
commit 4c184a25474995d41296f1c59eef364b3c710842
Author: Jim Jagielski 
Date:   Thu Jul 12 18:50:38 2018 +

Update targets for macOS

diff --git a/desktop/source/pagein/makefile.mk 
b/desktop/source/pagein/makefile.mk
index e4588785cd6a..fdf2988001fa 100644
--- a/desktop/source/pagein/makefile.mk
+++ b/desktop/source/pagein/makefile.mk
@@ -63,13 +63,8 @@ ALL: \
 .INCLUDE :  target.mk
 
 ICUDLLPOST=$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR)
-.IF "$(OS)" == "MACOSX"
-UDKDLLPOST=$(patsubst %.dylib,%$(UDK_MAJOR).dylib,$(DLLPOST)
-UNODLLPOST=.uno$(DLLPOST)
-.ELSE
 UDKDLLPOST=$(DLLPOST).$(UDK_MAJOR)
 UNODLLPOST=.uno$(DLLPOST)
-.ENDIF
 DFTDLLPOST=$(DLLPOSTFIX)$(DLLPOST) # Default 
 
 URELIBPATH=..$/ure-link$/lib
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index 7b3a39874ef0..5a7fa6382f64 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -293,15 +293,15 @@ then
 if [ "${OFFICE_HOME}" ]
 then
mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
-   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu3.${soext}" \
+   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}.3" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
-   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper3${comid}.${soext}" \
+   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \

"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
-   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal3.${soext}" \
+   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}.3" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
-   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper3${comid}.${soext}" \
+   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \

"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
-   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper3${comid}.${soext}" 
\
+   ln -s 
"${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \

"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
 
 fi
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 276fa3091b2a..f22d2d1eedb2 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -436,23 +436,23 @@ URLPREFIX=file://
 # Include UDK version numbers
 include $(PRJ)/include/udkversion.mk
 
-SALLIB=-luno_sal3
-CPPULIB=-luno_cppu3
-CPPUHELPERLIB=-luno_cppuhelper3$(COMID)
-SALHELPERLIB=-luno_salhelper3$(COMID)
-REGLIB=-lreg3
-STORELIB=-lstore3
-
-SALDYLIB=-Wl,-dylib_file,@__URELIB/libuno_sal3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_sal.dylib'
-CPPUDYLIB=-Wl,-dylib_file,@__URELIB/libuno_cppu3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppu.dylib'
-CPPUHELPERDYLIB=-Wl,-dylib_file,@__URELIB/libuno_cppuhelper3'$(COMID).dylib:$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib'
-SALHELPERDYLIB=-Wl,-dylib_file,@__URELIB/libuno_salhelper3$(COMID).dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_salhelper$(COMID).dylib'
-REGDYLIB=-Wl,-dylib_file,@__URELIB/libreg3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib'
-STOREDYLIB=-Wl,-dylib_file,@__URELIB/libstore3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib'
-
-INSTALL_NAME_URELIBS=$(INSTALLTOOL) -change 
@__URELIB/libuno3_sal.dylib 
@executable_path/libuno_sal3.dylib -change  
@__URELIB/libuno_cppu3.dylib 
@executable_path/libuno_cppu3.dylib -change 
@__URELIB/libuno_cppuhelper$(COMID)3.dylib
 @executable_path/libuno_cppuhelper$(COMID)3.dylib -change 
@__URELIB/libuno_salhelper$(COMID)3.dylib
 @executable_path/libuno_salhelper$(COMID)3.dylib -change 
@__URELIB/libreg3.dylib 
@executable_path/libreg3.dylib -change 
@__URELIB/libstore3.dylib 
@executable_path/libstore3.dylib
-
-INSTALL_NAME_URELIBS_BIN=$(INSTALLTOOL) -change 
@__URELIB/libuno_sal3.dylib 
libuno_sal3.dylib -change  
@__URELIB/libuno_cppu3.dylib

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sd/source vcl/win vcl/WinResTarget_vcl.mk

2018-07-12 Thread Matthias Seidel

 dev/null |binary
 sd/source/filter/html/pubdlg.src |8 +-
 vcl/WinResTarget_vcl.mk  |   10 +--
 vcl/win/source/src/oo.ico|binary
 vcl/win/source/src/salsrc.rc |  119 +++
 5 files changed, 69 insertions(+), 68 deletions(-)

New commits:
commit 9353191981faed85afa7e40bd3941a8bd9d87102
Author: Matthias Seidel 
Date:   Thu Jul 12 10:46:06 2018 +

Replacing sd.ico (StarDesktop?) with OpenOffice icon

diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
index e3b29b5b3540..b6c5c5ae3a6c 100755
--- a/vcl/WinResTarget_vcl.mk
+++ b/vcl/WinResTarget_vcl.mk
@@ -24,8 +24,8 @@
 $(eval $(call gb_WinResTarget_WinResTarget,vcl/src))
 
 $(eval $(call gb_WinResTarget_set_include,vcl/src,\
-$$(INCLUDE) \
--I$(SRCDIR)/vcl/inc \
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
 ))
 
 ifeq ($(OS),WNT)
@@ -49,7 +49,7 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
 vcl/win/source/src/copyf.cur \
 vcl/win/source/src/drect.cur \
 vcl/win/source/src/movef.cur \
-vcl/win/source/src/sd.ico \
+vcl/win/source/src/oo.ico \
 vcl/win/source/src/ase.cur \
 vcl/win/source/src/copyf2.cur \
 vcl/win/source/src/dtext.cur \
@@ -127,8 +127,8 @@ $(eval $(call gb_WinResTarget_add_file,vcl/src,\
 ))
 
 $(eval $(call gb_WinResTarget_set_include,vcl/src,\
-$$(INCLUDE) \
--I$(SRCDIR)/vcl/os2/source/src \
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/os2/source/src \
 ))
 
 endif
diff --git a/vcl/win/source/src/oo.ico b/vcl/win/source/src/oo.ico
new file mode 100644
index ..f9c2b09e67bb
Binary files /dev/null and b/vcl/win/source/src/oo.ico differ
diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc
index 810f15564c30..5adb26a9cb3f 100644
--- a/vcl/win/source/src/salsrc.rc
+++ b/vcl/win/source/src/salsrc.rc
@@ -28,67 +28,67 @@
 #include 
 #endif
 
-SAL_RESID_POINTER_NULL CURSOR  NULLPTR.CUR
+SAL_RESID_POINTER_NULL CURSOR  NULLPTR.CUR
 #if ( WINVER < 0x0400 )
-SAL_RESID_POINTER_HELP CURSOR  HELP.CUR
+SAL_RESID_POINTER_HELP CURSOR  HELP.CUR
 #endif
 #ifndef WNT
-SAL_RESID_POINTER_HSIZECURSOR  HSIZE.CUR
-SAL_RESID_POINTER_VSIZECURSOR  VSIZE.CUR
-SAL_RESID_POINTER_NESWSIZE CURSOR  NESWSIZE.CUR
-SAL_RESID_POINTER_NWSESIZE CURSOR  NWSESIZE.CUR
+SAL_RESID_POINTER_HSIZECURSOR  HSIZE.CUR
+SAL_RESID_POINTER_VSIZ CURSOR  VSIZE.CUR
+SAL_RESID_POINTER_NESWSIZE CURSOR  NESWSIZE.CUR
+SAL_RESID_POINTER_NWSESIZE CURSOR  NWSESIZE.CUR
 #endif
-SAL_RESID_POINTER_CROSSCURSOR  CROSS.CUR
-SAL_RESID_POINTER_MOVE CURSOR  MOVE.CUR
-SAL_RESID_POINTER_HSPLIT   CURSOR  HSPLIT.CUR
-SAL_RESID_POINTER_VSPLIT   CURSOR  VSPLIT.CUR
-SAL_RESID_POINTER_HSIZEBAR CURSOR  HSIZEBAR.CUR
-SAL_RESID_POINTER_VSIZEBAR CURSOR  VSIZEBAR.CUR
-SAL_RESID_POINTER_HAND CURSOR  HAND.CUR
-SAL_RESID_POINTER_REFHAND  CURSOR  REFHAND.CUR
-SAL_RESID_POINTER_PEN  CURSOR  PEN.CUR
-SAL_RESID_POINTER_MAGNIFY  CURSOR  MAGNIFY.CUR
-SAL_RESID_POINTER_FILL CURSOR  FILL.CUR
-SAL_RESID_POINTER_ROTATE   CURSOR  ROTATE.CUR
-SAL_RESID_POINTER_HSHEAR   CURSOR  HSHEAR.CUR
-SAL_RESID_POINTER_VSHEAR   CURSOR  VSHEAR.CUR
-SAL_RESID_POINTER_MIRROR   CURSOR  MIRROR.CUR
-SAL_RESID_POINTER_CROOKCURSOR  CROOK.CUR
-SAL_RESID_POINTER_CROP CURSOR  CROP.CUR
-SAL_RESID_POINTER_MOVEPOINTCURSOR  MOVEPT.CUR
+SAL_RESID_POINTER_CROSSCURSOR  CROSS.CUR
+SAL_RESID_POINTER_MOVE CURSOR  MOVE.CUR
+SAL_RESID_POINTER_HSPLIT   CURSOR  HSPLIT.CUR
+SAL_RESID_POINTER_VSPLIT   CURSOR  VSPLIT.CUR
+SAL_RESID_POINTER_HSIZEBAR CURSOR  HSIZEBAR.CUR
+SAL_RESID_POINTER_VSIZEBAR CURSOR  VSIZEBAR.CUR
+SAL_RESID_POINTER_HAND CURSOR  HAND.CUR
+SAL_RESID_POINTER_REFHAND  CURSOR  REFHAND.CUR
+SAL_RESID_POINTER_PEN  CURSOR  PEN.CUR
+SAL_RESID_POINTER_MAGNIFY  CURSOR  MAGNIFY.CUR
+SAL_RESID_POINTER_FILL CURSOR  FILL.CUR
+SAL_RESID_POINTER_ROTATE   CURSOR  ROTATE.CUR

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/sd ooo_custom_images/classic sd/source

2018-06-26 Thread Matthias Seidel

 default_images/sd/res/pubdes.png|binary
 default_images/sd/res/pubdes2.png   |binary
 default_images/sd/res/pubdes3.png   |binary
 default_images/sd/res/pubdes4.png   |binary
 default_images/sd/res/pubdlg1.png   |binary
 default_images/sd/res/pubdlg2.png   |binary
 default_images/sd/res/pubdlg3.png   |binary
 default_images/sd/res/pubdlg4.png   |binary
 default_images/sd/res/pubdlg5.png   |binary
 ooo_custom_images/classic/classic_images.tar.gz |binary
 sd/source/ui/dlg/dlgass.src |  269 ++--
 11 files changed, 118 insertions(+), 151 deletions(-)

New commits:
commit bac3d319aeeaaf6faaec6dc6fb1152d26da49c78
Author: Matthias Seidel 
Date:   Tue Jun 26 07:32:37 2018 +

Cleaned up dialog for Presentation Wizard

diff --git a/sd/source/ui/dlg/dlgass.src b/sd/source/ui/dlg/dlgass.src
index d479173ec00f..d835237bf062 100644
--- a/sd/source/ui/dlg/dlgass.src
+++ b/sd/source/ui/dlg/dlgass.src
@@ -27,7 +27,7 @@ ModalDialog DLG_ASS
 {
 OutputSize = TRUE ;
 SVLook = TRUE ;
-Size = MAP_APPFONT ( 272 , 190 ) ;
+Size = MAP_APPFONT ( 272, 190 ) ;
 Text[ en-US ] = "Presentation Wizard";
 
 HelpId = HID_SD_AUTOPILOT_PAGE1 ;
@@ -37,16 +37,16 @@ ModalDialog DLG_ASS
 Control CT_PREVIEW
 {
 Border = TRUE ;
-Pos = MAP_APPFONT ( 144 , 40  ) ;
-Size = MAP_APPFONT ( 122 , 96 ) ;
+Pos = MAP_APPFONT ( 144, 40 ) ;
+Size = MAP_APPFONT ( 122, 96 ) ;
 SVLook = FALSE ;
 };
 
 CheckBox CB_PREVIEW
 {
 HelpID = "sd:CheckBox:DLG_ASS:CB_PREVIEW";
-Pos = MAP_APPFONT ( 144 , 140  );
-Size = MAP_APPFONT ( 122 , 10 );
+Pos = MAP_APPFONT ( 144, 140 );
+Size = MAP_APPFONT ( 122, 10 );
 TabStop = TRUE;
 Text [ en-US ] = "Previe~w";
 };
@@ -54,37 +54,35 @@ ModalDialog DLG_ASS
 CheckBox CB_STARTWITH
 {
 HelpID = "sd:CheckBox:DLG_ASS:CB_STARTWITH";
-Pos = MAP_APPFONT ( 144 , 154  );
-Size = MAP_APPFONT ( 122 , 10 );
+Pos = MAP_APPFONT ( 144, 154 );
+Size = MAP_APPFONT ( 122, 10 );
 TabStop = TRUE;
 Text [ en-US ] = "~Do not show this wizard again" ;
 };
 
-// Seite 1
-
+// Page 1
 FixedBitmap FB_PAGE1
 {
 OutputSize = TRUE ;
 Scale = TRUE;
-Border = TRUE;
-Pos = MAP_APPFONT ( 6 , 4  ) ;
-Size = MAP_APPFONT ( 258 , 29 ) ;
-Fixed = Bitmap { File = "dlgass1.bmp" ; };
+Pos = MAP_APPFONT ( 6, 5 ) ;
+Size = MAP_APPFONT ( 260, 29 ) ;
+Fixed = Bitmap { File = "dlgass1.png" ; };
 };
 
 FixedLine FL_PAGE1_ARTGROUP
 {
 OutputSize = TRUE;
-Pos = MAP_APPFONT ( 6 , 37  );
-Size =MAP_APPFONT ( 132 , 8 );
+Pos = MAP_APPFONT ( 6, 37 );
+Size =MAP_APPFONT ( 132, 8 );
 Text [ en-US ] = "Type";
 };
 
 RadioButton RB_PAGE1_EMPTY
 {
 HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_EMPTY";
-Pos = MAP_APPFONT ( 12 , 48  );
-Size = MAP_APPFONT ( 130 , 10 );
+Pos = MAP_APPFONT ( 12, 48 );
+Size = MAP_APPFONT ( 130, 10 );
 TabStop = TRUE;
 Text [ en-US ] = "~Empty presentation";
 };
@@ -92,16 +90,16 @@ ModalDialog DLG_ASS
 RadioButton RB_PAGE1_TEMPLATE
 {
 HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_TEMPLATE";
-Pos = MAP_APPFONT ( 12 , 62  );
-Size = MAP_APPFONT ( 130 , 10 );
+Pos = MAP_APPFONT ( 12, 62 );
+Size = MAP_APPFONT ( 130, 10 );
 Text [ en-US ] = "~From template";
 };
 
 RadioButton RB_PAGE1_OPEN
 {
 HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_OPEN";
-Pos = MAP_APPFONT ( 12 , 76  );
-Size = MAP_APPFONT ( 130 , 10 );
+Pos = MAP_APPFONT ( 12, 76 );
+Size = MAP_APPFONT ( 130, 10 );
 Text [ en-US ] = "O~pen existing presentation";
 };
 
@@ -109,15 +107,15 @@ ModalDialog DLG_ASS
 {
 HelpID = "sd:PushButton:DLG_ASS:PB_PAGE1_OPEN";
 OutputSize = TRUE ;
-Pos = MAP_APPFONT ( 18 , 89 ) ;
-Size = MAP_APPFONT ( 50 , 18 ) ;
+Pos = MAP_APPFONT ( 18, 89 ) ;
+Size = MAP_APPFONT ( 50, 18 ) ;
 TabStop = TRUE ;
 };
 
 ListBox LB_PAGE1_REGION
 {
-Pos = MAP_APPFONT ( 12 , 90  );
-Size = MAP_APPFONT ( 120 , 12 );
+Pos = MAP_APPFONT ( 12, 90 );
+Size = MAP_APPFONT ( 120, 12 );
 TabStop = TRUE ;
 Border = TRUE ;
 DropDown = TRUE ;
@@ -127,44 +125,43 @@ ModalDialog DLG_ASS
 ListBox LB_PAGE1_TEMPLATES
 {
 Border = TRUE ;
-Pos = MAP_APPFONT ( 12 , 106  ) ;
-Size = MAP_APPFONT ( 120 , 59 ) ;
+Pos = MAP_APPFONT ( 12, 106 ) ;
+Size = MAP_APPFONT ( 120, 59 ) ;
 HelpId = HID_SD_AUTOPILOT_TEMPLATES ;
 };
 
 ListBox

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extras/source offapi/com sfx2/source

2018-06-21 Thread Matthias Seidel

 dev/null   |binary
 extras/source/templates/presnt/lang/vi/prs-novelty.otp |binary
 offapi/com/sun/star/document/MacroExecMode.idl |   10 +-
 sfx2/source/doc/docmacromode.cxx   |4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 36283b11af115fda9d600cd3b4f0ea0e8837b01c
Author: Matthias Seidel 
Date:   Thu Jun 21 09:56:22 2018 +

Fixed typo:

conformation -> confirmation

diff --git a/offapi/com/sun/star/document/MacroExecMode.idl 
b/offapi/com/sun/star/document/MacroExecMode.idl
index 1b4dbcc7aa8b..7eea2dafd77f 100644
--- a/offapi/com/sun/star/document/MacroExecMode.idl
+++ b/offapi/com/sun/star/document/MacroExecMode.idl
@@ -45,7 +45,7 @@ published constants MacroExecMode
 /** Execute macros from secure list quietly.
 
 
-If a macro is not in the list a conformation for it executing will
+If a macro is not in the list a confirmation for it executing will
 appear.
 
 */
@@ -57,7 +57,7 @@ published constants MacroExecMode
 from secure list are executed quietly.
 
 
-If the macro is neither in secure list nor signed a conformation
+If the macro is neither in secure list nor signed a confirmation
 will be requested.
 
 */
@@ -73,7 +73,7 @@ published constants MacroExecMode
 
 
 //-
-/** A macro should be executed always no conformation should be provided.
+/** A macro should be executed always no confirmation should be provided.
 */
 
 const short ALWAYS_EXECUTE_NO_WARN = 4;
@@ -108,14 +108,14 @@ published constants MacroExecMode
 
  If the macro is signed with unknown certificate a warning will
 appear. The macro either will not be executed or if the warning
-allows conformation, it will be executed after user agrees.
+allows confirmation, it will be executed after user agrees.
 
 */
 const short FROM_LIST_AND_SIGNED_WARN = 8;
 
 //-
 /** Execute only macros from secure list or macros that are signed by
-trusted certificates. No warning/conformation should be shown.
+trusted certificates. No warning/confirmation should be shown.
 */
 const short FROM_LIST_AND_SIGNED_NO_WARN = 9;
 
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 102468fbd986..a8b6483d7af2 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -249,7 +249,7 @@ namespace sfx2
 // check whether the document is signed with trusted certificate
 if ( nMacroExecutionMode != MacroExecMode::FROM_LIST )
 {
-// the trusted macro check will also retrieve the signature 
state ( small optimization )
+// the trusted macro check will also retrieve the signature 
state (small optimization)
 sal_Bool bHasTrustedMacroSignature = 
m_pData->m_rDocumentAccess.hasTrustedScriptingSignature( nMacroExecutionMode != 
MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN );
 
 sal_uInt16 nSignatureState = 
m_pData->m_rDocumentAccess.getScriptingSignatureState();
@@ -296,7 +296,7 @@ namespace sfx2
 }
 }
 
-// conformation is required
+// confirmation is required
 sal_Bool bSecure = sal_False;
 
 if ( eAutoConfirm == eNoAutoConfirm )
commit 2247e3d487b279347a3b6a06875ff15bacabc9aa
Author: Matthias Seidel 
Date:   Thu Jun 21 08:56:12 2018 +

Cleaned up Vietnamese templates

diff --git a/extras/source/templates/presnt/lang/vi/prs-novelty.otp 
b/extras/source/templates/presnt/lang/vi/prs-novelty.otp
index b9b90d94d4f3..aa6a50dc3cb0 100644
Binary files a/extras/source/templates/presnt/lang/vi/prs-novelty.otp and 
b/extras/source/templates/presnt/lang/vi/prs-novelty.otp differ
diff --git a/extras/source/templates/presnt/lang/vi/prs-novelty_new.otp 
b/extras/source/templates/presnt/lang/vi/prs-novelty_new.otp
deleted file mode 100644
index aa6a50dc3cb0..
Binary files a/extras/source/templates/presnt/lang/vi/prs-novelty_new.otp and 
/dev/null differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/source svtools/source

2018-06-16 Thread Matthias Seidel

 cui/source/tabpages/autocdlg.src  |2 +-
 svtools/source/dialogs/so3res.src |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 12d44226aa83f399a24be377a34e505b72439a87
Author: Matthias Seidel 
Date:   Sat Jun 16 15:25:06 2018 +

#i124718#

Corrected typo

diff --git a/svtools/source/dialogs/so3res.src 
b/svtools/source/dialogs/so3res.src
index b10e818282f8..ef0e3e7e5f37 100644
--- a/svtools/source/dialogs/so3res.src
+++ b/svtools/source/dialogs/so3res.src
@@ -226,7 +226,7 @@ String STR_PASTE
 };
 String STR_CONVERT_TO
 {
-Text [ en-US ] = "Converts the selected %1object to the object type %2." ;
+Text [ en-US ] = "Converts the selected %1 object to the object type %2." ;
 };
 String STR_ACTIVATE_AS
 {
commit c41e252dc38642a28f5558ff238ce8e91637b6be
Author: Matthias Seidel 
Date:   Sat Jun 16 14:58:05 2018 +

#i112891#

Corrected typo

diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index f93090fe2714..1337bd32720d 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -547,7 +547,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
 };
 String ST_NON_BREAK_SPACE
 {
-   Text [ en-US ] = "Add non breaking space before specific punctuation 
marks in french text" ;
+   Text [ en-US ] = "Add non breaking space before specific punctuation 
marks in French text" ;
 };
 String ST_ORDINAL
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits -

2018-06-02 Thread Pedro Giffuni

 0 files changed

New commits:
commit 7ca6c18c0eb268322c66728dcbdbc9a2229a9e7d
Author: Pedro Giffuni 
Date:   Sat Jun 2 22:02:07 2018 +

Revert r1832747:

Drop references and the requirement for the StAX API.

The saxon build needs more care.

diff --git a/NOTICE b/NOTICE
index 1cdb073d5422..68d964b9fd9f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -135,6 +135,7 @@ As part of the base system this product also includes code 
from the following
 projects which are licensed under the Apache license:
 - serf
 - redland
+- StAX
 
 The notices from these projects are following:
 
@@ -148,6 +149,10 @@ This product includes Redland software (http://librdf.org/)
 developed at the Institute for Learning and Research Technology,
 University of Bristol, UK (http://www.bristol.ac.uk/).
 
+
+StAX
+[no notices]
+
 
 
 This product includes software developed by the OpenSSL Project
diff --git a/external_deps.lst b/external_deps.lst
index 7753870b8ab3..4243d5be5c0e 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -187,6 +187,12 @@ if (SOLAR_JAVA == TRUE)
 URL1 = 
http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
+if (SOLAR_JAVA == TRUE)
+MD5 = 980143f96b3f6ce45d2e4947da21a5e9
+name = stax-src-1.2.0.zip
+URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
+URL2 = http://maven.ibiblio.org/maven/stax/jars/stax-src-1.2.0.zip
+
 if (ENABLE_MEDIAWIKI == YES)
 MD5 = a7983f859eafb2677d7ff386a023bc40
 name = xsltml_2.1.2.zip
diff --git a/saxon/prj/build.lst b/saxon/prj/build.lst
index de579a047406..813097c66d90 100644
--- a/saxon/prj/build.lst
+++ b/saxon/prj/build.lst
@@ -1,2 +1,2 @@
-xx saxon   :   solenv NULL
+xx saxon   :   solenv stax NULL
 xx saxon   nmake   -   all xx_saxon NULL
diff --git a/saxon/saxon-9.0.0.7-bj.patch b/saxon/saxon-9.0.0.7-bj.patch
index c04d69c9d1c8..157ed004c2ef 100644
--- a/saxon/saxon-9.0.0.7-bj.patch
+++ b/saxon/saxon-9.0.0.7-bj.patch
@@ -1,6 +1,6 @@
 --- misc/src/build.xml 2008-07-11 12:11:50.079281000 +0200
 +++ misc/build/src/build.xml   2008-07-11 12:17:29.84874 +0200
-@@ -1 +1,1020 @@
+@@ -1 +1,1027 @@
 -dummy
 +
 +
@@ -170,6 +170,13 @@
 +
 +-->
 +
++
++
++
++
++
++
++
 +
 +
 +
diff --git a/set_soenv.in b/set_soenv.in
index 854cac9e3ccd..b4acb948299e 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -2007,6 +2007,7 @@ ToFile( "RAT_JAR_HOME",  "@RAT_JAR_HOME@", "e" );
 ToFile( "DMAKE_URL", "@DMAKE_URL@","e" );
 ToFile( "DMAKE_PATH","@DMAKE_PATH@",   "e" );
 ToFile( "IS_SYSTEM_DMAKE",   "@IS_SYSTEM_DMAKE@",  "e" );
+ToFile( "BUILD_STAX","@BUILD_STAX@",   "e" );
 ToFile( "BUILD_UNOWINREG",   "@BUILD_UNOWINREG@",  "e" );
 ToFile( "USE_XINERAMA",  "@USE_XINERAMA@", "e" );
 ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@","e" );
diff --git a/stax/download/README_stax-1.2.0.jar.txt 
b/stax/download/README_stax-1.2.0.jar.txt
new file mode 100644
index ..c2f4365afbac
--- /dev/null
+++ b/stax/download/README_stax-1.2.0.jar.txt
@@ -0,0 +1,13 @@
+The JSR173 is the XML pull API used at build time for the Saxon-B
+XSLT processor: it has become part of OpenJDK 6.
+
+When using an older JDK, you can get the API from
+http://dist.codehaus.org/stax/jars/
+located at the StAX Home site
+http://stax.codehaus.org/
+and put it under stax/download.
+
+1.2 Release(final) is available under the Apache License 2.0.
+
+Checksum (for reference):
+MD5 (stax-1.2.0.jar) = aa3439d235f7d999532b66bac56c1f87
diff --git a/stax/makefile.mk b/stax/makefile.mk
new file mode 100644
index ..145e787cedba
--- /dev/null
+++ b/stax/makefile.mk
@@ -0,0 +1,74 @@
+#**
+#  
+#  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
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**
+
+
+
+PRJ=.
+
+PRJNAME=stax
+TARGET=stax
+USE_JAVAVER=TRUE
+
+# --- Settings -
+
+.INCLUDE : settings.mk
+.INCLUDE : antsettings.mk
+
+.IF "$(SOLAR_JAVA)"

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/source i18npool/source sdext/source store/source svl/inc svl/source unotools/source vcl/source vcl/unx vos/source

2018-05-01 Thread Don Lewis

 connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx |8 +-
 connectivity/source/commontools/dbexception.cxx|8 +-
 connectivity/source/drivers/adabas/BUser.cxx   |2 
 connectivity/source/drivers/file/FResultSet.cxx|8 +-
 connectivity/source/drivers/file/FStatement.cxx|   16 ++--
 connectivity/source/drivers/hsqldb/HUser.cxx   |2 
 connectivity/source/drivers/mysql/YUser.cxx|2 
 connectivity/source/inc/propertyids.hxx|2 
 connectivity/source/parse/PColumn.cxx  |   18 ++---
 connectivity/source/sdbcx/VCatalog.cxx |2 
 connectivity/source/sdbcx/VColumn.cxx  |   14 ++--
 connectivity/source/sdbcx/VIndex.cxx   |2 
 connectivity/source/sdbcx/VKey.cxx |8 +-
 connectivity/source/sdbcx/VKeyColumn.cxx   |2 
 connectivity/source/sdbcx/VTable.cxx   |8 +-
 connectivity/source/sdbcx/VView.cxx|8 +-
 i18npool/source/search/levdis.cxx  |4 -
 i18npool/source/search/textsearch.cxx  |4 -
 sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx   |2 
 store/source/storcach.cxx  |4 -
 store/source/stortree.cxx  |6 -
 svl/inc/svl/cntnrsrt.hxx   |2 
 svl/inc/svl/svarray.hxx|8 +-
 svl/source/items/itemset.cxx   |2 
 svl/source/memtools/svarray.cxx|   10 +-
 svl/source/misc/inethist.cxx   |6 -
 svl/source/numbers/zforfind.cxx|   14 ++--
 svl/source/numbers/zformat.cxx |   32 -
 unotools/source/i18n/charclass.cxx |   12 +--
 vcl/source/gdi/bitmap4.cxx |2 
 vcl/source/gdi/pdfwriter_impl.cxx  |8 +-
 vcl/source/gdi/pdfwriter_impl.hxx  |6 -
 vcl/source/gdi/pdfwriter_impl2.cxx |6 -
 vcl/unx/generic/app/wmadaptor.cxx  |2 
 vcl/unx/generic/fontmanager/afm_hash.cpp   |   10 +-
 vcl/unx/generic/fontmanager/parseAFM.cxx   |   34 
+-
 vos/source/object.cxx  |2 
 37 files changed, 143 insertions(+), 143 deletions(-)

New commits:
commit 0ee87bc7c34f6caea6604d42354df2ea97d26b64
Author: Don Lewis 
Date:   Tue May 1 18:46:30 2018 +

The register storage class is deprecated and is incompatible with C++17.

Modern compilers have mostly been ignoring it, probably other than to
forbid the use of the address-of operator.  Get ahead of the game and
delete it now.

Reported by clang 6.

diff --git a/i18npool/source/search/levdis.cxx 
b/i18npool/source/search/levdis.cxx
index 60581a170bcf..c4ffeca7ead6 100644
--- a/i18npool/source/search/levdis.cxx
+++ b/i18npool/source/search/levdis.cxx
@@ -93,7 +93,7 @@
 {   \
 if ( jj != ii ) \
 {   \
-register sal_Int32 k;   \
+sal_Int32 k;\
 if ( jj > 0 )   \
 for ( k=0; k < jj; k++ )\
 if ( cpPattern[k] == c )\
@@ -272,7 +272,7 @@ int WLevDistance::WLD( const sal_Unicode* cString, 
sal_Int32 nStringLen )
 nSPMin = npDistance[0];
 int nReplacePos = -1;   // tristate Flag
 // fuer jede Patternspalte den String durchgehen
-for ( register sal_Int32 i=1; i <= nStringLen; i++ )
+for ( sal_Int32 i=1; i <= nStringLen; i++ )
 {
 d1 = d2;// WLD( X(i-1), Y(j-1) )
 d2 = npDistance[i]; // WLD( X(i)  , Y(j-1) )
diff --git a/i18npool/source/search/textsearch.cxx 
b/i18npool/source/search/textsearch.cxx
index 7c716e8a2828..7d625ece3976 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -879,7 +879,7 @@ SearchResult TextSearch::ApproxSrchFrwrd( const OUString& 
searchStr,
 
 OUString aWTemp( searchStr );
 
-register sal_Int32 nStt, nEnd;
+sal_Int32 nStt, nEnd;
 
 Boundary aWBnd = xBreak->getWordBoundary( aWTemp, startPos,
 aSrchPara.Locale,
@@ -926,7 +926,7 @@ SearchResult TextSearch::ApproxSrchBkwrd( const OUString& 
searchStr,
 
 OUString aWTemp( searchStr );

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extensions/source sc/source solenv/gbuild solenv/inc svtools/source

2018-04-21 Thread Matthias Seidel

 extensions/source/update/check/updatecheckconfig.hxx |4 ++--
 sc/source/ui/miscdlgs/retypepassdlg.src  |2 +-
 solenv/gbuild/platform/freebsd.mk|7 +++
 solenv/inc/unxfbsd.mk|7 ++-
 svtools/source/java/javaerror.src|2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 2549527d994cd3747a35ca51781f5fb79bb5b9c6
Author: Matthias Seidel 
Date:   Sun Apr 22 00:00:24 2018 +

Fixed typos, removed whitespace

diff --git a/extensions/source/update/check/updatecheckconfig.hxx 
b/extensions/source/update/check/updatecheckconfig.hxx
index 27262b2cb0cc..b5b311ada4da 100755
--- a/extensions/source/update/check/updatecheckconfig.hxx
+++ b/extensions/source/update/check/updatecheckconfig.hxx
@@ -80,8 +80,8 @@ private:
 
 
 /* This class implements the non published UNO service 
com.sun.star.setup.UpdateCheckConfig,
- * which primary use is to be able to track changes done in the Toos -> 
Options page of this
- * component, as this is not supported by the OOo configuration for extendable 
groups.
+ * which primary use is to be able to track changes done in the Tools -> 
Options page of this
+ * component, as this is not supported by the AOO configuration for extendable 
groups.
  */
 
 class UpdateCheckConfig : public ::cppu::WeakImplHelper3<
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src 
b/sc/source/ui/miscdlgs/retypepassdlg.src
index daba4b3ede34..9717acaca5b4 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.src
+++ b/sc/source/ui/miscdlgs/retypepassdlg.src
@@ -58,7 +58,7 @@ ModalDialog RID_SCDLG_RETYPEPASS
 
 WordBreak = TRUE ;
 
-Text [ en-US ] = "The document you are about to export has one or more 
protected items with password that cannot be exported.  Please re-type your 
password to be able to export your document." ;
+Text [ en-US ] = "The document you are about to export has one or more 
protected items with password that cannot be exported. Please re-type your 
password to be able to export your document." ;
 };
 
 FixedLine FL_DOCUMENT
diff --git a/svtools/source/java/javaerror.src 
b/svtools/source/java/javaerror.src
index ec24338661f0..3a2a118ab522 100644
--- a/svtools/source/java/javaerror.src
+++ b/svtools/source/java/javaerror.src
@@ -48,7 +48,7 @@ ErrorBox ERRORBOX_JVMCREATIONFAILED
 {
 Buttons = WB_OK;
 DefButton = WB_DEF_OK ;
-Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) 
to perform this task. The selected JRE is defective. Please select another 
version or install a new JRE and select  it under Tools - Options - 
%PRODUCTNAME - Java.";
+Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) 
to perform this task. The selected JRE is defective. Please select another 
version or install a new JRE and select it under Tools - Options - %PRODUCTNAME 
- Java.";
 };
 
 ErrorBox ERRORBOX_RESTARTREQUIRED
commit 00df62bded7abff051b3defcc56ad0731693c8cd
Author: Don Lewis 
Date:   Sat Apr 21 23:17:08 2018 +

Unbreak build on FreeBSD with clang 6.0 and newer.  Clang 6 changed

the its default C++ standard from C++98 to C++14 and our old code
is not prepared for that.  Avoid the problem by adding the -std=gnu++98
compiler flag.

Add the -fstack-protector compiler flag on FreeBSD INTEL and X86_64.

diff --git a/solenv/gbuild/platform/freebsd.mk 
b/solenv/gbuild/platform/freebsd.mk
index 5f4bc943186e..0148fc23fe57 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -92,6 +92,7 @@ gb_CXXFLAGS := \
-fno-use-cxa-atexit \
-fvisibility-inlines-hidden \
-fvisibility=hidden \
+   -std=gnu++98 \
-pipe
 ifeq ($(COM),CLANG)
 gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH
@@ -142,6 +143,12 @@ gb_LinkTarget_LDFLAGS += \
 
 endif
 
+ifneq ($(filter $(CPUNAME),INTEL X86_64),)
+gb_CFLAGS += -fstack-protector
+gb_CXXFLAGS += -fstack-protector
+gb_LinkTarget_LDFLAGS += -fstack-protector
+endif
+
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0
 gb_COMPILEROPT1FLAGS := -O0
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk
index baa01f5ba4bb..92db30a813d4 100644
--- a/solenv/inc/unxfbsd.mk
+++ b/solenv/inc/unxfbsd.mk
@@ -105,11 +105,16 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
 CFLAGS_NO_EXCEPTIONS=-fno-exceptions
 
 # -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS) 
+CFLAGSCXX= -pipe $(ARCH_FLAGS) -std=gnu++98
 .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 CFLAGSCXX += -fvisibility-inlines-hidden
 .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 
+.IF "$(CPUNAME)" == "INTEL" || "$(CPUNAME)" == "X86_64"
+CFLAGSCC += -fstack-protector
+CFLAGSCXX += -fstack-protector
+.ENDIF
+
 # Compiler flags for compiling static object in multi threaded environment 
with graphical user interface

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - jvmfwk/plugins solenv/ant

2018-04-15 Thread Damjan Jovanovic

 jvmfwk/plugins/sunmajor/pluginlib/util.cxx |   87 +++--
 solenv/ant/aoo-ant.xml |5 +
 2 files changed, 50 insertions(+), 42 deletions(-)

New commits:
commit c81bc5523f31cad14262bfd4fea26af1acfea804
Author: Damjan Jovanovic 
Date:   Sun Apr 15 09:47:52 2018 +

Target our baseline Java version in the new Ant build.

Patch by: me

diff --git a/solenv/ant/aoo-ant.xml b/solenv/ant/aoo-ant.xml
index 3a267edcbebb..d8b91b2d7dec 100644
--- a/solenv/ant/aoo-ant.xml
+++ b/solenv/ant/aoo-ant.xml
@@ -40,6 +40,7 @@
 
 
 
+
 
 
 
@@ -111,6 +112,8 @@
 
 
 
Date:   Sun Apr 15 09:46:56 2018 +

Improve Java detection on *nix, by also checking the immediate

subdirectories of /usr and /usr/local, where at least FreeBSD puts Java
(eg. /usr/local/openjdk8, /usr/local/openjdk7-jre). Also simplify that
search code a bit, and eliminate an unnecessary stat() for a directory on
which it has already been called earlier.

Patch by: me

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index e8f048df8c27..90c52f3ab66d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -91,25 +91,30 @@ char const *g_arCollectDirs[] = {
 "jvm/"
 };
 
+struct JavaSearchPathEntry {
+int searchImmediateContents; // More thorough, too slow for /usr/bin and 
/usr/lib
+char const *path;
+};
+
 /* These are directories in which a java installation is
looked for.
 */
-char const *g_arSearchPaths[] = {
+struct JavaSearchPathEntry g_arSearchPaths[] = {
 #ifdef MACOSX
-"",
-"Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin",
-"System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/"
+{ 0, "" },
+{ 0, "Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin" 
},
+{ 0, "System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/" },
 #else
-"",
-"usr/",
-"usr/local/",
-"usr/local/IBMJava2-ppc-142",
-"usr/local/j2sdk1.3.1",
+{ 0, "" },
+{ 1, "usr/" },
+{ 1, "usr/local/" },
+{ 0, "usr/local/IBMJava2-ppc-142" },
+{ 0, "usr/local/j2sdk1.3.1" },
 #ifdef X86_64
-"usr/lib64/",
+{ 0, "usr/lib64/" },
 #endif
-"usr/lib/",
-"usr/bin/"
+{ 0, "usr/lib/" },
+{ 0, "usr/bin/" }
 #endif
 };
 }
@@ -1148,11 +1153,11 @@ void 
createJavaInfoDirScan(vector& vecInfos)
 arNames[i] = OUString(g_arJavaNames[i], strlen(g_arJavaNames[i]),
   RTL_TEXTENCODING_UTF8);
 
-int cSearchPaths= sizeof(g_arSearchPaths) / sizeof(char*);
+int cSearchPaths= sizeof(g_arSearchPaths) / sizeof(g_arSearchPaths[0]);
 boost::scoped_array sarPathNames(new OUString[cSearchPaths]);
 OUString *arPaths = sarPathNames.get();
 for(int c = 0; c < cSearchPaths; c++)
-arPaths[c] = OUString(g_arSearchPaths[c], strlen(g_arSearchPaths[c]),
+arPaths[c] = OUString(g_arSearchPaths[c].path, 
strlen(g_arSearchPaths[c].path),
RTL_TEXTENCODING_UTF8);
 
 int cCollectDirs = sizeof(g_arCollectDirs) / sizeof(char*);
@@ -1174,8 +1179,8 @@ void 
createJavaInfoDirScan(vector& vecInfos)
 for(int j= 0; j < cCollectDirs; j++)
 {
 OUString usDir2(usDir1 + arCollectDirs[j]);
-// prevent that we scan the whole /usr, /usr/lib, etc 
directories
-if (arCollectDirs[j] != OUString())
+// prevent that we scan the whole /usr/bin, /usr/lib, etc 
directories
+if (g_arSearchPaths[ii].searchImmediateContents || 
arCollectDirs[j] != OUString())
 {
 //usr/java/xxx
 //Examin every subdirectory
@@ -1227,33 +1232,31 @@ void 
createJavaInfoDirScan(vector& vecInfos)
 + usDir2 + OUSTR(". Osl file error: ")
 + OUString::valueOf((sal_Int32) openErr));
 }
-else
+}
+for (int j= 0; j < cJavaNames; j++)
+{
+//When we look directly into a dir like /usr/bin, /usr/lib, 
etc. then we only
+//look for certain java directories, such as jre, jdk, etc. 
Whe do not want
+//to examine the whole directory because of performance 
reasons.
+
+//  usFile  arNames[j]
+// <--><->
+// file:///usr/lib/jvm
+// <-->
+//  arPaths[ii] (usDir1)
+//
+OUString usDir3(usDir1 + arNames[j]);
+
+DirectoryItem item3;
+if(DirectoryItem::get(usDir3, item3) == File::E_None)
 {
-//usr/java
-

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - autodoc/Executable_autodoc.mk autodoc/Makefile autodoc/Module_autodoc.mk autodoc/prj autodoc/source Module_ooo.mk Repository.mk twain/M

2018-03-28 Thread Damjan Jovanovic

 Module_ooo.mk  |   15 +
 Repository.mk  |1 
 autodoc/Executable_autodoc.mk  |  305 +
 autodoc/Makefile   |   32 +++
 autodoc/Module_autodoc.mk  |   14 -
 autodoc/prj/build.lst  |   67 --
 autodoc/prj/d.lst  |3 
 autodoc/prj/makefile.mk|   52 +---
 autodoc/source/ary/cpp/makefile.mk |   76 ---
 autodoc/source/ary/doc/makefile.mk |   54 -
 autodoc/source/ary/idl/makefile.mk |   83 ---
 autodoc/source/ary/info/makefile.mk|   56 -
 autodoc/source/ary/kernel/makefile.mk  |   59 -
 autodoc/source/ary/loc/makefile.mk |   57 -
 autodoc/source/ary_i/kernel/makefile.mk|   56 -
 autodoc/source/display/html/makefile.mk|   74 ---
 autodoc/source/display/idl/makefile.mk |   73 --
 autodoc/source/display/toolkit/makefile.mk |   60 -
 autodoc/source/exes/adc_uni/makefile.mk|  100 -
 autodoc/source/parser/adoc/makefile.mk |   58 -
 autodoc/source/parser/cpp/makefile.mk  |   83 ---
 autodoc/source/parser/kernel/makefile.mk   |   54 -
 autodoc/source/parser/tokens/makefile.mk   |   58 -
 autodoc/source/parser_i/idl/makefile.mk|   80 ---
 autodoc/source/parser_i/idoc/makefile.mk   |   58 -
 autodoc/source/parser_i/tokens/makefile.mk |   59 -
 twain/Makefile |   32 +++
 twain/Module_twain.mk  |   34 ---
 twain/Package_inc.mk   |   26 ++
 twain/prj/build.lst|3 
 twain/prj/d.lst|3 
 twain/prj/makefile.mk  |   49 +---
 32 files changed, 461 insertions(+), 1373 deletions(-)

New commits:
commit ee34e88d5e6effdbfb88ff63a98e779bfd7fff05
Author: Damjan Jovanovic 
Date:   Thu Mar 29 00:45:19 2018 +

Port main/twain to gbuild.

Update Module_ooo.mk.

Patch by: me

diff --git a/Module_ooo.mk b/Module_ooo.mk
index 3ca9deb8ed6b..ea4d80539b67 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 MathMLDTD \
 UnoControls \
 animations \
+autodoc \
 automation \
 avmedia \
 basctl \
@@ -36,6 +37,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 canvas \
 comphelper \
 configmgr \
+cosv \
 cppcanvas \
 cui \
 dbaccess \
@@ -52,17 +54,18 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 idl \
 io \
 javaunohelper \
+jvmaccess \
 linguistic \
 o3tl \
 offapi \
 oovbaapi \
 oox \
-padmin \
 package \
+padmin \
 rdbmaker \
 registry \
-reportdesign \
 remotebridges \
+reportdesign \
 sane \
 sax \
 sc \
@@ -80,15 +83,19 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 sw \
 toolkit \
 tools \
+twain \
+ucb \
 ucbhelper \
 udkapi \
+udm \
+unixODBC \
+unodevtools \
 unotools \
 unoxml \
 uui \
 vbahelper \
 vcl \
-udm \
-unixODBC \
+vos \
 wizards \
 writerfilter \
 x11_extensions \
diff --git a/twain/Makefile b/twain/Makefile
new file mode 100644
index ..c1d144cbd4c9
--- /dev/null
+++ b/twain/Makefile
@@ -0,0 +1,32 @@
+#**
+#  
+#  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
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath 
$(firstword $(MAKEFILE_LIST/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/twain/util/makefile.mk b/twain/Module_twain.mk
similarity index 83%
rename from twain/util/makefile.mk
rename to twain/Module_twain.mk
index 497d7832b73d..5cf3fa88a04a 100644
--- a/twain/util/makefile.mk
+++ b/twain/Module_twain.mk
@@ -21,15 +21,10

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - dtrans/Library_dnd_os2.mk dtrans/Library_sysdtrans_os2.mk dtrans/Module_dtrans.mk dtrans/source postprocess/packcomponents scp2/source

2018-03-28 Thread Yuri Dario

 dtrans/Library_dnd_os2.mk   |   56 +++
 dtrans/Library_sysdtrans_os2.mk |7 
 dtrans/Module_dtrans.mk |1 
 dtrans/source/os2/clipb/Os2Clipboard.hxx|3 
 dtrans/source/os2/clipb/Os2Transferable.hxx |4 
 dtrans/source/os2/dnd/DragSource.cxx|  404 ++
 dtrans/source/os2/dnd/DragSource.hxx|  108 +
 dtrans/source/os2/dnd/DropTarget.cxx|  511 
 dtrans/source/os2/dnd/DropTarget.hxx|  137 +++
 dtrans/source/os2/dnd/OTransferable.cxx |  452 
 dtrans/source/os2/dnd/OTransferable.hxx |   98 +
 dtrans/source/os2/dnd/dndentry.cxx  |  117 ++
 dtrans/source/os2/dnd/globals.cxx   |  200 ++
 dtrans/source/os2/dnd/globals.hxx   |   63 +++
 postprocess/packcomponents/makefile.mk  |1 
 scp2/source/ooo/file_library_ooo.scp|2 
 vcl/inc/os2/saldata.hxx |   11 
 vcl/source/window/syschild.cxx  |2 
 vcl/source/window/window.cxx|2 
 19 files changed, 2169 insertions(+), 10 deletions(-)

New commits:
commit ad88c94f4ecb7e5876ff481164276403000993e6
Author: Yuri Dario 
Date:   Wed Mar 28 17:00:13 2018 +

#i127729# Add full drag support for the OS/2 platform.

diff --git a/dtrans/Library_dnd_os2.mk b/dtrans/Library_dnd_os2.mk
new file mode 100644
index ..4aa30f541c38
--- /dev/null
+++ b/dtrans/Library_dnd_os2.mk
@@ -0,0 +1,56 @@
+#**
+#  
+#  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
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**
+
+
+
+$(eval $(call gb_Library_Library,dnd))
+
+$(eval $(call 
gb_Library_add_precompiled_header,dnd,$(SRCDIR)/dtrans/inc/pch/precompiled_dtrans))
+
+$(eval $(call gb_Library_set_componentfile,dnd,dtrans/util/dnd))
+
+$(eval $(call gb_Library_set_include,dnd,\
+$$(INCLUDE) \
+-I$(SRCDIR)/dtrans/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,dnd,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dnd,\
+cppuhelper \
+cppu \
+sal \
+stl \
+$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,dnd,\
+dtrans/source/os2/dnd/dndentry \
+dtrans/source/os2/dnd/globals \
+dtrans/source/os2/dnd/OTransferable \
+dtrans/source/os2/dnd/DragSource \
+dtrans/source/os2/dnd/DropTarget \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dtrans/Module_dtrans.mk b/dtrans/Module_dtrans.mk
index e2826ac331f1..bf1820b4ac88 100644
--- a/dtrans/Module_dtrans.mk
+++ b/dtrans/Module_dtrans.mk
@@ -39,6 +39,7 @@ endif
 
 ifeq ($(OS),OS2)
 $(eval $(call gb_Module_add_targets,dtrans,\
+   Library_dnd_os2 \
Library_sysdtrans_os2 \
 ))
 endif
diff --git a/dtrans/source/os2/dnd/DragSource.cxx 
b/dtrans/source/os2/dnd/DragSource.cxx
new file mode 100644
index ..9a6cfc5bb626
--- /dev/null
+++ b/dtrans/source/os2/dnd/DragSource.cxx
@@ -0,0 +1,404 @@
+/**
+*
+* 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
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+*/
+
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_dtrans.hxx"
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - Module_ooo.mk registry/Executable_checksingleton.mk registry/Executable_rdbedit.mk registry/Executable_regcompare.mk registry/Executabl

2018-03-22 Thread Damjan Jovanovic

 Module_ooo.mk  |1 
 Repository.mk  |   14 +
 registry/Executable_checksingleton.mk  |   49 +++
 registry/Executable_rdbedit.mk |   39 +++
 registry/Executable_regcompare.mk  |   48 ++
 registry/Executable_regmerge.mk|   47 ++
 registry/Executable_regview.mk |   46 ++
 registry/Library_reg.mk|   64 +
 registry/Makefile  |   32 
 registry/Module_registry.mk|   38 ++
 registry/Package_inc.mk|   37 ++
 registry/inc/registry/reader.h |   69 +--
 registry/inc/registry/reflread.hxx |3 -
 registry/inc/registry/reflwrit.hxx |3 -
 registry/inc/registry/registry.h   |   67 +-
 registry/inc/registry/registry.hxx |3 -
 registry/inc/registry/registrydllapi.h |   37 ++
 registry/inc/registry/writer.h |   19 +++
 registry/prj/build.lst |7 --
 registry/prj/d.lst |   20 ---
 registry/prj/makefile.mk   |   41 
 registry/tools/makefile.mk |   84 -
 registry/util/makefile.mk  |   72 
 solenv/gbuild/Deliver.mk   |4 -
 solenv/gbuild/Library.mk   |9 +++
 solenv/gbuild/gbuild.mk|2 
 solenv/gbuild/platform/freebsd.mk  |   16 +-
 solenv/gbuild/platform/linux.mk|   15 +
 solenv/gbuild/platform/solaris.mk  |   15 +
 29 files changed, 593 insertions(+), 308 deletions(-)

New commits:
commit 0ae30994cefb0a39d0dd1b8b3c10045fd765a069
Author: Damjan Jovanovic 
Date:   Thu Mar 22 06:22:38 2018 +

Add registry to Module_ooo.mk

Patch by: me

diff --git a/Module_ooo.mk b/Module_ooo.mk
index a0b3b1b65de0..e01beeae1d80 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 padmin \
 package \
 rdbmaker \
+registry \
 reportdesign \
 remotebridges \
 sane \
commit fa6e37ede484ef12706fc0df45e6143083c12392
Author: Damjan Jovanovic 
Date:   Thu Mar 22 05:29:37 2018 +

Implement the ability to build "UDK versioned" libraries in gbuild

for *nix platforms. Do this by setting the ELF SONAME to the
libxyz.so.3 style library output name, changing the output file
that the linker writes to to be in this format (from libxyz.so),
making a symlink from libxyz.so to libxyz.so.3, adding libxyz.so.3
as a delivery AUXTARGET for the deliverable libxyz.so, and
changing the deliver commands to copy symlinks properly. This is
all what dmake does too.

Use this to port main/registry to gbuild.

Patch by: me

diff --git a/Repository.mk b/Repository.mk
index a485eb47ffca..40a240fa7650 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -27,8 +27,10 @@ $(eval $(call gb_Helper_register_repository,SRCDIR))
 $(eval $(call gb_Helper_register_executables,NONE, \
 bmp \
 bmpsum \
+checksingleton \
 g2g \
 mkunroll \
+rdbedit \
 rdbmaker \
 rscdep \
 so_checksum \
@@ -42,6 +44,15 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 spadmin.bin \
 ))
 
+$(eval $(call gb_Helper_register_executables,SDK, \
+regcompare \
+))
+
+$(eval $(call gb_Helper_register_executables,UREBIN, \
+regmerge \
+regview \
+))
+
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 AppleRemote \
 adabas \
@@ -101,7 +112,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 oox \
 package2 \
 qstart_gtk \
-reg \
 rpt \
 rptui \
 rptxml \
@@ -163,6 +173,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+reg \
+store \
 xmlreader \
 ))
 
diff --git a/registry/Executable_checksingleton.mk 
b/registry/Executable_checksingleton.mk
new file mode 100644
index ..6167df920b07
--- /dev/null
+++ b/registry/Executable_checksingleton.mk
@@ -0,0 +1,49 @@
+#**
+#  
+#  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
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - lucene/lucene-java-version.patch solenv/gbuild

2018-03-19 Thread Jim Jagielski

 lucene/lucene-java-version.patch |   20 ++--
 solenv/gbuild/platform/macosx.mk |2 --
 2 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 08c3b36e02e8c52597dc595b2b832390b3aa3147
Author: Jim Jagielski 
Date:   Mon Mar 19 16:53:04 2018 +

Use gcc3 for COMID for macOS/OSX

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index a57f7347628c..6bcd3a998ccd 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -22,8 +22,6 @@
 
 
 GUI := UNX
-COM := S5ABI
-COMID := s5abi
 #COM := S5ABI
 #COMID := s5abi
 
commit 146c1088dc5078c1722b37a9c84fdae6b4de2027
Author: Jim Jagielski 
Date:   Mon Mar 19 15:14:19 2018 +

More EOL foolishness

diff --git a/lucene/lucene-java-version.patch b/lucene/lucene-java-version.patch
index 626be2a8d1ed..c22e7fc94aa3 100644
--- a/lucene/lucene-java-version.patch
+++ b/lucene/lucene-java-version.patch
@@ -27,13 +27,13 @@
 --- misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml
2010-11-28 02:22:11.0 +0200
 +++ misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml
2018-03-05 06:41:07.207097100 +0200
 @@ -23,8 +23,8 @@
- Smart Chinese Analyzer
-   
- 
--  
--  
-+  
-+  
-   
-   
-   
+ Smart Chinese Analyzer
+   
+ 
+-  
+-  
++  
++  
+   
+   
+   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - odk/settings oowintool set_soenv.in solenv/gbuild solenv/inc solenv/win64

2018-03-12 Thread Damjan Jovanovic

 odk/settings/settings.mk  |8 
 oowintool |   44 +++--
 set_soenv.in  |   59 +--
 solenv/gbuild/platform/windows.mk |   26 +++
 solenv/inc/wnt.mk |4 
 solenv/win64/readme.txt   |2 
 solenv/win64/win64.patch  |  305 --
 7 files changed, 110 insertions(+), 338 deletions(-)

New commits:
commit e908c6878c5c612996efa953d71bff0a7eeb1bbd
Author: Damjan Jovanovic 
Date:   Mon Mar 12 17:34:16 2018 +

The Win64 patch has been merged now, no need to keep

a copy in main/solenv/win64.

Patch by: me

diff --git a/solenv/win64/readme.txt b/solenv/win64/readme.txt
deleted file mode 100644
index 2dac1a5bf364..
--- a/solenv/win64/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Please refer to https://wiki.openoffice.org/wiki/Win64_port
-for instructions.
diff --git a/solenv/win64/win64.patch b/solenv/win64/win64.patch
deleted file mode 100644
index dad8f61b5de5..
--- a/solenv/win64/win64.patch
+++ /dev/null
@@ -1,305 +0,0 @@
-Index: configure.ac
-===
 configure.ac   (revision 1826001)
-+++ configure.ac   (working copy)
-@@ -2116,18 +2116,27 @@
-   PATH="$MSPDB_PATH:$PATH"
- 
-   AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
--  if test -x "$with_cl_home/bin/cl.exe"; then
--  CC="$with_cl_home/bin/cl.exe"
--  else
--  AC_PATH_PROG(CC, cl.exe)
--  fi
--  if test -e "$CC"; then
-+  case "$build_cpu" in
-+i?86)
-+  cl_subdirectory="bin"
-+  ;;
-+x86_64)
-+  cl_subdirectory="bin/amd64"
-+  ;;
-+*)
-+  AC_MSG_ERROR([Unknown/unsupported CPU.])
-+  ;;
-+  esac
-+  if test -x "$with_cl_home/$cl_subdirectory/cl.exe"; then
-+  CC="$with_cl_home/$cl_subdirectory/cl.exe"
-+  COMPATH="$with_cl_home"
-   # This gives us a posix path with 8.3 filename 
restrictions
-   CC=`cygpath -d "$CC"`
-   CC=`cygpath -u "$CC"`
-+  COMPATH=`cygpath -d "$COMPATH"`
-+  COMPATH=`cygpath -u "$COMPATH"`
-   # Remove /cl.exe from CC case insensitive
-   AC_MSG_RESULT([found ($CC)])
--  COMPATH=`echo $CC | $SED 
's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
-   export INCLUDE=`cygpath -d "$COMPATH/Include"`
-   dnl  Check which Microsoft C/C++ compiler is found
-   AC_MSG_CHECKING([the Version of Microsoft C/C++ 
Compiler])
-@@ -2150,7 +2159,7 @@
-   AC_MSG_ERROR([Compiler too old. Use Microsoft 
C/C++ .NET 2008.])
-   fi
-   else
--  AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use 
--with-cl-home or set path to cl.exe.])
-+  AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use 
--with-cl-home.])
-   fi
-   else
-   AC_MSG_CHECKING([the Mingwin32 C++ Compiler])
-Index: set_soenv.in
-===
 set_soenv.in   (revision 1826001)
-+++ set_soenv.in   (working copy)
-@@ -687,8 +687,6 @@
-   $USE_DIRECTX5   = "";
-   $FRAME_HOME = PathFormat('@FRAME_HOME@');
-   $USE_NEW_SDK= "TRUE";
--  $CPUNAME= "INTEL";
--  $CPU= "I";
-   $GUI= "WNT";
-   $GUIBASE= "WIN";
-   $GVER   = "NT351";
-@@ -706,20 +704,19 @@
-   $COMPATH= PathFormat('@COMPATH@/bin');
-   $COMPATH=~ s/\/bin$//i;
-   $COM= "GCC";
-+  $CPU= "I";
-+  $CPUNAME= "INTEL";
-   $CVER   = "C341";
-   $OUTPATH= "wntgcci";
--  $INPATH = $OUTPATH.$PROEXT;
-   $ATL_INCLUDE = 
'$SOLARVER'.$ds.'$INPATH'.$ds."inc".$ds."external".$ds."mingw".$ds."include".$ds."atl".
 " ".'$PSDK_HOME'.$ds."include".$ds."atl";
-   }
-   else # The MSVC section starts here
--  {   $outfile= "winenv.set";
-+  {
-   $COMPATH= PathFormat('@COMPATH@');
-   $CXX_X64_BINARY = PathFormat('@COMPATH@/bin/amd64/cl.exe');
-   $LINK_X64_BINARY = PathFormat('@COMPATH@/bin/amd64/link.exe');
-   $LIBMGR_X64_BINARY = PathFormat('@COMPATH@/bin/amd64/lib.exe');
-   $COM= "MSC";
--  $OUTPATH= "wntmsci@COMEX@";
--  $INPATH = $OUTPATH.$PROEXT;
-   $COMEX  = '@COMEX@';
-   if ( "@COMEX@" eq "10" ) { # .NET 2003 needs M1310
-   $CVER=

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cppu/util python/makefile.mk python/prj python/python-2.7.14-pcbuild-dir.patch python/python-2.7.14-pcbuild-no-host-python.patch python

2018-03-08 Thread Damjan Jovanovic

 cppu/util/makefile.mk |2 
 cppu/util/purpenvhelper3MSCX.map  |   28 
 python/makefile.mk|   21 
 python/prj/d.lst  |   16 
 python/python-2.7.14-pcbuild-dir.patch|   10 
 python/python-2.7.14-pcbuild-no-host-python.patch |   11 
 python/python-2.7.14-pcbuild-python-path.patch|   11 
 python/python-2.7.14-pcbuild-subsystem.patch  |   20 
 python/python-2.7.14-pcbuild-win64-target.patch   |   60 
 python/python-2.7.14-pcbuild-win64.patch  | 1704 ++
 10 files changed, 1881 insertions(+), 2 deletions(-)

New commits:
commit 6fa014325dac9dba4e1fbb33649d2d90ff45b1d3
Author: Damjan Jovanovic 
Date:   Thu Mar 8 17:56:54 2018 +

Add symbol versions for the Win64 platform

necessary to build main/cppu.

Patch by: me

diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk
index eac3d26e7580..46ee6ab0650c 100644
--- a/cppu/util/makefile.mk
+++ b/cppu/util/makefile.mk
@@ -70,6 +70,8 @@ SHL2TARGET  := $(NAMEpurpenv_helper)
 DEF2NAME:= $(SHL2TARGET)
 .IF "$(GUI)$(COM)"=="WNTGCC"
 SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map
+.ELIF "$(GUI)$(COM)"=="WNTMSC"
+SHL2VERSIONMAP:=$(SHL2TARGET)$(CPU).map
 .ELIF "$(GUI)"=="OS2"
 SHL2VERSIONMAP:=uno_purpenvhelperwntgcc.map
 .ELSE
diff --git a/cppu/util/purpenvhelper3MSC.map b/cppu/util/purpenvhelper3MSCI.map
similarity index 100%
rename from cppu/util/purpenvhelper3MSC.map
rename to cppu/util/purpenvhelper3MSCI.map
diff --git a/cppu/util/purpenvhelper3MSCX.map b/cppu/util/purpenvhelper3MSCX.map
new file mode 100644
index ..790d10945ac0
--- /dev/null
+++ b/cppu/util/purpenvhelper3MSCX.map
@@ -0,0 +1,28 @@
+###
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+###
+UDK_3_0_0 {
+global:
+
?Environment_initWithEnterable@purpenv@helper@cppu@@YAXPEAU_uno_Environment@@PEAVEnterable@3@@Z
+
?createMapping@purpenv@helper@cppu@@YAXPEAPEAU_uno_Mapping@@PEAU_uno_Environment@@1P6AX_NPEAX3PEAU_typelib_TypeDescriptionReference@@PEAU_typelib_MethodParameter@@JPEBU_typelib_TypeDescription@@3QEAPEAXPEAPEAU_uno_Any@@@Z3@Z
+
+local:
+*;
+};
commit f959de1284e4c316fdb6049cf521f977abb87cf6
Author: Damjan Jovanovic 
Date:   Thu Mar 8 17:55:13 2018 +

Get main/python to build on Win64.

Adjust which files get delivered.

Patch by: me

diff --git a/python/makefile.mk b/python/makefile.mk
index 14994b5608e5..337be7265957 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -50,8 +50,21 @@ PATCH_FILES=\
 python-ssl.patch \
 python-solver-before-std.patch \
 python-$(PYVERSION)-sysbase.patch \
-python-$(PYVERSION)-nohardlink.patch \
-python-$(PYVERSION)-pcbuild.patch
+python-$(PYVERSION)-nohardlink.patch
+
+.IF "$(GUI)"=="WNT"
+.IF "$(CPUNAME)"=="INTEL"
+PATCH_FILES += python-$(PYVERSION)-pcbuild.patch
+.ELIF "$(CPUNAME)"=="X86_64"
+PATCH_FILES += \
+python-$(PYVERSION)-pcbuild-win64.patch \
+python-$(PYVERSION)-pcbuild-win64-target.patch \
+python-$(PYVERSION)-pcbuild-subsystem.patch \
+python-2.7.14-pcbuild-dir.patch \
+python-2.7.14-pcbuild-no-host-python.patch \
+python-2.7.14-pcbuild-python-path.patch
+.ENDIF
+.ENDIF
 
 CONFIGURE_DIR=
 
@@ -116,7 +129,11 @@ BUILD_DIR=PC/VS9.0
 # Build python executable and then runs a minimal script. Running the minimal 
script
 # ensures that certain *.pyc files are generated which would otherwise be 
created on
 # solver during registration in insetoo_native
+.IF "$(CPUNAME)"=="INTEL"
 BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln 
"Release|Win32"
+.ELIF "$(CPUNAME)"=="X86_64"
+BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln 
"Release|x64"
+.ENDIF
 .ENDIF
 .ENDIF
 
diff --git a/python/prj/d.lst b/python/prj/d.lst
index 99571b8f2733..d423579a4878 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -110,5 +110,21 @@ symlink: %_DEST%\lib%_EXT%\libpython2.7.so.1.0 
%_DEST%\lib%_EXT%\libpython2.7.so

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - openssl/makefile.mk openssl/openssl.patch soltools/javadep

2018-03-06 Thread Damjan Jovanovic

 openssl/makefile.mk|   18 --
 openssl/openssl.patch  |   30 ++
 soltools/javadep/javadep.c |   14 +-
 3 files changed, 55 insertions(+), 7 deletions(-)

New commits:
commit dbda740d5e12fb77f3452c3e5515bdad233b91d8
Author: Damjan Jovanovic 
Date:   Wed Mar 7 06:16:30 2018 +

Get openssl to build on Win64.

Patch by: me

diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 6762f642d4b2..dc97bb1c7459 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -151,12 +151,18 @@ OUT2BIN += out/libeay32.dll
 .ENDIF
 
 #CONFIGURE_ACTION=cmd /c $(PERL:s!\!/!) configure
-CONFIGURE_ACTION=$(PERL) configure $(NO_ASM)
-CONFIGURE_FLAGS=VC-WIN32
-.IF "$(NASM_PATH)"=="NO_NASM_HOME"
-  BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 
$(PERL)))" && nmake -f ms/ntdll.mak
-.ELSE
-  BUILD_ACTION=cmd /c "ms$(EMQ)\do_nasm.bat $(subst,/,\ $(normpath,1 
$(PERL)))" && nmake -f ms/ntdll.mak
+.IF "$(CPUNAME)"=="INTEL"
+CONFIGURE_ACTION=$(PERL) configure $(NO_ASM)
+CONFIGURE_FLAGS=VC-WIN32
+.IF "$(NASM_PATH)"=="NO_NASM_HOME"
+  BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 
$(PERL)))" && nmake -f ms/ntdll.mak
+.ELSE
+  BUILD_ACTION=cmd /c "ms$(EMQ)\do_nasm.bat $(subst,/,\ 
$(normpath,1 $(PERL)))" && nmake -f ms/ntdll.mak
+.ENDIF
+.ELIF "$(CPUNAME)"=="X86_64"
+CONFIGURE_ACTION=$(PERL) configure $(NO_ASM)
+CONFIGURE_FLAGS=VC-WIN64A
+BUILD_ACTION=cmd /c "ms$(EMQ)\do_win64a.bat $(subst,/,\ 
$(normpath,1 $(PERL)))" && cmd /c "nmake -f ms/ntdll.mak"
 .ENDIF
 
 OUT2LIB = out32dll$/ssleay32.lib
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index b487f8fc5db4..27a01adffaa2 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -122,3 +122,33 @@ diff -ur misc/openssl-1.0.2h/util/pl/VC-32.pl 
misc/build/openssl-1.0.2h/util/pl/
  if ($FLAVOR =~ /WIN64/)
  {
  # Note that we currently don't have /WX on Win64! There is a lot of
+diff -Nur misc/build/openssl-1.0.2h/ms/do_win64a.bat 
misc/build/openssl-1.0.2h/ms/do_win64a.bat
+--- misc/build/openssl-1.0.2h/ms/do_win64a.bat 2016-05-03 15:44:42.0 
+0200
 misc/build/openssl-1.0.2h/ms/do_win64a.bat 2018-03-07 07:59:41.870638000 
+0200
+@@ -1,19 +1,19 @@
+-perl util\mkfiles.pl >MINFO
++%1 util\mkfiles.pl >MINFO
+ 
+ cmd /c "nasm -f win64 -v" >NUL 2>&1
+ if %errorlevel% neq 0 goto ml64
+ 
+-perl ms\uplink-x86_64.pl nasm > ms\uptable.asm
++%1 ms\uplink-x86_64.pl nasm > ms\uptable.asm
+ nasm -f win64 -o ms\uptable.obj ms\uptable.asm
+ goto proceed
+ 
+ :ml64
+-perl ms\uplink-x86_64.pl masm > ms\uptable.asm
++%1 ms/uplink-x86_64.pl masm > ms/uptable.asm
+ ml64 -c -Foms\uptable.obj ms\uptable.asm
+ 
+ :proceed
+-perl util\mk1mf.pl VC-WIN64A >ms\nt.mak
+-perl util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak
++%1 util\mk1mf.pl VC-WIN64A >ms\nt.mak
++%1 util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak
+ 
+-perl util\mkdef.pl 32 libeay > ms\libeay32.def
+-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
++%1 util\mkdef.pl 32 libeay > ms\libeay32.def
++%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def
commit 756f141b6bfa64854d61230201ca9fc9d52a6b78
Author: Damjan Jovanovic 
Date:   Wed Mar 7 05:14:45 2018 +

Update the main/soltools javadep tool to deal with Java 9

(possibily 7 and 8 too, when using invokedynamic).

Patch by: me

diff --git a/soltools/javadep/javadep.c b/soltools/javadep/javadep.c
index e0902ba678b2..06e332f6a6f8 100644
--- a/soltools/javadep/javadep.c
+++ b/soltools/javadep/javadep.c
@@ -93,7 +93,10 @@ enum {
 CONSTANT_Long   = 5,
 CONSTANT_Double = 6,
 CONSTANT_NameAndType= 12,
-CONSTANT_Utf8   = 1
+CONSTANT_Utf8   = 1,
+CONSTANT_MethodHandle   = 15,
+CONSTANT_MethodType = 16,
+CONSTANT_InvokeDynamic  = 18
 };
 
 enum { NGROW_INIT = 10, NGROW = 2 };
@@ -512,6 +515,15 @@ process_class_file(const char *pfilename, const struct 
growable *pfilt)
 a_utf8 = read_utf8();
 pc_pool[i] = a_utf8;
 break;
+case CONSTANT_MethodHandle:
+skip_bytes(, 3);
+break;
+case CONSTANT_MethodType:
+skip_bytes(, 2);
+break;
+case CONSTANT_InvokeDynamic:
+skip_bytes(, 4);
+break;
 default:
 /* Unknown Constant_pool entry, this means we are
  * in trouble
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - icc/makefile.mk icc/SampleICC-1.3.2-Win64.patch salhelper/source

2018-03-06 Thread Damjan Jovanovic

 icc/SampleICC-1.3.2-Win64.patch |   11 +++
 icc/makefile.mk |2 -
 salhelper/source/makefile.mk|2 +
 salhelper/source/mscx.map   |   58 
 4 files changed, 72 insertions(+), 1 deletion(-)

New commits:
commit 4fd38c7a96b91bdce3804a490e6f4b643000c212
Author: Damjan Jovanovic 
Date:   Wed Mar 7 04:37:48 2018 +

Patch main/icc to build on Win64.

Patch by: me

diff --git a/icc/SampleICC-1.3.2-Win64.patch b/icc/SampleICC-1.3.2-Win64.patch
new file mode 100644
index ..ad1c8a54f81c
--- /dev/null
+++ b/icc/SampleICC-1.3.2-Win64.patch
@@ -0,0 +1,11 @@
+--- misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h 2018-03-07 
06:19:39.296824700 +0200
 misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h 2018-03-07 
06:33:33.075513600 +0200
+@@ -80,7 +80,7 @@
+ #endif
+ 
+ //PC, visual C++
+-#if defined(_MSC_VER) && !defined(__MWERKS__) && defined(_M_IX86)
++#if defined(_MSC_VER) && !defined(__MWERKS__) && (defined(_M_IX86) || 
defined(_M_AMD64))
+ 
+   //Define how 64 bit integers are represented
+   #define ICCUINT64 unsigned __int64
diff --git a/icc/makefile.mk b/icc/makefile.mk
index 40e849058e27..3b6d3102c75f 100644
--- a/icc/makefile.mk
+++ b/icc/makefile.mk
@@ -34,7 +34,7 @@ TARGET=icc
 
 TARFILE_NAME=SampleICC-1.3.2
 TARFILE_MD5=fdb27bfe2dbe2e7b57ae194d9bf36bab
-PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME).format-security.patch
+PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME).format-security.patch 
SampleICC-1.3.2-Win64.patch
 
 CONVERTFILES= \
 IccProfLib$/IccTagProfSeqId.h \
commit fbff6744fa4f49e5a3389a1c1d174b2a9914a211
Author: Damjan Jovanovic 
Date:   Wed Mar 7 04:15:14 2018 +

Add a linker map file for salhelper on Win64.

Patch by: me

diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk
index 440bc6c2b11e..2f9ed8485e98 100644
--- a/salhelper/source/makefile.mk
+++ b/salhelper/source/makefile.mk
@@ -64,6 +64,8 @@ DEF1NAME= $(SHL1TARGET)
 
 .IF "$(COMNAME)"=="msci"
 SHL1VERSIONMAP=msci.map
+.ELIF "$(COMNAME)"=="mscx"
+SHL1VERSIONMAP=mscx.map
 .ELIF "$(GUI)"=="OS2"
 SHL1VERSIONMAP=gcc3os2.map
 .ELIF "$(COMNAME)"=="sunpro5"
diff --git a/salhelper/source/mscx.map b/salhelper/source/mscx.map
new file mode 100644
index ..a9d950b11e89
--- /dev/null
+++ b/salhelper/source/mscx.map
@@ -0,0 +1,58 @@
+###
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+###
+UDK_3_0_0 {
+global:
+GetVersionInfo
+??0ORealDynamicLoader@salhelper@@IEAA@PEAPEAV01@AEBVOUString@rtl@@1PEAX2@Z
+??1ORealDynamicLoader@salhelper@@MEAA@XZ
+??_7ORealDynamicLoader@salhelper@@6B@
+?acquire@ORealDynamicLoader@salhelper@@QEAAKXZ
+?getApi@ORealDynamicLoader@salhelper@@QEBAPEAXXZ
+?newInstance@ORealDynamicLoader@salhelper@@SAPEAV12@PEAPEAV12@AEBVOUString@rtl@@1@Z
+?release@ORealDynamicLoader@salhelper@@QEAAKXZ
+??1SimpleReferenceObject@salhelper@@MEAA@XZ
+??2SimpleReferenceObject@salhelper@@SAPEAX_K@Z
+??2SimpleReferenceObject@salhelper@@SAPEAX_KAEBUnothrow_t@std@@@Z
+??3SimpleReferenceObject@salhelper@@SAXPEAX@Z
+??3SimpleReferenceObject@salhelper@@SAXPEAXAEBUnothrow_t@std@@@Z
+local:
+*;
+};
+
+UDK_3.1 {
+global:
+??_7SimpleReferenceObject@salhelper@@6B@;
+
+??0Condition@salhelper@@QEAA@AEAVMutex@osl@@@Z;
+??1Condition@salhelper@@UEAA@XZ;
+
+??0ConditionModifier@salhelper@@QEAA@AEAVCondition@1@@Z;
+??1ConditionModifier@salhelper@@QEAA@XZ
+
+??0ConditionWaiter@salhelper@@QEAA@AEAVCondition@1@@Z;
+??0ConditionWaiter@salhelper@@QEAA@AEAVCondition@1@K@Z;
+??1ConditionWaiter@salhelper@@QEAA@XZ
+
+??0timedout@ConditionWaiter@salhelper@@QEAA@XZ;
+??0timedout@ConditionWaiter@salhelper@@QEAA@AEBU012@@Z;
+??1timedout@ConditionWaiter@salhelper@@UEAA@XZ;
+??4timedout@ConditionWaiter@salhelper@@QEAAAEAU012@AEBU012@@Z;
+} UDK_3_0_0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - odk/settings officecfg/registry solenv/win64

2018-03-06 Thread Damjan Jovanovic

 odk/settings/settings.mk   |8 --
 officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu |2 
 solenv/win64/win64.patch   |   28 
++
 3 files changed, 29 insertions(+), 9 deletions(-)

New commits:
commit ddd858ea859bab6078d1add02ecb57578385f3b7
Author: Damjan Jovanovic 
Date:   Tue Mar 6 16:59:52 2018 +

Revert 1825956 and put it into the win64.patch file instead,

as it may break building 32 bit AOO on 64 bit Windows.

Patch by: me

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index f22d2d1eedb2..0976ec27b988 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -57,8 +57,6 @@ JAVABIN=bin
 ifeq "$(PLATFORM)" "windows"
 # Settings for Windows using Microsoft compiler/linker
 
-PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1 | sed -e 
's/^i.86$$/i386/')
-
 OS=WIN
 PS=\\
 ICL=$$
@@ -121,14 +119,8 @@ SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" 
-I"$(OO_SDK_JAVA_HOME)/inclu
 # define for used compiler necessary for UNO
 # -DCPPU_ENV=msci -- windows msvc 4.x - 7.x
 
-ifeq "$(PROCTYPE)" "i386"
 CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
 CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
-endif
-ifeq "$(PROCTYPE)" "x86_64"
-CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx
-CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx
-endif
 CC_OUTPUT_SWITCH=-Fo
 
 LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL /DEBUGTYPE:cv
diff --git a/solenv/win64/win64.patch b/solenv/win64/win64.patch
index ff17fc5e4865..17f96f0cee1b 100644
--- a/solenv/win64/win64.patch
+++ b/solenv/win64/win64.patch
@@ -252,3 +252,31 @@ Index: solenv/inc/wnt.mk
  # --- changes for W32-tcsh - should move into settings.mk ---
  JAVAC=javac
  JAVA=java
+Index: main/odk/settings/settings.mk
+===
+--- main/odk/settings/settings.mk  (revision 1825955)
 main/odk/settings/settings.mk  (revision 1825956)
+@@ -57,6 +57,8 @@
+ ifeq "$(PLATFORM)" "windows"
+ # Settings for Windows using Microsoft compiler/linker
+ 
++PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1 | sed -e 
's/^i.86$$/i386/')
++
+ OS=WIN
+ PS=\\
+ ICL=$$
+@@ -119,8 +121,14 @@
+ # define for used compiler necessary for UNO
+ # -DCPPU_ENV=msci -- windows msvc 4.x - 7.x
+ 
++ifeq "$(PROCTYPE)" "i386"
+ CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
+ CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
++endif
++ifeq "$(PROCTYPE)" "x86_64"
++CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx
++CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx
++endif
+ CC_OUTPUT_SWITCH=-Fo
+ 
+ LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL /DEBUGTYPE:cv
commit 9e642822f4394464c52af6f2268511154f5bc744
Author: Matthias Seidel 
Date:   Tue Mar 6 15:21:07 2018 +

Changed links to https to avoid redirection

diff --git a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu 
b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
index 39a7c7077a61..fbc98bc46f3a 100644
--- a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
@@ -26,7 +26,7 @@
 http://openoffice.org/2001/registry;>
   
 
-  http://extensions.openoffice.org/getmore?cid=920794
+  https://extensions.openoffice.org/getmore?cid=920794
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - setup_native/source solenv/bin

2018-02-25 Thread Matthias Seidel

 setup_native/source/packinfo/package_names.txt   |2 +-
 setup_native/source/packinfo/packinfo_office.txt |2 +-
 solenv/bin/make_ext_update_info.pl   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d6e2a2cce5cd2118403f0435c3bd2698164115c4
Author: Matthias Seidel 
Date:   Sat Feb 24 11:42:03 2018 +

Changed description for package "ooofonts" from "Mailcap module..." to 
"Fonts module..."

diff --git a/setup_native/source/packinfo/package_names.txt 
b/setup_native/source/packinfo/package_names.txt
index c726cda609c4..86f3a8db438f 100644
--- a/setup_native/source/packinfo/package_names.txt
+++ b/setup_native/source/packinfo/package_names.txt
@@ -32,7 +32,7 @@
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration   KDE integration 
module for %APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math  Math module for 
%APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate  Online update 
modul for %APACHEPROJECTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts  Mailcap module for 
%APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts  Fonts module for 
%APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic Linguistic 
module for %APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno Pyuno module for 
%APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheckEnglish 
spellchecker module for %APACHEPROJECTNAME %PRODUCTVERSION
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 545e690746d3..984db61a9e04 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -376,7 +376,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
 copyright = "2012-2018 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Mailcap module for %APACHEPROJECTNAME %PRODUCTVERSION"
+description = "Fonts module for %APACHEPROJECTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
commit 7f4ad2a39dfaff0bb50aaac409ca5f61e93ef1d6
Author: Matthias Seidel 
Date:   Sat Feb 24 11:39:06 2018 +

Fixed double wording in comment

diff --git a/solenv/bin/make_ext_update_info.pl 
b/solenv/bin/make_ext_update_info.pl
index ae6ca7719686..33bd3a463dcf 100755
--- a/solenv/bin/make_ext_update_info.pl
+++ b/solenv/bin/make_ext_update_info.pl
@@ -125,7 +125,7 @@ writeUpdateInformationData($ARGV[0]);
 die "Error: The description.xml does not contain a  element.\n" 
unless $identifier;
 die "Error: The description.xml does not contain a  element. \n" 
unless $version;
 
-#write the write the update-download element and the children.
+#write the update-download element and the children.
 #the indention of  corresponds to that of 
 print $FH ' 'x$indent, '', "\n";
 #check if update-urls have been provided through --update-url option
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/source dbaccess/source svx/source

2018-02-18 Thread Matthias Seidel

 connectivity/source/resource/conn_shared_res.src |2 +-
 dbaccess/source/ext/adabas/AdabasNewDb.src   |2 +-
 svx/source/dialog/imapdlg.cxx|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f4385117298865ab4522c895dcf904ae092473a7
Author: Matthias Seidel 
Date:   Sun Feb 18 14:13:53 2018 +

#i85702#

Changed German "" to "*" until we have a better solution.

diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index fb2de2cf881f..d7b7b8f889ec 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -78,7 +78,7 @@
 #include 
 
 #define SELF_TARGET "_self"
-#define IMAP_ALL_FILTER ""
+#define IMAP_ALL_FILTER "*"
 #define IMAP_CERN_FILTER"MAP - CERN"
 #define IMAP_NCSA_FILTER"MAP - NCSA"
 #define IMAP_BINARY_FILTER  "SIP - StarView ImageMap"
commit 4152bef79573e3c7b3e77cc65ef347ace0d6aba6
Author: Matthias Seidel 
Date:   Sun Feb 18 14:03:53 2018 +

Fixed typo, deleted whitespace

diff --git a/connectivity/source/resource/conn_shared_res.src 
b/connectivity/source/resource/conn_shared_res.src
index 8009f629b643..6d2ae1f32d53 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -603,7 +603,7 @@ String STR_COMMAND_NOT_FOUND
 };
 String STR_DATABASE_NEEDS_CONVERTING
 {
-Text [ en-US ] = "The current database need to be converted. Please insert 
control user  and password.";
+Text [ en-US ] = "The current database needs to be converted. Please 
insert control user and password.";
 };
 String STR_USER_NO_DELETE
 {
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.src 
b/dbaccess/source/ext/adabas/AdabasNewDb.src
index ba21abc01cd1..5efd2d17eb5f 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.src
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.src
@@ -441,7 +441,7 @@ String STR_ADABAS_NO_ACCESSRIGHTS
 
 String STR_ADABAS_CANNOT_CONVERT
 {
-Text[ en-US ] = "The current database need to be converted. Please insert 
control user  and password.";
+Text[ en-US ] = "The current database needs to be converted. Please insert 
control user and password.";
 };
 
 String STR_ADABAS_PASSWORD_ILLEGAL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extensions.lst

2017-12-26 Thread Andrea Pescetti

 extensions.lst |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 283f9bd000c187fe29edc04a23fcaf0da7459ece
Author: Andrea Pescetti 
Date:   Tue Dec 26 22:02:37 2017 +

#i127637# Sort components for languages that need multiple OXT files.

diff --git a/extensions.lst b/extensions.lst
index 881b69982889..fadba4b8d02e 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -38,11 +38,6 @@
 # [ language=all && ENABLE_XXX ]
 #file://XXX.oxt
 
-# Danish dictionary and synonyms
-[ language=da ]
-b38cba04b6513dd42b031199d617cce6 
https://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download
 "danske-synonymer.oxt"
-6ee1e24fb17e44577d8e3200f3e44adc 
https://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download
 "dict-da.oxt"
-
 # Asturian dictionary
 [ language=ast ]
 931373dea3bed9621dd55713b53b38ae 
https://sourceforge.net/projects/aoo-extensions/files/3932/2/ort_ast_20150417_2259.oxt/download
 "dict-ast.oxt"
@@ -59,6 +54,11 @@
 [ language=ca_XR ]
 6112a73444a1ad3cf70736649e228f0f 
https://sourceforge.net/projects/aoo-extensions/files/1395/0/dict_valencian_llit.oxt/download
 "dict-ca_xr.oxt"
 
+# Danish dictionary and synonyms
+[ language=da ]
+6ee1e24fb17e44577d8e3200f3e44adc 
https://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download
 "dict-da.oxt"
+b38cba04b6513dd42b031199d617cce6 
https://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download
 "danske-synonymer.oxt"
+
 # German dictionary
 [ language=de || language=de_DE || language=nl || language=ru ]
 ea35a6a6761655107da3e99ee56c171f 
https://sourceforge.net/projects/aoo-extensions/files/1075/15/dict-de_de-frami_2017-01-12.oxt/download
 "dict-de_de.oxt"
@@ -97,8 +97,8 @@
 
 # Hungarian dictionary and grammar checker
 [ language=hu ]
-76345f925e34fef2d29bade4f29108e9 
https://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download
 "lightproof-hu_hu.oxt"
 d320e43e815c2dfd599dbfb7cd0e41fb 
https://sourceforge.net/projects/aoo-extensions/files/1283/9/dict-hu.oxt/download
 "dict-hu.oxt"
+76345f925e34fef2d29bade4f29108e9 
https://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download
 "lightproof-hu_hu.oxt"
 
 # Italian dictionary
 [ language=it || language=de || language=de_DE ]
commit f2525d80a4ae4425bc43a1b43b96026294f29352
Author: Andrea Pescetti 
Date:   Tue Dec 26 21:14:26 2017 +

#i127637# Standardize on lowercase filenames for all bundled extensions.

diff --git a/extensions.lst b/extensions.lst
index 8dac95593825..881b69982889 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -40,7 +40,7 @@
 
 # Danish dictionary and synonyms
 [ language=da ]
-b38cba04b6513dd42b031199d617cce6 
https://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download
 "DanskeSynonymer.oxt"
+b38cba04b6513dd42b031199d617cce6 
https://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download
 "danske-synonymer.oxt"
 6ee1e24fb17e44577d8e3200f3e44adc 
https://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download
 "dict-da.oxt"
 
 # Asturian dictionary
@@ -97,7 +97,7 @@
 
 # Hungarian dictionary and grammar checker
 [ language=hu ]
-76345f925e34fef2d29bade4f29108e9 
https://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download
 "lightproof-hu_HU-1.3.oxt"
+76345f925e34fef2d29bade4f29108e9 
https://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download
 "lightproof-hu_hu.oxt"
 d320e43e815c2dfd599dbfb7cd0e41fb 
https://sourceforge.net/projects/aoo-extensions/files/1283/9/dict-hu.oxt/download
 "dict-hu.oxt"
 
 # Italian dictionary
@@ -120,6 +120,10 @@
 [ language=nl ]
 5c0de383ef649cffefc128cfb36b4d43 
https://sourceforge.net/projects/aoo-extensions/files/1456/6/nl-dict-v2.00g.oxt/download
 "dict-nl.oxt"
 
+# Norwegian dictionary
+[ language=nb ]
+c06841f7f193e4f083482440999d801b 
https://sourceforge.net/projects/aoo-extensions/files/1216/2/dictionary-no-no-2.2.oxt/download
 "dict-no_no.oxt"
+
 # Polish dictionary
 [ language=pl ]
 a69f9221864b1360e38ff3f0b0cc9222 
https://sourceforge.net/projects/aoo-extensions/files/806/4/pl-dict.oxt/download
 "dict-pl.oxt"
@@ -144,10 +148,6 @@
 [ language=sl ]
 a95158fff7aa901938b9bc67c4937a88 
https://sourceforge.net/projects/aoo-extensions/files/3280/10/pack-sl.oxt/download
 "dict-sl.oxt"
 
-# Norwegian dictionary
-[ language=nb ]
-c06841f7f193e4f083482440999d801b 
https://sourceforge.net/projects/aoo-extensions/files/1216/2/dictionary-no-no-2.2.oxt/download
 "dict-no_no.oxt"
-
 # Swedish dictionary
 [ language=sv ]
 32ab4edf1496a7cf5469ee1643eb0128 
https://sourceforge.net/projects/aoo-extensions/files/5959/1/dict-sv.oxt/download

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - automation/Library_sts.mk canvas/Library_vclcanvas.mk dbaccess/Library_dbui.mk framework/Library_fwk.mk sc/Library_scfilt.mk sc/Library

2017-12-15 Thread Don Lewis

 automation/Library_sts.mk   |7 +--
 canvas/Library_vclcanvas.mk |   12 +
 dbaccess/Library_dbui.mk|   24 --
 framework/Library_fwk.mk|   12 +++--
 sc/Library_sc.mk|   99 +++-
 sc/Library_scfilt.mk|   10 +---
 sd/Library_sd.mk|   25 ---
 sd/Library_sdfilt.mk|   10 +---
 set_soenv.in|2 
 sfx2/Library_sfx.mk |   10 +---
 solenv/gbuild/LinkTarget.mk |8 +--
 svx/Library_svxcore.mk  |   13 ++---
 12 files changed, 96 insertions(+), 136 deletions(-)

New commits:
commit 53d9f415b2985f3784fabc9e72c3b486dad5efc8
Author: Don Lewis 
Date:   Fri Dec 15 14:54:32 2017 +

Enhance gb_LinkTarget_set_*_optimization functions to allow multiple

targets to be specified.

Convert optimization overrides in the gbuild library makefiles to
use gb_LinkTarget_set_*_optimization.

There should be no functional change.

diff --git a/automation/Library_sts.mk b/automation/Library_sts.mk
index 16a4af320ca8..5c2bf76d454a 100644
--- a/automation/Library_sts.mk
+++ b/automation/Library_sts.mk
@@ -94,12 +94,11 @@ endif
 $(eval $(call gb_Library_add_exception_objects,sts,\
automation/source/server/XMLParser \
automation/source/server/server \
-))
-
-$(eval $(call gb_Library_add_cxxobjects,sts,\
automation/source/server/statemnt \
-   , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
 ))
 
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+   automation/source/server/statement, $(gb_COMPILERNOOPTFLAGS) \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 0213ac0d1c82..3bcdffdefbb6 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_Library_add_exception_objects,vclcanvas,\
canvas/source/vcl/canvascustomsprite \
canvas/source/vcl/canvasfont \
canvas/source/vcl/canvashelper \
+   canvas/source/vcl/canvashelper_texturefill \
canvas/source/vcl/devicehelper \
canvas/source/vcl/impltools \
canvas/source/vcl/services \
@@ -80,14 +81,9 @@ $(eval $(call gb_Library_add_exception_objects,vclcanvas,\
 ))
 
 # Solaris Sparc with Sun Compiler: noopt
-ifneq ($(strip($OS)),SOLARIS)
-$(eval $(call gb_Library_add_exception_objects,vclcanvas,\
-   canvas/source/vcl/canvashelper_texturefill \
-))
-else
-$(eval $(call gb_Library_add_cxxobjects,vclcanvas,\
-   canvas/source/vcl/canvashelper_texturefill \
-, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+ifeq ($(strip($OS)),SOLARIS)
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+   canvas/source/vcl/canvashelper_texturefill, $(gb_COMPILERNOOPTFLAGS) \
 ))
 endif
 
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index e3e68cce0947..7a0adb992bdc 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -269,6 +269,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
dbaccess/source/ui/uno/UserSettingsDlg \
dbaccess/source/ui/uno/admindlg \
dbaccess/source/ui/uno/composerdialogs \
+   dbaccess/source/ui/uno/copytablewizard \
dbaccess/source/ui/uno/dbinteraction \
dbaccess/source/ui/uno/textconnectionsettings_uno \
dbaccess/source/ui/uno/unoDirectSql \
@@ -276,6 +277,15 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
dbaccess/source/ui/uno/unosqlmessage \
 ))
 
+# the following source file can't be compiled with optimization by some 
compilers (crash or endless loop):
+# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC
+# the latter is currently not supported by gbuild and needs a fix here later
+ifneq ($(COM),$(filter-out GCC,$(COM)))
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+   dbaccess/source/ui/uno/copytablewizard, $(gb_COMPILERNOOPTFLAGS) \
+))
+endif
+
 $(eval $(call gb_Library_add_noexception_objects,dbui, \
dbaccess/source/shared/dbu_reghelper \
dbaccess/source/shared/dbustrings \
@@ -299,18 +309,4 @@ $(eval $(call gb_Library_add_noexception_objects,dbui, \
dbaccess/source/ui/querydesign/TableFieldInfo \
 ))
 
-# the following source file can't be compiled with optimization by some 
compilers (crash or endless loop):
-# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC
-# the latter is currently not supported by gbuild and needs a fix here later
-ifeq ($(COM),$(filter-out GCC,$(COM)))
-$(eval $(call gb_Library_add_exception_objects,dbui,\
-dbaccess/source/ui/uno/copytablewizard \
-))
-else
-$(eval $(call gb_Library_add_cxxobjects,dbui,\
-dbaccess/source/ui/uno/copytablewizard \
-, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 449800331fce..bfcf494d50e6 100644

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - configure.cmd dtrans/Library_sysdtrans_os2.mk embeddedobj/Library_emboleobj.mk RepositoryExternal.mk RepositoryFixes.mk scp2/source set

2017-12-14 Thread Yuri Dario

 RepositoryExternal.mk |2 ++
 RepositoryFixes.mk|   28 
 configure.cmd |1 +
 dtrans/Library_sysdtrans_os2.mk   |   14 +++---
 embeddedobj/Library_emboleobj.mk  |5 -
 scp2/source/ooo/file_library_ooo.scp  |   10 +-
 set_soenv.in  |2 +-
 slideshow/Library_slideshow.mk|   16 +---
 solenv/inc/libs.mk|2 +-
 vcl/Library_vcl.mk|2 +-
 xmlsecurity/source/xmlsec/nss/makefile.mk |2 +-
 11 files changed, 48 insertions(+), 36 deletions(-)

New commits:
commit a94441cb5b5147804fc7f1e7487e6b1c24920188
Author: Yuri Dario 
Date:   Thu Dec 14 14:35:59 2017 +

#i126518# OS/2 build with system expat.

diff --git a/configure.cmd b/configure.cmd
index 91201fe85cc3..f5eabe900356 100755
--- a/configure.cmd
+++ b/configure.cmd
@@ -39,6 +39,7 @@ SET CFG_OPT=%CFG_OPT% --with-system-apr 
--with-system-apr-util --with-system-ser
 SET CFG_OPT=%CFG_OPT% --enable-bundled-dictionaries --enable-category-b 
--with-system-nss
 SET CFG_OPT=%CFG_OPT% --disable-unit-tests
 SET CFG_OPT=%CFG_OPT% --disable-online-update
+SET CFG_OPT=%CFG_OPT% --with-system-expat
 SET CFG_OPT=%CFG_OPT% --with-lang="de es fr it nl ru"
 
 sh ./configure %CFG_OPT% | tee configure.log
commit 612633c96398a91795331b248625cac8dc98fd55
Author: Yuri Dario 
Date:   Thu Dec 14 13:50:08 2017 +

#i126518# OS/2 build system updates: use full names for slideshow and 
sysdtrans, remove unneeded libraries, use standard toolkit path, fix DLL short 
names, disable libs for coin-or.

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 40bcd9abf728..486da512f384 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -535,6 +535,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 $(call gb_LinkTarget_add_linked_libs,$(1),CoinMP)
 ifneq ($(OS),WNT)
+ifneq ($(OS),OS2)
 $(call gb_LinkTarget_add_linked_libs,$(1),\
 CoinUtils \
 Clp \
@@ -545,6 +546,7 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\
 CbcSolver \
 )
 endif
+endif
 endef
 
 endif # SYSTEM_COINMP
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 3b2295e133cc..09fc2044c10f 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -188,7 +188,7 @@ gb_Library_FILENAMES := $(patsubst 
cui:iicuc%,cui:icuc%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
i18nisolang1:i18nisolang1%,i18nisolang1:i18nisolang1gcc3%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
jvmaccess:jvmaccess%,jvmaccess:jvmaccess3gcc3%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
jvmfwk:jvmfwk%,jvmfwk:jvmfwk3%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst 
rdf:rdf%,rdf:librdf%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst reg:reg%,reg:reg3%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst tl:itl%,tl:tl%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sal:sal%,sal:sal3%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
salhelper:salhelper%,salhelper:salhelp3%,$(gb_Library_FILENAMES))
@@ -207,15 +207,35 @@ gb_Library_FILENAMES := $(patsubst 
stl:stl%,stl:stdc++%,$(gb_Library_FILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst 
sw:sw%,sw:swoo%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst 
comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst 
drawinglayer:drawinglayer%,drawinglayer:drawingl%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst 
fsstorage:fsstorage.uno%,fsstorage:fsstorag%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst 
hatchwindowfactory:hatchwindowfactory.uno%,hatchwindowfactory:hatchwin%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst 
fsstorage:fsstorage%,fsstorage:fsstorag%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst 
hatchwindowfactory:hatchwindowfactory%,hatchwindowfactory:hatchwin%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst 
msforms:msforms.uno%,msforms:msforms%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst 
passwordcontainer:passwordcontainer.uno%,passwordcontainer:password%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst 
passwordcontainer:passwordcontainer%,passwordcontainer:password%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst 
productregistration:productregistration.uno%,productregistration:productr%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst 
textconversiondlgs:textconversiondlgs%,textconversiondlgs:txcnvdlg%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst 
vbahelper:vbahelper%,vbahelper:vbahelp%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - redland/raptor redland/rasqal redland/redland solenv/gbuild

2017-12-14 Thread Yuri Dario

 redland/raptor/makefile.mk   |   13 ++---
 redland/raptor/raptor-1.4.18.patch.os2   |   11 ---
 redland/raptor/raptor2-2.0.15.patch.os2  |   15 ++
 redland/rasqal/makefile.mk   |   13 +
 redland/rasqal/rasqal-0.9.16.patch.os2   |5 ---
 redland/redland/makefile.mk  |   12 +---
 redland/redland/redland-1.0.17.patch.os2 |   44 +++
 redland/redland/redland-1.0.8.patch.os2  |   12 
 solenv/gbuild/BuildDirs.mk   |5 +++
 solenv/gbuild/Output.mk  |   14 -
 10 files changed, 101 insertions(+), 43 deletions(-)

New commits:
commit 21dad5bff119504c4a389c925951ba9593a730ea
Author: Yuri Dario 
Date:   Thu Dec 14 09:48:54 2017 +

#i126518# OS/2 environment vars are uppercase, breaks gnu make rules. 
Ignore escape sequence.

diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index eb0a91aa99fb..db8e459ec130 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -32,6 +32,11 @@ ifneq ($(and $(gb_LOCALBUILDDIR),$(wildcard 
$(gb_LOCALBUILDDIR)/SetupLocal.mk)),
 include $(gb_LOCALBUILDDIR)/SetupLocal.mk
 endif
 
+# env variables names are uppercase only
+ifeq ($(OS),OS2)
+gb_REPOS = $(GB_REPOS)
+endif
+
 ifeq ($(strip $(gb_REPOS)),)
 gb_REPOS := $(SOLARSRC)
 endif
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 8db587733c55..62acd486201c 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -49,8 +49,18 @@ define gb_Output_warn
 $(warning $(NEWLINE)[ WARN  $(2) ] !!!$(NEWLINE)[ WARN  $(2) ] !!! 
$(1)$(NEWLINE)[ WARN  $(2) ] !!!)
 endef
 
-gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf "%c", 27 }' -)
-gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }' -)
+# env variables names are uppercase only
+ifeq ($(OS),OS2)
+gb_COLOR = $(GB_COLOR)
+gb_TITLES = $(GB_TITLES)
+endif
+
+# disable for OS/2
+ifneq ($(OS),OS2)
+gb_Output_ESCAPE := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 27 }' -)
+gb_Output_BELL := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 7 }' -)
+endif
+
 
 # only enable colorized output if
 # - gb_COLOR is set
commit e7141775b1bc46f65f7d60291d4f326ebecab608
Author: Yuri Dario 
Date:   Thu Dec 14 09:39:35 2017 +

#i126518# build redland using autotools chain also on OS/2.

diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index ed221e7d5ea5..a9b42427181f 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -54,10 +54,14 @@ PATCH_FILES=$(OOO_PATCH_FILES)
 
 
 .IF "$(OS)"=="OS2"
-BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)/src
-ADDITIONAL_FILES+=src/windows.h
 OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2
+CONFIGURE_DIR=
+CONFIGURE_ACTION=libtoolize && aclocal && autoconf && .$/configure
+# do not enable grddl parser (#i93768#)
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests 
--enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb 
--without-sqlite --without-mysql --without-postgresql --without-threestore  
 --with-regex-library=posix --with-decimal=none --with-www=xml 
--prefix=$(PWD)/$(OUT) --includedir=(PWD)$/$(INCCOM) --libdir=$(PWD)$/$(LB)
+BUILD_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_DIR=$(CONFIGURE_DIR)
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
 OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
@@ -149,7 +153,8 @@ OUT2BIN+=src$/.libs$/*.dll
 # if we use dmake, this is done automagically
 .ENDIF
 .ELIF "$(GUI)"=="OS2"
-# if we use dmake, this is done automagically
+OUT2LIB+=src$/.libs$/*.a
+OUT2BIN+=src$/.libs$/*.dll
 .ELSE
 OUT2LIB+=src$/.libs$/libraptor2.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor2.so
 .ENDIF
diff --git a/redland/raptor/raptor-1.4.18.patch.os2 
b/redland/raptor/raptor-1.4.18.patch.os2
deleted file mode 100644
index c424810674b4..
--- a/redland/raptor/raptor-1.4.18.patch.os2
+++ /dev/null
@@ -1,11 +0,0 @@
 misc/raptor-1.4.18/src/windos.hThu Nov  6 15:25:51 2008
-+++ misc/build/raptor-1.4.18/src/windows.h Thu Nov  6 15:33:14 2008
-@@ -1,1 +1,7 @@
--dummy
-+#define BOOL
-+#define APIENTRY
-+#define HANDLE int
-+#define DWORD int
-+#define LPVOID void*
-+#define TRUE 1
-+#define FALSE 0
diff --git a/redland/raptor/raptor2-2.0.15.patch.os2 
b/redland/raptor/raptor2-2.0.15.patch.os2
new file mode 100644
index ..27dc716c6e26
--- /dev/null
+++ b/redland/raptor/raptor2-2.0.15.patch.os2
@@ -0,0 +1,15 @@
+--- misc/raptor2-2.0.15/docs/version.xml   2014-11-02 07:24:32.0 
+0100
 misc/build/raptor2-2.0.15/docs/version.xml 2016-12-03 16:22:28.0 
+0100
+@@ -1 +1 @@
+-2.0.15
++2.0.15
+--- misc/raptor2-2.0.15/src/sort_r.h   2014-10-10 01:00:44.0 +0200
 misc/build/raptor2-2.0.15/src/sort_r.h 2016-12-03 16:38:50.0 
+0100
+@@ -22,6 +22,7 @@
+ #if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || \
+  defined __FreeBSD__

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - configure.cmd

2017-12-02 Thread Yuri Dario

 configure.cmd |   24 +---
 1 file changed, 21 insertions(+), 3 deletions(-)

New commits:
commit b350a9c5ba78b5c8354ce68074e5c22bec1b76dd
Author: Yuri Dario 
Date:   Sat Dec 2 13:16:33 2017 +

#i127524# disable building and distribution of automatic online updater on 
OS/2.

diff --git a/configure.cmd b/configure.cmd
index 416442b93c69..91201fe85cc3 100755
--- a/configure.cmd
+++ b/configure.cmd
@@ -38,6 +38,7 @@ SET CFG_OPT=%CFG_OPT% --with-ant-home=%MY_ANT_HOME% 
--without-junit
 SET CFG_OPT=%CFG_OPT% --with-system-apr --with-system-apr-util 
--with-system-serf
 SET CFG_OPT=%CFG_OPT% --enable-bundled-dictionaries --enable-category-b 
--with-system-nss
 SET CFG_OPT=%CFG_OPT% --disable-unit-tests
+SET CFG_OPT=%CFG_OPT% --disable-online-update
 SET CFG_OPT=%CFG_OPT% --with-lang="de es fr it nl ru"
 
 sh ./configure %CFG_OPT% | tee configure.log
commit 1c118421c135a001cbf196e513b187ce5d350f0c
Author: Yuri Dario 
Date:   Sat Dec 2 13:14:51 2017 +

#i126518# rework list of build options for OS/2 configure.

diff --git a/configure.cmd b/configure.cmd
index 192166c9b55c..416442b93c69 100755
--- a/configure.cmd
+++ b/configure.cmd
@@ -20,12 +20,29 @@ rem  under the License.
 rem  
 rem *
 setlocal
-SET JAVA_HOME=d:\os2\java160
-SET MY_ANT_HOME=d:/os2/java160/apache-ant-1.7.0
+SET JAVA_HOME=e:\os2\java160
+SET MY_ANT_HOME=e:/os2/java160/apache-ant-1.7.0
 SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_HOME%\bin;
 
 set config_shell=sh
 set perl_sh_dir=%UNIXROOT%/usr/bin
 
-sh ./configure --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg 
--without-stlport --with-system-icu --with-system-curl --with-system-python 
--with-system-openssl --with-system-libxml --with-system-libxslt 
--disable-werror --disable-mozilla --disable-odk --with-x=no 
--disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes 
--disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit 
--with-system-apr --with-system-apr-util --with-system-serf --with-system-nss 
--enable-bundled-dictionaries --enable-category-b --with-lang="de es fr it nl 
ru" | tee configure.log
+SET CFG_OPT=
+SET CFG_OPT=%CFG_OPT% --prefix=/@unixroot/usr --with-system-zlib 
--with-system-jpeg
+SET CFG_OPT=%CFG_OPT% --without-stlport --with-system-icu --with-system-curl
+SET CFG_OPT=%CFG_OPT% --with-system-python --with-system-openssl 
--with-system-libxml
+SET CFG_OPT=%CFG_OPT% --with-system-libxslt --disable-werror
+SET CFG_OPT=%CFG_OPT% --disable-odk --with-x=no --disable-fontconfig 
--disable-gnome-vfs
+SET CFG_OPT=%CFG_OPT% --disable-gtk --with-java=yes --disable-gcjaot 
--without-fonts
+SET CFG_OPT=%CFG_OPT% --with-ant-home=%MY_ANT_HOME% --without-junit
+SET CFG_OPT=%CFG_OPT% --with-system-apr --with-system-apr-util 
--with-system-serf
+SET CFG_OPT=%CFG_OPT% --enable-bundled-dictionaries --enable-category-b 
--with-system-nss
+SET CFG_OPT=%CFG_OPT% --disable-unit-tests
+SET CFG_OPT=%CFG_OPT% --with-lang="de es fr it nl ru"
+
+sh ./configure %CFG_OPT% | tee configure.log
+
+REM auto* breaks PATH for perl, workaround
+perl set_soenv
+
 endlocal
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/framework shell/inc shell/prj

2017-12-02 Thread Matthias Seidel

 dev/null   |binary
 shell/inc/internal/types.hxx   |5 +
 shell/inc/internal/zipfile.hxx |4 
 shell/prj/build.lst|2 ++
 4 files changed, 11 insertions(+)

New commits:
commit c9ec60287f6514810b85fd23ce91b1840d0ba3c8
Author: Matthias Seidel 
Date:   Sat Dec 2 13:01:27 2017 +

Remove unused graphics

diff --git a/default_images/framework/res/beta/backing-beta.png 
b/default_images/framework/res/beta/backing-beta.png
deleted file mode 100755
index 4ff3f6d0edff..
Binary files a/default_images/framework/res/beta/backing-beta.png and /dev/null 
differ
diff --git a/default_images/framework/res/beta/backing_rtl_left-beta.png 
b/default_images/framework/res/beta/backing_rtl_left-beta.png
deleted file mode 100755
index d4d123bcfb05..
Binary files a/default_images/framework/res/beta/backing_rtl_left-beta.png and 
/dev/null differ
commit f29bf060cc443830c0f7234f7865af8442f05bcd
Author: Yuri Dario 
Date:   Sat Dec 2 12:08:07 2017 +

#i126518# build ooofilereader library using zlib/minizip system headers on 
OS/2.

diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx
index 6a16fddc9672..985ce023af21 100644
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/internal/types.hxx
@@ -29,8 +29,13 @@
 #include 
 #include 
 #include 
+#ifdef OS2
+#include 
+#include 
+#else
 #include 
 #include 
+#endif
 
 
 typedef std::vector StringList_t;
diff --git a/shell/inc/internal/zipfile.hxx b/shell/inc/internal/zipfile.hxx
index 194620806cc9..fe9d040ba7e9 100644
--- a/shell/inc/internal/zipfile.hxx
+++ b/shell/inc/internal/zipfile.hxx
@@ -29,7 +29,11 @@
 #endif
 
 
+#ifdef OS2
+#include 
+#else
 #include 
+#endif
 
 
 #include 
diff --git a/shell/prj/build.lst b/shell/prj/build.lst
index 991069863daa..7d887dab6b65 100644
--- a/shell/prj/build.lst
+++ b/shell/prj/build.lst
@@ -13,7 +13,9 @@ slshell\source\unix\sysshell   nmake   -  
 u   sl_unix_syssh
 slshell\source\tools\lngconvex nmake   -   w   
sl_win32_lngconv sl_inc NULL
 slshell\source\tools\regsvrex  nmake   -   w   
sl_win32_regsvrex  sl_inc NULL
 slshell\source\all\zipfile nmake   -   w   
sl_all_zipfile  sl_inc NULL
+slshell\source\all\zipfile nmake   -   p   
sl_all_zipfile  sl_inc NULL
 slshell\source\all\ooofilereader   nmake   -   w   
sl_all_ooofilereader sl_all_zipfile.w sl_all sl_inc NULL
+slshell\source\all\ooofilereader   nmake   -   p   
sl_all_ooofilereader sl_all_zipfile.p sl_all sl_inc NULL
 slshell\source\win32\shlxthandler\res  nmake   -   w   
sl_win32_shlxthandler_res sl_win32_lngconv.w sl_inc NULL
 slshell\source\win32\shlxthandler\util nmake   -   w   
sl_win32_shlxthandler_util  sl_inc NULL
 slshell\source\win32\shlxthandler\propsheets   nmake   -   w   
sl_win32_shlxthandler_propsheets  sl_inc NULL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extensions/source

2017-11-28 Thread Matthias Seidel

 extensions/source/config/ldap/ldapaccess.hxx|2 +-
 extensions/source/config/ldap/ldapuserprofilebe.hxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7ff777edb7e373243f6e66720df1886dea6f7141
Author: Matthias Seidel 
Date:   Tue Nov 28 22:44:54 2017 +

Fixed typos

diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx 
b/extensions/source/config/ldap/ldapuserprofilebe.hxx
index 38a68f17b0c0..84cac1b6e0c4 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.hxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx
@@ -50,8 +50,8 @@ typedef 
cppu::WeakComponentImplHelper2
Date:   Tue Nov 28 22:07:39 2017 +

Fixed typo

diff --git a/extensions/source/config/ldap/ldapaccess.hxx 
b/extensions/source/config/ldap/ldapaccess.hxx
index 9d0856d95166..851d71eb5320 100644
--- a/extensions/source/config/ldap/ldapaccess.hxx
+++ b/extensions/source/config/ldap/ldapaccess.hxx
@@ -82,7 +82,7 @@ struct LdapDefinition
 
 typedef std::map< rtl::OUString, rtl::OUString > LdapData; // key/value pairs
 
-/** Class encapulating all LDAP functionality */
+/** Class encapsulating all LDAP functionality */
 class LdapConnection
 {
 friend struct LdapMessageHolder;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/source oowintool

2017-11-16 Thread Damjan Jovanovic

 connectivity/source/drivers/odbcbase/OStatement.cxx |2 +-
 oowintool   |   10 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 0a382157b19c8b1a818e98c826613c99335a05ec
Author: Damjan Jovanovic 
Date:   Fri Nov 17 03:04:09 2017 +

64-bit ODBC's SQLGetStmtAttr() returns 64 bit values in *ValuePtr


(https://docs.microsoft.com/en-us/sql/odbc/reference/odbc-64-bit-information).

Patch by: me

diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx 
b/connectivity/source/drivers/odbcbase/OStatement.cxx
index 514499a5cc08..b1c0a3316d4a 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -445,7 +445,7 @@ Reference< XResultSet > OStatement_Base::getResultSet 
(sal_Bool checkCount) thro
 
 sal_Int32 OStatement_Base::getStmtOption (short fOption) const
 {
-sal_Int32   result = 0;
+SQLLEN  result = 0;
 OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
 N3SQLGetStmtAttr(m_aStatementHandle, fOption,,SQL_IS_INTEGER,NULL);
 return result;
commit a48c71085e3c2df62295b49250d0b116cfb4b3c4
Author: Damjan Jovanovic 
Date:   Fri Nov 17 02:05:43 2017 +

Allow oowintool to find 32 bit VC++ in Cygwin64.

Patch by: Damjan Jovanovic and Matthias Seidel
Tested by: Matthias Seidel

diff --git a/oowintool b/oowintool
index 2b8f271bbd8c..8ebdae5dcd67 100755
--- a/oowintool
+++ b/oowintool
@@ -217,6 +217,11 @@ sub find_msvs()
$ver->{'product_dir'} = $install;
return $ver;
}
+   $install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/" . 
$ver->{'key'});
+   if (defined $install && $install ne '') {
+   $ver->{'product_dir'} = $install;
+   return $ver;
+   }
 }
 die "Can't find MS Visual Studio / VC++";
 }
@@ -232,6 +237,11 @@ sub find_msvc()
$ver->{'product_dir'} = $install;
return $ver;
}
+   $install = reg_get_value("HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/" . 
$ver->{'key'});
+   if (defined $install && $install ne '') {
+   $ver->{'product_dir'} = $install;
+   return $ver;
+   }
 }
 die "Can't find MS Visual Studio / VC++";
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - config.guess config.sub instsetoo_native/inc_openoffice

2017-11-15 Thread Matthias Seidel

 config.guess   |  773 
--
 config.sub |  391 +++--
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt  |4 
 instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt |2 
 4 files changed, 624 insertions(+), 546 deletions(-)

New commits:
commit 9f84f56c9103c1228cd09dbb83395dbac2a8f52c
Author: Matthias Seidel 
Date:   Wed Nov 15 17:24:08 2017 +

Removed unused (and invisible) field for serial number from Windows 
installer

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index de216916aaab..88b8c9fb804e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -45,7 +45,7 @@ CustomerInformation   BackPushButton  164 243 
66  17  3   OOO_CONTROL_32  Next
 CustomerInformationBanner  Bitmap  0   0   374 44  1   
BannerBmp   
 CustomerInformationBannerLine  Line0   44  376 0   
1   
 CustomerInformationCancel  PushButton  301 243 66  17  
3   OOO_CONTROL_35  NameLabel   
-CustomerInformationCompanyEdit Edit21  100 249 17  
3   COMPANYNAME OOO_CONTROL_36  SerialLabel 
+CustomerInformationCompanyEdit Edit21  100 249 17  
3   COMPANYNAME OOO_CONTROL_36  RadioGroup  
 CustomerInformationCompanyLabelText21  89  75  10  
3   OOO_CONTROL_37  CompanyEdit 
 CustomerInformationDlgDesc Text21  23  249 25  65539   
OOO_CONTROL_38  
 CustomerInformationDlgLine Line0   234 376 0   1   

@@ -55,8 +55,6 @@ CustomerInformation   NameEditEdit21  63  
249 17  3   USERNAMEOOO_CONTROL_41  Company
 CustomerInformationNameLabel   Text21  52  75  10  
3   OOO_CONTROL_42  NameEdit
 CustomerInformationNextPushButton  230 243 66  17  
3   OOO_CONTROL_43  Cancel  
 CustomerInformationRadioGroup  RadioButtonGroup63  170 
300 50  3   ApplicationUsersBack
-CustomerInformationSerialLabel Text21  127 109 10  
2   OOO_CONTROL_45  SerialNumber
-CustomerInformationSerialNumberMaskedEdit  21  138 237 
17  2   ISX_SERIALNUM   RadioGroup  
 CustomSetupBackPushButton  164 243 66  17  3   
OOO_CONTROL_46  Next
 CustomSetupBanner  Bitmap  0   0   374 44  1   
BannerBmp   
 CustomSetupBannerLine  Line0   44  376 0   1   

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
index f335fb6828e1..62a057e333ff 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
@@ -7,8 +7,6 @@ CustomerInformation DlgRadioGroupText   Hide
Version9X
 CustomerInformationRadioGroup  HideNOT Privileged
 CustomerInformationRadioGroup  HideProductState > 0
 CustomerInformationRadioGroup  HideVersion9X
-CustomerInformationSerialLabel ShowSERIALNUMSHOW
-CustomerInformationSerialNumberShowSERIALNUMSHOW
 CustomSetupChangeFolderHideInstalled
 CustomSetupDetails HideInstalled
 CustomSetupInstallLabelHideInstalled
commit 69907f2b899746c4dff0879ada9388e36f5d1c56
Author: Matthias Seidel 
Date:   Wed Nov 15 17:15:16 2017 +

Updated to the latest version:

- config.guess 2017-11-07
- config.sub 2017-11-04

diff --git a/config.guess b/config.guess
index c2246a4f7f4c..31e01efec3e3 100755
--- a/config.guess
+++ b/config.guess
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2009-12-30'
+timestamp='2017-11-07'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/java

2017-10-24 Thread Damjan Jovanovic

 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
 |6 
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java
  |   15 
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlViews.java
   |  163 ++
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OContainer.java
  |9 
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OView.java
   |  131 
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxViewDescriptor.java
 |  125 +++
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/PropertyIds.java
  |8 
 7 files changed, 449 insertions(+), 8 deletions(-)

New commits:
commit a4621f906e51b07b4052dc6eac3b1210408e19e8
Author: Damjan Jovanovic 
Date:   Tue Oct 24 04:34:26 2017 +

Implement views in the PostgreSQL driver.

Patch by: me

diff --git 
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
 
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
index ad66cf6de697..1845ec849033 100644
--- 
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
+++ 
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
@@ -71,7 +71,7 @@ public class PostgresqlCatalog extends OCatalog {
 String name = buildName(row);
 names.add(name);
 }
-return new PostgresqlTables(this, metadata, this, names);
+return new PostgresqlViews(this, metadata, this, names);
 } catch (ElementExistException | SQLException exception) {
 throw new com.sun.star.uno.RuntimeException("Error", exception);
 } finally {
@@ -88,4 +88,8 @@ public class PostgresqlCatalog extends OCatalog {
 public OContainer refreshUsers() {
 return null;
 }
+
+synchronized OContainer getTablesInternal() {
+return tables;
+}
 }
diff --git 
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java
 
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java
index 885cca5cdc3b..f2cc5c88fd8f 100644
--- 
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java
+++ 
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java
@@ -26,6 +26,7 @@ import java.util.List;
 import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.ElementExistException;
+import com.sun.star.container.NoSuchElementException;
 import com.sun.star.lang.IllegalArgumentException;
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.sdbc.SQLException;
@@ -33,6 +34,7 @@ import com.sun.star.sdbc.XDatabaseMetaData;
 import com.sun.star.sdbc.XResultSet;
 import com.sun.star.sdbc.XRow;
 import com.sun.star.sdbc.XStatement;
+import com.sun.star.sdbcx.XDrop;
 import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
 import com.sun.star.sdbcx.comp.postgresql.sdbcx.OContainer;
 import 
com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxTableDescriptor;
@@ -95,7 +97,15 @@ public class PostgresqlTables extends OContainer {
 
 String composedName = DbTools.composeTableName(metadata, 
nameComponents.getCatalog(), nameComponents.getSchema(), 
nameComponents.getTable(),
 true, ComposeRule.InDataManipulation);
-String sql = String.format("DROP %s %s", isView ? "VIEW" : 
"TABLE", composedName);
+if (isView) {
+XDrop dropView = UnoRuntime.queryInterface(XDrop.class, 
catalog.getViews());
+String unquotedName = DbTools.composeTableName(metadata, 
nameComponents.getCatalog(), nameComponents.getSchema(), 
nameComponents.getTable(),
+false, ComposeRule.InDataManipulation);
+dropView.dropByName(unquotedName);
+return;
+}
+
+String sql = "DROP TABLE " + composedName;
 
 XStatement statement = null;
 try {
@@ -104,8 +114,7 @@ public class PostgresqlTables extends OContainer {
 } finally {
 CompHelper.disposeComponent(statement);
 }
-// FIXME: delete it from our views
-} catch (IllegalArgumentException | UnknownPropertyException | 
WrappedTargetException wrappedTargetException) {
+} catch (IllegalArgumentException | UnknownPropertyException | 
WrappedTargetException | NoSuchElementException

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - nss/nss.patch sw/source

2017-10-09 Thread Jim Jagielski

 nss/nss.patch   |4 ++--
 sw/source/ui/config/optload.src |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b647042ff4fcedff5b4817ed793095e5da84ebab
Author: Jim Jagielski 
Date:   Mon Oct 9 20:59:12 2017 +

Force lib again

diff --git a/nss/nss.patch b/nss/nss.patch
index 17ca773ac9b3..decd24926a5f 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -116,7 +116,7 @@ diff -ur misc/nss-3.25/nss/coreconf/Darwin.mk 
misc/build/nss-3.25/nss/coreconf/D
 +
 +# CC is taken from environment automatically.
 +#CC   = cc
-+CCC   = $(CXX) -stdlib=libc++
++CCC   = $(CXX) -stdlib=libc++ -std=c++11
  
 -CC= gcc
 -CCC   = g++
@@ -282,7 +282,7 @@ diff -ur misc/nss-3.25/nss/external_tests/common/gtest.mk 
misc/build/nss-3.25/ns
  else
 -CXXFLAGS += -std=c++0x
 +ifeq (Darwin,$(OS_ARCH))
-+CXXFLAGS += -stdlib=libc++
++CXXFLAGS += -stdlib=libc++ -std=c++11
 +else
 +CXXFLAGS += -std=c++0x
 +endif
commit 4ea2caad90cb3cb34ab9bf4dfa117b83e0c9f853
Author: Matthias Seidel 
Date:   Mon Oct 9 20:10:55 2017 +

Increased length for localized strings

diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src
index 856343037024..9ac20221f4d8 100644
--- a/sw/source/ui/config/optload.src
+++ b/sw/source/ui/config/optload.src
@@ -44,7 +44,7 @@ TabPage TP_OPTLOAD_PAGE
 FixedText FT_LINK
 {
 Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 115 , 8 ) ;
+Size = MAP_APPFONT ( 125 , 8 ) ;
 Text [ en-US ] = "Update links when loading";
 };
 RadioButton RB_ALWAYS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - instsetoo_native/inc_openoffice README

2017-09-13 Thread Matthias Seidel

 README|2 -
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |   18 
+-
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 00706a1a9b5bfdb6db32086043a74af61ebf824d
Author: Matthias Seidel 
Date:   Tue Sep 12 22:48:56 2017 +

Minor changes to OpenOffice Windows installer 
(AdminNetworkLocation/CustomSetup/FilesInUse)

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index b9f23f0acff9..ae6a69d30354 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -18,15 +18,15 @@ AdminChangeFolder   Up  PushButton  310 64  
19  19  3670019 UpIco   NewFolder   OOO_CONTRO
 AdminNetworkLocation   BackPushButton  164 243 66  17  
3   OOO_CONTROL_14  InstallNow  
 AdminNetworkLocation   Banner  Bitmap  0   0   374 44  1   
BannerBmp   
 AdminNetworkLocation   BannerLine  Line0   44  376 0   
1   
-AdminNetworkLocation   Browse  PushButton  286 124 66  17  
3   OOO_CONTROL_17  Back
+AdminNetworkLocation   Browse  PushButton  301 124 66  17  
3   OOO_CONTROL_17  Back
 AdminNetworkLocation   Cancel  PushButton  301 243 66  17  
3   OOO_CONTROL_18  LBBrowse
 AdminNetworkLocation   DlgDesc Text21  23  249 25  65539   
OOO_CONTROL_19  
 AdminNetworkLocation   DlgLine Line0   234 376 0   1   

-AdminNetworkLocation   DlgText Text21  51  326 40  3   
OOO_CONTROL_20  
+AdminNetworkLocation   DlgText Text21  51  345 40  3   
OOO_CONTROL_20  
 AdminNetworkLocation   DlgTitleText13  6   257 25  
65539   OOO_CONTROL_21  
 AdminNetworkLocation   InstallNow  PushButton  230 243 66  
17  3   OOO_CONTROL_22  Cancel  
 AdminNetworkLocation   LBBrowseText21  90  100 10  
3   OOO_CONTROL_23  SetupPathEdit   
-AdminNetworkLocation   SetupPathEdit   PathEdit21  102 330 
17  3   TARGETDIR   Browse  
+AdminNetworkLocation   SetupPathEdit   PathEdit21  102 345 
17  3   TARGETDIR   Browse  
 AdminWelcome   BackPushButton  164 243 66  17  1   
OOO_CONTROL_24  Next
 AdminWelcome   Cancel  PushButton  301 243 66  17  3   
OOO_CONTROL_25  Back
 AdminWelcome   DlgLine Line0   234 376 0   1   

@@ -67,14 +67,14 @@ CustomSetup DlgDesc Text21  23  249 25  
65539   OOO_CONTROL_52
 CustomSetupDlgLine Line0   234 376 0   1   

 CustomSetupDlgText Text21  51  345 10  3   
OOO_CONTROL_53  
 CustomSetupDlgTitleText13  6   257 25  65539   
OOO_CONTROL_54  
-CustomSetupFeatureGroupGroupBox233 65  134 133 
1   OOO_CONTROL_55  
+CustomSetupFeatureGroupGroupBox233 65  134 132 
1   OOO_CONTROL_55  
 CustomSetupHelpPushButton  21  243 66  17  3   
OOO_CONTROL_56  Details 
 CustomSetupInstallLabelText21  200 278 10  3   
OOO_CONTROL_57  
 CustomSetupItemDescription Text239 78  125 50  3   
OOO_CONTROL_58  
 CustomSetupLocationText21  213 278 20  3   
OOO_CONTROL_59  
 CustomSetupNextPushButton  230 243 66  17  3   
OOO_CONTROL_60  Cancel  
 CustomSetupSizeText239 134 125 60  3   
OOO_CONTROL_61  
-CustomSetupTreeSelectionTree   21  68  205 129 3   
_BrowseProperty ChangeFolder
+CustomSetupTreeSelectionTree   21  68  206 129 3   
_BrowseProperty ChangeFolder
 CustomSetupTipsBanner  Bitmap  0   0   374 44  1   
BannerBmp   
 CustomSetupTipsBannerLine  Line0   44  376 0   
1   
 CustomSetupTipsDlgDesc Text21  23  249 25  65539

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/prj instsetoo_native/inc_sdkoo

2017-09-11 Thread Matthias Seidel

 connectivity/prj/build.lst   |2 -
 instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt |   12 +--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d75eb34a7154f1e8aaaddf1cbc57b8fe60860d12
Author: Matthias Seidel 
Date:   Mon Sep 11 14:46:15 2017 +

Minor changes to Windows installer (SDK/InstallChangeFolder)

diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
index f893a630ae34..acd441e5b6a4 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
@@ -145,17 +145,17 @@ FileTypeDialogNextPushButton  230 243 
66  17  3   OOO_CONTROL_134 Cancel
 InstallChangeFolderBanner  Bitmap  0   0   374 44  1   
BannerBmp   
 InstallChangeFolderBannerLine  Line0   44  376 0   
1   
 InstallChangeFolderCancel  PushButton  301 243 66  17  
3   OOO_CONTROL_111 ComboText   
-InstallChangeFolderCombo   DirectoryCombo  21  64  277 80  
4128779 _BrowseProperty Up  
-InstallChangeFolderComboText   Text21  50  99  14  
3   OOO_CONTROL_113 Combo   
+InstallChangeFolderCombo   DirectoryCombo  21  64  292 80  
4128779 _BrowseProperty Up  
+InstallChangeFolderComboText   Text21  51  99  14  
3   OOO_CONTROL_113 Combo   
 InstallChangeFolderDlgDesc Text21  23  249 25  65539   
OOO_CONTROL_114 
 InstallChangeFolderDlgLine Line0   234 376 0   1   

 InstallChangeFolderDlgTitleText13  6   257 25  
65539   OOO_CONTROL_115 
-InstallChangeFolderListDirectoryList   21  90  332 97  
15  _BrowseProperty TailText
-InstallChangeFolderNewFolder   PushButton  335 64  19  
19  3670019 NewFolderIcoListOOO_CONTROL_117
+InstallChangeFolderListDirectoryList   21  90  345 97  
11  _BrowseProperty TailText
+InstallChangeFolderNewFolder   PushButton  348 64  19  
19  3670019 NewFolderIcoListOOO_CONTROL_117
 InstallChangeFolderOK  PushButton  230 243 66  17  
3   OOO_CONTROL_118 Cancel  
-InstallChangeFolderTailPathEdit21  207 332 17  
15  _BrowseProperty OK  
+InstallChangeFolderTailPathEdit21  207 345 17  
15  _BrowseProperty OK  
 InstallChangeFolderTailTextText21  193 99  13  
3   OOO_CONTROL_120 Tail
-InstallChangeFolderUp  PushButton  310 64  19  19  
3670019 UpIco   NewFolder   OOO_CONTROL_121
+InstallChangeFolderUp  PushButton  322 64  19  19  
3670019 UpIco   NewFolder   OOO_CONTROL_121
 InstallWelcome BackPushButton  164 243 66  17  1   
OOO_CONTROL_122 Copyright   
 InstallWelcome Cancel  PushButton  301 243 66  17  3   
OOO_CONTROL_123 Back
 InstallWelcome Copyright   Text135 144 228 73  65539   
OOO_CONTROL_124 Next
commit 97e67306667c2004167fcd2ae6c556788d427f9d
Author: Damjan Jovanovic 
Date:   Sun Sep 10 13:56:45 2017 +

main/connectivity/util depends on main/connectivity/java/sdbc_postgresql.

The missing dependency was sometimes causing util to build first,
failing due to missing sdbc_postgresql.xcu.

Found by: Matthias Seidel
Patch by: me

diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 249cf339c84a..9244df25ed97 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -26,4 +26,4 @@ cn  connectivity\source\simpledbt   nmake   - 
  all cn_simpledbt
 cn  connectivity\source\dbtools nmake   -   all cn_dbtools 
cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
 cn  connectivity\qa\connectivity\tools  nmake   -   all 
cn_qa_tools cn_inc NULL
 cn  connectivity\qa nmake   -   all cn_qa 
cn_inc NULL
-cn  connectivity\util   nmake   -   all cn_util 
cn_ado cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase 
cn_hsqldb cn_macab NULL
+cn  connectivity\util   nmake   -   all cn_util 
cn_ado cn_evoab2 cn_calc cn_odbc

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - instsetoo_native/inc_openoffice

2017-09-05 Thread Matthias Seidel

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 10e628873f7e24462911864c0748ecf6eb1f1ff6
Author: Matthias Seidel 
Date:   Tue Sep 5 21:05:27 2017 +

Rearranged VolumeCostList

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index ee911a835a66..b01ba0500b32 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -118,9 +118,9 @@ DiskSpaceRequirements   Banner  Bitmap  0   0   
374 44  1   BannerBmp
 DiskSpaceRequirements  BannerLine  Line0   44  376 0   
1   
 DiskSpaceRequirements  DlgDesc Text21  23  249 25  65539   
OOO_CONTROL_96  
 DiskSpaceRequirements  DlgLine Line0   234 376 0   1   

-DiskSpaceRequirements  DlgText Text10  185 358 41  3   
OOO_CONTROL_97  
+DiskSpaceRequirements  DlgText Text13  185 353 41  3   
OOO_CONTROL_97  
 DiskSpaceRequirements  DlgTitleText13  6   257 25  
65539   OOO_CONTROL_98  
-DiskSpaceRequirements  ListVolumeCostList  8   55  358 125 
393223  {120}{70}{70}{70}{70}   
+DiskSpaceRequirements  ListVolumeCostList  13  55  353 125 
393223  {60}{80}{70}{70}{70}
 DiskSpaceRequirements  OK  PushButton  301 243 66  17  
3   OOO_CONTROL_100 
 FilesInUse Banner  Bitmap  0   0   374 44  1   
BannerBmp   
 FilesInUse BannerLine  Line0   44  376 0   1   

commit 567d872af2cf3779d039013b948e4c0035a3062a
Author: Matthias Seidel 
Date:   Tue Sep 5 19:45:18 2017 +

Rearranged VolumeCostList (en-US/de)

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 29ee915d7d8e..11b36830092a 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -380,7 +380,7 @@ en-US = "The highlighted volumes do not have enough disk 
space available for the
 en-US = "{}Out of Disk Space"
 
 [OOO_CONTROL_156]
-en-US = "{120}{70}{70}{70}{70}"
+en-US = "{60}{80}{70}{70}{70}"
 
 [OOO_CONTROL_157]
 en-US = "OK"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sw/source

2017-03-29 Thread Matthias Seidel

 sw/source/filter/html/htmlfly.cxx |4 ++--
 sw/source/filter/html/htmltab.cxx |   18 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 870b2b08c8ad89228626b36304f470b9f7f2282d
Author: Matthias Seidel 
Date:   Wed Mar 29 15:56:46 2017 +

Fixed typos

diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index 2a4863e621a0..86a55a4f806d 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2270,7 +2270,7 @@ void HTMLTable::InsertCell( HTMLTableCnts *pCnts,
 inline void HTMLTable::CloseSection( sal_Bool bHead )
 {
 // die vorhergende Section beenden, falls es schon eine Zeile gibt
-ASSERT( nCurRow<=nRows, "ungeultige aktuelle Zeile" );
+ASSERT( nCurRow<=nRows, "ungueltige aktuelle Zeile" );
 if( nCurRow>0 && nCurRow<=nRows )
 ((*pRows)[nCurRow-1])->SetEndOfGroup();
 if( bHead /*&& nCurRow==1*/ )
@@ -2309,7 +2309,7 @@ void HTMLTable::OpenRow( SvxAdjust eAdjust, sal_Int16 
eVertOrient,
 
 void HTMLTable::CloseRow( sal_Bool bEmpty )
 {
-ASSERT( nCurRowOpenRow( eAdjust, eVertOri, pBrushItem );
 // ist beim ersten GetNextToken schon pending, muss bei
-// wiederaufsetzen auf jedenfall neu gelesen werden!
+// wiederaufsetzen auf jeden Fall neu gelesen werden!
 SaveState( 0 );
 }
 
@@ -4537,7 +4537,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable 
*pCurTable,
 }
 
 // ist beim ersten GetNextToken schon pending, muss bei
-// wiederaufsetzen auf jedenfall neu gelesen werden!
+// wiederaufsetzen auf jeden Fall neu gelesen werden!
 SaveState( 0 );
 }
 
@@ -4735,7 +4735,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable 
*pCurTable,
 }
 }
 // ist beim ersten GetNextToken schon pending, muss bei
-// wiederaufsetzen auf jedenfall neu gelesen werden!
+// wiederaufsetzen auf jeden Fall neu gelesen werden!
 SaveState( 0 );
 }
 
@@ -4971,7 +4971,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable 
*pCurTable )
 pCurTable->SetCaption( pStNd, bTop );
 
 // ist beim ersten GetNextToken schon pending, muss bei
-// wiederaufsetzen auf jedenfall neu gelesen werden!
+// wiederaufsetzen auf jeden Fall neu gelesen werden!
 SaveState( 0 );
 }
 
@@ -5330,7 +5330,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust 
eParentAdjust,
 delete pTblOptions;
 
 // ist beim ersten GetNextToken schon pending, muss bei
-// wiederaufsetzen auf jedenfall neu gelesen werden!
+// wiederaufsetzen auf jeden Fall neu gelesen werden!
 SaveState( 0 );
 }
 
commit 1a63a96b03e755f492eec5fa6b3e6e22545060f1
Author: Matthias Seidel 
Date:   Wed Mar 29 15:49:24 2017 +

Fixed typos

diff --git a/sw/source/filter/html/htmlfly.cxx 
b/sw/source/filter/html/htmlfly.cxx
index e51cc212eb24..16ab44d74ba7 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -1368,7 +1368,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
 
 rHTMLWrt.ChangeParaToken( 0 );
 
-// Die aktulle  beenden!
+// Die aktuelle  beenden!
 rHTMLWrt.OutAndSetDefList( 0 );
 
 // als Multicol ausgeben
@@ -1478,7 +1478,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
 {
 rHTMLWrt.ChangeParaToken( 0 );
 
-// Die aktulle  beenden!
+// Die aktuelle  beenden!
 rHTMLWrt.OutAndSetDefList( 0 );
 pStr = OOO_STRING_SVTOOLS_HTML_division;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sal/qa solenv/gbuild

2017-01-30 Thread Don Lewis

 sal/qa/osl/mutex/osl_Mutex.cxx|2 +-
 solenv/gbuild/LinkTarget.mk   |   13 -
 solenv/gbuild/gbuild.mk   |   14 ++
 solenv/gbuild/platform/windows.mk |6 --
 4 files changed, 19 insertions(+), 16 deletions(-)

New commits:
commit 91eb929548955c5dfcda6d390e2883981fce0906
Author: Don Lewis 
Date:   Tue Jan 31 05:31:55 2017 +

The clear_001 QA test fails sporadically with a 7 nSec mutex hold time

measurement.  The nominal hold time for the mutex is 5 seconds, but
because the mutex state is polled at 1 second intervals, the actual
measured time will probably be 6+ seconds.  If the nanoseconds field
of the starting timestamp is large, it is possible that it will have
wrapped to a small value at the poll time when the mutex is detected
as having been released.  If the time interval was calculated at
full precision by subtracting both the seconds and nanoseconds fields
of the before and after timestamps, an interval of just over 6
seconds could look like 7 seconds and a large negative number of
nanoseconds.  Since this test only subtracts the seconds field, it
can think the difference is 7 seconds and fail the "nSec < 7" assertion.
As a quick fix, change the assertion to "nSec <= 7".

diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index 1b1e46e..4261932 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -729,7 +729,7 @@ namespace osl_ClearableGuard
 
 myThread.join();
 
-ASSERT_TRUE(nSec < 7 && nSec > 1) << "ClearableGuard method: clear";
+ASSERT_TRUE(nSec <= 7 && nSec > 1) << "ClearableGuard method: clear";
 }
 
 TEST_F(clear, clear_002 )
commit 6e7960c2ed194344819e089eb0c3e39045dd0a0e
Author: Damjan Jovanovic 
Date:   Tue Jan 31 05:05:11 2017 +

We need to pass "-DEBUG" to the linker on Windows for debugging to work.

Patch by: me
Tested by: pats

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 65caabd..b9c068e 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -30,19 +30,6 @@
 # LDFLAGS
 
 # CFLAGS from environment override debug/optimization flags
-ifeq ($(gb_DEBUGLEVEL),2)
-gb_DEBUGGING := TRUE
-endif
-
-ifeq ($(ENABLE_SYMBOLS),SMALL)
-gb_DEBUGGING := TRUE
-else ifeq ($(ENABLE_SYMBOLS),TRUE)
-gb_DEBUGGING := TRUE
-endif
-
-ifeq ($(ENABLE_CRASHDUMP),TRUE)
-gb_DEBUGGING := TRUE
-endif
 
 ifeq ($(gb_DEBUGGING),TRUE)
 CFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index f7c6e76..b0ac8c1 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -92,6 +92,20 @@ gb_DEBUGLEVEL := 1
 endif
 endif
 
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_DEBUGGING := TRUE
+endif
+
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_DEBUGGING := TRUE
+else ifeq ($(ENABLE_SYMBOLS),TRUE)
+gb_DEBUGGING := TRUE
+endif
+
+ifeq ($(ENABLE_CRASHDUMP),TRUE)
+gb_DEBUGGING := TRUE
+endif
+
 ifneq ($(strip $(ENABLE_PCH)),)
 gb_ENABLE_PCH := $(true)
 else
diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index df85d20..ecdcf44 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -195,15 +195,17 @@ gb_LinkTarget_LDFLAGS := \
 
 gb_DEBUG_CFLAGS := -Zi
 
+ifeq ($(gb_DEBUGGING),TRUE)
+gb_LinkTarget_LDFLAGS += -DEBUG
+endif
+
 # this does not use CFLAGS so it is not overridable
 ifneq ($(ENABLE_CRASHDUMP),)
-gb_LinkTarget_LDFLAGS += -DEBUG
 gb_CFLAGS+=-Zi
 gb_CXXFLAGS+=-Zi
 endif
 
 ifeq ($(gb_DEBUGLEVEL),2)
-gb_LinkTarget_LDFLAGS += -DEBUG
 gb_COMPILEROPTFLAGS :=
 else
 gb_COMPILEROPTFLAGS := -Ob1 -Oxs -Oy-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/inc source_soenv.sh

2017-01-26 Thread Pedro Giffuni

 solenv/inc/unx.mk |4 
 source_soenv.sh   |9 +
 2 files changed, 13 insertions(+)

New commits:
commit b11dcb469297f5cf257c472cdbc8492cb594ab8d
Author: Pedro Giffuni 
Date:   Thu Jan 26 18:41:55 2017 +

Reinstate part of the LinuxPPC64 support removed by error.

This shouldn't have happened in r1778625.

diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index fa521d5..bfb42ab 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -91,6 +91,10 @@
 .INCLUDE : unxlngppc.mk
 .ENDIF
 
+.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUXPPOWERPC64"
+.INCLUDE : unxlngppc64.mk
+.ENDIF
+
 .IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUX3S390"
 .INCLUDE : unxlngs390.mk
 .ENDIF
commit 3233dc045e3135fa6687b6c44951ae10e01f05cd
Author: Pedro Giffuni 
Date:   Thu Jan 26 18:04:03 2017 +

FreeBSD PPC and ARM support.

diff --git a/source_soenv.sh b/source_soenv.sh
index cb03564..43ed8e1 100644
--- a/source_soenv.sh
+++ b/source_soenv.sh
@@ -95,6 +95,15 @@ else
 amd64-*-freebsd*|x86_64-*-freebsd*)
 . ./FreeBSDAMDEnv.Set.sh
 ;;
+arm*-*-freebsd*)
+. ./FreeBSDARMEnv.Set.sh
+;;
+powerpc-*-freebsd*)
+. ./FreeBSDPPCEnv.Set.sh
+;;
+powerpc64-*-freebsd*)
+. ./FreeBSDPPC64Env.Set.sh
+;;
 # the result here (whether you get x86_64) seems to depend on $CC...
 i[3456]86-*-darwin*|x86_64-*-darwin*)
 . ./MacOSXX86Env.Set.sh
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/gbuild

2017-01-22 Thread Damjan Jovanovic

 solenv/gbuild/JavaClassSet.mk  |3 ++-
 solenv/gbuild/platform/freebsd.mk  |2 +-
 solenv/gbuild/platform/linux.mk|2 +-
 solenv/gbuild/platform/macosx.mk   |2 +-
 solenv/gbuild/platform/os2.mk  |   36 +---
 solenv/gbuild/platform/solaris.mk  |2 +-
 solenv/gbuild/platform/windows.mk  |   36 +---
 solenv/gbuild/platform/winmingw.mk |   11 +++
 8 files changed, 19 insertions(+), 75 deletions(-)

New commits:
commit fdceace757ab51da03547798676e44b2b34daf29
Author: Damjan Jovanovic 
Date:   Sun Jan 22 17:09:50 2017 +

Don't use the "archive" package format, which is to be extrated by

smoketest as a side effect, for the subsequent tests. The smoketest
is currently broken and won't do that, and the path is wrong anyway,
as it was for OpenOffice 3 and we're now on 4.

Instead, use the office instance from the "installed" package format
for subsequent tests, as it doesn't have to zipped up and unzipped,
resulting in faster building and faster testing, and doesn't require
a side effect in a module that will probably be moved from main/
to test/.

Patch by: me

diff --git a/solenv/gbuild/platform/freebsd.mk 
b/solenv/gbuild/platform/freebsd.mk
index 5d4dd05..d576df1 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -402,7 +402,7 @@ endef
 
 define gb_JunitTest_JunitTest_platform
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-   
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice}"
 \
+   
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice4/program/soffice}"
 \
 -Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
 -Dorg.openoffice.test.arg.user=file://$(call 
gb_JunitTest_get_userdir,$(1)) \
 
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index e50c986..1981101 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -381,7 +381,7 @@ endef
 
 define gb_JunitTest_JunitTest_platform
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-   
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice}"
 \
+   
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice4/program/soffice}"
 \
 -Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
 -Dorg.openoffice.test.arg.user=file://$(call 
gb_JunitTest_get_userdir,$(1)) \
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 7bcbec7..5ebf76e 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -418,7 +418,7 @@ endef
 
 define gb_JunitTest_JunitTest_platform
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-   
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/OpenOffice.org.app/Contents/MacOS/soffice}"
 \
+   
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice4/program/soffice}"
 \
 -Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
 -Dorg.openoffice.test.arg.user=file://$(call 
gb_JunitTest_get_userdir,$(1)) \
 
diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk
index 9cec835..f68679f 100644
--- a/solenv/gbuild/platform/os2.mk
+++ b/solenv/gbuild/platform/os2.mk
@@ -514,43 +514,9 @@ endef
 
 # JunitTest class
 
-gb_defaultlangiso := en-US
-gb_smoketest_instset := 
$(SRCDIR)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(gb_defaultlangiso)/OOo_*_install-arc_$(gb_defaultlangiso).zip
-
-ifeq ($(OOO_TEST_SOFFICE),)
-
-
-# Work around Windows problems with long pathnames (see issue 50885) by
-# installing into the temp directory instead of the module output tree (in 
which
-# case $(target).instpath contains the path to the temp installation,
-# which is removed after smoketest); can be removed once issue 50885 is fixed;
-# on other platforms, a single installation to solver is created in
-# smoketestoo_native.
-
-# for now, no dependency on $(shell ls $(gb_smoketest_instset))
-# because that doesn't work before the instset is built
-# and there is not much of a benefit anyway (gbuild not knowing about 
smoketest)
-define gb_JunitTest_JunitTest_platform_longpathname_hack
-$(call gb_JunitTest_get_target,$(1)) : $(call 
gb_JunitTest_get_target,$(1)).instpath
-$(call gb_JunitTest_get_target,$(1)) : CLEAN_CMD = $(call 
gb_Helper_abbreviate_dirs,rm -rf `cat $$@.instpath` $$@.instpath)
-
-$(call gb_JunitTest_get_target,$(1)).instpath : 
-   INST_DIR=(cygpath -m `mktemp -d -t testinst.XX`) \
-

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - set_soenv.in sw/qa

2017-01-18 Thread Damjan Jovanovic

 set_soenv.in   |2 +-
 sw/qa/complex/checkColor/CheckChangeColor.java |3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 5cf449daa11726dc29f20f23f1e74b2564dc0551
Author: Damjan Jovanovic 
Date:   Wed Jan 18 20:59:35 2017 +

Fix a main/sw subsequent test. The BackColor of a page style is irrelevant

since we only want to test changing it, and it only seems to have meaning
when the FillStyle is color, which it isn't.

Patch by: me

diff --git a/sw/qa/complex/checkColor/CheckChangeColor.java 
b/sw/qa/complex/checkColor/CheckChangeColor.java
index 949e420..07b59bd 100644
--- a/sw/qa/complex/checkColor/CheckChangeColor.java
+++ b/sw/qa/complex/checkColor/CheckChangeColor.java
@@ -63,9 +63,6 @@ public class CheckChangeColor {
 XPropertySet xPropertySet = (XPropertySet) 
UnoRuntime.queryInterface(XPropertySet.class, 
xPageStyleCollection.getByName("Standard") );
 
 assertEquals(
-"BackColor", new Any(Type.LONG, 0x),
-Any.complete(xPropertySet.getPropertyValue("BackColor")));
-assertEquals(
 "IsLandscape", new Any(Type.BOOLEAN, false),
 Any.complete(xPropertySet.getPropertyValue("IsLandscape")));
 assertEquals(
commit 70af00b96ab2d5914dbe06e74630fc1ffabdd4ae
Author: Damjan Jovanovic 
Date:   Wed Jan 18 20:58:11 2017 +

Add a ./configure option for Hamcrest once again, this time optional,

so that newer versions of JUnit can work.

Patch by: me

diff --git a/set_soenv.in b/set_soenv.in
index 7db8d39..c79671b 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1641,7 +1641,7 @@ ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
 ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
 ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
 ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@","e" );
-# ToFile( "HAMCREST_CORE_JAR", "@HAMCREST_CORE_JAR@","e" );
+ToFile( "HAMCREST_CORE_JAR", "@HAMCREST_CORE_JAR@","e" );
 ToFile( "SAC_JAR",   "@SAC_JAR@",  "e" );
 ToFile( "LIBXML_JAR","@LIBXML_JAR@",   "e" );
 ToFile( "FLUTE_JAR", "@FLUTE_JAR@","e" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - postprocess/prj sc/JunitTest_sc_complex.mk test/inc test/prj test/source

2017-01-18 Thread Damjan Jovanovic

 postprocess/prj/build.lst   |2 
 sc/JunitTest_sc_complex.mk  |2 
 test/inc/makefile.mk|   36 +
 test/inc/pch/precompiled_test.cxx   |   24 
 test/inc/pch/precompiled_test.hxx   |   28 
 test/inc/test/detail/testdllapi.hxx |   37 +
 test/inc/test/gettestargument.hxx   |   42 +
 test/inc/test/officeconnection.hxx  |   63 +
 test/inc/test/oustringostreaminserter.hxx   |   46 +
 test/inc/test/toabsolutefileurl.hxx |   42 +
 test/inc/test/uniquepipename.hxx|   40 +
 test/prj/build.lst  |6 
 test/prj/d.lst  |   17 
 test/source/cpp/getargument.cxx |   45 +
 test/source/cpp/getargument.hxx |   42 +
 test/source/cpp/gettestargument.cxx |   39 +
 test/source/cpp/makefile.mk |   72 ++
 test/source/cpp/officeconnection.cxx|  170 
+
 test/source/cpp/toabsolutefileurl.cxx   |   81 ++
 test/source/cpp/uniquepipename.cxx  |   44 +
 test/source/cpp/unoexceptionprotector/makefile.mk   |   67 ++
 test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx |   96 ++
 test/source/java/org/openoffice/test/Argument.java  |   32 
 test/source/java/org/openoffice/test/FileHelper.java|   56 +
 test/source/java/org/openoffice/test/OfficeConnection.java  |  220 
++
 test/source/java/org/openoffice/test/OfficeFileUrl.java |   38 +
 test/source/java/org/openoffice/test/TestArgument.java  |   35 +
 test/source/java/org/openoffice/test/makefile.mk|   53 +
 test/source/java/org/openoffice/test/tools/DocumentType.java|   60 +
 test/source/java/org/openoffice/test/tools/OfficeDocument.java  |  324 
++
 test/source/java/org/openoffice/test/tools/OfficeDocumentView.java  |  140 
 test/source/java/org/openoffice/test/tools/SpreadsheetDocument.java |   69 ++
 test/source/java/org/openoffice/test/tools/SpreadsheetView.java |   68 ++
 test/source/java/org/openoffice/test/tools/makefile.mk  |   47 +
 34 files changed, 2181 insertions(+), 2 deletions(-)

New commits:
commit b4448f13ef5a8ddece9dd35f4ca749aa203cb976
Author: Damjan Jovanovic 
Date:   Wed Jan 18 05:16:11 2017 +

Fix a main/sc JunitTest typo.

Patch by: me

diff --git a/sc/JunitTest_sc_complex.mk b/sc/JunitTest_sc_complex.mk
index f946a3a..03d34c6 100644
--- a/sc/JunitTest_sc_complex.mk
+++ b/sc/JunitTest_sc_complex.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_JunitTest_add_jars,sc_complex,\
 ))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,sc_complex,\
-   sc/qa/complex/sc/CalcCRTL \
+   sc/qa/complex/sc/CalcRTL \
 ))
 
 $(eval $(call gb_JunitTest_add_classes,sc_complex,\
commit 74dc26ee5acba162d704a5ff4082391fb2953f1e
Author: Damjan Jovanovic 
Date:   Wed Jan 18 04:32:59 2017 +

Resurrect main/test, which was deleted by liuzhe in r1378870, probably

by accident, and which we need for test.jar and test-tools.jar for
subsequent tests.

I am only bringing back the prj, inc and source subdirectories, as the
others are unnecessary.

Patch by: me

diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 62aa24e..9993021 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po  postprocess ::  svgio accessibility automation basctl bean 
chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans 
embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter 
forms fpicker helpcontent2 io JAVAINSTALLER2:javainstaller2 lingucomponent 
MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config 
remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow 
starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge 
xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top 
unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign 
sdext SWEXT:swext smoketestdoc uui writerfilter winaccessibility oox 
MYSQLC:mysqlc LIBXSLT:libxslt NULL
+po  postprocess ::  svgio accessibility automation basctl bean 
chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans 
embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter 
forms

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - automation/Library_communi.mk.old avmedia/Library_avmediagst.mk cosv/prj

2017-01-17 Thread Damjan Jovanovic

 automation/Library_communi.mk.old |   99 --
 avmedia/Library_avmediagst.mk |7 +-
 cosv/prj/build.lst|1 
 3 files changed, 5 insertions(+), 102 deletions(-)

New commits:
commit d42fe4f30e3ea154600c8e5b5892051922325707
Author: Damjan Jovanovic 
Date:   Tue Jan 17 18:10:51 2017 +

Some gbuild fixes discovered during an audit compared to dmake.

Delete an unnecessary file in main/automation.
Disable exception handling for 2 files in main/avmedia.

Patch by: me

diff --git a/automation/Library_communi.mk.old 
b/automation/Library_communi.mk.old
deleted file mode 100644
index a890e45..000
--- a/automation/Library_communi.mk.old
+++ /dev/null
@@ -1,99 +0,0 @@
-#**
-#  
-#  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
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**
-
-
-
-$(eval $(call gb_Library_Library,communi))
-
-$(eval $(call 
gb_Library_add_precompiled_header,communi,$(SRCDIR)/automation/inc/pch/precompiled_automation))
-
-$(eval $(call gb_Library_add_package_headers,communi,automation_inc))
-
-$(eval $(call gb_Library_set_include,communi,\
-$$(INCLUDE) \
-   -I$(SRCDIR)/automation/inc \
-   -I$(SRCDIR)/automation/inc/pch \
-   -I$(SRCDIR)/automation/source/inc \
-))
-
-#$(eval $(call gb_Library_add_defs,communi,\
-#  -DAVMEDIA_DLLIMPLEMENTATION \
-#))
-
-$(eval $(call gb_Library_add_api,communi,\
-   offapi \
-   udkapi \
-))
-
-$(eval $(call gb_Library_add_linked_libs,communi,\
-   sal \
-   simplecm \
-   svl \
-   tl \
-   vcl \
-   vos3 \
-   $(gb_STDLIBS) \
-))
-
-ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_add_linked_libs,communi,\
-   advapi32 \
-   gdi32 \
-))
-endif
-
-$(eval $(call gb_Library_add_noexception_objects,communi,\
-   automation/source/communi/communi \
-   automation/source/server/recorder \
-   automation/source/server/svcommstream \
-   automation/source/server/cmdbasestream \
-   automation/source/server/scmdstrm \
-   automation/source/server/sta_list \
-   automation/source/server/editwin \
-   automation/source/server/retstrm \
-   automation/source/server/profiler \
-   automation/source/simplecm/tcpio \
-   automation/source/simplecm/packethandler \
-   automation/source/simplecm/simplecm \
-))
-
-ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Library_add_noexception_objects,communi,\
-   automation/source/server/prof_usl \
-))
-else
-$(eval $(call gb_Library_add_noexception_objects,communi,\
-   automation/source/server/prof_nul \
-))
-endif
-
-$(eval $(call gb_Library_add_exception_objects,communi,\
-   automation/source/server/XMLParser \
-   automation/source/server/server \
-))
-
-$(eval $(call gb_Library_add_cxxobjects,dnd,\
-   automation/source/server/statemnt \
-   , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index 7ceecd1..b37ef6e 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -62,10 +62,13 @@ $(eval $(call gb_Library_add_libs,avmediagst,\
 
 $(eval $(call gb_Library_add_exception_objects,avmediagst,\
avmedia/source/gstreamer/gstuno \
-   avmedia/source/gstreamer/gstmanager \
-   avmedia/source/gstreamer/gstwindow \
avmedia/source/gstreamer/gstplayer \
avmedia/source/gstreamer/gstframegrabber \
 ))
 
+$(eval $(call gb_Library_add_noexception_objects,avmediagst,\
+   avmedia/source/gstreamer/gstmanager \
+   avmedia/source/gstreamer/gstwindow \
+))
+
 # vim: set noet sw=4 ts=4:
commit dacecb6cec89ec425db349f5739b6096174f2192
Author: Damjan Jovanovic 
Date:   Tue Jan 17 18:09:12 2017 +

Make main/cosv's prj/build.lst more suitable for automated analysis.

Patch by: me

diff --git a/cosv/prj/build.lst b/cosv/prj/build.lst
index f75303c..0c036f9 100644
--- a/cosv/prj/build.lst
+++ b/cosv/prj/build.lst
@@ -1,4 +1,3 @@

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - external/gcc3_specific external/prj scp2/source solenv/inc ure/source

2017-01-16 Thread Pedro Giffuni

 external/gcc3_specific/makefile.mk |   88 -
 external/prj/build.lst |1 
 scp2/source/ooo/ure.scp|   22 -
 solenv/inc/settings.mk |3 -
 solenv/inc/target.mk   |4 -
 solenv/inc/tg_compv.mk |   32 -
 solenv/inc/unx.mk  |3 -
 ure/source/README  |8 +--
 ure/source/uretest/Makefile|8 +--
 ure/source/uretest/Makefile.pln|9 +--
 ure/source/uretest/README  |   10 
 11 files changed, 12 insertions(+), 176 deletions(-)

New commits:
commit 02ad5ece6b3f578c74c066175410bf90450301dd
Author: Pedro Giffuni 
Date:   Tue Jan 17 00:43:35 2017 +

KDE: Add the KDE path to KDE_LIBS instead of adding it to SOLARLIB.

Just a small cleanup hinted by the kde4enable branch.

diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 92862bf..fa521d5 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -198,8 +198,7 @@ DLLPOST!:=$(DLLPOST).$($(UNIXVERSIONNAMES)_MAJOR)
 .IF "$(ENABLE_KDE)" != ""
 .IF "$(KDE_ROOT)"!=""
 KDE_CFLAGS:=-I$(KDE_ROOT)/include -DQT_CLEAN_NAMESPACE
-KDE_LIBS:=-lkdeui -lkdecore -lqt-mt
-SOLARLIB+=-L$(KDE_ROOT)/lib
+KDE_LIBS:=-L$(KDE_ROOT)/lib -lkdeui -lkdecore -lqt-mt
 .IF "$(OS)$(CPU)" == "LINUXX"
 SOLARLIB+=-L$(KDE_ROOT)/lib64
 .ENDIF  # "$(OS)$(CPU)" == "LINUXX"
commit 95ba35dde78288c707d4143a9ef8e67e1acfae43
Author: Pedro Giffuni 
Date:   Mon Jan 16 22:25:07 2017 +

i104495 - libstdc++ removal.

This cleanup was meant for KDE4 integration: in the BSDs this is dead code
and it doesn't seem a good idea on linux either, plus carrying libstdc++
doesn't align with ASF policies.

diff --git a/external/gcc3_specific/makefile.mk 
b/external/gcc3_specific/makefile.mk
deleted file mode 100644
index 42610dd..000
--- a/external/gcc3_specific/makefile.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-# *
-#  
-#  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
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-# *
-PRJ=..
-PRJNAME=external
-TARGET=gcc3_specific
-
-# --
-.INCLUDE: settings.mk
-# --
-
-
-.IF "$(BUILD_SPECIAL)"==""
-
-.IF "$(GUI)" == "WNT"
-
-.IF "$(COM)" == "GCC"
-
-.IF "$(MINGW_SHARED_GCCLIB)" == "YES"
-MINGWGCCDLL=$(BIN)$/$(MINGW_GCCDLL)
-.ENDIF
-
-.IF "$(MINGW_SHARED_GXXLIB)" == "YES"
-MINGWGXXDLL=$(BIN)$/$(MINGW_GXXDLL)
-.ENDIF
-
-all : $(BIN)$/mingwm10.dll $(MINGWGCCDLL) $(MINGWGXXDLL)
-
-$(BIN)$/mingwm10.dll :
-$(COPY) -p $(COMPATH)$/bin$/mingwm10.dll $(BIN)$/
-
-.IF "$(MINGW_SHARED_GCCLIB)" == "YES"
-$(MINGWGCCDLL) :
-$(COPY) -p $(COMPATH)$/bin$/$(MINGW_GCCDLL) $(BIN)$/
-.ENDIF
-
-.IF "$(MINGW_SHARED_GXXLIB)" == "YES"
-$(MINGWGXXDLL) :
-$(COPY) -p $(COMPATH)$/bin$/$(MINGW_GXXDLL) $(BIN)$/
-.ENDIF
-
-.ENDIF
-
-.ELSE
-
-.IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3"
-
-.IF "$(OS)"!="MACOSX"
-.IF "$(OS)"!="OS2"
-
-.EXPORT : CC
-
-all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) 
$(LB)$/libgcc_s.so.$(SHORTSTDC3)
-
-
-$(LB)$/libstdc++.so.$(SHORTSTDCPP3) :
-$(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB)
-
-$(LB)$/libgcc_s.so.$(SHORTSTDC3) :
-$(GCCINSTLIB) libgcc_s.so.$(SHORTSTDC3) $(LB)
-
-.ENDIF
-.ENDIF 
-.ENDIF 
-
-.ENDIF
-.ENDIF # "$(BUILD_SPECIAL)"==""
-
-
-.INCLUDE: target.mk
-
diff --git a/external/prj/build.lst b/external/prj/build.lst
index 5620441..ccf60b1 100644
--- a/external/prj/build.lst
+++ b/external/prj/build.lst
@@ -1,4 +1,3 @@
 el  external :   soltools NULL
 el externalusr1 - all el_mkout NULL
-el external\gcc3_specific  nmake   -   all el_gcc3 NULL
 el external\mingwheaders   nmake   -   w   el_mingwheaders 
NULL
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 5263b27..a4399d6 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -823,26 +823,6 @@ File gid_File_Dl_Libxml2
 End
 #endif
 
-#if

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/Library_cui.mk external_deps.lst python/makefile.mk python/prj python/python-2.7.12-mingw.patch python/python-2.7.12-nohardlink.pat

2017-01-09 Thread Damjan Jovanovic

 cui/Library_cui.mk|2 
 external_deps.lst |6 
 python/makefile.mk|2 
 python/prj/d.lst  |  108 +-
 python/python-2.7.12-mingw.patch  |  571 ---
 python/python-2.7.12-nohardlink.patch |   11 
 python/python-2.7.12-pcbuild.patch| 1710 --
 python/python-2.7.12-sysbase.patch|   14 
 python/python-2.7.13-mingw.patch  |  571 +++
 python/python-2.7.13-nohardlink.patch |   11 
 python/python-2.7.13-pcbuild.patch| 1710 ++
 python/python-2.7.13-sysbase.patch|   14 
 python/python-freebsd.patch   |   46 
 python/python-md5.patch   |6 
 python/python-solaris.patch   |4 
 python/python-solver-before-std.patch |6 
 python/python-ssl.patch   |   12 
 python/pyversion.mk   |2 
 18 files changed, 2403 insertions(+), 2403 deletions(-)

New commits:
commit 27f0c3366b4fb7c667d400e953c033f07de675f3
Author: Damjan Jovanovic 
Date:   Mon Jan 9 01:47:34 2017 +

Fix a missing bracket problem in a main/cui makefile when BUILD_VER_STRING

is set.

Patch by: me

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 8d448ad..c4e56c4 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,cui,\
 ))
 
 ifneq ($(BUILD_VER_STRING),)
-$(eval $(call gb_Library_add_defs,cui,-DBUILD_VER_STRING="$(BUILD_VER_STRING"))
+$(eval $(call 
gb_Library_add_defs,cui,-DBUILD_VER_STRING="$(BUILD_VER_STRING)"))
 endif
 
 $(eval $(call gb_Library_add_defs,cui,\
commit d6e0c30370effa6326fd174f6f05227a1c86c8d6
Author: Pedro Giffuni 
Date:   Mon Jan 9 00:45:26 2017 +

Bring new Python bugfix release version 2.7.13.

Release Notes:
https://hg.python.org/cpython/raw-file/v2.7.13/Misc/NEWS

Tested on FreeBSD but since it is a minor update, we don't expect
problems on other platforms.

diff --git a/external_deps.lst b/external_deps.lst
index 0eb7931b..5a02e6a 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -201,9 +201,9 @@ if (ENABLE_MEDIAWIKI == YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_PYTHON != YES)
-MD5 = 88d61f82e3616a4be952828b3694109d
-name = Python-2.7.12.tgz
-URL1 = http://www.python.org/ftp/python/2.7.12/Python-2.7.12.tgz
+MD5 = 17add4bf0ad0ec2f08e0cae6d205c700
+name = Python-2.7.13.tgz
+URL1 = http://www.python.org/ftp/python/2.7.13/Python-2.7.13.tgz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_BOOST != YES)
diff --git a/python/makefile.mk b/python/makefile.mk
index 5580971..22ab60e 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -42,7 +42,7 @@ all:
 
 
 TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=88d61f82e3616a4be952828b3694109d
+TARFILE_MD5=17add4bf0ad0ec2f08e0cae6d205c700
 PATCH_FILES=\
 python-solaris.patch \
 python-freebsd.patch \
diff --git a/python/prj/d.lst b/python/prj/d.lst
index 157aca8..b521c1e 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy
 mkdir: %_DEST%\lib%_EXT%\python\unittest
 mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
 
-..\%__SRC%\misc\build\Python-2.7.12\Lib\* %_DEST%\lib%_EXT%\python\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\lib-old\* 
%_DEST%\lib%_EXT%\python\lib-old\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\lib-tk\* 
%_DEST%\lib%_EXT%\python\lib-tk\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\site-packages\* 
%_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\encodings\* 
%_DEST%\lib%_EXT%\python\encodings\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\email\* 
%_DEST%\lib%_EXT%\python\email\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\email\mime\* 
%_DEST%\lib%_EXT%\python\email\mime\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\compiler\* 
%_DEST%\lib%_EXT%\python\compiler\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\hotshot\* 
%_DEST%\lib%_EXT%\python\hotshot\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\distutils\* 
%_DEST%\lib%_EXT%\python\distutils\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\distutils\command\* 
%_DEST%\lib%_EXT%\python\distutils\command\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\dom\* 
%_DEST%\lib%_EXT%\python\xml\dom\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\parsers\* 
%_DEST%\lib%_EXT%\python\xml\parsers\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\sax\* 
%_DEST%\lib%_EXT%\python\xml\sax\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\curses\* 
%_DEST%\lib%_EXT%\python\curses\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\plat-linux2\* 
%_DEST%\lib%_EXT%\python\plat-linux2\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\config\* 
%_DEST%\lib%_EXT%\python\config\*
-..\%__SRC%\misc\build\Python-2.7.12\Lib\bsddb\*

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/Library_cui.mk RepositoryFixes.mk

2017-01-08 Thread Damjan Jovanovic

 RepositoryFixes.mk |   26 +-
 cui/Library_cui.mk |5 -
 2 files changed, 25 insertions(+), 6 deletions(-)

New commits:
commit 21f210aaf26636e2c258cdd52478d1a6d925f921
Author: Damjan Jovanovic 
Date:   Sun Jan 8 19:57:08 2017 +

Fix a Windows naming clash between main/cui, whose library, icuin.lib,

was clashing with main/icu's icuin.lib once we started using gbuild,
which places libraries in a common directory. The main/cui library is
now just icui.lib, and main/icu's is still icuin.lib.

Also update RepositoryFixes.mk with all the main/icu libraries.

Patch by: me

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 17873dd..a59ab76 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -70,7 +70,6 @@ ifeq ($(OS),WNT)
 ifneq ($(USE_MINGW),)
 
 gb_Library_FILENAMES := $(patsubst 
comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst 
cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
@@ -93,7 +92,10 @@ gb_Library_FILENAMES := $(patsubst 
stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES
 # all other libraries built by OOo and all platform libraries (exceptions see 
below) are used without an import library
 # we link against their dlls in gcc format directly
 gb_Library_NOILIBFILENAMES:=\
+icudt \
+icuin \
 icule \
+icutu \
 icuuc \
 uwinapi \
 winmm \
@@ -112,7 +114,10 @@ gb_Library_DLLFILENAMES := $(filter-out $(foreach 
lib,$(gb_Library_ILIBFILENAMES
 gb_Library_DLLFILENAMES += $(foreach 
lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
 
 gb_Library_DLLFILENAMES := $(patsubst 
comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst 
icudt:icudt%,icudt:icudt40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst 
icuin:icuin%,icuin:icuin40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst 
icule:icule%,icule:icule40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst 
icutu:icutu%,icutu:icutu40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst 
icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst 
jvmaccess:jvmaccess%,jvmaccess:jvmaccess$(gb_Library_MAJORVER)%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
@@ -123,7 +128,6 @@ gb_Library_TARGETS := $(filter-out 
stl,$(gb_Library_TARGETS))
 else #ifneq ($(USE_MINGW),)
 
 gb_Library_FILENAMES := $(patsubst 
comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst 
cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
@@ -143,7 +147,12 @@ gb_Library_FILENAMES := $(patsubst 
stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES
 
 # change the names of all import libraries that don't have an "i" prefix as in 
our standard naming schema
 gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
-gb_Library_NOILIBFILENAMES += icuuc icule
+gb_Library_NOILIBFILENAMES += \
+icudt \
+icuin \
+icule \
+icutu \
+icuuc
 
 gb_Library_FILENAMES := $(filter-out $(foreach 
lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES += $(foreach 
lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
@@ -154,6 +163,10 @@ gb_Library_FILENAMES := $(patsubst 
z:z%,z:zlib%,$(gb_Library_FILENAMES))
 #endif
 
 gb_Library_DLLFILENAMES := $(patsubst 
comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst 
icudt:icudt%,icudt:icudt40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst 
icuin:icuin%,icuin:icuin40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst 
icule:icule%,icule:icule40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst 
icutu:icutu%,icutu:icutu40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst 
icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
@@ -200,8 +213,11 @@ gb_Library_DLLFILENAMES := $(patsubst 
sfx:test_sfx2_metadatable%,sfx:tstsfx2m%,$
 
 gb_Library_NOILIBFILENAMES:=\
 ft2lib \
-icuuc \

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - setup_native/source solenv/bin

2016-10-21 Thread Ariel Constenla-Haile

 setup_native/source/win32/customactions/shellextensions/registerextensions.cxx 
|2 
 setup_native/source/win32/nsis/downloadtemplate.nsi
|   94 +++---
 solenv/bin/modules/installer/download.pm   
|  136 --
 solenv/bin/modules/installer/globals.pm
|3 
 solenv/bin/modules/installer/simplepackage.pm  
|3 
 5 files changed, 48 insertions(+), 190 deletions(-)

New commits:
commit ff2631c08ee4ab17d99836c5d1b83c65123a601a
Author: Ariel Constenla-Haile 
Date:   Fri Oct 21 14:30:14 2016 +

i127100 - Build Windows installer with NSIS >= 3.0

diff --git a/setup_native/source/win32/nsis/downloadtemplate.nsi 
b/setup_native/source/win32/nsis/downloadtemplate.nsi
index d755dfb..79d4d7a 100644
--- a/setup_native/source/win32/nsis/downloadtemplate.nsi
+++ b/setup_native/source/win32/nsis/downloadtemplate.nsi
@@ -3,6 +3,9 @@
 !define PRODUCT_PUBLISHER "PUBLISHERPLACEHOLDER"
 !define PRODUCT_WEB_SITE "WEBSITEPLACEHOLDER"
 
+; Enable Unicode
+Unicode true
+
 ; SetCompressor lzma
 SetCompressor zlib
 
@@ -212,59 +215,44 @@ FunctionEnd
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 
-#231#!macro MUI_LANGUAGE_PACK LANGUAGE
-#231#  !verbose push
-#231#  !verbose ${MUI_VERBOSE}
-#231#  !insertmacro MUI_INSERT
-#231#  LoadLanguageFile "NSISPATHPLACEHOLDER\${LANGUAGE}_pack.nlf"
-#231#  ;Set default language file for MUI and backup user setting
-#231#  !ifdef LANGFILE_DEFAULT
-#231#!define MUI_LANGFILE_DEFAULT_TEMP "${LANGFILE_DEFAULT}"
-#231#!undef LANGFILE_DEFAULT
-#231#  !endif
-#231#  !define LANGFILE_DEFAULT "${NSISDIR}\Contrib\Language files\English.nsh"
-#231#  ;Include language file
-#231#  !insertmacro LANGFILE_INCLUDE "NSISPATHPLACEHOLDER\${LANGUAGE}_pack.nsh"
-#231#  ;Restore user setting for default language file
-#231#  !undef LANGFILE_DEFAULT
-#231#  !ifdef MUI_LANGFILE_DEFAULT_TEMP
-#231#!define LANGFILE_DEFAULT "${MUI_LANGFILE_DEFAULT}"
-#231#  !endif
-#231#  ;Add language to list of languages for selection dialog  
-#231#  !ifndef MUI_LANGDLL_LANGUAGES
-#231#   !define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' 
'${LANG_${LANGUAGE}}' "
-#231#!define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' 
'${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' "
-#231#  !else
-#231#!ifdef MUI_LANGDLL_LANGUAGES_TEMP
-#231#  !undef MUI_LANGDLL_LANGUAGES_TEMP
-#231#!endif
-#231#!define MUI_LANGDLL_LANGUAGES_TEMP "${MUI_LANGDLL_LANGUAGES}"
-#231#!undef MUI_LANGDLL_LANGUAGES
-#231#  !ifdef MUI_LANGDLL_LANGUAGES_CP_TEMP
-#231#  !undef MUI_LANGDLL_LANGUAGES_CP_TEMP
-#231#!endif
-#231#!define MUI_LANGDLL_LANGUAGES_CP_TEMP "${MUI_LANGDLL_LANGUAGES_CP}"
-#231#!undef MUI_LANGDLL_LANGUAGES_CP
-#231#!define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' 
'${LANG_${LANGUAGE}}' ${MUI_LANGDLL_LANGUAGES_TEMP}"
-#231#!define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' 
'${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' ${MUI_LANGDLL_LANGUAGES_CP_TEMP}"
-#231#  !endif
-#231#  !verbose pop
-#231#!macroend
-
-#204#!macro MUI_LANGUAGE_PACK LANGUAGE
-#204#  !verbose push
-#204#  !verbose ${MUI_VERBOSE}
-#204#  !include "NSISPATHPLACEHOLDER\${LANGUAGE}_pack.nsh"
-#204#  !verbose pop
-#204#!macroend
-
-#204#!macro MUI_LANGUAGEFILE_PACK_BEGIN LANGUAGE
-#204#  !ifndef MUI_INSERT
-#204#!define MUI_INSERT
-#204#!insertmacro MUI_INSERT
-#204#  !endif
-#204#  LoadLanguageFile "NSISPATHPLACEHOLDER\${LANGUAGE}_pack.nlf"
-#204#!macroend
+!macro MUI_LANGUAGE_PACK LANGUAGE
+  !verbose push
+  !verbose ${MUI_VERBOSE}
+  !insertmacro MUI_INSERT
+  LoadLanguageFile "NSISPATHPLACEHOLDER\${LANGUAGE}_pack.nlf"
+  ;Set default language file for MUI and backup user setting
+  !ifdef LANGFILE_DEFAULT
+!define MUI_LANGFILE_DEFAULT_TEMP "${LANGFILE_DEFAULT}"
+!undef LANGFILE_DEFAULT
+  !endif
+  !define LANGFILE_DEFAULT "${NSISDIR}\Contrib\Language files\English.nsh"
+  ;Include language file
+  !insertmacro LANGFILE_INCLUDE "NSISPATHPLACEHOLDER\${LANGUAGE}_pack.nsh"
+  ;Restore user setting for default language file
+  !undef LANGFILE_DEFAULT
+  !ifdef MUI_LANGFILE_DEFAULT_TEMP
+!define LANGFILE_DEFAULT "${MUI_LANGFILE_DEFAULT}"
+  !endif
+  ;Add language to list of languages for selection dialog  
+  !ifndef MUI_LANGDLL_LANGUAGES
+   !define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' 
'${LANG_${LANGUAGE}}' "
+!define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' 
'${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' "
+  !else
+!ifdef MUI_LANGDLL_LANGUAGES_TEMP
+  !undef MUI_LANGDLL_LANGUAGES_TEMP
+!endif
+!define MUI_LANGDLL_LANGUAGES_TEMP "${MUI_LANGDLL_LANGUAGES}"
+!undef MUI_LANGDLL_LANGUAGES
+   !ifdef MUI_LANGDLL_LANGUAGES_CP_TEMP
+  !undef MUI_LANGDLL_LANGUAGES_CP_TEMP
+!endif
+!define

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - external_deps.lst fpicker/source

2016-10-17 Thread Pedro Giffuni

 external_deps.lst   |2 +-
 fpicker/source/win32/filepicker/VistaFilePicker.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 08f842c93a2b61f3d92dd8dd633c45434c0b4bfa
Author: Pedro Giffuni 
Date:   Mon Oct 17 20:04:22 2016 +

More google code fallout.

MDDS has moved to gitlab, which doesn't help when looking for the old
version we need so use the Google archive instead.

diff --git a/external_deps.lst b/external_deps.lst
index 3eba2f0..931a6a14 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -57,7 +57,7 @@ if ( true )
 if (SYSTEM_MDDS != YES)
 MD5 = 0dd138efff4412c707e239290fb82d4f
 name = mdds_0.3.1.tar.bz2
-URL1 = http://multidimalgorithm.googlecode.com/files/mdds_0.3.1.tar.bz2
+URL1 = 
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/multidimalgorithm/mdds_0.3.1.tar.bz2
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
  
 if (SYSTEM_LIBTEXTCAT != YES)
commit 169403abedce4eb279d4db2baca71a00c63224ab
Author: Damjan Jovanovic 
Date:   Mon Oct 17 19:16:46 2016 +

Read PROP_DIRECTORY instead of PROP_FILENAME in the Vista file picker's

getDisplayDirectory() method.

Patch by: Regina Henschel
Review by: Damjan Jovanovic
(see https://bz.apache.org/ooo/show_bug.cgi?id=96720#c12)

diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx 
b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 486cb7b..77f3116 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -315,7 +315,7 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const 
::rtl::OUString& sDirec
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_GET_DIRECTORY);
 m_aAsyncExecute.triggerRequestThreadAware(rRequest, 
AsyncRequests::NON_BLOCKED);
-const ::rtl::OUString sDirectory = 
rRequest->getArgumentOrDefault(PROP_FILENAME, ::rtl::OUString());
+const ::rtl::OUString sDirectory = 
rRequest->getArgumentOrDefault(PROP_DIRECTORY, ::rtl::OUString());
 
 return sDirectory;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/bin

2016-10-01 Thread Andrea Pescetti

 solenv/bin/srcrelease.xml |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0d06ab4fc6dc9b9295c1126b0c239cdb654c6332
Author: Andrea Pescetti 
Date:   Sat Oct 1 15:46:32 2016 +

#i127148# Include testgraphical/references in generated source package.

diff --git a/solenv/bin/srcrelease.xml b/solenv/bin/srcrelease.xml
index 45bca58..43c380e 100644
--- a/solenv/bin/srcrelease.xml
+++ b/solenv/bin/srcrelease.xml
@@ -32,6 +32,7 @@
   
   
   
+  
   
 
 
@@ -73,6 +74,7 @@
   
   
   
+  
 
 
   
@@ -89,6 +91,7 @@
   
   
   
+  
 
 
   
commit 92209efe38c47e65ec5d34c81199749dca7dfb78
Author: Andrea Pescetti 
Date:   Sat Oct 1 14:12:51 2016 +

#i126605# Ignore generated scripts for supported platforms when creating 
source package.

diff --git a/solenv/bin/srcrelease.xml b/solenv/bin/srcrelease.xml
index 5a05488..45bca58 100644
--- a/solenv/bin/srcrelease.xml
+++ b/solenv/bin/srcrelease.xml
@@ -29,7 +29,7 @@
   
   
 
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 3 >

1 - 100 of 273 matches

Mail list logo