core.git: 2 commits - configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |  118 +--
 1 file changed, 59 insertions(+), 59 deletions(-)

New commits:
commit d9d976cd0ab0b52647e562d5c9cc3e492f71ee5d
Author: Christian Lohmaier 
AuthorDate: Thu Apr 18 12:56:50 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 26 14:01:00 2024 +0200

use unix paths for dir tests and prefer PathFormat…

over manual cygpath calls. Since PathFormat checks whether the path is
8.3 compatible/in case of spaces or other incompatible characters remove
some superfluous checks
also drop a workaround for VS2017 (minimum requried version is 2019)

Change-Id: I2d098cf323c96862c06acf7605abacbefe8a35ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166333
Reviewed-by: Christian Lohmaier 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 7aa526693862..554ccc8bc683 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4142,7 +4142,8 @@ win_get_env_from_vsdevcmdbat()
 {
 local WRAPPERBATCHFILEPATH="`mktemp -t wrpXX.bat`"
 printf '@set VSCMD_SKIP_SENDTELEMETRY=1
' > $WRAPPERBATCHFILEPATH
-printf '@call "%s/../Common7/Tools/VsDevCmd.bat" /no_logo
' "$(cygpath -w $VC_PRODUCT_DIR)" >> $WRAPPERBATCHFILEPATH
+PathFormat "$VC_PRODUCT_DIR"
+printf '@call "%s/../Common7/Tools/VsDevCmd.bat" /no_logo
' "$formatted_path" >> $WRAPPERBATCHFILEPATH
 # use 'echo.%ENV%' syntax (instead of 'echo %ENV%') to avoid outputting 
"ECHO is off." in case when ENV is empty or a space
 printf '@setlocal
@echo.%%%s%%
@endlocal
' "$1" >> $WRAPPERBATCHFILEPATH
 local result
@@ -4177,7 +4178,7 @@ find_ucrt()
 ide_env_file="${ide_env_dir}VsDevCmd.bat"
 if test -f "$ide_env_file"; then
 PathFormat "$(win_get_env_from_vsdevcmdbat UniversalCRTSdkDir)"
-UCRTSDKDIR=$formatted_path
+UCRTSDKDIR=$formatted_path_unix
 UCRTVERSION=$(win_get_env_from_vsdevcmdbat UCRTVersion)
 dnl Hack needed at least by tml:
 if test "$UCRTVERSION" = 10.0.15063.0 \
@@ -4371,9 +4372,9 @@ if test "$_os" = "WINNT"; then
 fi
 
 # Find the version of devenv.exe
-# MSVC 2017 devenv does not start properly from a DOS 8.3 path
-DEVENV=$(cygpath -lm "$VC_PRODUCT_DIR/../Common7/IDE/devenv.exe")
-DEVENV_unix=$(cygpath -u "$DEVENV")
+PathFormat "$VC_PRODUCT_DIR/../Common7/IDE/devenv.exe"
+DEVENV="$formatted_path"
+DEVENV_unix="$formatted_path_unix"
 if test ! -e "$DEVENV_unix"; then
 AC_MSG_WARN([No devenv.exe found - this is expected for VC++ Build 
Tools])
 fi
@@ -4398,11 +4399,10 @@ if test "$_os" = "WINNT"; then
 # Remove /cl.exe from CC case insensitive
 AC_MSG_NOTICE([found Visual C++ $vcyear])
 
-main_include_dir=`cygpath -d -m "$COMPATH/Include"`
-CPPFLAGS="$CPPFLAGS -I$main_include_dir"
-
 PathFormat "$COMPATH"
-COMPATH=`win_short_path_for_make "$formatted_path"`
+COMPATH="$formatted_path"
+COMPATH_unix="$formatted_path_unix"
+CPPFLAGS="$CPPFLAGS -I$COMPATH/Include"
 
 VCVER=$vcnumwithdot
 VCTOOLSET=$vctoolset
@@ -6733,15 +6733,10 @@ find_winsdk_version()
 winsdkbinsubdir="$regvalue".0
 winsdklibsubdir=$winsdkbinsubdir
 local tmppath="$winsdktest\Include\$winsdklibsubdir"
-local tmppath_unix=$(cygpath -u "$tmppath")
+PathFormat "$tmppath"
+local tmppath_unix=$formatted_path_unix
 # test exist the SDK path
-if test -d "$tmppath_unix"; then
-   # when path is convertible to a short path then path is okay
-   cygpath -d "$tmppath" >/dev/null 2>&1
-   if test $? -ne 0; then
-  AC_MSG_ERROR([Windows SDK doesn't have a 8.3 name, see 
NtfsDisable8dot3NameCreation])
-   fi
-else
+if test ! -d "$tmppath_unix"; then
AC_MSG_ERROR([The Windows SDK not found, check the 
installation])
 fi
 fi
@@ -6847,8 +6842,8 @@ if test "$_os" = "WINNT"; then
 
 # normalize if found
 if test -n "$WINDOWS_SDK_HOME"; then
-WINDOWS_SDK_HOME=`cygpath -d "$WINDOWS_SDK_HOME"`
-WINDOWS_SDK_HOME=`cygpath -u "$WINDOWS_SDK_HOME"`
+PathFormat "$WINDOWS_SDK_HOME"
+WINDOWS_SDK_HOME=$formatted_path_unix
 fi
 
 WINDOWS_SDK_LIB_SUBDIR=$winsdklibsubdir
@@ -6916,9 +6911,9 @@ the  Windows SDK are installed.])
 WINDOWS_SDK_HOME_unix="$formatted_path_unix"
 if test "$build_os" = "cygwin" -o "$build_os" = "wsl"; then
 SOLARINC="$SOLARINC -I$WINDOWS_SDK_HOME/include -I$COMPATH/Include"
-if test -d "$WINDOWS_SDK_HOME/include/um"; then
+if test -d "$WINDOWS_SDK_HOME_unix/include/um"; then
 SOLARINC="$SOLARINC 

core.git: 2 commits - configure.ac include/svx sw/inc sw/sdi sw/source sw/uiconfig

[Oliver Specht (via logerrit)]

 configure.ac|2 
 include/svx/relfld.hxx  |1 
 sw/inc/cmdid.h  |5 
 sw/inc/strings.hrc  |7 +
 sw/sdi/_tabsh.sdi   |   20 +++
 sw/sdi/swriter.sdi  |   50 +
 sw/source/uibase/shells/tabsh.cxx   |  144 +++
 sw/source/uibase/sidebar/TableEditPanel.cxx |  147 +++-
 sw/source/uibase/sidebar/TableEditPanel.hxx |   11 ++
 sw/uiconfig/swriter/ui/sidebartableedit.ui  |  115 +
 10 files changed, 493 insertions(+), 9 deletions(-)

New commits:
commit 828d2637fd3120bfd342b41548caf9c55fc0f603
Author: Oliver Specht 
AuthorDate: Tue Jan 30 17:07:46 2024 +0100
Commit: Gabor Kelemen 
CommitDate: Mon Feb 12 18:17:18 2024 +0100

tdf#159662 Add table alignment and left/right spacing to sidebar in Writer

Change-Id: I12d898f21ca8c7d581aaa1c587c5b6434a35f516
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162769
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx
index 8bc4c05580ec..85cec451cb94 100644
--- a/include/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
@@ -46,6 +46,7 @@ public:
 voidEnableNegativeMode() {bNegativeEnabled = true;}
 
 void set_sensitive(bool sensitive) { 
m_xSpinButton->set_sensitive(sensitive); }
+bool get_sensitive() const { return m_xSpinButton->get_sensitive(); }
 void set_value(int nValue, FieldUnit eValueUnit) { 
m_xSpinButton->set_value(nValue, eValueUnit); }
 int get_value(FieldUnit eDestUnit) const { return 
m_xSpinButton->get_value(eDestUnit); }
 int get_min(FieldUnit eValueUnit) const { return 
m_xSpinButton->get_min(eValueUnit); }
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 4773f173d603..e8521380c62c 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -520,7 +520,10 @@ class SwUINumRuleItem;
 #define FN_FORMAT_APPLY_DEFAULT (FN_FORMAT2 + 157)
 #define FN_FORMAT_APPLY_TEXTBODY(FN_FORMAT2 + 158)
 #define FN_REMOVE_DIRECT_CHAR_FORMATS   (FN_FORMAT2 + 159)
-//free (160)
+#define SID_ATTR_TABLE_ALIGNMENT(FN_FORMAT2 + 160)
+#define SID_ATTR_TABLE_LEFT_SPACE   (FN_FORMAT2 + 161)
+#define SID_ATTR_TABLE_RIGHT_SPACE  (FN_FORMAT2 + 162)
+//free (163 except 194 already used above)
 
 // Region: Extras
 #define FN_LINE_NUMBERING_DLG   (FN_EXTRA + 2 )   /* */
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 8f3eadcab6d8..b3e9a9370bfc 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1492,6 +1492,13 @@
 #define STR_COMPAT_OPT_USEVARIABLEWIDTHNBSP 
NC_("STR_COMPAT_OPT_USEVARIABLEWIDTHNBSP", "Render non-breaking spaces (NBSP) 
as standard-space-width (off for fixed size)")
 #define STR_COMPAT_OPT_NOGAPAFTERNOTENUMBER 
NC_("STR_COMPAT_OPT_NOGAPAFTERNOTENUMBER", "Do not add an extra space after 
number in footnotes / endnotes with hanging first line")
 
+#define STR_TABLE_PANEL_ALIGN_AUTO  
NC_("sidebartableedit|alignautolabel", "Automatic")
+#define STR_TABLE_PANEL_ALIGN_LEFT  
NC_("sidebartableedit|alignleftlabel", "Left")
+#define STR_TABLE_PANEL_ALIGN_FROM_LEFT 
NC_("sidebartableedit|alignfromleftlabel", "From left")
+#define STR_TABLE_PANEL_ALIGN_RIGHT 
NC_("sidebartableedit|alignrightlabel", "Right")
+#define STR_TABLE_PANEL_ALIGN_CENTER
NC_("sidebartableedit|aligncenterlabel", "Center")
+#define STR_TABLE_PANEL_ALIGN_MANUAL
NC_("sidebartableedit|alignmanuallabel", "Manual")
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi
index e4b6b9a2dd6c..7596d2c29bda 100644
--- a/sw/sdi/_tabsh.sdi
+++ b/sw/sdi/_tabsh.sdi
@@ -446,5 +446,25 @@ interface BaseTextTable
 StateMethod = GetState ;
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
+
+SID_ATTR_TABLE_ALIGNMENT
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
+SID_ATTR_TABLE_LEFT_SPACE
+[
+StateMethod = GetState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
+SID_ATTR_TABLE_RIGHT_SPACE
+[
+StateMethod = GetState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
 }
 
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 861d5ccec21a..16d939a8903d 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -8693,6 +8693,56 @@ SfxUInt32Item TableColumWidth SID_ATTR_TABLE_COLUMN_WIDTH
 GroupId = SfxGroupId::Table;
 ]
 
+SfxUInt32Item TableAlignment SID_ATTR_TABLE_ALIGNMENT
+(SfxInt32Item TableLeftSpace SID_ATTR_TABLE_LEFT_SPACE, SfxInt32Item 
TableRightSpace SID_ATTR_TABLE_RIGHT_SPACE)
+[
+AutoUpdate = TRUE,
+FastCall = FALSE,
+ReadOnlyDoc = 

core.git: 2 commits - configure.ac external/openssl

[Andras Timar (via logerrit)]

 configure.ac|2 +-
 external/openssl/ExternalProject_openssl.mk |4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a2fb7ac13e6e1cc27559871f0455342bdcccaa40
Author: Andras Timar 
AuthorDate: Mon May 24 20:15:14 2021 +0200
Commit: Andras Timar 
CommitDate: Mon Jan 15 08:31:52 2024 +0100

FreeBSD: fix OPENSSL_PLATFORM

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

diff --git a/external/openssl/ExternalProject_openssl.mk 
b/external/openssl/ExternalProject_openssl.mk
index d197721d024a..048158700f84 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -26,7 +26,9 @@ OPENSSL_PLATFORM := \
 $(if $(filter GNU/kFreeBSD,$(shell uname)),\
   debian-kfreebsd-amd64\
 ,\
-  $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64, 
linux-generic64) no-asm\
+  $(if $(filter FreeBSD,$(shell uname)), BSD-x86_64,\
+$(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64, 
linux-generic64) no-asm\
+  )\
 )\
   ,\
 $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic32, 
linux-generic32)\
commit 29df00696393c63be1071357e7d404610dc71ba8
Author: Andras Timar 
AuthorDate: Mon May 24 20:12:36 2021 +0200
Commit: Andras Timar 
CommitDate: Mon Jan 15 08:31:42 2024 +0100

FreeBSD: evaluate --with-gnu-patch

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

diff --git a/configure.ac b/configure.ac
index b8ddf562d6c7..859b404d287a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11656,7 +11656,7 @@ if test -z "$PATCH"; then
 fi
 
 dnl On Solaris or macOS, check if --with-gnu-patch was used
-if test "$_os" = "SunOS" -o "$_os" = "Darwin"; then
+if test "$_os" = "SunOS" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
 if test -z "$with_gnu_patch"; then
 GNUPATCH=$PATCH
 else

[Libreoffice-commits] core.git: 2 commits - configure.ac

[Mike Kaganski (via logerrit)]

 configure.ac |   18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 3b74fa43f537f471b1b87741d703f2696ed24510
Author: Mike Kaganski 
AuthorDate: Sat Nov 11 16:25:29 2023 +0300
Commit: Mike Kaganski 
CommitDate: Sat Nov 11 16:25:03 2023 +0100

Simplify input theme filtering

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

diff --git a/configure.ac b/configure.ac
index 35b654abe1f7..15e7c781e993 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13498,13 +13498,12 @@ fi
 
 WITH_THEMES=""
 if test "x$with_theme" != "xno"; then
-for theme in $with_theme; do
+with_theme_sorted=`echo $with_theme|sed 's/\bdefault\b/colibre/g'|tr '\ ' 
'\n'|sort -u`
+for theme in $with_theme_sorted; do
 case $theme in
-
breeze|breeze_dark|breeze_dark_svg|breeze_svg|colibre|colibre_svg|colibre_dark|colibre_dark_svg|elementary|elementary_svg|karasa_jaga|karasa_jaga_svg|sifr|sifr_svg|sifr_dark|sifr_dark_svg|sukapura|sukapura_dark|sukapura_dark_svg|sukapura_svg)
 real_theme="$theme" ;;
-default) real_theme=colibre ;;
+
breeze|breeze_dark|breeze_dark_svg|breeze_svg|colibre|colibre_svg|colibre_dark|colibre_dark_svg|elementary|elementary_svg|karasa_jaga|karasa_jaga_svg|sifr|sifr_svg|sifr_dark|sifr_dark_svg|sukapura|sukapura_dark|sukapura_dark_svg|sukapura_svg)
 WITH_THEMES="${WITH_THEMES:+$WITH_THEMES }$theme" ;;
 *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
 esac
-WITH_THEMES=`echo "$WITH_THEMES $real_theme"|tr '\ ' '\n'|sort|uniq|tr 
'\n' '\ '`
 done
 fi
 AC_MSG_RESULT([$WITH_THEMES])
commit db029c5a02880beb262165822a2e833c47569984
Author: Mike Kaganski 
AuthorDate: Sat Nov 11 16:22:23 2023 +0300
Commit: Mike Kaganski 
CommitDate: Sat Nov 11 16:24:57 2023 +0100

When MPL subset needs to disable icon themes, suggest filtered input

A suggestion like "you wanted to have a, b, c, d; you need to exclude
b; use e" makes little sense :-)

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

diff --git a/configure.ac b/configure.ac
index 545c3de33303..35b654abe1f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14765,15 +14765,20 @@ if test "$enable_mpl_subset" = "yes"; then
 mpl_error_string="$mpl_error_string$newline Need to disable extra 
extensions enabled using --enable-ext-."
 fi
 denied_themes=
+filtered_themes=
 for theme in $WITH_THEMES; do
 case $theme in
 
breeze|breeze_dark|breeze_dark_svg|breeze_svg|elementary|elementary_svg|karasa_jaga|karasa_jaga_svg)
 #denylist of icon themes under GPL or LGPL
-denied_themes="$denied_themes $theme" ;;
-*) : ;;
+denied_themes="${denied_themes:+$denied_themes }$theme" ;;
+*)
+filtered_themes="${filtered_themes:+$filtered_themes }$theme" ;;
 esac
 done
 if test "x$denied_themes" != "x"; then
-mpl_error_string="$mpl_error_string$newline Need to disable icon 
themes from '$WITH_THEMES': $denied_themes present, use --with-theme=colibre."
+if test "x$filtered_themes" == "x"; then
+filtered_themes="colibre"
+fi
+mpl_error_string="$mpl_error_string$newline Need to disable icon 
themes: $denied_themes, use --with-theme=$filtered_themes."
 fi
 
 ENABLE_OPENGL_TRANSITIONS=

[Libreoffice-commits] core.git: 2 commits - configure.ac distro-configs/Jenkins

[Michael Weghorn (via logerrit)]

 configure.ac   |   66 -
 distro-configs/Jenkins/android_common.conf |2 
 2 files changed, 39 insertions(+), 29 deletions(-)

New commits:
commit a6b369c59a97dbbde40233d3ce5467a09131d079
Author: Michael Weghorn 
AuthorDate: Wed Jan 25 11:14:52 2023 +0100
Commit: Michael Weghorn 
CommitDate: Thu Feb 16 20:33:07 2023 +

android: Support NDK 24.x and 25.x, use NDK 25 for Jenkins

NDK 24 dropped support for API versions < 19,
quoting [1]:

> * Jelly Bean (APIs 16, 17, and 18) is no longer supported. The minimum OS
>   supported by the NDK is KitKat (API level 19).

Therefore, use API level 19 for these (and unknown) NDKs unless
anything greater has explicitly been specified using the
`--with-android-api-level=` autogen switch
(or is default for the architecture, s. above).

Update the Jenkins config to use NDK 25 for the Android
builds as discussed in the ESC meeting on 2023-01-26 [2].

[1] https://developer.android.com/ndk/downloads/revision_history
[2] 
https://lists.freedesktop.org/archives/libreoffice/2023-January/089878.html

Change-Id: Ib8e65f433ee89ff1bc12432722570bf8f9f7ed85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146135
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/configure.ac b/configure.ac
index a68d8efb52ba..a346bde17e87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -741,8 +741,18 @@ if test -n "$with_android_ndk"; then
 23.*)
 ;;
 *)
-AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 23.* have been used successfully. Proceed at your own risk.])
-add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 23.* have been used successfully. Proceed at your own risk."
+# NDK 24 dropped support for API levels < 19
+if test "$ANDROID_API_LEVEL" -lt "19"; then
+ANDROID_API_LEVEL=19
+fi
+case $ANDROID_NDK_VERSION in
+24.*|25.*)
+;;
+*)
+AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, 
only versions 23.* to 25.* have been used successfully. Proceed at your own 
risk.])
+add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, 
only versions 23.* to 25.* have been used successfully. Proceed at your own 
risk."
+;;
+esac
 ;;
 esac
 
diff --git a/distro-configs/Jenkins/android_common.conf 
b/distro-configs/Jenkins/android_common.conf
index c5489f36c3e4..54af74b3450a 100644
--- a/distro-configs/Jenkins/android_common.conf
+++ b/distro-configs/Jenkins/android_common.conf
@@ -1,5 +1,5 @@
 --with-android-sdk=$HOME/Android/Sdk
---with-android-ndk=$HOME/Android/Sdk/ndk/23.2.8568313
+--with-android-ndk=$HOME/Android/Sdk/ndk/25.1.8937393
 --with-jdk-home=/etc/alternatives/java_sdk_11
 --enable-android-editing
 CC_FOR_BUILD=/opt/rh/devtoolset-7/root/usr/bin/gcc
commit 7fe6f298131386d80349f2fe46b1f69d31fd4af9
Author: Michael Weghorn 
AuthorDate: Wed Jan 25 11:13:15 2023 +0100
Commit: Michael Weghorn 
CommitDate: Thu Feb 16 20:32:59 2023 +

android: Move android API level check up in configure.ac

No logical change intended. This is in preparation of
using `ANDROID_API_LEVEL` in the NDK check in a follow-up commit.

Change-Id: I746cae640a57a49efbdefd8ba00dcc1c4edc4ef9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146134
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/configure.ac b/configure.ac
index 6707b808ef18..a68d8efb52ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -686,34 +686,6 @@ fi
 if test -n "$with_android_ndk"; then
 eval ANDROID_NDK_DIR=$with_android_ndk
 
-# Set up a lot of pre-canned defaults
-
-if test ! -f $ANDROID_NDK_DIR/RELEASE.TXT; then
-if test ! -f $ANDROID_NDK_DIR/source.properties; then
-AC_MSG_ERROR([Unrecognized Android NDK. Missing RELEASE.TXT or 
source.properties file in $ANDROID_NDK_DIR.])
-fi
-ANDROID_NDK_VERSION=`sed -n -e 's/Pkg.Revision = //p' 
$ANDROID_NDK_DIR/source.properties`
-else
-ANDROID_NDK_VERSION=`cut -f1 -d' ' <$ANDROID_NDK_DIR/RELEASE.TXT`
-fi
-if test -z "$ANDROID_NDK_VERSION";  then
-AC_MSG_ERROR([Failed to determine Android NDK version. Please check 
your installation.])
-fi
-case $ANDROID_NDK_VERSION in
-r9*|r10*)
-AC_MSG_ERROR([Building for Android requires NDK version >= 23.*])
-;;
-11.1.*|12.1.*|13.1.*|14.1.*|16.*|17.*|18.*|19.*|20.*|21.*|22.*)
-AC_MSG_ERROR([Building for Android requires NDK version >= 23.*])
-;;
-23.*)
-;;
-*)
-AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 23.* have been used successfully. Proceed at your own risk.])
-add_warning "Untested Android NDK version 

[Libreoffice-commits] core.git: 2 commits - configure.ac external/cairo

[Tor Lillqvist (via logerrit)]

 configure.ac|2 +-
 external/cairo/ExternalProject_cairo.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8aef8c3a1451b2fce37a21870a004855822ee335
Author: Tor Lillqvist 
AuthorDate: Wed Nov 23 15:48:27 2022 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Nov 29 01:56:02 2022 +0100

Make it possible to run either Writer or Calc in the same Emscripten thing

If no --with-main-module option is used, don't strip either.

To switch, you need to edit the instdir/program/soffice.js . (Or
static/emscripten/soffice_args.js and re-make.)

Change-Id: I572a777134e7b29fc4896e7b094ceca521874ae1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143396
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/configure.ac b/configure.ac
index 0d0ccebda32a..bea2bd98a22e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3937,7 +3937,7 @@ if test "$cross_compiling" = "yes"; then
 if test "$_os" = "Emscripten"; then
 if test "$with_main_module" = "calc"; then
 ENABLE_WASM_STRIP_WRITER=TRUE
-else
+elif test "$with_main_module" = "writer"; then
 ENABLE_WASM_STRIP_CALC=TRUE
 fi
 fi
commit dff1d7526f8b9d98c864a32654820cf92196ccbf
Author: Thorsten Behrens 
AuthorDate: Thu Nov 10 00:32:10 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Nov 29 01:55:50 2022 +0100

Don't use pthread for cairo

For cross builds, odd cases of cairo configure picking up wrong librt
and then missing pthread functions - so lets just disable it, we're
not using cairo multi-threaded anyway.

Change-Id: Id8b6426203859e7bf082d71ad8cf4548928d6acc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143390
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/external/cairo/ExternalProject_cairo.mk 
b/external/cairo/ExternalProject_cairo.mk
index 53a51b5e45ea..fd934906343b 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
$(gb_RUN_CONFIGURE) ./configure \
$(if $(debug),STRIP=" ") \
$(if $(filter ANDROID iOS,$(OS)),CFLAGS="$(if $(debug),-g) 
$(ZLIB_CFLAGS) $(gb_VISIBILITY_FLAGS)") \
-   $(if $(filter EMSCRIPTEN,$(OS)),CFLAGS=" $(ZLIB_CFLAGS) 
-Wno-enum-conversion $(gb_EMSCRIPTEN_CPPFLAGS)" --enable-pthread=yes 
PTHREAD_LIBS="") \
+   $(if $(filter EMSCRIPTEN,$(OS)),CFLAGS=-DCAIRO_NO_MUTEX" 
$(ZLIB_CFLAGS) -Wno-enum-conversion $(gb_EMSCRIPTEN_CPPFLAGS)" ) \
$(if $(filter-out EMSCRIPTEN ANDROID iOS,$(OS)), \
CFLAGS="$(CFLAGS) $(call 
gb_ExternalProject_get_build_flags,cairo) $(ZLIB_CFLAGS)" \
LDFLAGS="$(call 
gb_ExternalProject_get_link_flags,cairo)" \

[Libreoffice-commits] core.git: 2 commits - configure.ac solenv/bin sysui/desktop

[Christian Lohmaier (via logerrit)]

 configure.ac  |7 ++-
 solenv/bin/macosx-codesign-app-bundle |   16 +---
 sysui/desktop/macosx/Info.plist.in|4 
 3 files changed, 19 insertions(+), 8 deletions(-)

New commits:
commit 6e6c6f697b019348161648d9d26398bf64de83ef
Author: Christian Lohmaier 
AuthorDate: Tue Oct 18 13:12:29 2022 +0200
Commit: Christian Lohmaier 
CommitDate: Sun Oct 23 12:11:38 2022 +0200

macOS sandbox: only use com.apple.application-identifier for main package

when multiple files are signed with that entitlement, the build will
just be listed with "Not Available for Testing" via Testflight

Change-Id: I92957f24513ab419ddbc4289b53175932111c198
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141497
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/macosx-codesign-app-bundle 
b/solenv/bin/macosx-codesign-app-bundle
index a29b339de744..6894329fa406 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -25,11 +25,14 @@ done
 
 APP_BUNDLE="$1"
 entitlements=
+application_identifier=
 if test -n "$ENABLE_MACOSX_SANDBOX"; then
 # In a sandboxed build executables need the entitlements
 entitlements="--entitlements $BUILDDIR/lo.xcent"
+application_identifier=`/usr/libexec/PlistBuddy -c "print 
com.apple.application-identifier"  $BUILDDIR/lo.xcent`
+# remove the key from the entitlement - only use it when signing the whole 
bundle in the final step
+/usr/libexec/PlistBuddy -c "delete com.apple.application-identifier"  
$BUILDDIR/lo.xcent
 # All data files are in Resources and included in the app bundle signature
-# through that. I think.
 other_files=''
 # HACK: remove donate menu entries, need to support apple-pay and be 
verified
 # as non profit as a bare minimum to allow asking
@@ -120,14 +123,13 @@ done
 # CFBundleExecutable from Info.plist, i.e. soffice, plus the contents
 # of the Resources tree.
 #
-# At this stage we also attach the entitlements in the sandboxing case
-#
-# Also omit some files from the Bundle's seal via the resource-rules
-# (bootstraprc and similar that the user might adjust and image files)
 # See also https://developer.apple.com/library/mac/technotes/tn2206/
 
-id=`echo ${PRODUCTNAME} | tr ' ' '-'`
-
+if test -n "$ENABLE_MACOSX_SANDBOX" && test -n "$application_identifier"; then
+# add back the application-identfier to the entitlements
+# testflight/beta-testing won't work if that key is used when signing the 
other executables
+/usr/libexec/PlistBuddy -c "add com.apple.application-identifier string 
$application_identifier"  $BUILDDIR/lo.xcent
+fi
 codesign --force --options=runtime --identifier="${MACOSX_BUNDLE_IDENTIFIER}" 
--sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements "$APP_BUNDLE" || exit 1
 
 exit 0
commit 3336cb1b3d12e9cd5c2f560c82129dc8ed7527da
Author: Christian Lohmaier 
AuthorDate: Tue Oct 18 12:51:52 2022 +0200
Commit: Christian Lohmaier 
CommitDate: Sun Oct 23 12:11:29 2022 +0200

macOS: add XCode and SDK buildversions to Info.plist

without those submitting a build for external testing via testflight is
not possible because appstore thinks you were using a beta version of XCode

Change-Id: I6979a9d290c3e67dd9969d6e535625760b639c25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141496
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/configure.ac b/configure.ac
index 259001e70b65..a40c08e16b29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3428,7 +3428,7 @@ if test $_os = Darwin; then
 fi
 
 AC_MSG_RESULT([macOS SDK $macosx_sdk at $MACOSX_SDK_PATH])
-
+MACOSX_SDK_BUILD_VERSION=$(xcodebuild -version -sdk "$MACOSX_SDK_PATH" 
ProductBuildVersion) 
 case $macosx_sdk in
 10.13)
 MACOSX_SDK_VERSION=101300
@@ -3491,6 +3491,9 @@ if test $_os = Darwin; then
 AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at 
least Xcode 12.5])
 fi
 
+my_xcode_ver1=$(xcrun xcodebuild -version | tail -n 1)
+MACOSX_XCODE_BUILD_VERSION=${my_xcode_ver1#Build version }
+
 case "$with_macosx_version_min_required" in
 10.14)
 MAC_OS_X_VERSION_MIN_REQUIRED="101400"
@@ -3661,6 +3664,8 @@ AC_SUBST(ENABLE_MACOSX_SANDBOX)
 AC_SUBST(MACOSX_BUNDLE_IDENTIFIER)
 AC_SUBST(MACOSX_PROVISIONING_INFO)
 AC_SUBST(MACOSX_PROVISIONING_PROFILE)
+AC_SUBST(MACOSX_SDK_BUILD_VERSION)
+AC_SUBST(MACOSX_XCODE_BUILD_VERSION)
 
 dnl ===
 dnl Check iOS SDK and compiler
diff --git a/sysui/desktop/macosx/Info.plist.in 
b/sysui/desktop/macosx/Info.plist.in
index 6593139019fc..5401687027fa 100644
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1961,6 +1961,10 @@
 
 NSContactsUsageDescription
 You can add your contacts as a data source for mail merge or 
similar 

[Libreoffice-commits] core.git: 2 commits - configure.ac

[Luboš Luňák (via logerrit)]

 configure.ac |  112 +--
 1 file changed, 78 insertions(+), 34 deletions(-)

New commits:
commit f6882d91ad8d2219aa6fdc1583507910ee103e2b
Author: Luboš Luňák 
AuthorDate: Thu Jul 21 16:53:32 2022 +0200
Commit: Luboš Luňák 
CommitDate: Fri Jul 22 19:16:59 2022 +0200

fix configure handling of tarball path on WSL

Change-Id: Ie33eb8e256a38c5120fdd713b3fc34160a8728b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137347
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/configure.ac b/configure.ac
index 3b96ba195226..f81492852b8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,7 +190,9 @@ AbsolutePath()
 # Args: $1: A possibly relative pathname
 # Return value: $absolute_path
 
-local rel="$1"
+# Convert to unix path, mkdir would treat c:/path as a relative path.
+PathFormat "$1"
+local rel="$formatted_path_unix"
 absolute_path=""
 test ! -e "$rel" && mkdir -p "$rel"
 if test -d "$rel" ; then
@@ -6081,7 +6083,7 @@ if test -z "$TARFILE_LOCATION"; then
 else
 AbsolutePath "$TARFILE_LOCATION"
 PathFormat "${absolute_path}"
-TARFILE_LOCATION="${formatted_path}"
+TARFILE_LOCATION="${formatted_path_unix}"
 fi
 AC_SUBST(TARFILE_LOCATION)
 
commit c93e40ea0be17b586c30fc3b53c5f8193f26cd79
Author: Luboš Luňák 
AuthorDate: Thu Jul 21 16:31:03 2022 +0200
Commit: Luboš Luňák 
CommitDate: Fri Jul 22 19:16:45 2022 +0200

configure fixes for WSL

- Enabling some Cygwin checks also for WSL.
- Handling of Windows paths as needed for WSL.
- Reading of registry using wsl-lo-helper as WSL doesn't provide registry
  in /proc the way Cygwin does.
Configure now passes for me (with Skia and Java disabled).

Change-Id: I325c4e6f9f825b3b6d0aa6cb350bafabc4011ce5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137346
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/configure.ac b/configure.ac
index 67493ea442e7..3b96ba195226 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3849,6 +3849,31 @@ reg_get_value_64()
 reg_get_value "64" "$1"
 }
 
+reg_list_values()
+{
+# Return value: $reglist
+unset reglist
+
+if test "$build_os" = "wsl"; then
+reglist=$($WSL_LO_HELPER --list-registry $1 "$2" 2>/dev/null | tr -d 
'\r')
+return
+fi
+
+reglist=$(ls "/proc/registry${1}/${2}")
+}
+
+# List values from the 32-bit side of the Registry
+reg_list_values_32()
+{
+reg_list_values "32" "$1"
+}
+
+# List values from the 64-bit side of the Registry
+reg_list_values_64()
+{
+reg_list_values "64" "$1"
+}
+
 case "$host_os" in
 cygwin*|wsl*)
 COM=MSC
@@ -6510,15 +6535,18 @@ find_al()
 # We need this check to detect 4.6.1 or above.
 for ver in 4.8 4.7.2 4.7.1 4.7 4.6.2 4.6.1; do
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/NETFXSDK/$ver/WinSDK-NetFx40Tools/InstallationFolder"
-if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f 
"$regvalue/bin/al.exe" \); then
+PathFormat "$regvalue"
+if test -n "$regvalue" -a \( -f "$formatted_path_unix/al.exe" -o -f 
"$formatted_path_unix/bin/al.exe" \); then
 altest=$regvalue
 return
 fi
 done
 
-for x in `ls 
/proc/registry32/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft\ 
SDKs/Windows`; do
+reg_list_values_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows"
+for x in $reglist; do
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/$x/WinSDK-NetFx40Tools/InstallationFolder"
-if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f 
"$regvalue/bin/al.exe" \); then
+PathFormat "$regvalue"
+if test -n "$regvalue" -a \( -f "$formatted_path_unix/al.exe" -o -f 
"$formatted_path_unix/bin/al.exe" \); then
 altest=$regvalue
 return
 fi
@@ -6804,26 +6832,30 @@ AC_SUBST(WINDOWS_SDK_LIB_SUBDIR)
 AC_SUBST(WINDOWS_SDK_VERSION)
 AC_SUBST(WINDOWS_SDK_WILANGID)
 
-if test "$build_os" = "cygwin"; then
+if test "$build_os" = "cygwin" -o "$build_os" = "wsl"; then
 dnl Check midl.exe; this being the first check for a tool in the SDK bin
 dnl dir, it also determines that dir's path w/o an arch segment if any,
 dnl WINDOWS_SDK_BINDIR_NO_ARCH:
 AC_MSG_CHECKING([for midl.exe])
 
 find_winsdk
+PathFormat "$winsdktest"
+winsdktest_unix="$formatted_path_unix"
+
 if test -n "$winsdkbinsubdir" \
--a -f "$winsdktest/Bin/$winsdkbinsubdir/$WIN_BUILD_ARCH/midl.exe"
+-a -f "$winsdktest_unix/Bin/$winsdkbinsubdir/$WIN_BUILD_ARCH/midl.exe"
 then
 MIDL_PATH=$winsdktest/Bin/$winsdkbinsubdir/$WIN_BUILD_ARCH
-WINDOWS_SDK_BINDIR_NO_ARCH=$WINDOWS_SDK_HOME/Bin/$winsdkbinsubdir
-elif test -f "$winsdktest/Bin/$WIN_BUILD_ARCH/midl.exe"; then
+

[Libreoffice-commits] core.git: 2 commits - configure.ac solenv/wsl

[Luboš Luňák (via logerrit)]

 configure.ac |   20 +---
 solenv/wsl/README|8 
 solenv/wsl/wsl-lo-helper.cpp |8 
 3 files changed, 25 insertions(+), 11 deletions(-)

New commits:
commit 981ba02267af461792c3ff30b8fecc5cd73497a3
Author: Luboš Luňák 
AuthorDate: Thu Jul 21 15:59:50 2022 +0200
Commit: Luboš Luňák 
CommitDate: Fri Jul 22 19:16:29 2022 +0200

add fallback for $PROGRAMFILESX86

It's not set in my WSL, but since it's going to be c:\program files (x86)
in the vast majority of cases, just hardcode a fallback.

Change-Id: I3bf41d6bae0e5bb36c53f0a4cf913a980a058fcf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137345
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/configure.ac b/configure.ac
index eca0ab405c85..67493ea442e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4052,6 +4052,9 @@ find_msvc()
 vs_versions_to_check "$1"
 if test "$build_os" = wsl; then
 vswhere="$PROGRAMFILESX86"
+if test -z "$vswhere"; then
+vswhere="c:\\Program Files (x86)"
+fi
 else
 vswhere="$(perl -e 'print $ENV{"ProgramFiles(x86)"}')"
 fi
commit 4fbcededefa07a97aa9ca55986241a0dd0146806
Author: Luboš Luňák 
AuthorDate: Thu Jul 21 15:57:53 2022 +0200
Commit: Luboš Luňák 
CommitDate: Fri Jul 22 19:16:16 2022 +0200

require wsl-lo-helper to be preinstalled, like 'make'

It is needed to even find MSVC, so configure cannot easily build it.

Change-Id: Ie4e950cf01b9d8778cdc3e9a53718954b0c3c166
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137344
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/configure.ac b/configure.ac
index 2bf56df211d9..eca0ab405c85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,7 +119,7 @@ PathFormat()
 formatted_path=$(wslpath -w "$formatted_path")
 ;;
 esac
-formatted_path=$($BUILDDIR/solenv/wsl/wsl-lo-helper.exe --8.3 
"$formatted_path")
+formatted_path=$($WSL_LO_HELPER --8.3 "$formatted_path")
 elif test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
 formatted_path=`cygpath -sm "$formatted_path"`
 else
@@ -355,7 +355,7 @@ if test -z "$host" -a -z "$build" -a "$(uname -r | grep -i 
Microsoft 2>/dev/null
 ;;
 esac
 if test -n "$opt_d" -o -n "$opt_s"; then
-input=$($BUILDDIR/solenv/wsl/wsl-lo-helper.exe --8.3 "$input")
+input=$($WSL_LO_HELPER --8.3 "$input")
 fi
 if test -n "$opt_m"; then
 input="${input//\\//}"
@@ -399,6 +399,17 @@ if test -z "$host" -a -z "$build" -a "$(uname -r | grep -i 
Microsoft 2>/dev/null
 
 exit 0
 fi
+
+if test -z "$WSL_LO_HELPER"; then
+if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/wsl-lo-helper" ; then
+WSL_LO_HELPER="$LODE_HOME/opt/bin/wsl-lo-helper"
+elif test -x "/opt/lo/bin/wsl-lo-helper"; then
+WSL_LO_HELPER="/opt/lo/bin/wsl-lo-helper"
+fi
+fi
+if test -z "$WSL_LO_HELPER"; then
+AC_MSG_ERROR([wsl-lo-helper not found. See solenv/wsl/README.])
+fi
 fi
 
 AC_CANONICAL_HOST
@@ -3811,7 +3822,7 @@ reg_get_value()
 unset regvalue
 
 if test "$build_os" = "wsl"; then
-regvalue=$($BUILDDIR/solenv/wsl/wsl-lo-helper.exe --read-registry $1 
"$2" 2>/dev/null)
+regvalue=$($WSL_LO_HELPER --read-registry $1 "$2" 2>/dev/null)
 return
 fi
 
diff --git a/solenv/wsl/README b/solenv/wsl/README
new file mode 100644
index ..a9609f08dce9
--- /dev/null
+++ b/solenv/wsl/README
@@ -0,0 +1,8 @@
+This is a tool that will be useful for various tasks when building LO on WSL.
+
+It is a Win32 program, not a Linux (WSL) one.
+
+Compile using the Developer Command Prompt from MSVC as:
+cl wsl-lo-helper.cpp advapi32.lib
+and the copy the executable to /opt/lo/bin (e.g. from shell as):
+sudo mv wsl-lo-helper.exe /opt/lo/bin/wsl-lo-helper
diff --git a/solenv/wsl/wsl-lo-helper.cpp b/solenv/wsl/wsl-lo-helper.cpp
index 1a90580b6f19..87285dcb1d3c 100644
--- a/solenv/wsl/wsl-lo-helper.cpp
+++ b/solenv/wsl/wsl-lo-helper.cpp
@@ -7,14 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/*
- * This is a tool that will be useful for various tasks if/when we build LO on 
WSL
- *
- * It is a Win32 program, not a Linux (WSL) one.
- *
- * Compile as: cl -MD wsl-lo-helper.cpp advapi32.lib
- */
-
 #include 
 #include 
 

[Libreoffice-commits] core.git: 2 commits - configure.ac sw/qa

[Xisco Fauli (via logerrit)]

 configure.ac  |3 +-
 sw/qa/extras/uiwriter/data/tdf149507.docx |binary
 sw/qa/extras/uiwriter/uiwriter3.cxx   |   36 ++
 3 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit 1968563b1dec40f2134a04b1241178ae27b0d6bb
Author: Xisco Fauli 
AuthorDate: Tue Jun 14 12:22:10 2022 +0200
Commit: Xisco Fauli 
CommitDate: Wed Jun 15 08:42:18 2022 +0200

tdf#149507: sw_uiwriter3: Add unittest

Change-Id: I3268e2b286045257f2974b6b0397991d3aebc0eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135820
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/uiwriter/data/tdf149507.docx 
b/sw/qa/extras/uiwriter/data/tdf149507.docx
new file mode 100644
index ..83704edfb8b3
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf149507.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 1c7c4a87d3c5..619e5c032549 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -131,6 +131,42 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf146848)
 CPPUNIT_ASSERT_EQUAL(4, nFieldsCount);
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf149507)
+{
+createSwDoc(DATA_DIRECTORY, "tdf149507.docx");
+
+CPPUNIT_ASSERT_EQUAL(1, getShapes());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+Scheduler::ProcessEventsToIdle();
+
+dispatchCommand(mxComponent, ".uno:Cut", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(0, getShapes());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+dispatchCommand(mxComponent, ".uno:Paste", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(1, getShapes());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+// Without the fix in place, this test would have crashed here
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(0, getShapes());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(1, getShapes());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf145321)
 {
 createSwDoc(DATA_DIRECTORY, "tdf145321.odt");
commit 47f1602b2681130e1400a37909fac3dfa7f667bb
Author: Thorsten Behrens 
AuthorDate: Tue Jun 14 14:10:04 2022 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Jun 15 08:41:55 2022 +0200

Fix with-vendor for cross-build targets some more

Regression from be2252c8d3e5d892ec1e6b12a2b55c2026597cb9 where spaces
in --with-vendor end up being poorly quoted.

Opted to pass down --with-vendor to sub-configure unconditionally even
if empty, due to the need of word splitting generally being needed for
the sub_conf_opts variable.

Change-Id: Id3740255bc8fbf98adf7464de7e2836fcde9f2fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135826
Reviewed-by: Balazs Varga 
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/configure.ac b/configure.ac
index f2dded1c65c8..8c24eb84fd5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5651,7 +5651,6 @@ if test "$cross_compiling" = "yes"; then
 test "$enable_wasm_strip" = "yes" && sub_conf_opts="$sub_conf_opts 
--enable-wasm-strip"
 test "${with_system_lockfile+set}" = set && sub_conf_opts="$sub_conf_opts 
--with-system-lockfile=${with_system_lockfile}"
 test "${enable_fuzzers}" = yes && sub_conf_opts="$sub_conf_opts 
--without-system-libxml"
-test -n "$with_vendor" -a "$with_vendor" != "no" && 
sub_conf_opts="$sub_conf_opts --with-vendor=$with_vendor"
 if test "$_os" = "Emscripten"; then
 sub_conf_opts="$sub_conf_opts --without-system-libxml 
--without-system-fontconfig --without-system-freetype --without-system-zlib"
 fi
@@ -5689,6 +5688,7 @@ if test "$cross_compiling" = "yes"; then
 $sub_conf_defaults \
 --with-parallelism="'$with_parallelism'" \
 --with-theme="'$with_theme'" \
+--with-vendor="'$with_vendor'" \
 $sub_conf_opts \
 $with_build_platform_configure_options \
 --srcdir=$srcdir
@@ -5697,6 +5697,7 @@ if test "$cross_compiling" = "yes"; then
 $sub_conf_defaults \
 --with-parallelism="$with_parallelism" \
 --with-theme="$with_theme" \
+"--with-vendor=$with_vendor" \
 $sub_conf_opts \
 $with_build_platform_configure_options \
 --srcdir=$srcdir \

[Libreoffice-commits] core.git: 2 commits - configure.ac include/xmloff schema/libreoffice xmloff/qa xmloff/source

[Miklos Vajna (via logerrit)]

 configure.ac|   61 
 include/xmloff/txtparae.hxx |4 
 include/xmloff/xmltoken.hxx |3 
 schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng |   15 ++
 xmloff/qa/unit/text.cxx |   36 +++
 xmloff/source/core/xmltoken.cxx |3 
 xmloff/source/text/txtparae.cxx |   41 
 xmloff/source/token/tokens.txt  |2 
 8 files changed, 104 insertions(+), 61 deletions(-)

New commits:
commit cf5bbe3fce4a250ab25998053965bdc604c6114e
Author: Miklos Vajna 
AuthorDate: Fri Apr 8 11:32:22 2022 +0200
Commit: Miklos Vajna 
CommitDate: Fri Apr 8 12:51:09 2022 +0200

sw content controls: add ODT export

Wrap the text portions inside the content control in a
 XML element. Also map the (so far) single UNO
property of it to .

This is just initial export for inline text content controls, more
properties are to be added in follow-up commits.

Change-Id: I5d928255b925ed7e08fb635ba39f546e9a4879de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132717
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 70716c1f77a2..546bf2adca3c 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -368,6 +368,10 @@ protected:
 const css::uno::Reference< css::beans::XPropertySet> & i_xPortion,
 bool i_bAutoStyles, bool i_isProgress, bool & rPrevCharIsSpace);
 
+/// Exports a  element.
+void ExportContentControl(const 
css::uno::Reference& xPortion,
+  bool bAutoStyles, bool isProgress, bool& 
rPrevCharIsSpace);
+
 bool isAutoStylesCollected() const { return mbCollected; }
 
 virtual void exportTableAutoStyles();
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 86cc93f9a3a2..cdfb259f59ce 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3487,6 +3487,9 @@ namespace xmloff::token {
 XML_COLOR_LUM_MOD,
 XML_COLOR_LUM_OFF,
 
+XML_CONTENT_CONTROL,
+XML_SHOWING_PLACE_HOLDER,
+
 XML_TOKEN_END
 };
 
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng 
b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index ccbc6e4336e8..68ac5c155d6a 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -2803,6 +2803,21 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
+  
+  
+
+  
+
+
+
+
+  
+  
+
+  
+
+  
+
   
   
 
diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx
index 3b067120eb7b..a7765e214066 100644
--- a/xmloff/qa/unit/text.cxx
+++ b/xmloff/qa/unit/text.cxx
@@ -383,6 +383,42 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testRelativeWidth)
 assertXPath(pXmlDoc, "//draw:frame", "width", "3.1492in");
 }
 
+CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testContentControlExport)
+{
+// Given a document with a content control around one or more text 
portions:
+getComponent() = loadFromDesktop("private:factory/swriter");
+uno::Reference xMSF(getComponent(), 
uno::UNO_QUERY);
+uno::Reference xTextDocument(getComponent(), 
uno::UNO_QUERY);
+uno::Reference xText = xTextDocument->getText();
+uno::Reference xCursor = xText->createTextCursor();
+xText->insertString(xCursor, "test", /*bAbsorb=*/false);
+xCursor->gotoStart(/*bExpand=*/false);
+xCursor->gotoEnd(/*bExpand=*/true);
+uno::Reference xContentControl(
+xMSF->createInstance("com.sun.star.text.ContentControl"), 
uno::UNO_QUERY);
+uno::Reference xContentControlProps(xContentControl, 
uno::UNO_QUERY);
+xContentControlProps->setPropertyValue("ShowingPlaceHolder", 
uno::makeAny(true));
+xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true);
+
+// When exporting to ODT:
+uno::Reference xStorable(getComponent(), uno::UNO_QUERY);
+uno::Sequence aStoreProps = 
comphelper::InitPropertySequence({
+{ "FilterName", uno::makeAny(OUString("writer8")) },
+});
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+xStorable->storeToURL(aTempFile.GetURL(), aStoreProps);
+validate(aTempFile.GetFileName(), test::ODF);
+
+// Then make sure the expected markup is used:
+std::unique_ptr pStream = parseExportStream(aTempFile, 
"content.xml");
+xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get());
+// Without the accompanying fix in place, this failed with:
+// - XPath '//loext:content-control' number of nodes is incorrect
+// i.e. the content control was lost on export.
+

[Libreoffice-commits] core.git: 2 commits - configure.ac filter/source

[Stephan Bergmann (via logerrit)]

 configure.ac   |2 +-
 filter/source/msfilter/msvbahelper.cxx |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9ea17a6331ca9491e7012dca837d3815cd4309ac
Author: Stephan Bergmann 
AuthorDate: Fri Apr 8 09:15:19 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Apr 8 12:46:41 2022 +0200

Adapt to latest VS 2022 MSM versions

...as present at least with VS 2022 17.1.3

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

diff --git a/configure.ac b/configure.ac
index 1cdd22b0ae66..a19f73031124 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6650,7 +6650,7 @@ find_msms()
 
 case "$VCVER" in
 16.0 | 17.0)
-my_msm_files="Microsoft_VC141_CRT_x86.msm Microsoft_VC142_CRT_x86.msm 
${my_msm_files}"
+my_msm_files="Microsoft_VC141_CRT_x86.msm Microsoft_VC142_CRT_x86.msm 
Microsoft_VC143_CRT_x86.msm ${my_msm_files}"
 ;;
 esac
 for f in $my_msm_files; do
commit f9a094cc0c2f61fd0838a42489b717ede3e24fed
Author: Andrea Gelmini 
AuthorDate: Fri Apr 8 11:14:37 2022 +0200
Commit: Andrea Gelmini 
CommitDate: Fri Apr 8 12:46:28 2022 +0200

Removed duplicated include

Change-Id: I898c24abd5366a85705b5f54258b16b22e044355
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132715
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini 

diff --git a/filter/source/msfilter/msvbahelper.cxx 
b/filter/source/msfilter/msvbahelper.cxx
index 89c5292a3cb3..5ba35cec81a5 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -39,7 +39,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

[Libreoffice-commits] core.git: 2 commits - configure.ac helpcontent2

[Andrea Gelmini (via logerrit)]

 configure.ac |2 +-
 helpcontent2 |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9b431a9b5532448765908c192225556b16a5d79f
Author: Andrea Gelmini 
AuthorDate: Sun Nov 14 19:55:20 2021 +0100
Commit: Julien Nabet 
CommitDate: Sat Nov 20 19:25:05 2021 +0100

Fix typos

Change-Id: I3db97c20af3815a366d93454c8fc66cf8bdd848e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125207
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/configure.ac b/configure.ac
index d2104fab57f3..5c893e30fb9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5928,7 +5928,7 @@ if test -z "$enable_pch"; then
 if test "$_os" = "WINNT"; then
 # Enabled by default on Windows.
 enable_pch=yes
-# never use [s]ccache on auto-enabled PCH builds, except if requested 
explicitely
+# never use [s]ccache on auto-enabled PCH builds, except if requested 
explicitly
 if test -z "$enable_ccache"; then
 CCACHE=""
 fi
commit 0b505dfff45c1fafc5b8894916e9a611cc5155f7
Author: Johnny_M 
AuthorDate: Sat Nov 20 19:24:58 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Sat Nov 20 19:24:58 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to a4d192693f92434fe8f92c745a15afc1e09b77d9
  - tdf#132643 Translate German section IDs

Change-Id: I8fea2f205848348c38e507b9169dc7ca434b3b7f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/125588
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index aec63dfd1ff1..a4d192693f92 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit aec63dfd1ff1016d64554ab7e804fa1580a71f77
+Subproject commit a4d192693f92434fe8f92c745a15afc1e09b77d9

[Libreoffice-commits] core.git: 2 commits - configure.ac reportdesign/inc

[Henry Castro (via logerrit)]

 configure.ac|2 +-
 reportdesign/inc/RptDef.hxx |5 +
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 6e7d4c1185a9a70ea795b6959fbd87ac8e84480c
Author: Henry Castro 
AuthorDate: Fri Nov 6 07:50:27 2020 -0400
Commit: Henry Castro 
CommitDate: Mon Nov 9 12:03:33 2020 +0100

lok:configure: replace obsolete configuration links

The "AC_LINK_FILES" is replaced by "AC_CONFIG_LINKS"

Change-Id: I9c82d3f54cf78f08489453389d4e5070529a4f69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105423
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/configure.ac b/configure.ac
index cd7af465d660..34d116db105e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14057,7 +14057,7 @@ CFLAGS=$my_original_CFLAGS
 CXXFLAGS=$my_original_CXXFLAGS
 CPPFLAGS=$my_original_CPPFLAGS
 
-AC_LINK_FILES([include], [include])
+AC_CONFIG_LINKS([include:include])
 
 # Keep in sync with list of files far up, at AC_MSG_CHECKING([for
 # BUILD platform configuration] - otherwise breaks cross building
commit 9a2d8d30ac2e525963c764794bd3d6bd3462f64b
Author: shubham656 
AuthorDate: Sat Nov 7 17:47:18 2020 +0530
Commit: Michael Stahl 
CommitDate: Mon Nov 9 12:03:24 2020 +0100

tdf#124176 Use pragma once instead of inclusive guards

Change-Id: I1eafb1e903d44f52eac8a506e6123c0978f00394
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105431
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index f2dd5952684a..91fff4ae2342 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX
-#define INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX
+#pragma once
 
 #include 
 #include 
@@ -88,6 +87,4 @@ template < typename T> T getStyleProperty(const 
css::uno::Reference< css::report
 
 }
 
-#endif // INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac filter/source

[Svante Schubert (via logerrit)]

 configure.ac|5 
+++
 filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl   |   13 
++
 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |3 
++
 3 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 646cf598633bacc3959fc126c9117f06f3d0f9e3
Author: Svante Schubert 
AuthorDate: Wed Jul 8 00:57:33 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Jul 8 14:57:32 2020 +0200

Fixing top border style by fixing three XSLT issues triggered by...

... new properties in ODF 1.3

* check for fo:border='none'
* missing @ in @fo:background-color
* without default case (xsl:otherwise), end delimiter for "page"
  missing in CSS

Change-Id: Ie5d0c3e8a32de0403534c5a4fa33a5f20393ce69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98365
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index f9b5aff1b363..d1c8f189be85 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -705,11 +705,16 @@
 
 
+)">
 
 
 
diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index dc07f7e2918b..ec5b680df150 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -303,6 +303,9 @@
 
 vertical-lr; 
 
+
+horizontal-tb; direction:ltr;
+
 
 
 
commit fa654ada6f6a9bd3daf9639119759164cd9ff5a3
Author: Michael Stahl 
AuthorDate: Wed Jul 8 09:51:56 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Jul 8 14:57:21 2020 +0200

configure: try to fix qconfig.h check

Change-Id: Ie88d36d2f00c920a2d2a3e8fc6a84fdca4552b86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98314
Reviewed-by: Michael Weghorn 
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 0be03f347d2a..ba23b7211e27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11930,8 +11930,13 @@ then
 AC_MSG_ERROR([Qt5 headers not found.  Please specify the root of your 
Qt5 installation by exporting QT5DIR before running "configure".])
 fi
 # check for scenario: qt5-qtbase-devel-*.86_64 installed but host is i686
+AC_LANG_PUSH([C++])
+save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="${CPPFLAGS} -I${qt5_incdir}"
 AC_CHECK_HEADER(QtCore/qconfig.h, [],
 [AC_MSG_ERROR(qconfig.h header not found.)], [])
+CPPFLAGS=$save_CPPFLAGS
+AC_LANG_POP([C++])
 
 AC_MSG_CHECKING([for Qt5 libraries])
 qt5_libdir="no"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier (via logerrit)]

 configure.ac  |2 +-
 scp2/source/sdkoo/sdkoo.scp   |2 +-
 solenv/bin/modules/installer/simplepackage.pm |5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit ce308d606caa658f20839cbe68387f866acac2b6
Author: Christian Lohmaier 
AuthorDate: Fri May 8 21:32:50 2020 +0200
Commit: Christian Lohmaier 
CommitDate: Wed May 13 13:34:36 2020 +0200

macOS: don't hardcode LibreOffice in SDK directory, use $PRODUCTNAME

so that it will use LibreOfficeDev when not using --enable-release-build

Change-Id: I60794ababce11355659d483197ce8b0193d375b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93817
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/configure.ac b/configure.ac
index 06b0dd704f4f..c670181c65d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -710,7 +710,7 @@ darwin*) # macOS or iOS
 _os=Darwin
 INSTROOTBASESUFFIX=/$PRODUCTNAME_WITHOUT_SPACES.app
 INSTROOTCONTENTSUFFIX=/Contents
-SDKDIRNAME=AC_PACKAGE_NAME${PRODUCTVERSION}_SDK
+SDKDIRNAME=${PRODUCTNAME}${PRODUCTVERSION}_SDK
 fi
 # See comment above the case "$host_os"
 LINKFLAGSSHL="-dynamiclib -single_module"
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index e4ff95221013..d0ebc0f6d1bc 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -48,7 +48,7 @@ Directory gid_Dir_Sdkoo_Sdk
 ParentID = PREDEFINED_PROGDIR;
 #endif
 #ifdef MACOSX
-DosName = "LibreOffice${PRODUCTVERSION}_SDK";
+DosName = "${PRODUCTNAME}${PRODUCTVERSION}_SDK";
 #else
 DosName = "sdk";
 #endif
commit d3942a41d98dbb2d41615c0eac4c39ff9946cd66
Author: Tor Lillqvist 
AuthorDate: Wed May 13 11:49:55 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Wed May 13 13:34:29 2020 +0200

Remove some code that was commented-out ten years ago

Change-Id: Iead0a7e770a5533e3fe4585f76e343f0039328fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94105
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index 7c7afe67d513..a0a7163ad31a 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -342,7 +342,6 @@ sub create_package
 if ( $installer::globals::languagepack ) { $scriptfilename = 
"osx_install_languagepack.applescript"; }
 if ( $installer::globals::helppack ) { $scriptfilename = 
"osx_install_helppack.applescript"; }
 my $scripthelperfilename = $ENV{'SRCDIR'} . 
"/setup_native/scripts/mac_install.script";
-# my $scripthelperrealfilename = $volume_name;
 my $scripthelperrealfilename = $volume_name_classic_app;
 
 # Finding both files in source tree
@@ -362,7 +361,7 @@ sub create_package
 my $scriptfilecontent = 
installer::files::read_file($scriptfilename);
 my $translationfilecontent = 
installer::files::read_file($installer::globals::macinstallfilename);
 localize_scriptfile($scriptfilecontent, $translationfilecontent, 
$languagestringref);
-# replace_variables_in_scriptfile($scriptfilecontent, 
$volume_name, $allvariables);
+
 replace_variables_in_scriptfile($scriptfilecontent, 
$volume_name_classic, $volume_name_classic_app, $allvariables);
 installer::files::save_file($scriptfilename, $scriptfilecontent);
 
@@ -384,7 +383,7 @@ sub create_package
 $destfile = "$contentsfolder/Info.plist";
 # Replacing variables in Info.plist
 $scriptfilecontent = installer::files::read_file($infoplistfile);
-# replace_one_variable_in_shellscript($scriptfilecontent, 
$volume_name, "FULLPRODUCTNAME" );
+
 replace_one_variable_in_shellscript($scriptfilecontent, 
$volume_name_classic_app, "FULLAPPPRODUCTNAME" ); # OpenOffice.org Language Pack
 replace_one_variable_in_shellscript($scriptfilecontent, 
$ENV{'MACOSX_BUNDLE_IDENTIFIER'}, "BUNDLEIDENTIFIER" );
 installer::files::save_file($destfile, $scriptfilecontent);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac sc/README sc/source

[Luboš Luňák (via logerrit)]

 configure.ac  |4 ++--
 sc/README |2 +-
 sc/source/ui/view/gridwin.cxx |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 68cd8a97510ccfccb98516539ddb4affc94d46fa
Author: Luboš Luňák 
AuthorDate: Wed Jul 3 11:40:58 2019 +0200
Commit: Luboš Luňák 
CommitDate: Sat Jul 6 10:08:51 2019 +0200

increase parallelism with --enable-icecream from 10 to 40

My 5-year-old desktop can build 8 jobs on its own, so 10 is a rather
pointless default nowadays. Icecream will spawn only as many jobs
as the cluster can handle, so this should work fine even for small
machines/clusters.

Change-Id: Iccdf3adf51f55428e89e042d83979a1e1327659e
Reviewed-on: https://gerrit.libreoffice.org/75029
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/configure.ac b/configure.ac
index 2f1f242e76fb..ba079753729f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2217,7 +2217,7 @@ AC_ARG_WITH(parallelism,
 [Number of jobs to run simultaneously during build. Parallel builds can
 save a lot of time on multi-cpu machines. Defaults to the number of
 CPUs on the machine, unless you configure --enable-icecream - then to
-10.]),
+40.]),
 ,)
 
 AC_ARG_WITH(all-tarballs,
@@ -12409,7 +12409,7 @@ if test -n "$with_parallelism" -a "$with_parallelism" 
!= "yes"; then
 fi
 else
 if test "$enable_icecream" = "yes"; then
-PARALLELISM="10"
+PARALLELISM="40"
 else
 case `uname -s` in
 
commit 48741ec47852d78000f71dc9f2b3e172ba94a894
Author: Luboš Luňák 
AuthorDate: Mon Jul 1 11:24:46 2019 +0200
Commit: Luboš Luňák 
CommitDate: Sat Jul 6 10:08:40 2019 +0200

change Calc's shortcut for dumping cell properties to Ctrl+Shift+F6

Ctrl+Shift+F9 is the recalc-all shortcut, and so my dbgutil build
litters dump.xml files all over the place (especially annoying
in sc/qa/unit/data dirs, as test simply try to test all files
in a dir and fail because of the dump.xml).

Change-Id: I4d55e0aa69104626fcaa4264dc74f37203c46021
Reviewed-on: https://gerrit.libreoffice.org/74950
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sc/README b/sc/README
index fdee3df23ee3..e355e0c3c612 100644
--- a/sc/README
+++ b/sc/README
@@ -10,7 +10,7 @@ Dumps the column width of the first 20 columns.
 
 Dumps the graphic objects and their position and size in pixel.
 
-=== CTRL+SHIFT+F9 ===
+=== CTRL+SHIFT+F6 ===
 
 Dumps the SfxItemSet representing the cell properties' of the
 current selection as a xml file. The file will be named dump.xml
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 74826da1aa37..555a7f0ca6dc 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3175,7 +3175,7 @@ void ScGridWindow::KeyInput(const KeyEvent& rKEvt)
 {
 dumpColumnInformationHmm();
 }
-else if (rKeyCode.GetCode() == KEY_F9)
+else if (rKeyCode.GetCode() == KEY_F6)
 {
 dumpCellProperties();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac sc/IwyuFilter_sc.yaml sc/source

[Libreoffice Gerrit user]

 configure.ac  |3 +++
 sc/IwyuFilter_sc.yaml |7 +++
 sc/source/ui/formdlg/dwfunctr.cxx |9 -
 sc/source/ui/formdlg/formula.cxx  |   10 +++---
 sc/source/ui/inc/dataproviderdlg.hxx  |2 +-
 sc/source/ui/inc/namemgrtable.hxx |1 +
 sc/source/ui/inc/tpview.hxx   |2 +-
 sc/source/ui/miscdlgs/acredlin.cxx|2 --
 sc/source/ui/miscdlgs/anyrefdg.cxx|3 ---
 sc/source/ui/miscdlgs/autofmt.cxx |7 ---
 sc/source/ui/miscdlgs/datafdlg.cxx|2 --
 sc/source/ui/miscdlgs/dataproviderdlg.cxx |2 +-
 sc/source/ui/miscdlgs/datastreamdlg.cxx   |1 -
 sc/source/ui/miscdlgs/filldlg.cxx |1 -
 sc/source/ui/miscdlgs/highred.cxx |2 --
 sc/source/ui/miscdlgs/instbdlg.cxx|1 -
 sc/source/ui/miscdlgs/linkarea.cxx|3 ---
 sc/source/ui/miscdlgs/mvtabdlg.cxx|1 -
 sc/source/ui/miscdlgs/optsolver.cxx   |7 +++
 sc/source/ui/miscdlgs/protectiondlg.cxx   |2 --
 sc/source/ui/miscdlgs/redcom.cxx  |5 +++--
 sc/source/ui/miscdlgs/scuiautofmt.cxx |   19 ++-
 sc/source/ui/miscdlgs/sharedocdlg.cxx |1 -
 sc/source/ui/miscdlgs/simpref.cxx |4 
 sc/source/ui/miscdlgs/solveroptions.cxx   |4 
 sc/source/ui/miscdlgs/solvrdlg.cxx|1 -
 sc/source/ui/miscdlgs/strindlg.cxx|1 -
 sc/source/ui/miscdlgs/tabbgcolordlg.cxx   |7 ---
 sc/source/ui/miscdlgs/tabopdlg.cxx|2 --
 sc/source/ui/miscdlgs/textdlgs.cxx|1 -
 sc/source/ui/miscdlgs/warnbox.cxx |1 -
 sc/source/ui/namedlg/namedefdlg.cxx   |1 -
 sc/source/ui/namedlg/namedlg.cxx  |2 --
 sc/source/ui/namedlg/namemgrtable.cxx |   12 ++--
 sc/source/ui/navipi/content.cxx   |7 ---
 sc/source/ui/navipi/navcitem.cxx  |1 -
 sc/source/ui/navipi/navipi.cxx|8 
 sc/source/ui/optdlg/calcoptionsdlg.cxx|   17 -
 sc/source/ui/optdlg/calcoptionsdlg.hxx|1 -
 sc/source/ui/optdlg/opredlin.cxx  |   11 +--
 sc/source/ui/optdlg/tpcalc.cxx|8 +---
 sc/source/ui/optdlg/tpcompatibility.cxx   |5 +++--
 sc/source/ui/optdlg/tpdefaults.cxx|1 -
 sc/source/ui/optdlg/tpformula.cxx |4 +---
 sc/source/ui/optdlg/tpview.cxx|9 +
 45 files changed, 38 insertions(+), 163 deletions(-)

New commits:
commit b8a0f8c6f34c7f916e53935e410a5a68931bb739
Author: Gabor Kelemen 
AuthorDate: Thu Mar 7 07:51:39 2019 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 11 12:43:48 2019 +0100

tdf#42949 Fix IWYU warnings in sc/source/ui/[f-o]*/*cxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I56e32029f40a7c440143e395d851396fb2740fa8
Reviewed-on: https://gerrit.libreoffice.org/68837
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index dc3b4ab96723..d04da62d06f1 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -521,6 +521,9 @@ blacklist:
 sc/source/ui/inc/StatisticsTwoVariableDialog.hxx:
 # base class has to be a complete type
 - viewdata.hxx
+sc/source/ui/inc/tpview.hxx:
+# Needed for VclPtr type
+- svx/colorbox.hxx
 sc/source/ui/unoobj/exceldetect.hxx:
 # base class has to be a complete type
 - com/sun/star/document/XExtendedFilterDetection.hpp
@@ -860,3 +863,7 @@ blacklist:
 sc/source/ui/drawfunc/futext3.cxx:
 # Needed for direct member access
 - svx/svdocapt.hxx
+sc/source/ui/formdlg/formula.cxx:
+# Complete type is needed
+- com/sun/star/sheet/XFormulaParser.hpp
+- com/sun/star/sheet/XFormulaOpCodeMapper.hpp
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx 
b/sc/source/ui/formdlg/dwfunctr.cxx
index f2c52f45fad7..bc99704c9dbc 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -19,23 +19,14 @@
 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
 
-#include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 
 #include 
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 23f4479722ee..56d96a456ea9 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -24,17 +24,13 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -43,10 +39,8 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -54,6 +48,8 @@
 #include 
 
 #include 
+#include 
+#include 
 
 using namespace formula;
 

[Libreoffice-commits] core.git: 2 commits - configure.ac

[Libreoffice Gerrit user]

 configure.ac |  105 ++-
 1 file changed, 69 insertions(+), 36 deletions(-)

New commits:
commit aec51c7f99d6ad0028eebda0213a632b090f6fcf
Author: Luboš Luňák 
AuthorDate: Wed Dec 19 11:15:40 2018 +0100
Commit: Luboš Luňák 
CommitDate: Mon Feb 4 11:06:29 2019 +0100

make --enable-split-debug the default for debug builds, if available

Currently done only on Linux, as I'm unsure about the status on other 
platforms,
and it seems that on Darwin the test passes successfully but later there are
problems. Feel free to add your platform.
https://lists.freedesktop.org/archives/libreoffice/2018-June/080437.html
https://lists.freedesktop.org/archives/libreoffice/2018-July/080484.html

Change-Id: I232ead45a1aff15cc738c612750ac28aedc08e83
Reviewed-on: https://gerrit.libreoffice.org/65425
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/configure.ac b/configure.ac
index 45e4595ef08b..fff0cab68623 100644
--- a/configure.ac
+++ b/configure.ac
@@ -554,6 +554,7 @@ test_dbus=yes
 test_fontconfig=yes
 test_cairo=no
 test_gdb_index=no
+test_split_debug=no
 
 # Default values, as such probably valid just for Linux, set
 # differently below just for Mac OSX, but at least better than
@@ -607,6 +608,7 @@ linux-gnu*|k*bsd*-gnu*)
 test_kde5=yes
 test_gtk3_kde5=yes
 test_gdb_index=yes
+test_split_debug=yes
 if test "$enable_fuzzers" != yes; then
 test_freetype=yes
 test_fontconfig=yes
@@ -1130,9 +1132,9 @@ libo_FUZZ_ARG_ENABLE(debug,
  extra debugging code like assertions. Extra large build! (enables -g 
compiler flag).]))
 
 libo_FUZZ_ARG_ENABLE(split-debug,
-AS_HELP_STRING([--enable-split-debug],
-[Uses split debug information (-gsplit-dwarf compile flag). Saves disk 
space and build time,
- but requires tools that support it (both build tools and 
debuggers).]))
+AS_HELP_STRING([--disable-split-debug],
+[Disable using split debug information (-gsplit-dwarf compile flag). 
Split debug information
+ saves disk space and build time, but requires tools that support it 
(both build tools and debuggers).]))
 
 libo_FUZZ_ARG_ENABLE(gdb-index,
 AS_HELP_STRING([--disable-gdb-index],
@@ -3867,9 +3869,10 @@ else
 fi
 AC_SUBST(ENABLE_DEBUG)
 
-if test "$enable_split_debug" = yes; then
-HAVE_GSPLIT_DWARF=
-if test "$GCC" = "yes"; then
+HAVE_GSPLIT_DWARF=
+if test "$enable_split_debug" != no; then
+dnl Currently by default enabled only on Linux, feel free to set 
test_split_debug above also for other platforms.
+if test "$enable_split_debug" = yes -o \( "$test_split_debug" = "yes" -a 
-n "$ENABLE_DEBUG$ENABLE_DBGUTIL" \); then
 AC_MSG_CHECKING([whether $CC supports -gsplit-dwarf])
 save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS -Werror -gsplit-dwarf"
@@ -3878,11 +3881,19 @@ if test "$enable_split_debug" = yes; then
 if test "$HAVE_GCC_SPLIT_DWARF" = "TRUE"; then
 AC_MSG_RESULT([yes])
 else
-AC_MSG_RESULT([no])
+if test "$enable_split_debug" = yes; then
+AC_MSG_ERROR([no])
+else
+AC_MSG_RESULT([no])
+fi
 fi
 fi
-AC_SUBST(HAVE_GCC_SPLIT_DWARF)
+if test -z "$HAVE_GCC_SPLIT_DWARF" -a "$test_split_debug" = "yes" -a -n 
"$ENABLE_DEBUG$ENABLE_DBGUTIL"; then
+AC_MSG_WARN([Compiler is not capable of creating split debug info, 
linking will require more time and disk space.])
+add_warning "Compiler is not capable of creating split debug info, 
linking will require more time and disk space."
+fi
 fi
+AC_SUBST(HAVE_GCC_SPLIT_DWARF)
 
 ENABLE_GDB_INDEX=
 if test "$enable_gdb_index" != "no"; then
commit bf63a95b981a9055e5c462cc85732629ce6b98b8
Author: Luboš Luňák 
AuthorDate: Wed Dec 19 11:05:54 2018 +0100
Commit: Luboš Luňák 
CommitDate: Mon Feb 4 11:06:18 2019 +0100

make --enable-gdb-index the default for debug builds, if supported

Currently only done on Linux, I'm not sure about the status on other 
platforms,
feel free to add your platform.
https://lists.freedesktop.org/archives/libreoffice/2018-June/080437.html
https://lists.freedesktop.org/archives/libreoffice/2018-July/080484.html

Change-Id: I5997f54e530c8078250eb7c116cb6bd2604e7925
Reviewed-on: https://gerrit.libreoffice.org/65424
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/configure.ac b/configure.ac
index f9149ebb9ddd..45e4595ef08b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -553,6 +553,7 @@ test_cups=yes
 test_dbus=yes
 test_fontconfig=yes
 test_cairo=no
+test_gdb_index=no
 
 # Default values, as such probably valid just for Linux, set
 # differently below just for Mac OSX, but at least better than
@@ -605,6 +606,7 @@ linux-gnu*|k*bsd*-gnu*)
 build_gstreamer_0_10=yes
 test_kde5=yes
 test_gtk3_kde5=yes
+test_gdb_index=yes
 

[Libreoffice-commits] core.git: 2 commits - configure.ac include/unoidl README.md svx/source

[Libreoffice Gerrit user]

 README.md |6 
 configure.ac  |   67 ++
 include/unoidl/unoidl.hxx |4 
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx |3 
 4 files changed, 43 insertions(+), 37 deletions(-)

New commits:
commit 685aca47da835e80f34b295c5d6389df03d1a8c2
Author: Stephan Bergmann 
AuthorDate: Fri Nov 23 19:04:07 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Dec 4 17:01:13 2018 +0100

Bump (Linux) Clang baseline to 5.0.2

...as discussed at


"minutes of ESC call ...".

This no longer sets CLANGVER, CLANG_VERSION, and CLANG_FULL_VERSION when 
using
Apple Clang (on macOS), which uses different version numbers from upstream
anyway.  But those variables are only used in the context of compiler 
plugins,
which do not work with Apple Clang anyway (which lacks necessary include 
files).

(Also, move "AC_SUBST(COM_IS_CLANG)" up to where it belongs.)

Change-Id: Iee37c42ecacf52fa5a07e35241bcd404025e1cdf
Reviewed-on: https://gerrit.libreoffice.org/63899
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/README.md b/README.md
index 45abb593bf9d..d72e9549c4fa 100644
--- a/README.md
+++ b/README.md
@@ -40,15 +40,11 @@ run and compile LibreOffice, also used by the TDF builds:
 * Build: 10.13.2 + Xcode 9.3
 * Linux:
 * Runtime: RHEL 6 or CentOS 6
-* Build: GCC 4.8.1 or Clang
+* Build: either GCC 4.8.1; or Clang 5.0.2 with libstdc++ 7.3.0
 * iOS (only for LibreOfficeKit):
 * Runtime: 11.4 (only support for newer i devices == 64 bit)
 * Build: Xcode 9.3 and iPhone SDK 11.4
 
-At least Clang 3.4.2 is known to be too old to pass the configure.ac check 
"whether $CXX supports
-C++17, C++14, or C++11" in its current form (due to the #pragma GCC diagnostic 
ignored "-Wpragmas"
-that it does not understand).
-
 If you want to use Clang with the LibreOffice compiler plugins, the minimal
 version of Clang is 5.0.2. Since Xcode doesn't provide the compiler plugin
 headers, you have to compile your own Clang to use them on macOS.
diff --git a/configure.ac b/configure.ac
index 947fc3920782..cb54af0e828f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3639,37 +3639,52 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 [AC_MSG_RESULT([yes])
  COM_IS_CLANG=TRUE],
 [AC_MSG_RESULT([no])])
+AC_SUBST(COM_IS_CLANG)
 
 CC_PLAIN=$CC
+CLANGVER=
 if test "$COM_IS_CLANG" = TRUE; then
-AC_MSG_CHECKING([the Clang version])
-if test "$_os" = WINNT; then
-dnl In which case, assume clang-cl:
-my_args="/EP /TC"
-dnl Filter out -FIIntrin.h, which needs to be explicitly stated for
-dnl clang-cl:
-CC_PLAIN=
-for i in $CC; do
-case $i in
--FIIntrin.h)
-;;
-*)
-CC_PLAIN="$CC_PLAIN $i"
-;;
-esac
-done
-else
-my_args="-E -P"
+AC_MSG_CHECKING([whether Clang is new enough])
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+#if !defined __apple_build_version__
+#error
+#endif
+]])],
+[my_apple_clang=yes],[my_apple_clang=])
+if test "$my_apple_clang" = yes; then
+AC_MSG_RESULT([assumed yes (Apple Clang)])
+else
+if test "$_os" = WINNT; then
+dnl In which case, assume clang-cl:
+my_args="/EP /TC"
+dnl Filter out -FIIntrin.h, which needs to be explicitly stated for
+dnl clang-cl:
+CC_PLAIN=
+for i in $CC; do
+case $i in
+-FIIntrin.h)
+;;
+*)
+CC_PLAIN="$CC_PLAIN $i"
+;;
+esac
+done
+else
+my_args="-E -P"
+fi
+clang_version=`echo 
__clang_major__.__clang_minor__.__clang_patchlevel__ | $CC_PLAIN $my_args -`
+CLANG_FULL_VERSION=`echo __clang_version__ | $CC_PLAIN $my_args -`
+CLANGVER=`echo $clang_version \
+| $AWK -F. '{ print 
\$1*1+(\$2<100?\$2:99)*100+(\$3<100?\$3:99) }'`
+if test "$CLANGVER" -ge 50002; then
+AC_MSG_RESULT([yes ($clang_version)])
+else
+AC_MSG_ERROR(["$CLANG_FULL_VERSION" is too old or unrecognized, 
must be at least Clang 5.0.2])
+fi
+AC_DEFINE_UNQUOTED(CLANG_VERSION,$CLANGVER)
+AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)
 fi
-clang_version=`echo __clang_major__.__clang_minor__.__clang_patchlevel__ | 
$CC_PLAIN $my_args -`
-CLANG_FULL_VERSION=`echo __clang_version__ | $CC_PLAIN $my_args -`
-CLANGVER=`echo $clang_version \
-| $AWK -F. '{ print \$1*1+(\$2<100?\$2:99)*100+(\$3<100?\$3:99) }'`
-

[Libreoffice-commits] core.git: 2 commits - configure.ac icon-themes/breeze_dark icon-themes/breeze_svg icon-themes/elementary_svg icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg postproce

[Libreoffice Gerrit user]

 configure.ac |7 
 icon-themes/breeze_dark/links.txt| 1725 --
 icon-themes/breeze_svg/links.txt | 1725 --
 icon-themes/elementary_svg/links.txt | 2012 ---
 icon-themes/sifr_dark/links.txt  |  223 ---
 icon-themes/sifr_svg/links.txt   |  223 ---
 postprocess/CustomTarget_images.mk   |   29 
 solenv/bin/pack_images.py|   54 
 vcl/source/app/IconThemeInfo.cxx |   50 
 9 files changed, 90 insertions(+), 5958 deletions(-)

New commits:
commit 73fdc1e11bdb38de212b8bc223f2fbb4fab01083
Author: Jan-Marek Glogowski 
AuthorDate: Wed Oct 31 17:24:28 2018 +
Commit: Jan-Marek Glogowski 
CommitDate: Mon Nov 5 14:40:53 2018 +0100

Package separate SVG icon sets

This change packages all SVG based icon sets in seperate zip
files. It automatically generates the SVGs links.txt from
the non-SVG version, if it doesn't exists by 's/\.png/\.svg/g'.

Same for the _dark version, but this just copies it.
This would also work for a _dark_svg version, if needed.

The patch explicitly does't package sifr_svg and tango_svg.

Change-Id: I8d7fda42d0ff9a2108ba8406bd4e82af4c54ff0c
Reviewed-on: https://gerrit.libreoffice.org/62706
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/configure.ac b/configure.ac
index 36d68bfe6393..7419886bcad8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1576,7 +1576,8 @@ AC_ARG_WITH(galleries,
 AC_ARG_WITH(theme,
 AS_HELP_STRING([--with-theme="theme1 theme2..."],
 [Choose which themes to include. By default those themes with an '*' 
are included.
- Possible choices: *breeze, *breeze_dark, *colibre, *elementary, 
*karasa_jaga, *sifr, *sifr_dark, *tango.]),
+ Possible choices: *breeze, *breeze_dark, *breeze_svg, *colibre, 
*colibre_svg, *elementary,
+ *elementary_svg, *karasa_jaga, *sifr, *sifr_dark, *tango.]),
 ,)
 
 libo_FUZZ_ARG_WITH(helppack-integration,
@@ -11377,14 +11378,14 @@ dnl 
===
 AC_MSG_CHECKING([which themes to include])
 # if none given use default subset of available themes
 if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then
-with_theme="breeze breeze_dark colibre elementary karasa_jaga sifr 
sifr_dark tango"
+with_theme="breeze breeze_dark breeze_svg colibre colibre_svg elementary 
elementary_svg karasa_jaga sifr sifr_dark tango"
 fi
 
 WITH_THEMES=""
 if test "x$with_theme" != "xno"; then
 for theme in $with_theme; do
 case $theme in
-
breeze|breeze_dark|colibre|elementary|karasa_jaga|sifr|sifr_dark|tango) 
real_theme="$theme" ;;
+
breeze|breeze_dark|breeze_svg|colibre|colibre_svg|elementary|elementary_svg|karasa_jaga|sifr|sifr_dark|tango)
 real_theme="$theme" ;;
 default) real_theme=colibre ;;
 *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
 esac
diff --git a/icon-themes/breeze_dark/links.txt 
b/icon-themes/breeze_dark/links.txt
deleted file mode 100644
index 9d1b43f4b335..
--- a/icon-themes/breeze_dark/links.txt
+++ /dev/null
@@ -1,1725 +0,0 @@
-# avmedia
-# ==
-avmedia/res/av02048.png cmd/sc_open.png
-avmedia/res/av02049.png cmd/sc_runbasic.png
-avmedia/res/av02050.png cmd/sc_mediapause.png
-avmedia/res/av02051.png cmd/sc_basicstop.png
-avmedia/res/av02052.png cmd/sc_mediarepeat.png
-avmedia/res/av02053.png cmd/sc_ok.png
-avmedia/res/av02054.png cmd/sc_mediamute.png
-avmedia/res/avl02048.png cmd/lc_open.png
-avmedia/res/avl02049.png cmd/lc_runbasic.png
-avmedia/res/avl02050.png cmd/lc_mediapause.png
-avmedia/res/avl02051.png cmd/lc_basicstop.png
-avmedia/res/avl02052.png cmd/lc_mediarepeat.png
-avmedia/res/avl02053.png cmd/lc_ok.png
-avmedia/res/avl02054.png cmd/lc_mediamute.png
-
-# chart2
-# ==
-chart2/res/dataeditor_icon01.png cmd/sc_insertrowsafter.png
-chart2/res/dataeditor_icon02.png cmd/sc_insertcolumnsafter.png
-chart2/res/dataeditor_icon03.png cmd/sc_deleterows.png
-chart2/res/dataeditor_icon04.png cmd/sc_deletecolumns.png
-chart2/res/dataeditor_icon05.png cmd/sc_insertcellsright.png
-chart2/res/dataeditor_icon06.png cmd/sc_insertcellsdown.png
-chart2/res/dataeditor_icon07.png cmd/sc_insertcolumnsafter.png
-chart2/res/dataeditor_icon08.png cmd/sc_insertcolumns.png
-chart2/res/dataeditor_icon09.png cmd/sc_insertrows.png
-chart2/res/selectrange.png formula/res/refinp1.png
-
-# cmd
-# ==
-
-# Add
-cmd/lc_adddatefield.png cmd/lc_datefield.png
-cmd/lc_addons.png cmd/lc_insertplugin.png
-cmd/lc_addprintarea.png cmd/lc_inserttable.png
-cmd/lc_addtable.png cmd/lc_inserttable.png
-cmd/sc_adddatefield.png cmd/sc_datefield.png
-cmd/sc_addons.png cmd/sc_insertplugin.png
-cmd/sc_addprintarea.png cmd/sc_inserttable.png

[Libreoffice-commits] core.git: 2 commits - configure.ac ios/source

[Libreoffice Gerrit user]

 configure.ac   |2 +-
 ios/source/ios.cxx |6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 97be9270868990d3d45b29724c8fdc3598d2a64c
Author: Tor Lillqvist 
AuthorDate: Wed Oct 31 20:30:24 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Oct 31 22:14:32 2018 +0200

Handle also css::ucb::NameClashException>(aException

Change-Id: I979a163e796418d9a693229698b638cec4bf2226

diff --git a/ios/source/ios.cxx b/ios/source/ios.cxx
index 36aaa245f76d..bc89150e7ed6 100644
--- a/ios/source/ios.cxx
+++ b/ios/source/ios.cxx
@@ -8,9 +8,11 @@
  */
 
 #include 
+#include 
 
 #include "com/sun/star/uno/Any.hxx"
 #include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp"
+#include "com/sun/star/ucb/NameClashException.hpp"
 #include "ios/ios.hxx"
 
 namespace
@@ -28,8 +30,12 @@ void lo_ios_throwException(css::uno::Any const& aException)
 assert(aException.getValueTypeClass() == css::uno::TypeClass_EXCEPTION);
 
 tryThrow(aException);
+tryThrow(aException);
 tryThrow(aException);
 
+std::cerr << "lo_ios_throwException: Unhandled exception type " << 
aException.getValueTypeName()
+  << std::endl;
+
 assert(false);
 }
 
commit 741e19f7d1e17b3eb6e47ba9b71bd708ea5d5d98
Author: Tor Lillqvist 
AuthorDate: Wed Oct 31 20:27:45 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Oct 31 22:14:32 2018 +0200

Current iOS SDK is 12.1

It sucks that configure.ac nowadays looks for exactly one specific
version of the iOS SDK. I don't understand why that was thought to be
a good idea.

Change-Id: I5b67e17c627735bbafffc8177f1422813a33e034

diff --git a/configure.ac b/configure.ac
index 0312d7f07841..6fa805b60f9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2956,7 +2956,7 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=12.0
+current_sdk_ver=12.1
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=$current_sdk_ver
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac connectivity/source

[Libreoffice Gerrit user]

 configure.ac |3 +--
 connectivity/source/drivers/mysqlc/mysqlc_driver.hxx |2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit abee8ffe6494a53b7b584597ef13831518a59d18
Author: Stephan Bergmann 
AuthorDate: Mon Aug 27 16:59:04 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 28 08:17:33 2018 +0200

SYSTEM_MYSQL_CPPCONN is never defined

...since 5061663ce052087c6d5d0910d6f99358e26dbbd1 "drop unnecessary
SYSTEM_MYSQL_CONNECTOR_CPP"

Change-Id: I2023baf04dfb050833a0032367fc2dc2cfdb9d92
Reviewed-on: https://gerrit.libreoffice.org/59670
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx 
b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
index 89c57630823e..d0f7febf8d13 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
@@ -54,12 +54,10 @@ protected:
 OWeakRefArray m_xConnections; // vector containing a list
 // of all the Connection objects
 // for this Driver
-#ifndef SYSTEM_MYSQL_CPPCONN
 #ifdef BUNDLE_MARIADB
 oslModule m_hCConnModule;
 bool m_bAttemptedLoadCConn;
 #endif
-#endif
 public:
 explicit MysqlCDriver(const Reference& 
_rxFactory);
 
commit 760111784eb014091a445b3c5c2d1ad7b1b1ded7
Author: Stephan Bergmann 
AuthorDate: Mon Aug 27 13:36:06 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 28 08:17:22 2018 +0200

No space before period

...left there by 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1 "Moving mysqlc 
into
connectivity as a library".  (And remove latter half of sentence that 
doesn't
make much sense anymore.)

Change-Id: Ic87bd243cfde61080e4afae14de5c3fe7c53824b
Reviewed-on: https://gerrit.libreoffice.org/59656
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 7ba6545c7ae5..a31b26c62ab9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1725,8 +1725,7 @@ AC_ARG_WITH(system-apache-commons,
 
 AC_ARG_WITH(system-mariadb,
 AS_HELP_STRING([--with-system-mariadb],
-[Use MariaDB/MySQL libraries already on system, for building the 
MariaDB Connector/LibreOffice
- .]),,
+[Use MariaDB/MySQL libraries already on system.]),,
 [with_system_mariadb="$with_system_libs"])
 
 AC_ARG_ENABLE(bundle-mariadb,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac external/harfbuzz

[Libreoffice Gerrit user]

 configure.ac  |2 -
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |4 +++
 external/harfbuzz/harfbuzz-ios.patch  |   29 ++
 3 files changed, 34 insertions(+), 1 deletion(-)

New commits:
commit c5bef7505a6b761cf586abb4316776069ce0e887
Author: Tor Lillqvist 
AuthorDate: Mon Aug 27 14:36:36 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Aug 27 14:39:11 2018 +0300

Disable mariadb for iOS, too

Change-Id: Iee7b31f1b1a498b99f027cc9f5aeb60360213e51

diff --git a/configure.ac b/configure.ac
index 26f66b92d1a3..88571f0308f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8316,7 +8316,7 @@ AC_SUBST(PYTHON_VERSION_MAJOR)
 AC_SUBST(PYTHON_VERSION_MINOR)
 
 ENABLE_MARIADBC=TRUE
-if test "$_os" = "Android"; then
+if test "$_os" = "Android" -o "$_os" = "iOS"; then
 ENABLE_MARIADBC=
 fi
 MARIADBC_MAJOR=1
commit a6b5dda58ca2e7c52f946bba12e79780f9a1fd00
Author: Tor Lillqvist 
AuthorDate: Mon Aug 27 13:54:00 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Aug 27 14:39:10 2018 +0300

Make harfbuzz build for iOS

Change-Id: Ifc28ac50a453eef8aa2f31d02ac513db0222eb4e

diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 74c990c0c1aa..3a20f31e101f 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -26,4 +26,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
 ))
 endif
 
+$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
+external/harfbuzz/harfbuzz-ios.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/harfbuzz-ios.patch 
b/external/harfbuzz/harfbuzz-ios.patch
new file mode 100644
index ..215800e5ab57
--- /dev/null
+++ b/external/harfbuzz/harfbuzz-ios.patch
@@ -0,0 +1,29 @@
+--- src/hb-coretext.cc
 src/hb-coretext.cc
+@@ -167,7 +167,7 @@
+   if (CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSText")) ||
+   CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSDisplay")))
+   {
+-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080
++#if !defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && 
(MAC_OS_X_VERSION_MIN_REQUIRED < 1080)
+ # define kCTFontUIFontSystem kCTFontSystemFontType
+ # define kCTFontUIFontEmphasizedSystem kCTFontEmphasizedSystemFontType
+ #endif
+@@ -217,7 +217,7 @@
+   }
+ 
+   CFURLRef original_url = nullptr;
+-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
++#if !defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && 
(MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
+   ATSFontRef atsFont;
+   FSRef fsref;
+   OSStatus status;
+@@ -240,7 +240,7 @@
+* process in Blink. This can be detected by the new file URL location
+* that the newly found font points to. */
+   CFURLRef new_url = nullptr;
+-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
++#if !defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && 
(MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
+   atsFont = CTFontGetPlatformFont (new_ct_font, NULL);
+   status = ATSFontGetFileReference (atsFont, );
+   if (status == noErr)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac ios/CustomTarget_iOS_setup.mk README.md

[Tor Lillqvist]

 README.md |4 ++--
 configure.ac  |2 +-
 ios/CustomTarget_iOS_setup.mk |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b9dde4a74cba5a771cbc85880d518f6717d19216
Author: Tor Lillqvist 
Date:   Thu Jun 7 21:51:14 2018 +0300

We use ICU 61 now

Change-Id: I7faf23de08db680599658206faaf302563f6

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index a9f98850c6d8..a0d1a18823ab 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -54,7 +54,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
> $(IOSGEN)/native-code.h
 
# copy resource files used to start/run LibreOffice
-   cp $(WORKDIR)/UnpackedTarball/icu/source/data/in/icudt60l.dat 
$(IOSRES)/icudt60l.dat
+   cp $(WORKDIR)/UnpackedTarball/icu/source/data/in/icudt61l.dat 
$(IOSRES)/icudt61l.dat
cp $(INSTDIR)/program/types.rdb $(IOSRES)/udkapi.rdb
cp $(INSTDIR)/program/types/offapi.rdb  $(IOSRES)
cp $(INSTDIR)/program/types/oovbaapi.rdb$(IOSRES)
commit 6961b7509122b6e829ec2b72e1bde68c615a0a2f
Author: Tor Lillqvist 
Date:   Thu Jun 7 17:15:07 2018 +0300

Bump iOS SDK version to the current one, 11.4

Not sure why we at some stage lost the possibiliy to build against any
of several recent versions, but require one specific. But yeah, no big
deal, anybody working on iOS code is expected to keep ther Xcode (and
thus SDKs) updated.

diff --git a/README.md b/README.md
index c59f68122473..3bcd70716e00 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,8 @@ run and compile LibreOffice, also used by the TDF builds:
 * Runtime: RHEL 6 or CentOS 6
 * Build: GCC 4.8.1 or Clang
 * iOS (only for LibreOfficeKit):
-* Runtime: 11.3 (only support for newer i devices == 64 bit)
-* Build: Xcode 9.3 and iPhone SDK 11.3
+* Runtime: 11.4 (only support for newer i devices == 64 bit)
+* Build: Xcode 9.3 and iPhone SDK 11.4
 
 At least Clang 3.4.2 is known to be too old to pass the configure.ac check 
"whether $CXX supports
 C++17, C++14, or C++11" in its current form (due to the #pragma GCC diagnostic 
ignored "-Wpragmas"
diff --git a/configure.ac b/configure.ac
index c045e6fb7340..0f236c885723 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2932,7 +2932,7 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=11.3
+current_sdk_ver=11.4
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=$current_sdk_ver
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac download.lst external/icu include/vcl vcl/source vcl/unx vcl/win

[Eike Rathke]

 configure.ac|4 
 download.lst|8 
 external/icu/UnpackedTarball_icu.mk |3 
 external/icu/icu4c-61-werror-shadow.patch.1 |   30 +--
 external/icu/icu4c-khmerbreakengine.patch.1 |  246 ++--
 external/icu/icu4c-ubsan.patch.1|   91 --
 include/vcl/window.hxx  |4 
 vcl/source/window/dialog.cxx|4 
 vcl/source/window/menufloatingwindow.cxx|4 
 vcl/source/window/window.cxx|4 
 vcl/unx/gtk3/gtk3gtkinst.cxx|7 
 vcl/win/window/salframe.cxx |4 
 12 files changed, 164 insertions(+), 245 deletions(-)

New commits:
commit f247f08e370626bbb427acd8f4a400fd875350a3
Author: Eike Rathke 
Date:   Tue Apr 17 20:13:52 2018 +0200

Upgrade to ICU 61.1

Change-Id: I89c1c3d13d85decc72576744de2a16d20471d29d
Reviewed-on: https://gerrit.libreoffice.org/53064
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/configure.ac b/configure.ac
index bdc374699cb9..458f9f3c2735 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9001,8 +9001,8 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=60
-ICU_MINOR=2
+ICU_MAJOR=61
+ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
 ICU_RECLASSIFIED_HEBREW_LETTER="TRUE"
diff --git a/download.lst b/download.lst
index 0a1fa65396d1..76f067bff4d7 100644
--- a/download.lst
+++ b/download.lst
@@ -102,10 +102,10 @@ export HUNSPELL_SHA256SUM := 
3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce
 export HUNSPELL_TARBALL := hunspell-1.6.2.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418
-export ICU_TARBALL := icu4c-60_2-src.tgz
-export ICU_DATA_SHA256SUM := 
68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9
-export ICU_DATA_TARBALL := icu4c-60_2-data.zip
+export ICU_SHA256SUM := 
d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef
+export ICU_TARBALL := icu4c-61_1-src.tgz
+export ICU_DATA_SHA256SUM := 
d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a
+export ICU_DATA_TARBALL := icu4c-61_1-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index a4d0b16ecb36..b81cdaab6242 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -27,15 +27,14 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-solarisgcc.patch.1 \
external/icu/icu4c-mkdir.patch.1 \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
-   external/icu/icu4c-ubsan.patch.1 \
external/icu/icu4c-icu11100.patch.1 \
external/icu/icu4c-scriptrun.patch.1 \
external/icu/icu4c-rtti.patch.1 \
external/icu/icu4c-clang-cl.patch.1 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
external/icu/icu4c-khmerbreakengine.patch.1 \
-   external/icu/icu4c-59-werror-shadow.patch.1 \
external/icu/ofz4860.patch.2 \
+   external/icu/icu4c-61-werror-shadow.patch.1 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/icu4c-59-werror-shadow.patch.1 
b/external/icu/icu4c-61-werror-shadow.patch.1
similarity index 50%
rename from external/icu/icu4c-59-werror-shadow.patch.1
rename to external/icu/icu4c-61-werror-shadow.patch.1
index fb88244aff13..b00f76317eff 100644
--- a/external/icu/icu4c-59-werror-shadow.patch.1
+++ b/external/icu/icu4c-61-werror-shadow.patch.1
@@ -1,33 +1,35 @@
+# https://ssl.icu-project.org/trac/ticket/13709
+# Werror=shadow fails for unistr.h
 diff -ur icu.org/source/common/unicode/unistr.h 
icu/source/common/unicode/unistr.h
 icu.org/source/common/unicode/unistr.h 2017-03-29 06:44:37.0 
+0200
-+++ icu/source/common/unicode/unistr.h 2017-04-24 11:59:51.782076511 +0200
-@@ -3080,11 +3080,11 @@
+--- icu.org/source/common/unicode/unistr.h 2018-03-26 15:38:29.0 
+0200
 icu/source/common/unicode/unistr.h 2018-04-18 10:44:16.321188314 +0200
+@@ -3053,11 +3053,11 @@
 * uint16_t * constructor.
 * Delegates to UnicodeString(const char16_t *, int32_t).
 * @param text UTF-16 string
 -   * @param length string length
-+   * 

[Libreoffice-commits] core.git: 2 commits - configure.ac README.md vcl/source

[jan Iversen]

 README.md  |4 ++--
 configure.ac   |2 +-
 vcl/source/filter/ipdf/pdfread.cxx |4 
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 6e7f6dd20aa58cb4c9ab66260a62d71a53002b9b
Author: jan Iversen 
Date:   Sun Apr 1 18:21:38 2018 +0200

iOS, void unused paramters.

Change-Id: I60b7d1a49d9e9073470ee8d0d6e68b34cdd0bdad

diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
index 572a4c2f6831..7f31e0ac15de 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -195,6 +195,10 @@ bool getCompatibleStream(SvStream& rInStream, SvStream& 
rOutStream, sal_uInt64 n
 size_t generatePreview(SvStream&, std::vector&, sal_uInt64 nPos, 
sal_uInt64 nSize,
size_t nFirstPage = 0, int nLastPage = 0)
 {
+(void)nPos;
+(void)nSize;
+(void)nFirstPage;
+(void)nLastPage;
 return false;
 }
 
commit e63a65174800968cfe5adb38e8f9ca28f22984d0
Author: jan Iversen 
Date:   Sun Apr 1 18:15:58 2018 +0200

iOS, bump versions

SDK needed is 11.3
Xcode needed is 9.3

Change-Id: If26eda81f969f63500d94e3274dda8efb59dec12

diff --git a/README.md b/README.md
index 1bbf9b58a481..c59f68122473 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,8 @@ run and compile LibreOffice, also used by the TDF builds:
 * Runtime: RHEL 6 or CentOS 6
 * Build: GCC 4.8.1 or Clang
 * iOS (only for LibreOfficeKit):
-* Runtime: 11.2 (only support for newer i devices == 64 bit)
-* Build: Xcode 9.0 and iPhone SDK 11.2
+* Runtime: 11.3 (only support for newer i devices == 64 bit)
+* Build: Xcode 9.3 and iPhone SDK 11.3
 
 At least Clang 3.4.2 is known to be too old to pass the configure.ac check 
"whether $CXX supports
 C++17, C++14, or C++11" in its current form (due to the #pragma GCC diagnostic 
ignored "-Wpragmas"
diff --git a/configure.ac b/configure.ac
index 73bc7b16a14d..e2d5c8c5e320 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2925,7 +2925,7 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=11.2
+current_sdk_ver=11.3
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=$current_sdk_ver
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac cui/source cui/uiconfig include/svtools officecfg/registry sc/inc sc/source svtools/source

[Stephan Bergmann]

 configure.ac   |4 
 cui/source/options/optcolor.cxx|4 
 cui/uiconfig/ui/colorconfigwin.ui  |  158 +
 include/svtools/colorcfg.hxx   |4 
 officecfg/registry/data/org/openoffice/Office/UI.xcu   |   20 ++
 officecfg/registry/schema/org/openoffice/Office/UI.xcs |   40 
 sc/inc/global.hxx  |2 
 sc/source/core/data/global.cxx |4 
 sc/source/ui/view/output.cxx   |   21 +-
 svtools/source/config/colorcfg.cxx |8 
 10 files changed, 217 insertions(+), 48 deletions(-)

New commits:
commit c3b6467aa636d9ee8ba6d55d9c9cd7f31f04f0e0
Author: Stephan Bergmann 
Date:   Mon Mar 26 14:51:59 2018 +0200

Fix check for "contained in PKGFORMAT"

Change-Id: I419e885a928c3f59e751f4da388f91ba5ffe739f
Reviewed-on: https://gerrit.libreoffice.org/51895
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index d79fe78ecd9a..3eed457588b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4996,7 +4996,7 @@ AC_MSG_CHECKING([for required Perl modules])
 perl_use_string="use Cwd ; use Digest::MD5"
 if test "$_os" = "WINNT"; then
 if test -n "$PKGFORMAT"; then
-for i in "$PKGFORMAT"; do
+for i in $PKGFORMAT; do
 case "$i" in
 msi)
 # for getting fonts versions to use in MSI
@@ -6665,7 +6665,7 @@ if test $_os = "WINNT"; then
 else
 VCREDIST_DIR=""
 if test -n "$PKGFORMAT"; then
-   for i in "$PKGFORMAT"; do
+   for i in $PKGFORMAT; do
case "$i" in
msi)
AC_MSG_WARN([--without-vcredist-dir not specified or 
exe not found - installer will have runtime dependency])
commit 030c30b33b569a38241ac8bd03a2de1fba2313cc
Author: Szymon Kłos 
Date:   Fri Mar 23 18:43:54 2018 +0100

tdf#116241 Customizing value highlighting colors

Available in: Tools->Options->Application colors

Change-Id: I6e4f7a0dcad9a6ee75019596853f0cbd3ab0
Reviewed-on: https://gerrit.libreoffice.org/51791
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 

diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 94e830fc44b4..a273888772c6 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -137,6 +137,10 @@ const vEntryInfo[] =
 { Group_Calc,IDS(deterror) },
 { Group_Calc,IDS(ref) },
 { Group_Calc,IDS(notes) },
+{ Group_Calc,IDS(values) },
+{ Group_Calc,IDS(formulas) },
+{ Group_Calc,IDS(text) },
+{ Group_Calc,IDS(protectedcells) },
 
 { Group_Draw,IDS(drawgrid) },
 
diff --git a/cui/uiconfig/ui/colorconfigwin.ui 
b/cui/uiconfig/ui/colorconfigwin.ui
index db6ab43dfccf..c9220f1b83e3 100644
--- a/cui/uiconfig/ui/colorconfigwin.ui
+++ b/cui/uiconfig/ui/colorconfigwin.ui
@@ -790,6 +790,98 @@
   
 
 
+  
+True
+False
+  
+  
+1
+35
+  
+
+
+  
+True
+False
+6
+0
+Values
+  
+  
+0
+35
+  
+
+
+  
+True
+False
+  
+  
+1
+36
+  
+
+
+  
+True
+False
+6
+0
+Formulas
+  
+  
+0
+36
+  
+
+
+  
+True
+False
+  
+  
+1
+37
+  
+
+
+  
+True
+False
+6
+0
+Text
+  
+  
+0
+37
+  
+
+
+  
+True
+False
+  
+  
+1
+38
+  
+
+
+  
+True
+False
+6
+0
+Protected cells background
+  
+  
+0
+38
+  
+
+
   
 True
 False
@@ -801,7 +893,7 @@
   
   
 0
-35
+39
 3
   
 
@@ -812,7 +904,7 @@
   
   
 1
-36
+40
   
 
 
@@ -825,7 +917,7 @@
   
   
 0
-36
+40
   
 
 
@@ -840,7 +932,7 @@
   
   
 0
-37
+41
 3
   
 
@@ -851,7 +943,7 @@
   
   
 1
-38
+42
   
 
 
@@ -864,7 +956,7 @@
   
   
 0
-38
+42
   
 
 
@@ -874,7 +966,7 @@
   
   
 1
-39
+43
   
 
 
@@ -887,7 +979,7 @@
   
   
 0
-39
+43
   
 
 
@@ -897,7 

[Libreoffice-commits] core.git: 2 commits - configure.ac vcl/unx

[Milian Wolff]

 configure.ac   |4 -
 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx |9 --
 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.hxx |3 
 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx |   98 +++--
 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.hxx |   29 +--
 vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.cxx|6 -
 6 files changed, 101 insertions(+), 48 deletions(-)

New commits:
commit cbf0c689d41ba11f37e557c10db7976f8318d43c
Author: Milian Wolff 
Date:   Wed Jan 24 11:43:20 2018 +0100

Undo "check for boost/process/child.hpp in configure.ac if 
--enable-gtk3-kde5"

This reverts commit c7a1320593191e8359aa64d8e262948da085d358.
It's no longer required since we ported away from boost.:process

Change-Id: I53c5b994c3ba2801823ba0d6ab25f43223db1476
Reviewed-on: https://gerrit.libreoffice.org/48491
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/configure.ac b/configure.ac
index 3de79ab4d192..2780d20f7b9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8716,10 +8716,6 @@ if test "$with_system_boost" = "yes"; then
[AC_MSG_ERROR(boost/shared_ptr.hpp not found. install boost)], [])
 AC_CHECK_HEADER(boost/spirit/include/classic_core.hpp, [],
[AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install 
boost >= 1.36)], [])
-if test "x$enable_gtk3_kde5" = "xyes"; then
-AC_CHECK_HEADER(boost/process/child.hpp, [],
-   [AC_MSG_ERROR(boost/process/child.hpp not found. install boost >= 
1.64)], [])
-fi
 CXXFLAGS=$save_CXXFLAGS
 AC_LANG_POP([C++])
 # this is in m4/ax_boost_base.m4
commit 068f244222edcc5916fe864a0265ab6ccb4e43d2
Author: Milian Wolff 
Date:   Wed Jan 24 11:35:20 2018 +0100

gtk3_kde5: port away from boost::process

While this uglifies the code, it removes a dependency on newer
boost 1.64+ which ships boost::process. This helps on systems
where LO is linked against system boost and an older version
of boost is used.

Additionally, and this is the main motivation, this makes it
easier to backport these changes to 5.2, where the bundled boost
is also only at 1.60.

To keep the required changes at a minimum, the osl_* API for
reading from/writing to the stdout/stdin of the helper process,
we buffer the responses on a line-by-line basis. Note that one
cannot simply reuse osl_readLine on the non-seekable oslFileHandle.
Instead, we have to roll our own simplistic readLine implementation...

Change-Id: I1197e38cb2416e926d8ba985accd6c10d78bcc52
Reviewed-on: https://gerrit.libreoffice.org/48490
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx 
b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
index 7372d476f55e..8c983996b791 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
@@ -42,13 +42,6 @@
 
 #include 
 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
@@ -57,8 +50,6 @@ using namespace 
::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
-namespace bp = boost::process;
-namespace bf = boost::filesystem;
 
 // helper functions
 
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.hxx 
b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.hxx
index 80261ded9f9b..740382d9ec49 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.hxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.hxx
@@ -32,9 +32,6 @@
 
 #include 
 
-#include 
-#include 
-
 #include "gtk3_kde5_filepicker_ipc.hxx"
 
 #include 
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx 
b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
index fd9c1c7b64e1..21690c5e74f8 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
@@ -26,6 +26,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 
@@ -41,38 +42,33 @@
 #include 
 
 #include 
-#include 
-#include 
-#include 
 
 using namespace ::com::sun::star::ui::dialogs;
 
-namespace bp = boost::process;
-namespace bf = boost::filesystem;
-
 // helper functions
 
 namespace
 {
-bf::path applicationDirPath()
+OUString applicationDirPath()
 {
 OUString applicationFilePath;
 osl_getExecutableFile();
 OUString applicationSystemPath;
 osl_getSystemPathFromFileURL(applicationFilePath.pData, 
);
-auto sysPath = applicationSystemPath.toUtf8();
-auto ret = bf::path(sysPath.getStr(), sysPath.getStr() + 
sysPath.getLength());
+const auto utf8Path = applicationSystemPath.toUtf8();
+  

[Libreoffice-commits] core.git: 2 commits - configure.ac vcl/unx

[Milian Wolff]

 configure.ac  |4 ++
 vcl/unx/gtk3_kde5/kde5_filepicker.cxx |   45 ++
 vcl/unx/gtk3_kde5/kde5_filepicker.hxx |3 --
 vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx |   27 ++
 4 files changed, 35 insertions(+), 44 deletions(-)

New commits:
commit f1b60bd62daff4aaf6465caadd4ad0c447521102
Author: Milian Wolff 
Date:   Mon Jan 22 17:06:00 2018 +0100

Support opening of (some) remote URLs through the KDE file dialog

LO already supports http, https, webdav and webdavs through the
WebDAVContentProvider. Ftp is supported via FTPContentProvider
and then finally we have the GIOContentProvider that can potentially
support SMB, if the dependencies for that are met.

We now configure the KDE file dialog to allow these remote protocols.
Note that this filtering depends on https://phabricator.kde.org/D10024
and https://phabricator.kde.org/D10025 to have any effect.

Then we rewrite the URLs we receive from KIO to a format that is
supported by LO. Most notably, we prepend `vnd.sun.star.` to the
webdav URL schemes, such that they get picked up by the
WebDAVContentProvider. Then finally, we clear the username from
the smb:// URLs we get from KIO, as that prevents GIO from opening
them.

In all cases, the user will get prompted a second time for the
credentials required to access the remote resource. This is
unfortunate, but better than nothing. In the future, we may solve
this issue through either a separate KIO UCP or by getting support
for the FDO Secret Service specification in KWallet.

Change-Id: I91df28434b115639c2698968e2a672b3320bf8e2
Reviewed-on: https://gerrit.libreoffice.org/48350
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx 
b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
index db7d04cf7d4a..456ba645808b 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
@@ -32,17 +32,6 @@
 #include 
 #include 
 
-// The dialog should check whether LO also supports the protocol
-// provided by KIO, and KFileWidget::dirOperator() is only 4.3+ .
-// Moreover it's only in this somewhat internal KFileWidget class,
-// which may not necessarily be what QFileDialog::fileWidget() returns,
-// but that's hopefully not a problem in practice.
-//#if Qt_VERSION_MAJOR == 4 && Qt_VERSION_MINOR >= 2
-//#define ALLOW_REMOTE_URLS 1
-//#else
-#define ALLOW_REMOTE_URLS 0
-//#endif
-
 // KDE5FilePicker
 
 KDE5FilePicker::KDE5FilePicker(QObject* parent)
@@ -53,16 +42,15 @@ KDE5FilePicker::KDE5FilePicker(QObject* parent)
 , _winId(0)
 , allowRemoteUrls(false)
 {
-#if ALLOW_REMOTE_URLS
-if (KFileWidget* fileWidget = 
dynamic_cast(_dialog->fileWidget()))
-{
-allowRemoteUrls = true;
-// Use finishedLoading signal rather than e.g. urlEntered, because if 
there's a problem
-// such as the URL being mistyped, there's no way to prevent two 
message boxes about it,
-// one from us and one from Qt code.
-connect(fileWidget->dirOperator(), SIGNAL(finishedLoading()), 
SLOT(checkProtocol()));
-}
-#endif
+_dialog->setSupportedSchemes({
+QStringLiteral("file"),
+QStringLiteral("ftp"),
+QStringLiteral("http"),
+QStringLiteral("https"),
+QStringLiteral("webdav"),
+QStringLiteral("webdavs"),
+QStringLiteral("smb"),
+});
 
 setMultiSelectionMode(false);
 
@@ -245,21 +233,6 @@ void SAL_CALL KDE5FilePicker::initialize(bool saveDialog)
 }
 }
 
-void KDE5FilePicker::checkProtocol()
-{
-// There's no libreoffice.desktop :(, so find a matching one.
-/*
-KService::List services = KServiceTypeTrader::self()->query( 
"Application", "Exec =~ 'libreoffice %U'" );
-QStringList protocols;
-if( !services.isEmpty())
-protocols = services[ 0 ]->property( "X-Qt-Protocols" ).toStringList();
-if( protocols.isEmpty()) // incorrect (developer?) installation ?
-protocols << "file" << "http";
-if( !protocols.contains( _dialog->baseUrl().protocol()) && 
!protocols.contains( "KIO" ))
-KMessageBox::error( _dialog, KIO::buildErrorString( 
KIO::ERR_UNSUPPORTED_PROTOCOL, _dialog->baseUrl().protocol()));
-*/
-}
-
 void KDE5FilePicker::setWinId(sal_uIntPtr winId) { _winId = winId; }
 
 bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e)
diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.hxx 
b/vcl/unx/gtk3_kde5/kde5_filepicker.hxx
index 8b364832c6af..25c7454f86b5 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker.hxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker.hxx
@@ -102,9 +102,6 @@ private:
 protected:
 bool eventFilter(QObject* watched, QEvent* event) override;
 
-private Q_SLOTS:
-void checkProtocol();
-
 Q_SIGNALS:
 void filterChanged();
   

[Libreoffice-commits] core.git: 2 commits - configure.ac include/oox oox/source

[Markus Mohrhard]

 configure.ac   |3 -
 include/oox/export/chartexport.hxx |2 +
 oox/source/export/chartexport.cxx  |   64 +
 3 files changed, 41 insertions(+), 28 deletions(-)

New commits:
commit 5f71a5a29be5ed4f77bfcd1b295ad220d018a67b
Author: Markus Mohrhard 
Date:   Thu Dec 21 23:44:15 2017 +0100

gtk3 is no longer experimental

Change-Id: I00b36e7109b1e4c286248aff75150ba3ef2d44b1
Reviewed-on: https://gerrit.libreoffice.org/46940
Reviewed-by: Markus Mohrhard 
Tested-by: Jenkins 

diff --git a/configure.ac b/configure.ac
index f88481b6c45e..f3bd86698cda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1142,8 +1142,7 @@ libo_FUZZ_ARG_ENABLE(gtk,
 
 libo_FUZZ_ARG_ENABLE(gtk3,
 AS_HELP_STRING([--disable-gtk3],
-[Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 
3.0 is available.
- This is experimental and may not work.]),
+[Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 
3.0 is available.]),
 ,test "${enable_gtk3+set}" = set || enable_gtk3=yes)
 
 libo_FUZZ_ARG_ENABLE(systray,
commit dd55a4e8cd652665848b76b29dd5f98efc752ba1
Author: Markus Mohrhard 
Date:   Thu Dec 21 23:43:21 2017 +0100

also export basic chart structure for empty charts

Change-Id: I545be33e5e093d5bd3fda4236213a413a6cc9ce7
Reviewed-on: https://gerrit.libreoffice.org/46939
Reviewed-by: Markus Mohrhard 
Tested-by: Jenkins 

diff --git a/include/oox/export/chartexport.hxx 
b/include/oox/export/chartexport.hxx
index cebc4f41ca4d..6b1e9f8fadde 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -149,6 +149,8 @@ private:
 void exportPieChart( const css::uno::Reference< css::chart2::XChartType >& 
xChartType );
 void exportRadarChart( const css::uno::Reference< css::chart2::XChartType 
>& xChartType );
 void exportScatterChart( const css::uno::Reference< 
css::chart2::XChartType >& xChartType );
+void exportScatterChartSeries( const css::uno::Reference< 
css::chart2::XChartType >& xChartType,
+css::uno::Sequence* 
pSeries);
 void exportStockChart( const css::uno::Reference< css::chart2::XChartType 
>& xChartType );
 void exportSurfaceChart( const css::uno::Reference< 
css::chart2::XChartType >& xChartType );
 void exportHiLowLines();
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 598b9e302a4a..f0d639a497a3 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1628,43 +1628,55 @@ void ChartExport::exportRadarChart( const Reference< 
chart2::XChartType >& xChar
 pFS->endElement( FSNS( XML_c, XML_radarChart ) );
 }
 
+void ChartExport::exportScatterChartSeries( const Reference< 
chart2::XChartType >& xChartType,
+css::uno::Sequence* pSeries)
+{
+FSHelperPtr pFS = GetFS();
+pFS->startElement( FSNS( XML_c, XML_scatterChart ),
+FSEND );
+// TODO:scatterStyle
+
+sal_Int32 nSymbolType = css::chart::ChartSymbolType::NONE;
+Reference< XPropertySet > xPropSet( mxDiagram , uno::UNO_QUERY);
+if( GetProperty( xPropSet, "SymbolType" ) )
+mAny >>= nSymbolType;
+
+const char* scatterStyle = "lineMarker";
+if (nSymbolType == css::chart::ChartSymbolType::NONE)
+{
+scatterStyle = "line";
+}
+
+pFS->singleElement( FSNS( XML_c, XML_scatterStyle ),
+XML_val, scatterStyle,
+FSEND );
+
+exportVaryColors(xChartType);
+// FIXME: should export xVal and yVal
+bool bPrimaryAxes = true;
+if (pSeries)
+exportSeries(xChartType, *pSeries, bPrimaryAxes);
+exportAxesId(bPrimaryAxes);
+
+pFS->endElement( FSNS( XML_c, XML_scatterChart ) );
+}
+
 void ChartExport::exportScatterChart( const Reference< chart2::XChartType >& 
xChartType )
 {
 FSHelperPtr pFS = GetFS();
 std::vector > aSplitDataSeries = 
splitDataSeriesByAxis(xChartType);
+bool bExported = false;
 for (auto itr = aSplitDataSeries.begin(), itrEnd = aSplitDataSeries.end();
 itr != itrEnd; ++itr)
 {
 if (itr->getLength() == 0)
 continue;
 
-pFS->startElement( FSNS( XML_c, XML_scatterChart ),
-FSEND );
-// TODO:scatterStyle
-
-sal_Int32 nSymbolType = css::chart::ChartSymbolType::NONE;
-Reference< XPropertySet > xPropSet( mxDiagram , uno::UNO_QUERY);
-if( GetProperty( xPropSet, "SymbolType" ) )
-mAny >>= nSymbolType;
-
-const char* scatterStyle = "lineMarker";
-if (nSymbolType == css::chart::ChartSymbolType::NONE)
-{
-scatterStyle = "line";
-}
-
-pFS->singleElement( FSNS( 

[Libreoffice-commits] core.git: 2 commits - configure.ac include/unotools sfx2/source unotools/source

[Stephan Bergmann]

 configure.ac   |2 
 include/unotools/saveopt.hxx   |6 --
 sfx2/source/doc/objstor.cxx|6 +-
 unotools/source/config/saveopt.cxx |   94 +++--
 4 files changed, 14 insertions(+), 94 deletions(-)

New commits:
commit b74da08e556b7b001943f0288a61da53791d4dcf
Author: Stephan Bergmann 
Date:   Tue Dec 19 16:16:36 2017 +0100

Read some configuration items directly

...removing them from SvtSaveOptions

Change-Id: I922ec0f88872b1f2d99c6a55faad00143d944473
Reviewed-on: https://gerrit.libreoffice.org/46797
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index 9b8a361b8f04..865ec73835cc 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -121,8 +121,6 @@ public:
 voidSetSaveRelFSys( bool b );
 boolIsSaveRelFSys() const;
 
-boolIsSaveUnpacked() const;
-
 voidSetLoadUserSettings(bool b);
 boolIsLoadUserSettings() const;
 
@@ -139,10 +137,6 @@ public:
 ODFDefaultVersion   GetODFDefaultVersion() const;
 ODFSaneDefaultVersion   GetODFSaneDefaultVersion() const;
 
-boolIsUseSHA1InODF12() const;
-
-boolIsUseBlowfishInODF12() const;
-
 boolIsReadOnly( EOption eOption ) const;
 };
 
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 5547c7ac51cc..68730d317740 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -368,8 +368,8 @@ void SfxObjectShell::SetupStorage( const uno::Reference< 
embed::XStorage >& xSto
 {
 SvtSaveOptions aSaveOpt;
 nDefVersion = aSaveOpt.GetODFDefaultVersion();
-bUseSHA1InODF12 = aSaveOpt.IsUseSHA1InODF12();
-bUseBlowfishInODF12 = aSaveOpt.IsUseBlowfishInODF12();
+bUseSHA1InODF12 = 
officecfg::Office::Common::Save::ODF::UseSHA1InODF12::get();
+bUseBlowfishInODF12 = 
officecfg::Office::Common::Save::ODF::UseBlowfishInODF12::get();
 }
 
 // the default values, that should be used for ODF1.1 and 
older formats
@@ -2631,7 +2631,7 @@ bool SfxObjectShell::CommonSaveAs_Impl(const 
INetURLObject& aURL, const OUString
 return false;
 }
 
-if (SfxItemState::SET != rItemSet.GetItemState(SID_UNPACK) && 
SvtSaveOptions().IsSaveUnpacked())
+if (SfxItemState::SET != rItemSet.GetItemState(SID_UNPACK) && 
officecfg::Office::Common::Save::Document::Unpacked::get())
 rItemSet.Put(SfxBoolItem(SID_UNPACK, false));
 
 OUString aTempFileURL;
diff --git a/unotools/source/config/saveopt.cxx 
b/unotools/source/config/saveopt.cxx
index 657eb6563488..26608c5b0f04 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -64,12 +64,9 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
 bSaveDocView,
 bSaveRelINet,
 bSaveRelFSys,
-bSaveUnpacked,
 bDoPrettyPrinting,
 bWarnAlienFormat,
-bLoadDocPrinter,
-bUseSHA1InODF12,
-bUseBlowfishInODF12;
+bLoadDocPrinter;
 
 SvtSaveOptions::ODFDefaultVersion   eODFDefaultVersion;
 
@@ -84,13 +81,10 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
 bROSaveDocView,
 bROSaveRelINet,
 bROSaveRelFSys,
-bROSaveUnpacked,
 bROWarnAlienFormat,
 bRODoPrettyPrinting,
 bROLoadDocPrinter,
-bROODFDefaultVersion,
-bROUseSHA1InODF12,
-bROUseBlowfishInODF12;
+bROODFDefaultVersion;
 
 virtual voidImplCommit() override;
 
@@ -110,12 +104,9 @@ public:
 boolIsSaveDocView() const   { return 
bSaveDocView; }
 boolIsSaveRelINet() const   { return 
bSaveRelINet; }
 boolIsSaveRelFSys() const   { return 
bSaveRelFSys; }
-boolIsSaveUnpacked() const  { return 
bSaveUnpacked; }
 bool

[Libreoffice-commits] core.git: 2 commits - configure.ac starmath/source vcl/commonfuzzer.mk

[Caolán McNamara]

 configure.ac |4 
 starmath/source/mathtype.cxx |  192 +--
 starmath/source/mathtype.hxx |5 -
 vcl/commonfuzzer.mk  |2 
 4 files changed, 102 insertions(+), 101 deletions(-)

New commits:
commit 20faa6eeda7a6300162d68dde910c75cba8e9421
Author: Caolán McNamara 
Date:   Tue Dec 5 11:52:30 2017 +

extend enum with missing entries and use those instead

of raw numbers

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

diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index e055cd951ee2..085b7cfc452b 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -717,66 +717,66 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 
nSelector,
 {
 switch (nSelector)
 {
-case 0x0:
+case tmANGLE:
 if (nVariation==0)
 rRet += " langle ";
 else if (nVariation==1)
 rRet += " \\langle ";
 break;
-case 0x1:
+case tmPAREN:
 if (nVariation==0)
 rRet += " left (";
 else if (nVariation==1)
 rRet += "\\(";
 break;
-case 0x2:
+case tmBRACE:
 if ((nVariation==0) || (nVariation==1))
 rRet += " left lbrace ";
 else
 rRet += " left none ";
 break;
-case 0x3:
+case tmBRACK:
 if (nVariation==0)
 rRet += " left [";
 else if (nVariation==1)
 rRet += "\\[";
 break;
-case 0x8:
-case 0xb:
+case tmLBLB:
+case tmLBRP:
 rRet += " \\[";
 break;
-case 0x4:
+case tmBAR:
 if (nVariation==0)
 rRet += " lline ";
 else if (nVariation==1)
 rRet += " \\lline ";
 break;
-case 0x5:
+case tmDBAR:
 if (nVariation==0)
 rRet += " ldline ";
 else if (nVariation==1)
 rRet += " \\ldline ";
 break;
-case 0x6:
+case tmFLOOR:
 if (nVariation == 0 || nVariation == 1)
 rRet += " left lfloor ";
 else if (nVariation==1)
 rRet += " left none ";
 break;
-case 0x7:
+case tmCEILING:
 if (nVariation==0)
 rRet += " lceil ";
 else if (nVariation==1)
 rRet += " \\lceil ";
 break;
-case 0x9:
-case 0xa:
+case tmRBRB:
+case tmRBLB:
 rRet += " \\]";
 break;
-case 0xc:
+case tmLPRB:
 rRet += " \\(";
 break;
-case 0xd:
+case tmROOT:
 if (nPart == 0)
 {
 if (nVariation == 0)
@@ -790,7 +790,7 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 
nSelector,
 }
 rRet += " {";
 break;
-case 0xe:
+case tmFRACT:
 if (nPart == 0)
 rRet += " { ";
 
@@ -799,7 +799,7 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 
nSelector,
 rRet += " over ";
 

[Libreoffice-commits] core.git: 2 commits - configure.ac libreofficekit/qa sw/source vcl/unx

[Caolán McNamara]

 configure.ac |2 +-
 libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx |2 --
 libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx |8 
 sw/source/core/inc/UndoCore.hxx  |5 +++--
 sw/source/core/inc/UndoTable.hxx |3 ++-
 sw/source/core/inc/rolbck.hxx|3 ++-
 sw/source/core/undo/undobj.cxx   |4 ++--
 sw/source/core/undo/untbl.cxx|2 +-
 vcl/unx/gtk3/gtk3gtkdata.cxx |6 --
 vcl/unx/gtk3/gtk3gtkframe.cxx|   15 +--
 10 files changed, 12 insertions(+), 38 deletions(-)

New commits:
commit e90f86db77476f16a28c44c96771c925c6172d6d
Author: Caolán McNamara 
Date:   Fri Dec 1 14:14:36 2017 +

require at least gtk3 3.10.0 to build gtk vclplug

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

diff --git a/configure.ac b/configure.ac
index e904fe3c29cc..505aaa768948 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9724,7 +9724,7 @@ if test "x$enable_gtk3" = "xyes"; then
 AC_MSG_ERROR([System cairo required for gtk3 support, do not combine 
--enable-gtk3 with --without-system-cairo])
 fi
 : ${with_system_cairo:=yes}
-PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.8 gtk+-unix-print-3.0 
gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", 
ENABLE_GTK3="")
+PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.10 gtk+-unix-print-3.0 
gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", 
ENABLE_GTK3="")
 if test "x$ENABLE_GTK3" = "xTRUE"; then
 R="gtk3"
 dnl Avoid installed by unpackaged files for now.
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
index 9dee02a0ac45..3c4457b38215 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
@@ -30,9 +30,7 @@ void GtvHelpers::userPromptDialog(GtkWindow* pWindow, const 
std::string& aTitle,
 for (const auto& entry : aEntries)
 {
 GtkWidget* pEntry = gtk_entry_new();
-#if GTK_CHECK_VERSION(3,2,0)
 gtk_entry_set_placeholder_text(GTK_ENTRY(pEntry), entry.first.c_str());
-#endif
 gtk_container_add(GTK_CONTAINER(pEntryArea), pEntry);
 }
 
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx
index fe7d33210ce1..9c075f571170 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx
@@ -159,21 +159,15 @@ static void addMoreUnoParam(GtkWidget* /*pWidget*/, 
gpointer userdata)
 
 GtkWidget* pTypeEntry = gtk_entry_new();
 gtk_box_pack_start(GTK_BOX(pParamContainer), pTypeEntry, TRUE, TRUE, 2);
-#if GTK_CHECK_VERSION(3,2,0)
 gtk_entry_set_placeholder_text(GTK_ENTRY(pTypeEntry), "Param type (Eg. 
boolean, string etc.)");
-#endif
 
 GtkWidget* pNameEntry = gtk_entry_new();
 gtk_box_pack_start(GTK_BOX(pParamContainer), pNameEntry, TRUE, TRUE, 2);
-#if GTK_CHECK_VERSION(3,2,0)
 gtk_entry_set_placeholder_text(GTK_ENTRY(pNameEntry), "Param name");
-#endif
 
 GtkWidget* pValueEntry = gtk_entry_new();
 gtk_box_pack_start(GTK_BOX(pParamContainer), pValueEntry, TRUE, TRUE, 2);
-#if GTK_CHECK_VERSION(3,2,0)
 gtk_entry_set_placeholder_text(GTK_ENTRY(pValueEntry), "Param value");
-#endif
 
 GtkWidget* pRemoveButton = 
gtk_button_new_from_icon_name("list-remove-symbolic", GTK_ICON_SIZE_BUTTON);
 g_signal_connect(pRemoveButton, "clicked", G_CALLBACK(removeUnoParam), 
pUnoParamAreaBox);
@@ -220,9 +214,7 @@ void unoCommandDebugger(GtkWidget* pButton, gpointer /* 
pItem */)
 
 GtkWidget* pUnoCmdEntry = gtk_entry_new ();
 gtk_box_pack_start(GTK_BOX(pUnoCmdAreaBox), pUnoCmdEntry, TRUE, TRUE, 2);
-#if GTK_CHECK_VERSION(3,2,0)
 gtk_entry_set_placeholder_text(GTK_ENTRY(pUnoCmdEntry), "UNO command (Eg. 
Bold, Italic etc.)");
-#endif
 GtkWidget* pUnoParamAreaBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 gtk_box_pack_start(GTK_BOX(pDialogMessageArea), pUnoParamAreaBox, TRUE, 
TRUE, 2);
 
diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index ee95314c350e..1c6e8e2c5e11 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -200,13 +200,7 @@ GdkCursor* GtkSalDisplay::getFromXBM( const unsigned char 
*pBitmap,
 cairo_surface_destroy(source);
 cairo_destroy(cr);
 
-#if GTK_CHECK_VERSION(3,10,0)
 GdkCursor *cursor = gdk_cursor_new_from_surface(m_pGdkDisplay, s, nXHot, 
nYHot);
-#else
-GdkPixbuf *pixbuf 

[Libreoffice-commits] core.git: 2 commits - configure.ac download.lst external/libwps filter/source sfx2/source solenv/flatpak-manifest.in writerperfect/qa

[Mike Kaganski]

 configure.ac|2 
 download.lst|4 -
 external/libwps/0001-drop-unneeded-include.patch.1  |   24 
 external/libwps/0001-try-to-fix-build-with-older-clang.patch.1  |   27 
--
 external/libwps/Library_wps.mk  |9 +++
 external/libwps/UnpackedTarball_libwps.mk   |4 -
 external/libwps/libwps-bundled-soname.patch.0   |4 -
 filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu |2 
 sfx2/source/appl/appuno.cxx |   20 +++
 solenv/flatpak-manifest.in  |6 +-
 writerperfect/qa/unit/WpftCalcFilterTest.cxx|1 
 writerperfect/qa/unit/data/calc/libwps/pass/QuattroPro.wb1  |binary
 12 files changed, 55 insertions(+), 48 deletions(-)

New commits:
commit cf2c667fbb41bf7d9e172d940c25abb78155efe2
Author: Mike Kaganski 
Date:   Mon Nov 27 13:26:48 2017 +0200

Don't copy the string

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

diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index ca9ca3a13794..a5bc1ea0b959 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -208,8 +208,8 @@ void TransformParameters( sal_uInt16 nSlotId, const 
uno::SequencenAttribs;
 
 const beans::PropertyValue& rProp = pPropsVal[0];
-OUString aName = rProp.Name;
-if ( nCount == 1 && aName == OUString( pSlot->pUnoName, strlen( 
pSlot->pUnoName ), RTL_TEXTENCODING_UTF8 ) )
+const OUString& rName = rProp.Name;
+if ( nCount == 1 && rName == OUString( pSlot->pUnoName, strlen( 
pSlot->pUnoName ), RTL_TEXTENCODING_UTF8 ) )
 {
 // there is only one parameter and its name matches the name of 
the property,
 // so it's either a simple property or a complex property in one 
single UNO struct
@@ -225,7 +225,7 @@ void TransformParameters( sal_uInt16 nSlotId, const 
uno::Sequence xFrame;
 OSL_VERIFY( rProp.Value >>= xFrame );
 rSet.Put( SfxUnoFrameItem( SID_FILLFRAME, xFrame ) );
 }
 else
-if ( aName == sHidden )
+if ( rName == sHidden )
 {
 bool bVal = false;
 if (rProp.Value >>= bVal)
commit 8d0e8d5d291cbb98de6964eab2f629a405c7e813
Author: David Tardon 
Date:   Mon Nov 27 10:16:07 2017 +0100

upload libwps 0.4.8

Change-Id: Ib285c227cd935987311be40df3745316943a54e0
Reviewed-on: https://gerrit.libreoffice.org/45331
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 4ff7655c0f36..3543d5874771 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7696,7 +7696,7 @@ 
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
 libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
 
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.7])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.8])
 
 libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
 
diff --git a/download.lst b/download.lst
index 98dd3526f783..5c15b2be12e8 100644
--- a/download.lst
+++ b/download.lst
@@ -230,8 +230,8 @@ export WPD_TARBALL := 
libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
 export WPG_SHA256SUM := 
57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33
 export WPG_VERSION_MICRO := 2
 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
-export WPS_SHA256SUM := 
2f2cab630bceace24f9dbb7d187cd6cd1f4c9f8a7b682c5f7e49c1e2cb58b217
-export WPS_VERSION_MICRO := 7
+export WPS_SHA256SUM := 
e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e
+export WPS_VERSION_MICRO := 8
 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
 export XSLTML_SHA256SUM := 
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
diff --git a/external/libwps/0001-drop-unneeded-include.patch.1 
b/external/libwps/0001-drop-unneeded-include.patch.1
new file mode 100644
index ..4d7b5a494530
--- /dev/null
+++ b/external/libwps/0001-drop-unneeded-include.patch.1
@@ -0,0 +1,24 @@
+From cec7e4b57b0e10139d5a5dcede9027b0ea85e07d Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Mon, 27 Nov 2017 19:32:53 +0100
+Subject: [PATCH] drop unneeded include
+
+---
+ src/lib/QuattroSpreadsheet.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/lib/QuattroSpreadsheet.cpp b/src/lib/QuattroSpreadsheet.cpp
+index 

[Libreoffice-commits] core.git: 2 commits - configure.ac download.lst external/icu i18npool/source i18nutil/source include/svl include/svx svl/source svx/source

[Eike Rathke]

 configure.ac|2 
 download.lst|8 
 external/icu/UnpackedTarball_icu.mk |3 
 external/icu/icu4c-59-icu13329-xlocale.patch.1  |   14 -
 external/icu/icu4c-59-werror-shadow.patch.1 |   42 
 external/icu/icu4c-59-werror-undef.patch.1  |   13 -
 external/icu/icu4c-changeset-39671.patch.1  |  155 
 external/icu/icu4c-changeset-40324.patch.1  |   11 -
 external/icu/icu4c-khmerbreakengine.patch.1 |   12 -
 external/icu/icu4c-ubsan.patch.1|   80 
 i18npool/source/breakiterator/breakiterator_unicode.cxx |   21 ++
 i18nutil/source/utility/unicode.cxx |   11 +
 include/svl/zforlist.hxx|3 
 include/svx/strings.hrc |7 
 svl/source/numbers/zforlist.cxx |7 
 svl/source/numbers/zforscan.cxx |6 
 svl/source/numbers/zforscan.hxx |4 
 svx/source/dialog/charmap.cxx   |   23 ++
 18 files changed, 87 insertions(+), 335 deletions(-)

New commits:
commit eb8bd7f21103ed2349b44c954db977709de2e4ec
Author: Eike Rathke 
Date:   Fri Nov 17 00:16:17 2017 +0100

Resolves: tdf#113889 no date particle reordering when exporting to Excel

Change-Id: I45667a67c6c69106d86755ed41438f23e019dfea

diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 9c809bf30e8c..3e59064281c2 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -402,7 +402,8 @@ public:
 language/country eNewLnge */
 bool PutandConvertEntry( OUString& rString, sal_Int32& nCheckPos,
  short& nType, sal_uInt32& nKey,
- LanguageType eLnge, LanguageType eNewLnge );
+ LanguageType eLnge, LanguageType eNewLnge,
+ bool bForExcelExport = false );
 
 /** Same as PutandConvertEntry but the format code string
  is considered to be of the System language/country eLnge and is
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 97f846ecc98b..dcca285d9f4b 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -623,14 +623,15 @@ bool SvNumberFormatter::PutandConvertEntry(OUString& 
rString,
short& nType,
sal_uInt32& nKey,
LanguageType eLnge,
-   LanguageType eNewLnge)
+   LanguageType eNewLnge,
+   bool bForExcelExport )
 {
 bool bRes;
 if (eNewLnge == LANGUAGE_DONTKNOW)
 {
 eNewLnge = IniLnge;
 }
-pFormatScanner->SetConvertMode(eLnge, eNewLnge);
+pFormatScanner->SetConvertMode(eLnge, eNewLnge, false, bForExcelExport);
 bRes = PutEntry(rString, nCheckPos, nType, nKey, eLnge);
 pFormatScanner->SetConvertMode(false);
 return bRes;
@@ -808,7 +809,7 @@ OUString SvNumberFormatter::GetFormatStringForExcel( 
sal_uInt32 nKey, const NfKe
 short nType = css::util::NumberFormat::DEFINED;
 sal_uInt32 nTempKey;
 OUString aTemp( pEntry->GetFormatstring());
-rTempFormatter.PutandConvertEntry( aTemp, nCheckPos, nType, 
nTempKey, nLang, LANGUAGE_ENGLISH_US);
+rTempFormatter.PutandConvertEntry( aTemp, nCheckPos, nType, 
nTempKey, nLang, LANGUAGE_ENGLISH_US, true);
 SAL_WARN_IF( nCheckPos != 0, "svl.numbers",
 "SvNumberFormatter::GetFormatStringForExcel - format 
code not convertible");
 if (nTempKey != NUMBERFORMAT_ENTRY_NOT_FOUND)
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index f845b5f2ed5d..a48063f7df24 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -115,6 +115,7 @@ ImpSvNumberformatScan::ImpSvNumberformatScan( 
SvNumberFormatter* pFormatterP )
 pFormatter = pFormatterP;
 xNFC = css::i18n::NumberFormatMapper::create( 
pFormatter->GetComponentContext() );
 bConvertMode = false;
+mbConvertForExcelExport = false;
 bConvertSystemToSystem = false;
 
 sKeyword[NF_KEY_E] = sEnglishKeyword[NF_KEY_E];// Exponent
@@ -1725,7 +1726,10 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 pLoc = pFormatter->GetLocaleData();
 //! init new keywords
 InitKeywords();
-bNewDateOrder = (eOldDateOrder != pLoc->getDateOrder());
+// Adapt date order to target locale, but Excel does not handle date
+// particle re-ordering for the target locale 

[Libreoffice-commits] core.git: 2 commits - configure.ac ios/LibreOfficeKit ios/LibreOfficeLight README.md

[jan Iversen]

 README.md   |4 +--
 configure.ac|4 +--
 ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj |   12 
+-
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |   12 
+-
 ios/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift |   10 +---
 ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift  |9 ---
 ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard  |4 +--
 7 files changed, 29 insertions(+), 26 deletions(-)

New commits:
commit 8cd7e7dfe6630648d110fa77991c283c8bf069bb
Author: jan Iversen 
Date:   Fri Oct 27 20:04:38 2017 +0200

iOS update to 11.0

Starting to use 11.0 features

Change-Id: I0e147c0b436a93d11f220b533a5b2091f7cb56fc

diff --git a/README.md b/README.md
index 62deaffcbf27..3fe1dabac50d 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,8 @@ run and compile LibreOffice, also used by the TDF builds:
  * Runtime: RHEL 6 or CentOS 6
  * Build: GCC 4.8.1 or Clang
 * iOS (only for LibreOfficeKit):
- * Runtime: 10.3 (only support for newer i devices == 64 bit)
- * Build: Xcode 9.0 and iPhone SDK 10.3
+ * Runtime: 11.0 (only support for newer i devices == 64 bit)
+ * Build: Xcode 9.0 and iPhone SDK 11.0
 
 If you want to use Clang with the LibreOffice compiler plugins, the minimal
 version of Clang is 3.4. Since Xcode doesn't provide the compiler plugin
diff --git a/configure.ac b/configure.ac
index d422adefa1e0..309ccb06b36c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2868,8 +2868,8 @@ if test $_os = iOS; then
 fi
 xcode_developer=`xcode-select -print-path`
 
-current_sdk_ver=10.3
-for sdkver in 11.0 10.3; do
+current_sdk_ver=11.0
+for sdkver in 11.0; do
 
t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
 if test -d $t; then
 ios_sdk=$sdkver
diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj 
b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
index caa67a55b8bf..f8a988031044 100644
--- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
@@ -198,14 +198,14 @@

"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
"$(LO_SRCDIR)/ios/generated",
);
-   IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+   IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_GENERATE_MAP_FILE = YES;
LD_MAP_FILE_PATH = ./iosKit.map;
LD_QUOTE_LINKER_ARGUMENTS_FOR_COMPILER_DRIVER = 
NO;
MACH_O_TYPE = staticlib;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
-   PRELINK_FLAGS = "-Wl -ios_version_min 10.3 -lz 
-liconv";
+   PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz 
-liconv";
SDKROOT = iphoneos;
VALID_ARCHS = "x86_64 arm64";
};
@@ -265,14 +265,14 @@

"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
"$(LO_SRCDIR)/ios/generated",
);
-   IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+   IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_GENERATE_MAP_FILE = YES;
LD_MAP_FILE_PATH = ./iosKit.map;
LD_QUOTE_LINKER_ARGUMENTS_FOR_COMPILER_DRIVER = 
NO;
MACH_O_TYPE = staticlib;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
-   PRELINK_FLAGS = "-Wl -ios_version_min 10.3 -lz 
-liconv";
+   PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz 
-liconv";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "x86_64 arm64";
@@ -285,7 +285,7 @@
buildSettings = {
MACH_O_TYPE = staticlib;
OTHER_LDFLAGS = "";
-   PRELINK_FLAGS = "-ios_version_min 10.3";
+   PRELINK_FLAGS = "-ios_version_min 11.0";
PRELINK_LIBS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
@@ -298,7 +298,7 @@

[Libreoffice-commits] core.git: 2 commits - configure.ac ios/CustomTarget_iOS.mk ios/LibreOfficeKit ios/loApp.xcconfig.in ios/loKit.xcconfig.in

[jan Iversen]

 configure.ac|4 +-
 ios/CustomTarget_iOS.mk |2 -
 ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj |   22 ++--
 ios/loApp.xcconfig.in   |1 
 ios/loKit.xcconfig.in   |1 
 5 files changed, 14 insertions(+), 16 deletions(-)

New commits:
commit 20db1be102731059e43ec5b3c2ae80039621f887
Author: jan Iversen 
Date:   Tue Oct 3 22:13:18 2017 +0200

iOS, bump SDK version to 10.3

10.3 is needed (anyhow 11.0 is on the street)

Change-Id: Ic9afed3ecbb76e71eb0ee0fc74f4b64dc38af716

diff --git a/configure.ac b/configure.ac
index 3b02041874b4..8c12f1301046 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2871,12 +2871,12 @@ if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
-versionmin=-mios-simulator-version-min=9.3
+versionmin=-mios-simulator-version-min=10.3
 IOS_ARCH=x86_64
 BITNESS=-fembed-bitcode
 else
 platform=iPhoneOS
-versionmin=-miphoneos-version-min=9.3
+versionmin=-miphoneos-version-min=10.3
 IOS_ARCH=arm64
 BITNESS=-fembed-bitcode
 fi
commit eb957c16904717201536f289063de63f1653dbf9
Author: jan Iversen 
Date:   Tue Oct 3 22:06:34 2017 +0200

iOS, get rid of OSX - iOS link conflict.

Prelinking uses special flags, adjusted.

Change-Id: Ie9537df3a158818128ee0c4e08b3ad0a782009fb

diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk
index a05194b7d318..d765ca2426f6 100644
--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS.mk
@@ -36,7 +36,6 @@ $(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk 
$(SRCDIR)/ios/CustomTarget_i
-e "s'@WORKDIR@'$(WORKDIR)'g" \
-e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \
-e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \
-   -e "s'@LDFLAGS@'-Wl,-lz,-liconv,-map,$(WORKDIR)/ios/iosKit.map 'g" \
-e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \
-e "s'@PRELINK@'`$(SRCDIR)/bin/lo-all-static-libs`'g" \
$(SRCDIR)/ios/loKit.xcconfig.in > $(WORKDIR)/ios/loKit.xcconfig
@@ -46,7 +45,6 @@ $(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk 
$(SRCDIR)/ios/CustomTarget_i
-e "s'@WORKDIR@'$(WORKDIR)'g" \
-e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \
-e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \
-   -e "s'@LDFLAGS@'-Wl,-lz,-liconv,-map,$(WORKDIR)/ios/iosKit.map 'g" \
-e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \
$(SRCDIR)/ios/loApp.xcconfig.in > $(WORKDIR)/ios/loApp.xcconfig
 
diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj 
b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
index 918920baeee5..407b57cb37d5 100644
--- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
@@ -198,12 +198,11 @@
"$(LO_SRCDIR)/ios/generated",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+   LD_GENERATE_MAP_FILE = YES;
+   LD_MAP_FILE_PATH = ./iosKit.map;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
-   OTHER_LDFLAGS = (
-   "$(LINK_LDFLAGS)",
-   "-lstdc++",
-   );
+   PRELINK_FLAGS = "-Wl -ios_version_min 10.3 -lz 
-liconv";
SDKROOT = iphoneos;
VALID_ARCHS = "x86_64 arm64";
};
@@ -261,12 +260,11 @@
"$(LO_SRCDIR)/ios/generated",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+   LD_GENERATE_MAP_FILE = YES;
+   LD_MAP_FILE_PATH = ./iosKit.map;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
-   OTHER_LDFLAGS = (
-   "$(LINK_LDFLAGS)",
-   "-lstdc++",
-   );
+   PRELINK_FLAGS = "-Wl -ios_version_min 10.3 -lz 
-liconv";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "x86_64 arm64";
@@ -276,7 +274,9 @@
39B5D21F1F78130F008FB162 /* Debug */ = {
isa = XCBuildConfiguration;

[Libreoffice-commits] core.git: 2 commits - configure.ac sw/qa

[Michael Stahl]

 configure.ac  |   40 --
 sw/qa/python/text_portion_enumeration_test.py |   32 ++--
 2 files changed, 47 insertions(+), 25 deletions(-)

New commits:
commit e137b0ee2ac2c7dcd209f44768433b709c432918
Author: Michael Stahl 
Date:   Thu Sep 7 17:42:19 2017 +0200

sw: fix text_portion_enumeration_test.py on WNT

This fails, mostly because of confusing native paths and URLs, and
because of deleting the temp. directory before closing the file that the
test wrote into it.

Also, why open the document as a template.

Change-Id: I6da2f3f2c47308c4956444869b5b100a124b8db0

diff --git a/sw/qa/python/text_portion_enumeration_test.py 
b/sw/qa/python/text_portion_enumeration_test.py
index cc7a28e785ea..343a7da39196 100644
--- a/sw/qa/python/text_portion_enumeration_test.py
+++ b/sw/qa/python/text_portion_enumeration_test.py
@@ -770,8 +770,8 @@ class EnumConverter():
 continue
 else:
 node = self._stack.pop()
-assert (isinstance(node, RubyNode),
-"stack error: Ruby expected; is: {}".format(str(node)))
+assert (isinstance(node, RubyNode)),
+"stack error: Ruby expected; is: {}".format(str(node))
 elif type_ == "InContentMetadata":
 xMeta = xPortion.InContentMetadata
 xmlid = xMeta.MetadataReference
@@ -3267,15 +3267,21 @@ class TextPortionEnumerationTest(unittest.TestCase):
 xComp = None
 filename = "TESTMETA.odt"
 try:
-xComp = self.__class__._uno.openWriterTemplateDoc(filename)
+xComp = self.__class__._uno.openBaseDoc(filename)
 if xComp:
 self.checkloadmeta(xComp)
 with TemporaryDirectory() as tempdir:
-file = os.path.join(tempdir, filename)
+if os.altsep: # we need URL so replace "\" with "/"
+tempdir = tempdir.replace(os.sep, os.altsep)
+file = tempdir + "/" + filename
 self.dostore(xComp, file)
 self.close(xComp)
-xComp = self.doload(file)
-self.checkloadmeta(xComp)
+xComp2 = None
+try:
+xComp2 = self.doload(file)
+self.checkloadmeta(xComp2)
+finally:
+self.close(xComp2)
 finally:
 self.close(xComp)
 
@@ -,15 +3339,21 @@ class TextPortionEnumerationTest(unittest.TestCase):
 xComp = None
 filename = "TESTXMLID.odt"
 try:
-xComp = self.__class__._uno.openWriterTemplateDoc(filename)
+xComp = self.__class__._uno.openBaseDoc(filename)
 if xComp:
 self.checkloadxmlid(xComp)
 with TemporaryDirectory() as tempdir:
-file = os.path.join(tempdir, filename)
+if os.altsep: # we need URL so replace "\" with "/"
+tempdir = tempdir.replace(os.sep, os.altsep)
+file = tempdir + "/" + filename
 self.dostore(xComp, file)
 self.close(xComp)
-xComp = self.doload(file)
-self.checkloadxmlid(xComp)
+xComp2 = None
+try:
+xComp2 = self.doload(file)
+self.checkloadxmlid(xComp2)
+finally:
+self.close(xComp2)
 finally:
 self.close(xComp)
 
commit d74424a09ee7207138ad9da0869b194d3d5c476c
Author: Michael Stahl 
Date:   Thu Sep 7 13:26:44 2017 +0200

configure: find MSVC 2017 MSMs & DLLs again

They're still called "VC150" in my installation.

Change-Id: I0a005236ff5edc758be41616e33b254577144f17

diff --git a/configure.ac b/configure.ac
index 127998708b30..c804dd3f0ce5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5206,19 +5206,21 @@ find_winsdk()
 
 find_msms()
 {
-my_msm_file=Microsoft_VC${VCVER}_CRT_x86.msm
+my_msm_files=Microsoft_VC${VCVER}_CRT_x86.msm
 if test $VCVER = 150; then
-my_msm_file=Microsoft_VC141_CRT_x86.msm
+my_msm_files="Microsoft_VC141_CRT_x86.msm ${my_msm_files}"
 fi
-AC_MSG_CHECKING([for $my_msm_file])
+AC_MSG_CHECKING([for ${my_msm_files}])
 msmdir=
 for ver in 14.0 15.0; do
 reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/MSMDir
 if test -n "$regvalue"; then
-if test -e "$regvalue/$my_msm_file"; then
-msmdir=$regvalue
-break
-fi
+for f in ${my_msm_files}; do
+if test -e "$regvalue/${f}"; then
+ 

[Libreoffice-commits] core.git: 2 commits - configure.ac connectivity/source include/connectivity sc/CppunitTest_sc_ucalc.mk sc/Library_sc.mk sc/source

[Lionel Elie Mamane]

 configure.ac |2 
 connectivity/source/commontools/dbtools.cxx  |   83 
 connectivity/source/drivers/dbase/DTable.cxx |   43 
 include/connectivity/dbtools.hxx |   45 
 sc/CppunitTest_sc_ucalc.mk   |1 
 sc/Library_sc.mk |1 
 sc/source/ui/docshell/docsh8.cxx |4 
 sc/source/ui/unoobj/filtuno.cxx  |  140 +++
 8 files changed, 234 insertions(+), 85 deletions(-)

New commits:
commit 7f1465a9599e9665159dd2d823a6e9064cca5703
Author: Lionel Elie Mamane 
Date:   Sun Jun 25 17:21:45 2017 +0200

tdf#108789 and others: overhaul DBase files encoding handling

 - Calc: make the complete "what encoding to use" decision before
 calling the connectivity driver, so that the driver has
 no ambiguity about whether it should override our setting
 or not.

 To this end, factorise the part of the driver that reads
 the encoding from the file header into dbtools.

 - Calc: don't ask for encoding when the file's header give the encoding.

 - don't confuse CP850 (the default) and "don't know", including:
   * don't ignore CP850 user setting
   * don't overwrite user setting with CP850

Thanks to Julien Nabet for the extensive collaboration on this.

Change-Id: Id80b7c505858b88f717b0ce6bd890527909e5fd1

diff --git a/connectivity/source/commontools/dbtools.cxx 
b/connectivity/source/commontools/dbtools.cxx
index 97316e5e2536..fa34331d85f9 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -2026,6 +2026,89 @@ OSQLColumns::Vector::const_iterator 
find(OSQLColumns::Vector::const_iterator fir
 ++first;
 return first;
 }
+
+namespace dbase
+{
+bool dbfDecodeCharset(rtl_TextEncoding &_out_encoding, sal_uInt8 nType, 
sal_uInt8 nCodepage)
+{
+switch (nType)
+{
+case dBaseIII:
+case dBaseIV:
+case dBaseV:
+case VisualFoxPro:
+case VisualFoxProAuto:
+case dBaseFS:
+case dBaseFSMemo:
+case dBaseIVMemoSQL:
+case dBaseIIIMemo:
+case FoxProMemo:
+{
+if (nCodepage != 0x00)
+{
+auto eEncoding(RTL_TEXTENCODING_DONTKNOW);
+switch(nCodepage)
+{
+case 0x01: eEncoding = RTL_TEXTENCODING_IBM_437; break;   
// DOS USA  code page 437
+case 0x02: eEncoding = RTL_TEXTENCODING_IBM_850; break;   
// DOS Multilingual code page 850
+case 0x03: eEncoding = RTL_TEXTENCODING_MS_1252; break;   
// Windows ANSI code page 1252
+case 0x04: eEncoding = RTL_TEXTENCODING_APPLE_ROMAN; break;   
// Standard Macintosh
+case 0x64: eEncoding = RTL_TEXTENCODING_IBM_852; break;   
// EE MS-DOScode page 852
+case 0x65: eEncoding = RTL_TEXTENCODING_IBM_866; break;   
// Russian MS-DOS   code page 866
+case 0x66: eEncoding = RTL_TEXTENCODING_IBM_865; break;   
// Nordic MS-DOScode page 865
+case 0x67: eEncoding = RTL_TEXTENCODING_IBM_861; break;   
// Icelandic MS-DOS
+//case 0x68: eEncoding = ; break; // Kamenicky (Czech) 
MS-DOS
+//case 0x69: eEncoding = ; break; // Mazovia (Polish) 
MS-DOS
+case 0x6A: eEncoding = RTL_TEXTENCODING_IBM_737; break;   
// Greek MS-DOS (437G)
+case 0x6B: eEncoding = RTL_TEXTENCODING_IBM_857; break;   
// Turkish MS-DOS
+case 0x6C: eEncoding = RTL_TEXTENCODING_IBM_863; break;   
// MS-DOS, Canada
+case 0x78: eEncoding = RTL_TEXTENCODING_MS_950; break;
// Windows, Traditional Chinese
+case 0x79: eEncoding = RTL_TEXTENCODING_MS_949; break;
// Windows, Korean (Hangul)
+case 0x7A: eEncoding = RTL_TEXTENCODING_MS_936; break;
// Windows, Simplified Chinese
+case 0x7B: eEncoding = RTL_TEXTENCODING_MS_932; break;
// Windows, Japanese (Shift-jis)
+case 0x7C: eEncoding = RTL_TEXTENCODING_MS_874; break;
// Windows, Thai
+case 0x7D: eEncoding = RTL_TEXTENCODING_MS_1255; break;   
// Windows, Hebrew
+case 0x7E: eEncoding = RTL_TEXTENCODING_MS_1256; break;   
// Windows, Arabic
+case 0x96: eEncoding = RTL_TEXTENCODING_APPLE_CYRILLIC; break; 
   // Russian Macintosh
+case 0x97: eEncoding = RTL_TEXTENCODING_APPLE_CENTEURO; break; 
   // Eastern European Macintosh
+case 0x98: eEncoding = RTL_TEXTENCODING_APPLE_GREEK; break;   
// Greek Macintosh
+case 0xC8: eEncoding = RTL_TEXTENCODING_MS_1250; break;   
// Windows EE   

[Libreoffice-commits] core.git: 2 commits - configure.ac onlineupdate/CustomTarget_generated.mk onlineupdate/source

[Markus Mohrhard]

 configure.ac  |3 +++
 onlineupdate/CustomTarget_generated.mk|4 ++--
 onlineupdate/source/update/updater/gen_cert_header.py |7 +--
 3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 20d04d6938a104124ac06271f17978a290cccf6c
Author: Markus Mohrhard 
Date:   Sun May 21 00:38:10 2017 +0200

take the certifcate info from the update config

Change-Id: I15856f21d19b45ec50bd3d63d2e526c9e8db450d

diff --git a/onlineupdate/CustomTarget_generated.mk 
b/onlineupdate/CustomTarget_generated.mk
index 0c0f230387a8..346629976328 100644
--- a/onlineupdate/CustomTarget_generated.mk
+++ b/onlineupdate/CustomTarget_generated.mk
@@ -15,13 +15,13 @@ $(onlineupdate_INC)/primaryCert.h : \
$(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,,1)
mkdir -p $(dir $@)
-   $(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py 
"primaryCertData" /lo/users/moggi/NSSDBDir/master-daily.der > 
$(onlineupdate_INC)/primaryCert.h #"$(UPDATE_CONFIG)"
+   $(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py 
"primaryCertData" $(UPDATE_CONFIG) > $(onlineupdate_INC)/primaryCert.h 
#"$(UPDATE_CONFIG)"
 
 $(onlineupdate_INC)/secondaryCert.h : \
$(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,,1)
mkdir -p $(dir $@)
-   $(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py 
"secondaryCertData" /lo/users/moggi/NSSDBDir/master-daily.der > 
$(onlineupdate_INC)/secondaryCert.h #"$(UPDATE_CONFIG)"
+   $(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py 
"secondaryCertData" $(UPDATE_CONFIG) > $(onlineupdate_INC)/secondaryCert.h 
#"$(UPDATE_CONFIG)"
 
 $(call gb_CustomTarget_get_target,onlineupdate/generated) : \
$(onlineupdate_INC)/primaryCert.h \
diff --git a/onlineupdate/source/update/updater/gen_cert_header.py 
b/onlineupdate/source/update/updater/gen_cert_header.py
index 5b70758db3f2..8fedcd9bcf62 100755
--- a/onlineupdate/source/update/updater/gen_cert_header.py
+++ b/onlineupdate/source/update/updater/gen_cert_header.py
@@ -2,6 +2,7 @@
 
 import sys
 import binascii
+import configparser
 
 def file_byte_generator(filename):
 with open(filename, "rb") as f:
@@ -17,6 +18,8 @@ def create_header(array_name, in_filename):
 
 if __name__ == '__main__':
 if len(sys.argv) < 3:
-print('ERROR: usage: gen_cert_header.py array_name in_filename')
+print('ERROR: usage: gen_cert_header.py array_name update_config_file')
 sys.exit(1);
-sys.exit(create_header(sys.argv[1], sys.argv[2]))
+config = configparser.ConfigParser()
+config.read(sys.argv[2])
+sys.exit(create_header(sys.argv[1], config['Updater']['certificate-der']))
commit 3964bfa04f5aa09a9199225a8763cdec74d92ee3
Author: Markus Mohrhard 
Date:   Sun May 21 00:12:58 2017 +0200

check that a update config is specified for mar based updater

Change-Id: I1fb87b33d4db8e5b0608aef13013be6dc9e8657e

diff --git a/configure.ac b/configure.ac
index 585c47efdfb7..cd4f0fa2ebaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11299,6 +11299,9 @@ else
 if test "$enable_online_update" = "mar"; then
 AC_MSG_RESULT([yes - MAR-based online update])
 ENABLE_ONLINE_UPDATE_MAR="TRUE"
+if test "$with_update_config" = ""; then
+AC_MSG_ERROR([mar based online updater needs an update config 
specified with "with-update-config])
+fi
 UPDATE_CONFIG="$with_update_config"
 AC_DEFINE(HAVE_FEATURE_UPDATE_MAR)
 elif test "$enable_online_update" = "yes"; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac

[Michael Stahl]

 configure.ac |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 9e9c7d8b541448fd6022837633d50baa5bbfab69
Author: Michael Stahl 
Date:   Thu Mar 9 15:29:14 2017 +0100

configure: find the MSMs where MSVC 2017 Release hides them

Change-Id: Id98d73eef46d63686745bf6cd3482b18c7223c3a

diff --git a/configure.ac b/configure.ac
index d1b813f..dc837c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5336,6 +5336,12 @@ find_msms()
 my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/$vcbuildnumber/MergeModules/"
 if test -e "$my_msm_dir/$my_msm_file"; then
 msmdir=$my_msm_dir
+else
+# got everything in 14.10.15017 except the MSMS in 25008... huh?
+my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/14.10.25008/MergeModules/"
+if test -e "$my_msm_dir/$my_msm_file"; then
+msmdir=$my_msm_dir
+fi
 fi
 fi
 
@@ -5347,6 +5353,7 @@ find_msms()
 AC_MSG_ERROR([not found])
 else
 AC_MSG_WARN([not found])
+add_warning "MSM $my_msm_file not found"
 fi
 fi
 }
commit 524e36f8071530c4706304a305402944a4a32dfa
Author: Michael Stahl 
Date:   Thu Mar 9 14:59:05 2017 +0100

configure: find MSVC 2017 64-bit compiler

Change-Id: I7ae99ebc693291709edc6df233f54dfe00d74e9e

diff --git a/configure.ac b/configure.ac
index c232649..d1b813f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3681,7 +3681,6 @@ if test "$_os" = "WINNT"; then
 LINK_X64_BINARY=
 
 if test "$BITNESS_OVERRIDE" = ""; then
-# TODO(davido): This is probably broken for MSVC 15.0
 AC_MSG_CHECKING([for a x64 compiler and libraries for 64-bit Explorer 
extensions])
 if test -f "$VC_PRODUCT_DIR/atlmfc/lib/amd64/atls.lib"; then
 # Prefer native x64 compiler to cross-compiler, in case we are 
running
@@ -3695,6 +3694,13 @@ if test "$_os" = "WINNT"; then
 CXX_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe"
 LINK_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/link.exe"
 fi
+elif test -f 
"$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/atlmfc/lib/x64/atls.lib"; then
+# nobody uses 32-bit OS to build, just pick the 64-bit compiler
+if 
"$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX64/x64/cl.exe" -? 
/dev/null 2>&1; then
+BUILD_X64=TRUE
+
CXX_X64_BINARY="$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX64/x64/cl.exe"
+
LINK_X64_BINARY="$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX64/x64/link.exe"
+fi
 fi
 if test "$BUILD_X64" = TRUE; then
 AC_MSG_RESULT([found])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac

[Tor Lillqvist]

 configure.ac |   33 -
 1 file changed, 12 insertions(+), 21 deletions(-)

New commits:
commit 9def779821324c73f81344b2b2d59f1e875903db
Author: Tor Lillqvist 
Date:   Thu Mar 9 01:49:06 2017 +0200

More AC_MSG_* usage cleanup

Output just one AC_MSG_RESULT for each AC_MSG_CHECKING.

Change-Id: I2ff1458a8b4abbe1804e33a39a9f4cc795cb28a1

diff --git a/configure.ac b/configure.ac
index 131cfcd..1748ed8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3356,10 +3356,7 @@ find_msvc()
 
 vs_versions_to_check "$1"
 
-AC_MSG_CHECKING([whether vs inst is $vsversions])
-
 for ver in $vsversions; do
-AC_MSG_CHECKING([ver is now: $ver])
 reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VC/ProductDir
 if test -n "$regvalue"; then
 vctest=$regvalue
@@ -3551,7 +3548,6 @@ if test "$_os" = "WINNT"; then
 dnl Save the true MSVC cl.exe for use when CC/CXX is actually clang-cl,
 dnl needed when building CLR code:
 if test -z "$MSVC_CXX"; then
-AC_MSG_CHECKING([real MSVC])
 if test "$BITNESS_OVERRIDE" = ""; then
 if test -f "$VC_PRODUCT_DIR/$CL_DIR/cl.exe"; then
 MSVC_CXX="$VC_PRODUCT_DIR/$CL_DIR/cl.exe"
@@ -3568,7 +3564,6 @@ if test "$_os" = "WINNT"; then
 fi
 fi
 
-AC_MSG_RESULT([$MSVC_CXX])
 # This gives us a posix path with 8.3 filename restrictions
 MSVC_CXX=`win_short_path_for_make "$MSVC_CXX"`
 fi
@@ -3605,7 +3600,6 @@ if test "$_os" = "WINNT"; then
 fi
 
 export INCLUDE=`cygpath -d "$COMPATH\Include"`
-AC_MSG_RESULT([INCLUDE is: ($INCLUDE)])
 
 PathFormat "$COMPATH"
 COMPATH="$formatted_path"
commit 78ad9c3eb378c72e3cb1258f313b4b8c3023069c
Author: Tor Lillqvist 
Date:   Thu Mar 9 01:40:48 2017 +0200

Fix AC_MSG_* usage for find_ucrt

You are supposed to output just one AC_MSG_RESULT for each AC_MSG_CHECKING

find_ucrt already errors out if it doesn't.

Change-Id: I63f58996f60577301631b11dd51728fdee324095

diff --git a/configure.ac b/configure.ac
index 6125f82..131cfcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3327,7 +3327,6 @@ find_ucrt()
 # Rest if not exist
 if ! test -d "${UCRTSDKDIR}Include/$UCRTVERSION/ucrt"; then
   UCRTSDKDIR=
-  AC_MSG_RESULT([UCRT: give up registry detection and retrieve from 
IDE env file])
 fi
 fi
 if test -z "$UCRTSDKDIR"; then
@@ -3453,20 +3452,18 @@ if test "$_os" = "WINNT"; then
 
 AC_MSG_CHECKING([for UCRT location])
 find_ucrt
-if test -n "$UCRTSDKDIR"; then
-AC_MSG_RESULT([found])
-PathFormat "${UCRTSDKDIR}Include/$UCRTVERSION/ucrt"
-ucrtincpath_formatted=$formatted_path
-# SOLARINC is used for external modules and must be set too.
-# And no, it's not sufficient to set SOLARINC only, as configure
-# itself doesn't honour it.
-SOLARINC="$SOLARINC -I$ucrtincpath_formatted"
-CFLAGS="$CFLAGS -I$ucrtincpath_formatted"
-CXXFLAGS="$CXXFLAGS -I$ucrtincpath_formatted"
-CPPFLAGS="$CPPFLAGS -I$ucrtincpath_formatted"
-else
-AC_MSG_ERROR([not found])
-fi
+# find_ucrt errors out if it doesn't find it
+AC_MSG_RESULT([found])
+PathFormat "${UCRTSDKDIR}Include/$UCRTVERSION/ucrt"
+ucrtincpath_formatted=$formatted_path
+# SOLARINC is used for external modules and must be set too.
+# And no, it's not sufficient to set SOLARINC only, as configure
+# itself doesn't honour it.
+SOLARINC="$SOLARINC -I$ucrtincpath_formatted"
+CFLAGS="$CFLAGS -I$ucrtincpath_formatted"
+CXXFLAGS="$CXXFLAGS -I$ucrtincpath_formatted"
+CPPFLAGS="$CPPFLAGS -I$ucrtincpath_formatted"
+
 AC_SUBST(UCRTSDKDIR)
 AC_SUBST(UCRTVERSION)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac external/fontconfig external/freetype extras/source RepositoryExternal.mk

[Caolán McNamara]

 RepositoryExternal.mk |8 +---
 configure.ac  |9 -
 external/fontconfig/ExternalProject_fontconfig.mk |2 +-
 external/fontconfig/Module_fontconfig.mk  |4 
 external/freetype/Module_freetype.mk  |4 
 extras/source/glade/libreoffice-catalog.xml.in|2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

New commits:
commit 5bd30fea44e544d072ff94b3812464cefd250feb
Author: Caolán McNamara 
Date:   Thu Dec 15 09:31:46 2016 +

fix svxlo-ColorListBox->svxcorelo-SvxColorListBox glade catalog

Change-Id: Ia007045c71e85fcca2afeacec6ef77d5f0b633f1

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 84a0558..82f9ab4 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -94,7 +94,7 @@
   
 
 
-
 
commit f2fae3684f35bfb03c4921adc4ecbddcff36374b
Author: Caolán McNamara 
Date:   Tue Dec 13 16:30:58 2016 +

build our own fontconfig and freetype under oss-fuzz

Change-Id: I7141aabd64c3f42545176fa8c907d8326e25e9ff

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index dcc47a6..3d5c5aa 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1273,7 +1273,7 @@ endef
 
 gb_ExternalProject__use_freetype :=
 
-else ifeq ($(OS),ANDROID)
+else
 
 define gb_LinkTarget__use_freetype_headers
 $(call gb_LinkTarget_use_external_project,$(1),freetype)
@@ -1286,7 +1286,7 @@ endef
 
 define gb_LinkTarget__use_freetype
 $(call gb_LinkTarget_use_external,$(1),freetype_headers)
-$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
+$(call gb_LinkTarget_add_libs,$(1),-lfreetype)
 
 endef
 
@@ -1309,7 +1309,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS))
 
 endef
 
-else ifeq ($(OS),ANDROID)
+else
 
 define gb_LinkTarget__use_fontconfig
 $(call gb_LinkTarget_use_external_project,$(1),fontconfig)
@@ -1318,6 +1318,8 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 
+$(call gb_LinkTarget_add_libs,$(1),-lfontconfig)
+
 endef
 
 endif # SYSTEM_FONTCONFIG
diff --git a/configure.ac b/configure.ac
index 3808f6e..9c55fe8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -665,7 +665,14 @@ linux-gnu*|k*bsd*-gnu*)
 build_gstreamer_0_10=yes
 test_tde=yes
 test_kde4=yes
-test_freetype=yes
+if test "$enable_fuzzers" != yes; then
+test_freetype=yes
+test_fontconfig=yes
+else
+test_freetype=no
+test_fontconfig=no
+BUILD_TYPE="$BUILD_TYPE FONTCONFIG FREETYPE"
+fi
 _os=Linux
 ;;
 
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk 
b/external/fontconfig/ExternalProject_fontconfig.mk
index e4de004..83387e3 100644
--- a/external/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
@@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" $(if $(filter 
ANDROID,$(OS)),LIBS="-lm") \
./configure \
--disable-shared \
-   --with-arch=arm \
+   $(if $(filter ANDROID,$(OS)),--with-arch=arm) \
--with-expat-includes=$(call 
gb_UnpackedTarball_get_dir,expat)/lib \
--with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
--with-freetype-config=$(call 
gb_UnpackedTarball_get_dir,freetype)/instdir/bin/freetype-config \
diff --git a/external/fontconfig/Module_fontconfig.mk 
b/external/fontconfig/Module_fontconfig.mk
index 764af35..e755f86 100644
--- a/external/fontconfig/Module_fontconfig.mk
+++ b/external/fontconfig/Module_fontconfig.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,fontconfig))
 
-ifeq ($(OS),ANDROID)
-
 $(eval $(call gb_Module_add_targets,fontconfig,\
ExternalProject_fontconfig \
UnpackedTarball_fontconfig \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/freetype/Module_freetype.mk 
b/external/freetype/Module_freetype.mk
index f6e316d..290014c 100644
--- a/external/freetype/Module_freetype.mk
+++ b/external/freetype/Module_freetype.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,freetype))
 
-ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF)))
-
 $(eval $(call gb_Module_add_targets,freetype,\
ExternalProject_freetype \
UnpackedTarball_freetype \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac scp2/source solenv/gbuild

[Matúš Kukan]

 configure.ac |5 -
 scp2/source/gnome/module_gnome.scp   |5 ++---
 solenv/gbuild/InstallModuleTarget.mk |2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 7740e945e0c74d057c424cced079adc766cc5604
Author: Matúš Kukan 
Date:   Sun Dec 11 00:09:01 2016 +0100

gid_File_Bin_Gnome_Open_Url was removed

..in eaa7f30102df4df01171e5daf83cdddae1bb0cda

Change-Id: I149ee4087dffe54fd63bacd3bb5aba67159fac72

diff --git a/scp2/source/gnome/module_gnome.scp 
b/scp2/source/gnome/module_gnome.scp
index e1c5862..200c300 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -27,11 +27,10 @@ Module gid_Module_Optional_Gnome
 PackageInfo = "packinfo_office.txt";
 MOD_NAME_DESC(MODULE_OPTIONAL_GNOME);
 Styles = ();
-Files = (auto_gnome_ALL,
+Files = (auto_gnome_ALL
 #if ENABLE_GIO
-  gid_File_Share_Registry_Gnome_Xcd,
+  ,gid_File_Share_Registry_Gnome_Xcd
 #endif
-  gid_File_Bin_Gnome_Open_Url
 );
 End
 
commit 1e074a455ed9c7136868f10bce3e173b22c1564b
Author: Matúš Kukan 
Date:   Sat Dec 10 23:53:29 2016 +0100

Remove some not used SCPDEFS

Change-Id: Ib85895c21cef9baeccc468b476cbd8170ee4c9ce

diff --git a/configure.ac b/configure.ac
index 6607ffa..2cf3ebf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2477,8 +2477,6 @@ fi
 if test "$enable_avmedia" = yes; then
 BUILD_TYPE="$BUILD_TYPE AVMEDIA"
 AC_DEFINE(HAVE_FEATURE_AVMEDIA)
-else
-SCPDEFS="$SCPDEFS -DDISABLE_AVMEDIA"
 fi
 
 # Decide whether to build database connectivity stuff (including
@@ -2539,7 +2537,6 @@ if test "$enable_dynamic_loading" = yes; then
 BUILD_TYPE="$BUILD_TYPE DYNLOADING"
 else
 DISABLE_DYNLOADING='TRUE'
-SCPDEFS="$SCPDEFS -DDISABLE_DYNLOADING"
 fi
 AC_SUBST(DISABLE_DYNLOADING)
 
@@ -3169,7 +3166,6 @@ fi
 
 if test "$cross_compiling" = "yes"; then
 export CROSS_COMPILING=TRUE
-SCPDEFS="$SCPDEFS -DCROSS_COMPILING"
 else
 CROSS_COMPILING=
 BUILD_TYPE="$BUILD_TYPE NATIVE"
@@ -7560,7 +7556,6 @@ fi
 ENABLE_LWP=
 if test "$enable_lotuswordpro" = "yes"; then
 ENABLE_LWP="TRUE"
-SCPDEFS="$SCPDEFS -DDISABLE_LWP"
 fi
 AC_SUBST(ENABLE_LWP)
 
diff --git a/solenv/gbuild/InstallModuleTarget.mk 
b/solenv/gbuild/InstallModuleTarget.mk
index 54848b0..d24b201 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -68,7 +68,7 @@ $(call gb_Output_announce,$(2),$(true),SPP,2)
 $(call gb_Helper_abbreviate_dirs,\
$(gb_ScpPreprocessTarget_COMMAND) \
-+ -P \
-   $(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \
+   $(SCPDEFS) $(SCP_DEFS) \
$(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \
$(if $(ENABLE_JAVA),-DENABLE_JAVA) \
$(SCP_SOURCE) > $(1) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac svl/source writerperfect/CppunitTest_writerperfect_draw.mk

[David Tardon]

 configure.ac|   89 +---
 svl/source/items/IndexedStyleSheets.cxx |9 +-
 writerperfect/CppunitTest_writerperfect_draw.mk |3 
 3 files changed, 32 insertions(+), 69 deletions(-)

New commits:
commit 33ae095d92246cd2c74c30c9e070a8e0241926db
Author: David Tardon 
Date:   Sun Nov 13 15:03:03 2016 +0100

add missing dependency

Change-Id: I72696c82d9a96709746060ae18bd497da8715d35

diff --git a/svl/source/items/IndexedStyleSheets.cxx 
b/svl/source/items/IndexedStyleSheets.cxx
index 260ae10..fa68f49 100644
--- a/svl/source/items/IndexedStyleSheets.cxx
+++ b/svl/source/items/IndexedStyleSheets.cxx
@@ -53,7 +53,6 @@ IndexedStyleSheets::IndexedStyleSheets()
 }
 ;}
 
-
 void
 IndexedStyleSheets::Register(const SfxStyleSheetBase& style, unsigned pos)
 {
@@ -91,6 +90,7 @@ IndexedStyleSheets::GetNumberOfStyleSheets() const
 void
 IndexedStyleSheets::AddStyleSheet(const rtl::Reference< SfxStyleSheetBase >& 
style)
 {
+assert(!style->GetName().isEmpty());
 if (!HasStyleSheet(style)) {
 mStyleSheets.push_back(style);
 // since we just added an element to the vector, we can safely do -1 
as it will always be >= 1
@@ -101,6 +101,7 @@ IndexedStyleSheets::AddStyleSheet(const rtl::Reference< 
SfxStyleSheetBase >& sty
 bool
 IndexedStyleSheets::RemoveStyleSheet(const rtl::Reference< SfxStyleSheetBase 
>& style)
 {
+assert(!style->GetName().isEmpty());
 rtl::OUString styleName = style->GetName();
 std::vector positions = FindPositionsByName(styleName);
 bool found = false;
@@ -200,6 +201,7 @@ void
 IndexedStyleSheets::Clear(StyleSheetDisposer& disposer)
 {
 for (VectorType::iterator it = mStyleSheets.begin(); it != 
mStyleSheets.end(); ++it) {
+assert(!(*it)->GetName().isEmpty());
 disposer.Dispose(*it);
 }
 mStyleSheets.clear();
@@ -207,7 +209,10 @@ IndexedStyleSheets::Clear(StyleSheetDisposer& disposer)
 }
 
 IndexedStyleSheets::~IndexedStyleSheets()
-{;}
+{
+for (const auto& rStyleSheet : mStyleSheets)
+assert(!rStyleSheet->GetName().isEmpty());
+}
 
 bool
 IndexedStyleSheets::HasStyleSheet(const rtl::Reference< SfxStyleSheetBase >& 
style) const
diff --git a/writerperfect/CppunitTest_writerperfect_draw.mk 
b/writerperfect/CppunitTest_writerperfect_draw.mk
index 442fef4..24f7ce4 100644
--- a/writerperfect/CppunitTest_writerperfect_draw.mk
+++ b/writerperfect/CppunitTest_writerperfect_draw.mk
@@ -42,4 +42,7 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,writerperfect_draw,\
writerperfect/qa/unit/WpftDrawFilterTest \
 ))
 
+$(call gb_CppunitTest_get_target,writerperfect_draw): \
+$(call gb_AllLangResTarget_get_target,sd)
+
 # vim: set noet sw=4 ts=4:
commit a64958ab631a81feda8a42807b17fda6cb29147e
Author: David Tardon 
Date:   Sat Nov 12 10:25:40 2016 +0100

move all tests for DLP libs to one place

Change-Id: Icbce7f5512c0c205f44db520f337ce9520d228d5

diff --git a/configure.ac b/configure.ac
index 1c1c87f..a5ffd99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7840,7 +7840,7 @@ fi
 AC_SUBST([ENABLE_EOT])
 
 dnl ===
-dnl Check for system librevenge
+dnl Check for DLP libs
 dnl ===
 AS_IF([test "$COM" = "MSC"],
   [librevenge_libdir="${WORKDIR}/LinkTarget/Library"],
@@ -7848,66 +7848,46 @@ AS_IF([test "$COM" = "MSC"],
 )
 libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 
0.0.1],["-I${WORKDIR}/UnpackedTarball/librevenge/inc"],["-L${librevenge_libdir} 
-lrevenge-0.0"])
 
-dnl ===
-dnl Check for system libe-book
-dnl ===
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1])
-libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2])
+libo_CHECK_SYSTEM_MODULE([libodfgen],[ODFGEN],[libodfgen-0.1])
 
-dnl ===
-dnl Check for system libetonyek
-dnl ===
-libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
-libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.5])
+AS_IF([test "$COM" = "MSC"],
+  [libwpd_libdir="${WORKDIR}/LinkTarget/Library"],
+  [libwpd_libdir="${WORKDIR}/UnpackedTarball/libwpd/src/lib/.libs"]
+)
+libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${libwpd_libdir}
 -lwpd-0.10"])
 
-dnl ===
-dnl Check for system libfreehand
-dnl ===
-libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
+libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
 
-dnl 

[Libreoffice-commits] core.git: 2 commits - configure.ac vcl/quartz

[Khaled Hosny]

 configure.ac   |   15 ---
 vcl/quartz/ctfonts.cxx |9 +
 2 files changed, 17 insertions(+), 7 deletions(-)

New commits:
commit 8285af5e56cbc9d3871f75454781ce0f5386ec08
Author: Khaled Hosny 
Date:   Mon Nov 7 07:59:49 2016 +0200

Disable VCL_FLOAT_DEVICE_PIXEL on macOS for now

Causes subtle and surprising differences, and it was only needed for the
Core Text-based layout engine, which is not the default now. We want to
use floats for our text layout everywhere at some point, though, so lets
keep the code around.

Change-Id: Iac4d0f58992646b9357a9f32c5eea8ff2729a5c0

diff --git a/configure.ac b/configure.ac
index 0d6329e..66fdc0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10175,13 +10175,14 @@ dnl 
===
 dnl Set vcl option: coordinate device in double or sal_Int32
 dnl ===
 
-AC_MSG_CHECKING([Type to use for Device Pixel coordinates])
-if test "$_os" = "Darwin" -o  $_os = iOS ; then
-AC_DEFINE(VCL_FLOAT_DEVICE_PIXEL)
-AC_MSG_RESULT([double])
-else
-AC_MSG_RESULT([sal_Int32])
-fi
+dnl disabled for now, we don't want subtle differences between OSs
+dnl AC_MSG_CHECKING([Type to use for Device Pixel coordinates])
+dnl if test "$_os" = "Darwin" -o  $_os = iOS ; then
+dnl AC_DEFINE(VCL_FLOAT_DEVICE_PIXEL)
+dnl AC_MSG_RESULT([double])
+dnl else
+dnl AC_MSG_RESULT([sal_Int32])
+dnl fi
 
 dnl ===
 dnl Test which vclplugs have to be built.
commit bd2ff931428a7007ef639004ea6a65a2fa417cb1
Author: Khaled Hosny 
Date:   Mon Nov 7 07:52:21 2016 +0200

Set Kashida width also on macOS

Otherwise we might not get any Kashida justification at all.

Change-Id: I6521d5a267392314d5d0da84b93fcd80c7b7cc57

diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 11905c2..735a30b 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -143,6 +143,15 @@ void CoreTextStyle::GetFontMetric( ImplFontMetricDataRef& 
rxFontMetric ) const
 rxFontMetric->SetScalableFlag( true );
 rxFontMetric->SetTrueTypeFlag( true ); // Not sure, but this field is used 
only for Windows so far
 rxFontMetric->SetKernableFlag( true );
+
+UniChar nKashidaCh = 0x0640;
+CGGlyph nKashidaGid = 0;
+if (CTFontGetGlyphsForCharacters(aCTFontRef, , , 1))
+{
+double nKashidaAdv = CTFontGetAdvancesForGlyphs(aCTFontRef,
+kCTFontHorizontalOrientation, , nullptr, 1);
+rxFontMetric->SetMinKashida(lrint(nKashidaAdv));
+}
 }
 
 bool CoreTextStyle::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect 
) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac

[Tor Lillqvist]

 configure.ac |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9e1ee599e00751bc2454a9e2549286f4afca81e5
Author: Tor Lillqvist 
Date:   Sun Sep 11 21:39:31 2016 +0300

Update min OS version to a more realistic value for iOS

Change-Id: I63617c49ce176180709a32c59a468c6abe076a3d

diff --git a/configure.ac b/configure.ac
index 4d8683c..d248c93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3005,10 +3005,10 @@ if test $_os = iOS; then
 if test "$enable_ios_simulator" = yes; then
 if test "$BITNESS_OVERRIDE" = 64; then
 XCODE_ARCHS=x86_64
-versionmin=-mios-simulator-version-min=7.0
+versionmin=-mios-simulator-version-min=9.0
 else
 XCODE_ARCHS=i386
-versionmin=-mios-simulator-version-min=7.0
+versionmin=-mios-simulator-version-min=9.0
 fi
 else
 platform=iPhoneOS
@@ -3017,7 +3017,7 @@ if test $_os = iOS; then
 else
 XCODE_ARCHS=armv7
 fi
-versionmin=-miphoneos-version-min=7.0
+versionmin=-miphoneos-version-min=9.0
 fi
 
 # LTO is not really recommended for iOS builds,
commit 143d6eb831c6a285463feb31af977acd59972d5a
Author: Tor Lillqvist 
Date:   Sun Sep 11 21:24:59 2016 +0300

Also look for iOS SDK 10.0

Change-Id: Ibc975a3c61542a2872a48c310351653734c225ce

diff --git a/configure.ac b/configure.ac
index 56f5ebe..4d8683c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2985,7 +2985,7 @@ if test $_os = iOS; then
 xcode_developer=`xcode-select -print-path`
 
 current_sdk_ver=9.3
-for sdkver in 9.3 9.2; do
+for sdkver in 10.0 9.3 9.2; do
 
t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
 if test -d $t; then
 ios_sdk=$sdkver
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac

[Michael Stahl]

 configure.ac |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 16c0807d75cfd9ecbca9c703ed0eadda80529aab
Author: Michael Stahl 
Date:   Tue Sep 27 11:53:56 2016 +0200

configure: reject Apple JDK

Since commit 32bc8ddbf335dd26019edcf12758643b4cff9913 the jvmfwk rejects
Apple JDK and while the Java code builds fine with it, various tests such as
CppunitTest_dbaccess_hsqldb_test fail if it is the only installed JRE.

The simplest way to avoid the problem is to not allow building with
Apple JDK.

Change-Id: I5701e38cffded4596ac94608867a038ff76f75ec

diff --git a/configure.ac b/configure.ac
index 10c987b..e02559d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7100,6 +7100,13 @@ _ACEOF
 
 # now check if $JAVA_HOME is really valid
 if test "$_os" = "Darwin" -o "$OS_FOR_BUILD" = MACOSX; then
+case "${JAVA_HOME}" in
+/Library/Java/JavaVirtualMachines/*)
+;;
+*)
+AC_MSG_ERROR([JDK in $JAVA_HOME cannot be used in CppUnit 
tests - install Oracle JDK])
+;;
+esac
 if test ! -f "$JAVA_HOME/lib/jvm.cfg" -a "x$with_jdk_home" = "x"; then
 JAVA_HOME_OK="NO"
 fi
commit 9a5b10544a11df3c0b08532a9143cd9adced4a4d
Author: Michael Stahl 
Date:   Tue Sep 27 11:32:08 2016 +0200

configure: non-working ant is an error, not a warning

For example ant 1.8.4 doesn't work with JDK 1.8.

Change-Id: I709fd0591c330cbfe6542976eb2fa0c3aec1e63f

diff --git a/configure.ac b/configure.ac
index 9622255..10c987b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11928,9 +11928,7 @@ EOF
 echo "configure: Ant test failed" >&5
 cat conftest.java >&5
 cat conftest.xml >&5
-AC_MSG_WARN([Ant does not work - Some Java projects will not 
build!])
-ANT_HOME=""
-add_warning "Ant does not work - Some Java projects will not 
build!"
+AC_MSG_ERROR([Ant does not work - Some Java projects will not 
build!])
 fi
 rm -f conftest* core core.* *.core
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac

[Stephan Bergmann]

 configure.ac |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 60b6b1eae563c727160724a8671844bf8136f5d5
Author: Stephan Bergmann 
Date:   Tue Sep 20 08:06:25 2016 +0200

Remove obsolete HAVE_GCC_VISIBILITY_FEATURE check

 "default-visibility 
class
symbol improperly resolved as hidden-visibility" is fixed ever since GCC 
4.2.

Make this a fatal configure error for now.  The check should be removed
completely after LO 5.3 branch-off.

Change-Id: Ie365d5a0e2217a4efd1e8e2642963738ae7d20b1
Reviewed-on: https://gerrit.libreoffice.org/29072
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 37d5145..ae9e83b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6608,9 +6608,7 @@ _ACEOF
 
 AC_MSG_RESULT([$gccvisbroken])
 if test "$gccvisbroken" = "yes"; then
-AC_MSG_WARN([Your gcc is not -fvisibility=hidden safe. Disabling 
visibility])
-add_warning "Your gcc is not -fvisibility=hidden safe. Disabling 
visibility"
-unset HAVE_GCC_VISIBILITY_FEATURE
+AC_MSG_ERROR([Your gcc is not -fvisibility=hidden safe. This is no 
longer supported.])
 fi
 fi
 
commit 8af35c9590262965c603d8609b57cc76d23e8506
Author: Stephan Bergmann 
Date:   Tue Sep 20 08:01:13 2016 +0200

Remove obsolete HAVE_GCC_VISIBILITY_FEATURE check

 "libstdc++ headers 
should
have pop/push of the visibility around the declarations" (aka gcc#22482,
rhbz#162935) is fixed ever since GCC 4.2.

Make this a fatal configure error for now.  The check should be removed
completely after LO 5.3 branch-off.

Change-Id: I3e8fde187b4b20652ee3164485ef868a9bf5a7ce
Reviewed-on: https://gerrit.libreoffice.org/29071
Tested-by: Stephan Bergmann 
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index f4b91fb..37d5145 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6494,9 +6494,7 @@ if test \( "$_os" != "WINNT" -o "$WITH_MINGW" = "yes" \); 
then
 AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
 AC_MSG_RESULT([$stlvisok])
 if test "$stlvisok" = "no"; then
-AC_MSG_WARN([Your libstdc++ headers are not visibility safe. 
Disabling visibility])
-add_warning "Your libstdc++ headers are not visibility safe. 
Disabling visibility"
-unset HAVE_GCC_VISIBILITY_FEATURE
+AC_MSG_ERROR([Your libstdc++ headers are not visibility safe. This 
is no longer supported.])
 fi
 fi
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac

[Thorsten Behrens]

 configure.ac |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit b9ebc6e4c8b0ae72f4a208df29f99fe1404595ed
Author: Thorsten Behrens 
Date:   Fri Aug 19 15:39:55 2016 +0200

configure.ac: use sed from path_progrs macro

Change-Id: I79a6352eabba6d6f3064df2340d53c2808210f6c

diff --git a/configure.ac b/configure.ac
index 0e386be0..847651b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7321,7 +7321,7 @@ if test "$with_export_validation" = yes; then
 ODFVALIDATOR="$SRC_ROOT/bin/odfvalidator.sh"
 
 # and fetch name of odfvalidator jar name from download.lst
-ODFVALIDATOR_JAR=`sed -ne "s/export *ODFVALIDATOR_JAR *:= *\(.*\) 
*/\1/p" $SRC_ROOT/download.lst`
+ODFVALIDATOR_JAR=`$SED -n -e "s/export *ODFVALIDATOR_JAR *:= *\(.*\) 
*/\1/p" $SRC_ROOT/download.lst`
 AC_SUBST(ODFVALIDATOR_JAR)
 
 if test -z "$ODFVALIDATOR_JAR"; then
@@ -7348,7 +7348,7 @@ if test "$with_export_validation" = yes; then
 OFFICEOTRON="$SRC_ROOT/bin/officeotron.sh"
 
 # and fetch name of officeotron jar name from download.lst
-OFFICEOTRON_JAR=`sed -ne "s/export *OFFICEOTRON_JAR *:= *\(.*\) 
*/\1/p" $SRC_ROOT/download.lst`
+OFFICEOTRON_JAR=`$SED -n -e "s/export *OFFICEOTRON_JAR *:= *\(.*\) 
*/\1/p" $SRC_ROOT/download.lst`
 AC_SUBST(OFFICEOTRON_JAR)
 
 if test -z "$OFFICEOTRON_JAR"; then
commit 53c98f01effb31c3308f0c27e4cc0bdd37fd974f
Author: Thorsten Behrens 
Date:   Fri Aug 19 15:33:17 2016 +0200

configure.ac: invert help text semantics for export-validation

Change-Id: I5444c89db7bf46b1894026aa8a2d58ce4d2294df

diff --git a/configure.ac b/configure.ac
index 81fb048..0e386be0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2035,10 +2035,9 @@ AC_ARG_WITH(symbol-config,
 [with_symbol_config=no])
 
 AC_ARG_WITH(export-validation,
-AS_HELP_STRING([--with-export-validation],
-[If you want the exported files to be validated. Right now limited to 
OOXML and ODF files.
- Note: You need executable scripts officeotron and odfvalidator that 
take the path to the file.
- See 
https://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/export-validation]),
+AS_HELP_STRING([--without-export-validation],
+[Disable validating OOXML and ODF files as exported from in-tree tests.
+ Use this option e.g. if your system only provides Java 5.]),
 ,with_export_validation=yes)
 
 AC_ARG_WITH(bffvalidator,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac sc/qa sc/source

[Noel Grandin]

 configure.ac|2 +-
 sc/qa/unit/ucalc.cxx|2 +-
 sc/source/ui/app/inputhdl.cxx   |2 +-
 sc/source/ui/app/scmod.cxx  |2 +-
 sc/source/ui/dbgui/validate.cxx |2 +-
 sc/source/ui/docshell/docsh.cxx |2 +-
 sc/source/ui/inc/TableFillingAndNavigationTools.hxx |2 +-
 sc/source/ui/inc/drawview.hxx   |6 +++---
 sc/source/ui/inc/gridwin.hxx|   10 +-
 sc/source/ui/inc/impex.hxx  |   10 +-
 sc/source/ui/inc/inputhdl.hxx   |4 ++--
 sc/source/ui/inc/inputwin.hxx   |2 +-
 sc/source/ui/inc/inscodlg.hxx   |2 +-
 sc/source/ui/inc/instbdlg.hxx   |4 ++--
 sc/source/ui/inc/mvtabdlg.hxx   |2 +-
 sc/source/ui/inc/namemgrtable.hxx   |2 +-
 sc/source/ui/inc/navipi.hxx |6 +++---
 sc/source/ui/inc/output.hxx |6 +++---
 sc/source/ui/inc/preview.hxx|2 +-
 sc/source/ui/inc/prevwsh.hxx|2 +-
 sc/source/ui/inc/protectiondlg.hxx  |2 +-
 sc/source/ui/inc/scuitphfedit.hxx   |2 +-
 sc/source/ui/inc/tabview.hxx|   14 +++---
 sc/source/ui/inc/tabvwsh.hxx|8 
 sc/source/ui/inc/transobj.hxx   |2 +-
 sc/source/ui/inc/validate.hxx   |2 +-
 sc/source/ui/inc/viewfunc.hxx   |   10 +-
 sc/source/ui/miscdlgs/inscodlg.cxx  |2 +-
 sc/source/ui/namedlg/namedlg.cxx|2 +-
 sc/source/ui/navipi/navipi.cxx  |6 +++---
 sc/source/ui/pagedlg/scuitphfedit.cxx   |2 +-
 sc/source/ui/undo/undoblk3.cxx  |2 +-
 sc/source/ui/unoobj/chart2uno.cxx   |4 ++--
 sc/source/ui/unoobj/shapeuno.cxx|4 ++--
 sc/source/ui/vba/vbarange.cxx   |8 
 sc/source/ui/vba/vbarange.hxx   |8 
 sc/source/ui/vba/vbavalidation.cxx  |2 +-
 sc/source/ui/vba/vbawindow.cxx  |2 +-
 sc/source/ui/vba/vbawindow.hxx  |2 +-
 sc/source/ui/vba/vbaworksheets.cxx  |2 +-
 sc/source/ui/view/cellsh.cxx|2 +-
 sc/source/ui/view/cellsh2.cxx   |4 ++--
 sc/source/ui/view/cellsh3.cxx   |2 +-
 sc/source/ui/view/drawview.cxx  |2 +-
 sc/source/ui/view/gridwin.cxx   |8 
 sc/source/ui/view/prevwsh.cxx   |2 +-
 sc/source/ui/view/tabview3.cxx  |6 +++---
 sc/source/ui/view/tabvwsh4.cxx  |2 +-
 sc/source/ui/view/tabvwsh5.cxx  |4 ++--
 sc/source/ui/view/tabvwshe.cxx  |4 ++--
 sc/source/ui/view/viewfun3.cxx  |2 +-
 sc/source/ui/view/viewfun4.cxx  |2 +-
 52 files changed, 99 insertions(+), 99 deletions(-)

New commits:
commit 8f6c5f21933c79aebbb2dcfc578799c573514dde
Author: Noel Grandin 
Date:   Fri Aug 19 14:15:37 2016 +0200

make the location of download.lst explicit

to see if it fixes a tinderbox

Change-Id: Ie87f2510330902a946bf5300dc63f67576fff146

diff --git a/configure.ac b/configure.ac
index dcebca9..4cd578a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7322,7 +7322,7 @@ if test "$with_export_validation" = yes; then
 ODFVALIDATOR="$SRC_ROOT/bin/odfvalidator.sh"
 
 # and fetch name of odfvalidator jar name from download.lst
-ODFVALIDATOR_JAR=`sed -ne "s/export *ODFVALIDATOR_JAR *:= *\(.*\) 
*/\1/p" download.lst`
+ODFVALIDATOR_JAR=`sed -ne "s/export *ODFVALIDATOR_JAR *:= *\(.*\) 
*/\1/p" $SRC_ROOT/download.lst`
 AC_SUBST(ODFVALIDATOR_JAR)
 
 if test -z "$ODFVALIDATOR_JAR"; then
commit 2749667151618307a5faab3af44132da05b77f0e
Author: Noel Grandin 
Date:   Fri Aug 19 12:52:25 2016 +0200

loplugin:countusersofdefaultparams in sc

Change-Id: I4052af7a19616d33c3c5fda9650d8fc4dff32256

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 394259d..c61574c 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -5366,7 +5366,7 @@ void Test::testImportStream()
 ScImportExport aObj(m_pDoc, ScAddress(0,0,0));
 aObj.SetImportBroadcast(true);
 aObj.SetExtOptions(aOpt);
-aObj.ImportString("1,2,3");
+aObj.ImportString("1,2,3", SotClipboardFormatId::STRING);
 
 CPPUNIT_ASSERT_EQUAL(1.0, 

[Libreoffice-commits] core.git: 2 commits - configure.ac distro-configs/LibreOfficeAndroidAarch64.conf distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf

[Tor Lillqvist]

 configure.ac  |1 +
 distro-configs/LibreOfficeAndroid.conf|3 ++-
 distro-configs/LibreOfficeAndroidAarch64.conf |3 ++-
 distro-configs/LibreOfficeAndroidX86.conf |3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit bc0abca9a743e156b8117aeccd0648247c9c308c
Author: Tor Lillqvist 
Date:   Thu Aug 18 22:35:50 2016 +0300

No export validation for the host platform when cross-compiling please

Sure, would make more sense to hardcode this in configure.ac. But
actually I guess that export validation will be turned off by default
anyway soon.

Change-Id: Icf266a0f389b9ebc8a28ee2e5f277449875ca885

diff --git a/distro-configs/LibreOfficeAndroid.conf 
b/distro-configs/LibreOfficeAndroid.conf
index 74d79b7..6259daa 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -5,5 +5,6 @@
 --disable-gstreamer-1-0
 --disable-randr
 --disable-systray
---without-junit
+--without-export-validation
 --without-helppack-integration
+--without-junit
diff --git a/distro-configs/LibreOfficeAndroidAarch64.conf 
b/distro-configs/LibreOfficeAndroidAarch64.conf
index e77d67f..4f3d2f4 100644
--- a/distro-configs/LibreOfficeAndroidAarch64.conf
+++ b/distro-configs/LibreOfficeAndroidAarch64.conf
@@ -5,5 +5,6 @@
 --disable-gstreamer-1-0
 --disable-randr
 --disable-systray
---without-junit
+--without-export-validation
 --without-helppack-integration
+--without-junit
diff --git a/distro-configs/LibreOfficeAndroidX86.conf 
b/distro-configs/LibreOfficeAndroidX86.conf
index 4f487d5..62cf17d 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -5,5 +5,6 @@
 --disable-gstreamer-1-0
 --disable-randr
 --disable-systray
---without-junit
+--without-export-validation
 --without-helppack-integration
+--without-junit
commit 809241fbb2d81bef2eab9f87268915144f22c9a0
Author: Tor Lillqvist 
Date:   Thu Aug 18 22:30:25 2016 +0300

We don't need any export validation on the build platform when 
cross-compiling

Change-Id: I3e5c92c2824f1b6503e85cff775424b48c3c38d0

diff --git a/configure.ac b/configure.ac
index 38d83c6..dcebca9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4631,6 +4631,7 @@ if test "$cross_compiling" = "yes"; then
 --with-parallelism="$with_parallelism" \
 --without-doxygen \
 --without-java \
+--without-export-validation \
 $sub_conf_opts \
 --srcdir=$srcdir \
 2>&1 | sed -e 's/^//'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac external/lpsolve solenv/gbuild

[Tor Lillqvist]

 configure.ac  |2 +-
 external/lpsolve/lp_solve_5.5.patch   |9 -
 solenv/gbuild/platform/IOS_ARM_GCC.mk |3 +--
 solenv/gbuild/platform/macosx.mk  |3 +--
 4 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit d179edbf4000a75f325238f1ba49b94e49af4b79
Author: Tor Lillqvist 
Date:   Mon Aug 15 18:25:43 2016 +0300

Default libtool to /usr/bin/libtool

We never want LIBTOOL to mean a GNU libtool (which is a totally
different program) which might be present in $PATH before
/usr/bin/libtool, specifically /usr/local/bin, which by default (and
stupidly IMHO) is before /usr/bin on stock OS X.

Change-Id: I633a9fd275503f77fc1a0dd3d24a6776579792ba

diff --git a/configure.ac b/configure.ac
index 07ffc08..a6ea1a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2929,7 +2929,7 @@ if test $_os = Darwin; then
 ;;
 esac
 
-LIBTOOL=libtool
+LIBTOOL=/usr/bin/libtool
 INSTALL_NAME_TOOL=install_name_tool
 if test -z "$save_CC"; then
 AC_MSG_CHECKING([what compiler to use])
commit 2e41d84857f902ff89ed67be637ed0dd4ec2cd8a
Author: Tor Lillqvist 
Date:   Mon Aug 15 18:03:29 2016 +0300

Drop leftover EXTRA_CFLAGS and EXTRA_CDEFS

Change-Id: I006d19498f4b5c3bd4088fd1e290c30e7022b1c9

diff --git a/external/lpsolve/lp_solve_5.5.patch 
b/external/lpsolve/lp_solve_5.5.patch
index 2f0f07d..2b2588a 100644
--- a/external/lpsolve/lp_solve_5.5.patch
+++ b/external/lpsolve/lp_solve_5.5.patch
@@ -56,7 +56,7 @@
  rm *.o 2>/dev/null
 --- misc/build/lp_solve_5.5/lpsolve55/ccc.osx.orig Thu Jun 23 22:53:08 2005
 +++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx
-@@ -1,23 +1,31 @@
+@@ -1,23 +1,30 @@
  src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c 
../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c 
../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c 
../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c 
../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c 
../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
 -c=cc
 +c=$CC
@@ -67,8 +67,7 @@
 +
  def=
  so=
-+extra_cflags=$EXTRA_CFLAGS
-+extra_cdefs=$EXTRA_CDEFS
++# EXTRA_LINKFLAGS is set in the ExternalProject_lpsolve.mk
 +extra_linkflags=$EXTRA_LINKFLAGS
 +
  if [ "$PLATFORM" = "SCO_UNIX" ]
@@ -81,7 +80,7 @@
 +opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME'
  
 -$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE 
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+$c $extra_cflags -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE 
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine 
$extra_cdefs $src
++$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE 
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
 -libtool -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ 
]*\///g'`
 +$LIBTOOL -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ 
]*\///g'`
  
@@ -89,7 +88,7 @@
  then
 -  $c -fPIC -fno-common -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE 
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
 -  $c -dynamiclib liblpsolve55.a -compatibility_version 5.5.0 -current_version 
5.5.0 -o liblpsolve55.dylib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc
-+  $c $extra_cflags -fPIC -fno-common -s -c -I.. -I../shared -I../bfp 
-I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts 
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL 
-DRoleIsExternalInvEngine $extra_cdefs $src
++  $c -fPIC -fno-common -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE 
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
 +  $c $extra_linkflags -dynamiclib liblpsolve55.a -compatibility_version 5.5.0 
-current_version 5.5.0 -o liblpsolve55.dylib `echo $src|sed s/[.]c/.o/g|sed 
's/[^ ]*\///g'` -lc
  fi
  
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index d648dcc..388cc5d 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -39,8 +39,7 @@ gb_OSDEFS := \
-DUNIX \
-DUNX \
-D_REENTRANT \
-   -DNO_PTHREAD_PRIORITY \
-   $(EXTRA_CDEFS) \
+   -DNO_PTHREAD_PRIORITY
 
 gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 824830f..bacd794 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ 

[Libreoffice-commits] core.git: 2 commits - configure.ac README.Solaris solenv/bin

[David Tardon]

 README.Solaris   |2 -
 configure.ac |6 ---
 solenv/bin/packimages.pl |   86 +--
 3 files changed, 48 insertions(+), 46 deletions(-)

New commits:
commit 4e3dc8c141c2efd037c1f214b5edff071812b6a8
Author: David Tardon 
Date:   Fri Jun 3 17:09:14 2016 +0200

remove use of Archive::Zip

Change-Id: I7c1e0057c3c1c0b6be524d1e9ad37357259ebd7c

diff --git a/README.Solaris b/README.Solaris
index ce460d9..a9ad888 100644
--- a/README.Solaris
+++ b/README.Solaris
@@ -20,8 +20,6 @@ sudo -s
 
 pkg install git make gcc-45 autoconf autogen automake-110 gnu-m4
 
-perl -MCPAN -e 'install Archive::Zip::Archive'
-
 pkg install pkg:/system/header@0.5.11-0.175.0.0.0.2.1
 pkg install pkg:/developer/gperf@3.0.3-0.175.0.0.0.2.537
 pkg install pkg:/developer/parser/bison@2.3-0.175.0.0.0.2.537
diff --git a/configure.ac b/configure.ac
index 0a1e137..3f2744f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5122,15 +5122,11 @@ dnl Testing for required Perl modules
 dnl ===
 
 AC_MSG_CHECKING([for required Perl modules])
-if `$PERL -e 'use Archive::Zip; use Cwd; use Digest::MD5'>/dev/null 2>&1`; then
+if `$PERL -e 'use Cwd; use Digest::MD5'>/dev/null 2>&1`; then
 AC_MSG_RESULT([all modules found])
 else
 AC_MSG_RESULT([failed to find some modules])
 # Find out which modules are missing.
-missing_perl_modules=
-if ! `$PERL -e 'use Archive::Zip;'>/dev/null 2>&1`; then
-missing_perl_modules=Archive::Zip
-fi
 if ! `$PERL -e 'use Cwd;'>/dev/null 2>&1`; then
 missing_perl_modules="$missing_perl_modules Cwd"
 fi
diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index e2f7af6..dc33dde 100644
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -27,9 +27,10 @@ use strict;
 use Getopt::Long;
 use File::Find;
 use File::Basename;
+use File::Copy qw(copy);
+use File::Path qw(make_path);
 require File::Temp;
 use File::Temp ();
-use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
 
  globals 
 
@@ -91,7 +92,8 @@ remove_links_from_zip_list($zip_hash_ref, \%links);
 
 $do_rebuild = is_file_newer($zip_hash_ref) if $do_rebuild == 0;
 if ( $do_rebuild == 1 ) {
-create_zip_archive($zip_hash_ref, \%links);
+my $tmpdir = copy_images($zip_hash_ref);
+create_zip_archive($zip_hash_ref, \%links, $tmpdir);
 replace_file($tmp_out_file, $out_file);
 print_message("packing  $out_file finished.") if $verbose;
 } else {
@@ -351,40 +353,50 @@ sub optimize_zip_layout($)
 return @sorted;
 }
 
-sub create_zip_archive
+sub copy_images($)
 {
-my $zip_hash_ref = shift;
-my $links_hash_ref = shift;
+my ($zip_hash_ref) = @_;
+my $dir = File::Temp->newdir();
+foreach (keys %$zip_hash_ref) {
+my $path = $zip_hash_ref->{$_} . "/$_";
+my $outpath = $dir . "/$_";
+print_message("copying '$path' to '$outpath' ...") if $extra_verbose;
+if ( -e $path) {
+my $dirname = dirname($outpath);
+if (!-d $dirname) {
+make_path($dirname);
+}
+copy($path, $outpath)
+or print_error("can't add file '$path' to image dir: $!", 5);
+}
+}
+return $dir;
+}
+
+sub create_zip_archive($$$)
+{
+my ($zip_hash_ref, $links_hash_ref, $image_dir_ref) = @_;
 
 print_message("creating image archive ...") if $verbose;
-my $zip = Archive::Zip->new();
 
-my $linktmp;
+chdir $image_dir_ref;
+
 if (keys %{$links_hash_ref}) {
-$linktmp = write_links($links_hash_ref);
-my $member = $zip->addFile($linktmp->filename, "links.txt", 
COMPRESSION_DEFLATED);
-if (!$member) {
-print_error("failed to add links file: $!", 5);
-}
+write_links($links_hash_ref, $image_dir_ref);
+system "zip $tmp_out_file links.txt";
+# print_error("failed to add links file: $!", 5);
 }
 
-# FIXME: test - $member = addfile ... $member->desiredCompressionMethod( 
COMPRESSION_STORED );
-# any measurable performance win/loss ?
-foreach ( optimize_zip_layout($zip_hash_ref) ) {
-my $path = $zip_hash_ref->{$_} . "/$_";
-print_message("zipping '$path' ...") if $extra_verbose;
-if ( -e $path) {
-my $member = $zip->addFile($path, $_, COMPRESSION_STORED);
-if ( !$member ) {
-print_error("can't add file '$path' to image zip archive: $!", 
5);
-}
-}
+my @sorted_list = optimize_zip_layout($zip_hash_ref);
+my $sorted_file = File::Temp->new();
+foreach my $item (@sorted_list) {
+print $sorted_file "$item\n";
 }
-my $status = $zip->writeToFileNamed($tmp_out_file);
-if ( $status != AZ_OK ) {
-print_error("write image zip archive '$tmp_out_file' failed. Reason: 
$status", 6);
-}
-return;
+binmode $sorted_file; # flush
+
+  

[Libreoffice-commits] core.git: 2 commits - configure.ac external/boost external/firebird external/libabw external/libcdr external/libebook external/libetonyek external/libgltf external/libmspub exter

[Michael Stahl]

 configure.ac  |1 
 external/boost/UnpackedTarball_boost.mk   |1 
 external/boost/boost.std.move.patch   |   21 --
 external/firebird/ExternalProject_firebird.mk |2 -
 external/libabw/ExternalProject_libabw.mk |3 --
 external/libcdr/ExternalProject_libcdr.mk |2 -
 external/libebook/ExternalProject_libebook.mk |2 -
 external/libetonyek/ExternalProject_libetonyek.mk |2 -
 external/libgltf/ExternalProject_libgltf.mk   |2 -
 external/libmspub/ExternalProject_libmspub.mk |2 -
 external/liborcus/ExternalProject_liborcus.mk |2 -
 external/libpagemaker/ExternalProject_libpagemaker.mk |2 -
 external/librevenge/ExternalProject_librevenge.mk |2 -
 external/libvisio/ExternalProject_libvisio.mk |2 -
 14 files changed, 12 insertions(+), 34 deletions(-)

New commits:
commit aa0b05f1856c1be670208f7c9cbc8d8830b1e349
Author: Michael Stahl 
Date:   Fri May 27 15:29:40 2016 +0200

boost: remove boost.std.move.patch

Apparently required only on obsolete/unsupported Mac OS X versions.

Change-Id: I68540e3ac0d6830ed42854def0367a17f15feacd

diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index e446e99..bedfc9a 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -43,7 +43,6 @@ boost_patches += boost_1_44_0-unused-parameters.patch
 endif
 
 boost_patches += boost.auto_link.patch
-boost_patches += boost.std.move.patch
 boost_patches += boost.wunused.patch
 
 boost_patches += ubsan.patch.0
diff --git a/external/boost/boost.std.move.patch 
b/external/boost/boost.std.move.patch
deleted file mode 100644
index 7c0dfb9..000
--- a/external/boost/boost.std.move.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru boost.orig/boost/config/compiler/clang.hpp 
boost/boost/config/compiler/clang.hpp
 foo/misc/boost.orig/boost/config/compiler/clang.hpp2015-05-07 
19:11:52.0 +0200
-+++ foo/misc/boost/boost/config/compiler/clang.hpp 2015-07-18 
22:40:56.304941957 +0200
-@@ -10,6 +10,8 @@
- 
- #define BOOST_HAS_PRAGMA_ONCE
- 
-+#include 
-+
- // Detecting `-fms-extension` compiler flag assuming that _MSC_VER defined 
when that flag is used.
- #if defined (_MSC_VER) && (__clang_major__ > 3 || (__clang_major__ == 3 && 
__clang_minor__ >= 4))
- #   define BOOST_HAS_PRAGMA_DETECT_MISMATCH
-@@ -161,7 +163,7 @@
- #  define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
- #endif
- 
--#if !__has_feature(cxx_rvalue_references)
-+#if !__has_feature(cxx_rvalue_references) || (defined(__APPLE__) && 
!defined(_LIBCPP_VERSION))
- #  define BOOST_NO_CXX11_RVALUE_REFERENCES
- #endif
- 
commit e355e54f2fddcf3146f33c9690e580e6b77aacef
Author: Michael Stahl 
Date:   Fri May 27 15:21:50 2016 +0200

configure: set BOOST_CPPFLAGS also in --without-system-boost case

Simplify the makefiles.

Change-Id: Ia695961e936e4a1ffdaff73eb56adc3c3905ed0c

diff --git a/configure.ac b/configure.ac
index b9565a9..97056e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8838,6 +8838,7 @@ else
 AC_MSG_RESULT([internal])
 BUILD_TYPE="$BUILD_TYPE BOOST"
 SYSTEM_BOOST=
+BOOST_CPPFLAGS="-I${WORKDIR}/UnpackedTarball/boost"
 fi
 AC_SUBST(SYSTEM_BOOST)
 
diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index cd89dfb..11817ee 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -49,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
" \
&& export CXXFLAGS=" \
$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \
-   -I$(call gb_UnpackedTarball_get_dir,boost) \
+   $(BOOST_CPPFLAGS) \
-L$(call 
gb_UnpackedTarball_get_dir,boost)/source/lib \
) \
$(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \
diff --git a/external/libabw/ExternalProject_libabw.mk 
b/external/libabw/ExternalProject_libabw.mk
index f2369c2..e174f9e 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -34,8 +34,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
--disable-debug \
--disable-werror \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
-   CXXFLAGS="$(CXXFLAGS) $(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
-   -I$(call gb_UnpackedTarball_get_dir,boost)) \
+   CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS) \
-DBOOST_ERROR_CODE_HEADER_ONLY 

[Libreoffice-commits] core.git: 2 commits - configure.ac sc/source

[Peter Foley]

 configure.ac |4 ++--
 sc/source/core/tool/rangenam.cxx |5 -
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 3a079aec09d2050ee9283262e932efe6aff504cf
Author: Peter Foley 
Date:   Sat Jan 16 14:04:12 2016 -0500

improve scp2 stamp messages

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

diff --git a/configure.ac b/configure.ac
index c8cefd4..d814673 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12943,7 +12943,7 @@ fi
 if test ! -f config_host.mk.stamp; then
 echo > config_host.mk.stamp
 elif test "$config_md5" = `$MD5SUM config_host.mk | sed "s/ .*//"`; then
-echo "Configuration unchanged - avoiding scp2 stamp update"
+echo "Host Configuration unchanged - avoiding scp2 stamp update"
 else
 echo > config_host.mk.stamp
 fi
@@ -12952,7 +12952,7 @@ fi
 if test ! -f config_host_lang.mk.stamp; then
 echo > config_host_lang.mk.stamp
 elif test "$config_lang_md5" = `$MD5SUM config_host_lang.mk | sed "s/ .*//"`; 
then
-echo "Configuration unchanged - avoiding scp2 stamp update"
+echo "Language Configuration unchanged - avoiding scp2 stamp update"
 else
 echo > config_host_lang.mk.stamp
 fi
commit 93d6aef1779e8b82a2a551b9e454a5d2aed5ce37
Author: Stephan Bergmann 
Date:   Mon Jan 18 08:28:54 2016 +0100

loplugin:unreffun

Change-Id: I1008a51abb3834a65aabfdf05370d9515a18c1e2

diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index a1e25ee..aa81602 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -653,11 +653,6 @@ int SAL_CALL ScRangeData_QsortNameCompare( const void* p1, 
const void* p2 )
 (*static_cast(p2))->GetName() );
 }
 
-bool operator<(const ScRangeData& left, const ScRangeData& right)
-{
-return left.GetName() < right.GetName();
-}
-
 namespace {
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac vcl/ios

[Tor Lillqvist]

 configure.ac|4 ++--
 vcl/ios/iosinst.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a84fd7d3a2ea36072154ae6b43cccec5dcce6e3f
Author: Tor Lillqvist 
Date:   Wed Dec 16 11:43:26 2015 +0200

SvpSalFrame ctor parameter list has changed

Change-Id: Ide3457c5baab3d7f84990f6c2311975002ba9f18

diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index f6ed871..8a0e249 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -89,7 +89,7 @@ public:
  SalFrameStyleFlags  nSalFrameStyle,
  SystemParentData   *pSysParent )
 : SvpSalFrame( pInstance, pParent, nSalFrameStyle,
-   true, basebmp::Format::ThirtyTwoBitTcMaskRGBA,
+   basebmp::Format::ThirtyTwoBitTcMaskRGBA,
pSysParent )
 {
 if (pParent == NULL && viewWidth > 1 && viewHeight > 1)
commit 56dabd64bcac51cbc75b6144fff1fb33860abb54
Author: Tor Lillqvist 
Date:   Wed Dec 16 10:25:26 2015 +0200

Look for iOS SDK 9.2, too

Change-Id: I2e16ae2ecb5f3a2a37c795e5ee26f72fc92b25bc

diff --git a/configure.ac b/configure.ac
index 157e7bc..49198a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3062,8 +3062,8 @@ if test $_os = iOS; then
 
 xcode_developer=`xcode-select -print-path`
 
-current_sdk_ver=8.3
-for sdkver in 9.1 9.0 8.4 8.3 8.2 8.1 8.0; do
+current_sdk_ver=9.2
+for sdkver in 9.2 9.1 9.0 8.4 8.3 8.2 8.1 8.0; do
 
t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
 if test -d $t; then
 ios_sdk=$sdkver
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac download.lst external/icu l10ntools/source svx/source

[Eike Rathke]

 configure.ac |2 
 download.lst |2 
 external/icu/UnpackedTarball_icu.mk  |5 
 external/icu/icu-ubsan.patch.0   |   11 
 external/icu/icu.changeset_36724.patch.1 |   39 
 external/icu/icu.changeset_36727.patch.1 |   55 -
 external/icu/icu.changeset_36801.patch.1 | 1222 ---
 external/icu/icu.vc15.patch  |   13 
 external/icu/icu4c-icu11451.patch.1  |   11 
 l10ntools/source/xmlparse.cxx|2 
 svx/source/dialog/charmap.cxx|   26 
 11 files changed, 29 insertions(+), 1359 deletions(-)

New commits:
commit 5b7e8efbf4d73e385c8fb3469a23c0b2592bfb57
Author: Eike Rathke 
Date:   Tue Oct 20 14:19:12 2015 +0200

Upgrade to ICU 56.1

Change-Id: Icc3d66c16fca95aa890aee6c67c84674fef878fc

diff --git a/configure.ac b/configure.ac
index be21c49..cd3b983 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8920,7 +8920,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=54
+ICU_MAJOR=56
 ICU_MINOR=1
 ICU_RECLASSIFIED_CLOSE_PARENTHESIS="TRUE"
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
diff --git a/download.lst b/download.lst
index c6eca20..62d93da 100644
--- a/download.lst
+++ b/download.lst
@@ -58,7 +58,7 @@ export HARFBUZZ_TARBALL := harfbuzz-0.9.40.tar.bz2
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 
4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_TARBALL := e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz
+export ICU_TARBALL := c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_TARBALL := 
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 export JFREEREPORT_LIBBASE_TARBALL := 
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index a1640e7..ad28fce 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -23,13 +23,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu-ubsan.patch.0 \
external/icu/icu4c-icu11100.patch.1 \
external/icu/icu4c-scriptrun.patch \
-   external/icu/icu4c-icu11451.patch.1 \
external/icu/rtti.patch.0 \
-   external/icu/icu.changeset_36724.patch.1 \
-   external/icu/icu.changeset_36727.patch.1 \
-   external/icu/icu.changeset_36801.patch.1 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.diff) \
-   external/icu/icu.vc15.patch \
$(if $(filter EMSCRIPTEN,$(OS)),external/icu/icu4c-emscripten.patch.1) \
 ))
 
diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0
index 25efb5f..6d1d3bc 100644
--- a/external/icu/icu-ubsan.patch.0
+++ b/external/icu/icu-ubsan.patch.0
@@ -162,14 +162,3 @@
 }
 virtual UBool operator == (const CacheKeyBase ) const {
 // reflexive
 source/common/uresbund.cpp
-+++ source/common/uresbund.cpp
-@@ -53,7 +53,7 @@
- UHashTok namekey, pathkey;
- namekey.pointer = b->fName;
- pathkey.pointer = b->fPath;
--return uhash_hashChars(namekey)+37*uhash_hashChars(pathkey);
-+return uhash_hashChars(namekey)+37U*uhash_hashChars(pathkey);
- }
- 
- /* INTERNAL: compares two entries */
diff --git a/external/icu/icu.changeset_36724.patch.1 
b/external/icu/icu.changeset_36724.patch.1
deleted file mode 100644
index 82e0f21..000
--- a/external/icu/icu.changeset_36724.patch.1
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: icu/source/i18n/regexcmp.cpp
-===
 icu/source/i18n/regexcmp.cpp   (revision 36723)
-+++ icu/source/i18n/regexcmp.cpp   (revision 36724)
-@@ -2136,4 +2136,8 @@
- int32_t minML= minMatchLength(fMatchOpenParen, patEnd);
- int32_t maxML= maxMatchLength(fMatchOpenParen, patEnd);
-+if (URX_TYPE(maxML) != 0) {
-+error(U_REGEX_LOOK_BEHIND_LIMIT);
-+break;
-+}
- if (maxML == INT32_MAX) {
- error(U_REGEX_LOOK_BEHIND_LIMIT);
-@@ -2169,4 +2173,8 @@
- int32_t minML= minMatchLength(fMatchOpenParen, patEnd);
- int32_t maxML= maxMatchLength(fMatchOpenParen, patEnd);
-+if (URX_TYPE(maxML) != 0) {
-+error(U_REGEX_LOOK_BEHIND_LIMIT);
-+break;
-+}
- if (maxML == INT32_MAX) {
- error(U_REGEX_LOOK_BEHIND_LIMIT);
-Index: icu/source/test/testdata/regextst.txt
-===
 icu/source/test/testdata/regextst.txt  (revision 36723)
-+++ icu/source/test/testdata/regextst.txt  

[Libreoffice-commits] core.git: 2 commits - configure.ac writerperfect/qa

[David Tardon]

 configure.ac|2 +-
 writerperfect/qa/unit/data/writer/libwps/pass/Write_3.1.wri |binary
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eeba0f6db6775a459d64fb6a2e45c3bbdd451f41
Author: David Tardon 
Date:   Thu Oct 8 19:46:39 2015 +0200

add MS Write test doc

Change-Id: Ieb33e9b134848e856613b6c769cc50a66f378b85

diff --git a/writerperfect/qa/unit/data/writer/libwps/pass/Write_3.1.wri 
b/writerperfect/qa/unit/data/writer/libwps/pass/Write_3.1.wri
new file mode 100644
index 000..458482d
Binary files /dev/null and 
b/writerperfect/qa/unit/data/writer/libwps/pass/Write_3.1.wri differ
commit 65d4197e2ea2f250f91ec16a17f761d3aef014aa
Author: David Tardon 
Date:   Thu Oct 8 19:44:58 2015 +0200

libwps 0.4.2 is required now

Change-Id: I93cd7c6fe178287bc5ea2759e53bebc1d5a9f62f

diff --git a/configure.ac b/configure.ac
index d85ca53..2ced1ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7859,7 +7859,7 @@ libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
 dnl ===
 dnl Check for system libwps
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
+libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4 >= 0.4.2])
 
 dnl ===
 dnl Check for system libwpg
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac download.lst external/libmwaw filter/source writerperfect/qa writerperfect/source

[David Tardon]

 configure.ac   |2 
 download.lst   |4 
 external/libmwaw/Library_mwaw.mk   |6 
 filter/source/config/fragments/filters/Mac_RagTime.xcu |2 
 writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraft_5.5.drw  |binary
 writerperfect/qa/unit/data/writer/libmwaw/pass/RagTime_5.5.rag |binary
 writerperfect/source/common/WPFTEncodingDialog.cxx |   99 
++
 writerperfect/source/common/WPXSvInputStream.cxx   |2 
 8 files changed, 77 insertions(+), 38 deletions(-)

New commits:
commit 6b0585a5b7e32d9acb6d8bc5f15d187959c7cc5b
Author: David Tardon dtar...@redhat.com
Date:   Mon Aug 24 20:49:00 2015 +0200

upload libmwaw 0.3.6

Change-Id: I09249673d42d36bf72ee1ffbf8f3f37734bd8bae

diff --git a/configure.ac b/configure.ac
index 5944d23..145c3d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7698,7 +7698,7 @@ 
libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 dnl ===
 dnl Check for system libmwaw
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 = 0.3.5])
+libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 = 0.3.6])
 
 dnl ===
 dnl Check for system libpagemaker
diff --git a/download.lst b/download.lst
index bc5a9f6..0f321c0 100644
--- a/download.lst
+++ b/download.lst
@@ -105,8 +105,8 @@ export MDDS_MD5SUM := ef2560ed5416652a7fe195305b14cebe
 export MDDS_TARBALL := mdds_0.12.1.tar.bz2
 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
-export MWAW_MD5SUM := bdc58bbf89aaaf6d29b3516d96830a06
-export MWAW_VERSION_MICRO := 5
+export MWAW_MD5SUM := a8364bf2e4ece2860ab96d6bee75f1d7
+export MWAW_VERSION_MICRO := 6
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 052362a..f5aeee0 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_add_defs,mwaw,\
 $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/ActaParser \
UnpackedTarball/libmwaw/src/lib/ActaText \
+   UnpackedTarball/libmwaw/src/lib/ApplePictParser \
UnpackedTarball/libmwaw/src/lib/BeagleWksBMParser \
UnpackedTarball/libmwaw/src/lib/BeagleWksDBParser \
UnpackedTarball/libmwaw/src/lib/BeagleWksDRParser \
@@ -117,6 +118,8 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/MWAWTable \
UnpackedTarball/libmwaw/src/lib/MWAWTextListener \
UnpackedTarball/libmwaw/src/lib/MacDocParser \
+   UnpackedTarball/libmwaw/src/lib/MacDraft5Parser \
+   UnpackedTarball/libmwaw/src/lib/MacDraft5StyleManager \
UnpackedTarball/libmwaw/src/lib/MacDraftParser \
UnpackedTarball/libmwaw/src/lib/MacDrawParser \
UnpackedTarball/libmwaw/src/lib/MacDrawProParser \
@@ -152,9 +155,12 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/NisusWrtText \
UnpackedTarball/libmwaw/src/lib/RagTime5ClusterManager \
UnpackedTarball/libmwaw/src/lib/RagTime5Graph \
+   UnpackedTarball/libmwaw/src/lib/RagTime5Layout \
UnpackedTarball/libmwaw/src/lib/RagTime5Parser \
+   UnpackedTarball/libmwaw/src/lib/RagTime5Pipeline \
UnpackedTarball/libmwaw/src/lib/RagTime5Spreadsheet \
UnpackedTarball/libmwaw/src/lib/RagTime5StructManager \
+   UnpackedTarball/libmwaw/src/lib/RagTime5StyleManager \
UnpackedTarball/libmwaw/src/lib/RagTime5Text \
UnpackedTarball/libmwaw/src/lib/RagTimeParser \
UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \
diff --git a/filter/source/config/fragments/filters/Mac_RagTime.xcu 
b/filter/source/config/fragments/filters/Mac_RagTime.xcu
index 69a23b2..6344292 100644
--- a/filter/source/config/fragments/filters/Mac_RagTime.xcu
+++ b/filter/source/config/fragments/filters/Mac_RagTime.xcu
@@ -15,7 +15,7 @@
 valuecom.sun.star.comp.Writer.MWAWImportFilter/value
 /prop
 prop oor:name=UIName
-value xml:lang=en-USRagTime Mac v2-3 Document/value
+value xml:lang=en-USRagTime Mac v2-5 Document/value
 /prop
 prop oor:name=FileFormatVersion
 value0/value
diff --git a/writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraft_5.5.drw 
b/writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraft_5.5.drw
new file mode 100644
index 000..5bb15fc

[Libreoffice-commits] core.git: 2 commits - configure.ac external/liborcus

[Tor Lillqvist]

 configure.ac  |2 --
 external/liborcus/ExternalProject_liborcus.mk |2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit ea2ed8a1d442d7f0e00b63abdab15fddb0d58233
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Jun 5 00:46:26 2015 +0300

Bin superfluous assignments

The variable is assigned an empty value already a few lines above.

Change-Id: I52d2b650d908209421368384e44d95bfe18d93ae

diff --git a/configure.ac b/configure.ac
index ac00539..68242b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5977,10 +5977,8 @@ if test $COM = MSC; then
 AC_MSG_CHECKING([whether $CXX supports C++11])
 AC_MSG_RESULT(yes)
 # MSVC supports (a subset of) CXX11 without any switch
-CXXFLAGS_CXX11=
 elif test $GCC = yes; then
 HAVE_CXX11=
-CXXFLAGS_CXX11=
 AC_MSG_CHECKING([whether $CXX supports C++11])
 for flag in -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x ; do
 save_CXXFLAGS=$CXXFLAGS
commit e48bb73b818d1e60b6a7a4389151ae6644805d4a
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Jun 5 00:44:12 2015 +0300

Fix weird compilation problem with __float128

Change-Id: I4a7ac5ee7f2f2c9d9d87517c826c1e80bd23477d

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index ff488bf..8a53fa8 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -63,7 +63,7 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)
+liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) 
$(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11)
 liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
 ifeq ($(COM),MSC)
 liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac filter/Configuration_filter.mk filter/source writerperfect/qa writerperfect/source

[David Tardon]

 configure.ac  |2 
 filter/Configuration_filter.mk|4 
 filter/source/config/fragments/filters/ClarisDraw.xcu |   30 +
 filter/source/config/fragments/filters/MacDraft.xcu   |   30 +
 filter/source/config/fragments/types/draw_ClarisDraw.xcu  |   29 +
 filter/source/config/fragments/types/draw_MacDraft.xcu|   29 +
 writerperfect/qa/unit/data/draw/libmwaw/pass/ClarisDraw.hqx   |  160 ++
 writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraft_1.0.hqx |  134 
 writerperfect/source/common/DirectoryStream.cxx   |   64 ++--
 writerperfect/source/draw/MWAWDrawImportFilter.cxx|8 
 10 files changed, 455 insertions(+), 35 deletions(-)

New commits:
commit dc65b0242544a7d4c22c6fcf473dafb3e2d41121
Author: David Tardon dtar...@redhat.com
Date:   Sun May 17 14:05:08 2015 +0200

astyle

Change-Id: I733f1f777bbe30f3ce8b15b60fe56b8dba240ffd

diff --git a/writerperfect/source/common/DirectoryStream.cxx 
b/writerperfect/source/common/DirectoryStream.cxx
index e5150e1..b0ff9c4 100644
--- a/writerperfect/source/common/DirectoryStream.cxx
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -117,50 +117,50 @@ DirectoryStream::~DirectoryStream()
 
 DirectoryStream *DirectoryStream::createForParent(const 
com::sun::star::uno::Referencecom::sun::star::ucb::XContent xContent)
 {
-try
-{
-if (!xContent.is())
-return 0;
+try
+{
+if (!xContent.is())
+return 0;
 
-DirectoryStream *pDir(0);
+DirectoryStream *pDir(0);
 
-const uno::Referencecontainer::XChild xChild(xContent, uno::UNO_QUERY);
-if (xChild.is())
-{
-const uno::Referenceucb::XContent xDirContent(xChild-getParent(), 
uno::UNO_QUERY);
-if (xDirContent.is())
+const uno::Referencecontainer::XChild xChild(xContent, 
uno::UNO_QUERY);
+if (xChild.is())
 {
-pDir = new writerperfect::DirectoryStream(xDirContent);
-if (!pDir-isStructured())
+const uno::Referenceucb::XContent 
xDirContent(xChild-getParent(), uno::UNO_QUERY);
+if (xDirContent.is())
 {
-delete pDir;
-pDir = 0;
+pDir = new writerperfect::DirectoryStream(xDirContent);
+if (!pDir-isStructured())
+{
+delete pDir;
+pDir = 0;
+}
 }
 }
-}
 
-return pDir;
-}
-catch (...)
-{
-return 0;
-}
+return pDir;
+}
+catch (...)
+{
+return 0;
+}
 }
 
 bool DirectoryStream::isDirectory(const 
com::sun::star::uno::Referencecom::sun::star::ucb::XContent xContent)
 {
-try
-{
-if (!xContent.is())
-return false;
+try
+{
+if (!xContent.is())
+return false;
 
-ucbhelper::Content aContent(xContent, 
uno::Referenceucb::XCommandEnvironment(), 
comphelper::getProcessComponentContext());
-return aContent.isFolder();
-}
-catch (...)
-{
-return false;
-}
+ucbhelper::Content aContent(xContent, 
uno::Referenceucb::XCommandEnvironment(), 
comphelper::getProcessComponentContext());
+return aContent.isFolder();
+}
+catch (...)
+{
+return false;
+}
 }
 
 bool DirectoryStream::isStructured()
commit 773bb53d0b672fbb6b274e45f35228c9427d7fb4
Author: David Tardon dtar...@redhat.com
Date:   Sun May 17 14:04:22 2015 +0200

enable new formats supported by libmwaw

Change-Id: I228b5f0a317c05ae845a9fded0ef19f87b648cde

diff --git a/configure.ac b/configure.ac
index b9d9e75..6cb02e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7610,7 +7610,7 @@ 
libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 dnl ===
 dnl Check for system libmwaw
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 = 0.3.4])
+libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 = 0.3.5])
 
 dnl ===
 dnl Check for system libpagemaker
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index d791909..c0b4eb9 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -570,8 +570,10 @@ $(eval $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,f
draw_Freehand_Document \
draw_Visio_Document \
draw_Beagle_Works \
+   draw_ClarisDraw \
draw_ClarisWorks \
draw_Great_Works \
+   draw_MacDraft \
draw_MacDraw \
draw_MacDrawPro \
draw_Mac_Works \
@@ -594,8 +596,10 @@ $(eval $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.x
CorelPresentationExchange \
FreehandDocument \

[Libreoffice-commits] core.git: 2 commits - configure.ac connectivity/CppunitTest_connectivity_commontools.mk solenv/bin solenv/gbuild sw/source

[Matúš Kukan]

 configure.ac |   12 --
 connectivity/CppunitTest_connectivity_commontools.mk |2 
 solenv/bin/install-gdb-printers  |2 
 solenv/gbuild/extensions/pre_MergedLibsList.mk   |   96 ---
 sw/source/filter/ww8/docxattributeoutput.cxx |3 
 5 files changed, 7 insertions(+), 108 deletions(-)

New commits:
commit 89964955e535f7343cccf1399312f0e8ac76323d
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Apr 17 20:30:27 2015 +0200

tdf#85769 Avoid writing font name attribute twice, by ignoring empty value

Change-Id: If2491db482fc6eebc5d28f03ace12a89ac6c0a0f

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index c9cd83d..1783a28 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6120,7 +6120,8 @@ void DocxAttributeOutput::CharFont( const SvxFontItem 
rFont)
 GetExport().GetId( rFont ); // ensure font info is written to fontTable.xml
 OUString sFontName(rFont.GetFamilyName());
 OString sFontNameUtf8 = OUStringToOString(sFontName, 
RTL_TEXTENCODING_UTF8);
-AddToAttrList( m_pFontsAttrList, 2,
+if (!sFontNameUtf8.isEmpty())
+AddToAttrList( m_pFontsAttrList, 2,
 FSNS( XML_w, XML_ascii ), sFontNameUtf8.getStr(),
 FSNS( XML_w, XML_hAnsi ), sFontNameUtf8.getStr() );
 }
commit fa8dc38372185d6d29d8d91391907e95b689
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Apr 20 19:48:38 2015 +0200

Bin confusing --enable-mergelibs=all option

It was most probably not working anyway and is something different to
libmerged, which intends to merge only core set of libraries.
To build everything into one library, approach similar to what we do for
Android could be better idea.

Change-Id: Id5b8c2fa2b26e8faaaeb022ea55eb2e39909e875

diff --git a/configure.ac b/configure.ac
index 0d492ad..d2a7aba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -915,11 +915,10 @@ AC_ARG_ENABLE([hardlink-deliver],
 )
 
 AC_ARG_ENABLE(mergelibs,
-AS_HELP_STRING([--enable-mergelibs=all/yes],
+AS_HELP_STRING([--enable-mergelibs],
 [Enables linking of big, merged, library. Experimental feature, tested
 only for Linux at some stage in history, but possibly does not work 
even
-for Linux any more. 'all' will link a lot of libraries into libmerged
-while 'yes' will do it for just a core set of libraries.])
+for Linux any more. This will link a core set of libraries into 
libmerged.])
 )
 
 AC_ARG_ENABLE(graphite,
@@ -12735,12 +12734,7 @@ if test -n $enable_mergelibs -a $enable_mergelibs 
!= no; then
 if test $_os != Linux -a $_os != WINNT; then
 add_warning --enable-mergelibs is not tested for this platform
 fi
-if test $enable_mergelibs = all; then
-MERGELIBS=ALL
-AC_DEFINE(STATIC_LINKING)
-else
-MERGELIBS=CORE
-fi
+MERGELIBS=TRUE
 AC_MSG_RESULT([yes])
 else
 AC_MSG_RESULT([no])
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk 
b/connectivity/CppunitTest_connectivity_commontools.mk
index 146c6af..9c2e645 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -32,7 +32,7 @@ endif
 # In mergedlibs mode we have multiply-defined symbols, which Visual Studio
 # does not like. There is no good solution, so just force it.
 ifeq ($(COM),MSC)
-ifeq ($(MERGELIBS),CORE)
+ifneq (,$(MERGELIBS))
 $(eval $(call gb_CppunitTest_add_ldflags,connectivity_commontools,\
 /FORCE:MULTIPLE \
 ))
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 036339e..0362a5c 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -123,7 +123,7 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
 fi
 
 if [[ -n ${MERGELIBS} ]]; then
-make_autoload merged program libmergedlo.$DYLIB merge svl tl basegfx `[[ 
${MERGELIBS} == ALL ]]  echo sw`
+make_autoload merged program libmergedlo.$DYLIB merge svl tl basegfx
 make_autoload cppu program libuno_cppu.$DYLIB.3
 make_autoload sal program libuno_sal.$DYLIB.3
 make_autoload sw program libswlo.$DYLIB
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index ed77c1f0..1ca047f 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -9,101 +9,6 @@
 #
 
 ifneq ($(MERGELIBS),)
-# set of libraries to link even more stuff into one merged library
-gb_EXTRAMERGEDLIBS := \
-   $(if $(filter-out ANDROID IOS,$(OS)),abp) \
-   $(if $(filter unx,$(GUIBASE)),basebmp) \
-   $(call gb_Helper_optional,DBCONNECTIVITY,bib) \
-   $(call gb_Helper_optional,DBCONNECTIVITY,calc) \
-   chartcore \
-   $(call 

[Libreoffice-commits] core.git: 2 commits - configure.ac include/cppu

[Miklos Vajna]

 configure.ac |9 +
 include/cppu/unotype.hxx |4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 427ef167e1a49ba7fcdef082de43622e02a84ce5
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Apr 1 09:15:44 2015 +0200

configure: check for validators if --with-export-validation is used

Change-Id: I535669e46f2535f0a0c0b106b964bfbc3a2e2d7e

diff --git a/configure.ac b/configure.ac
index f5c27f8..0dbf5ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2723,6 +2723,15 @@ AC_MSG_CHECKING([whether to enable export file 
validation])
 if test $with_export_validation = yes; then
 AC_MSG_RESULT([yes])
 AC_DEFINE(HAVE_EXPORT_VALIDATION)
+
+AC_CHECK_PROGS(ODFVALIDATOR, odfvalidator)
+if test -z $ODFVALIDATOR; then
+AC_MSG_ERROR([odfvalidator is not found in PATH, but required by 
--with-export-validation])
+fi
+AC_CHECK_PROGS(OFFICEOTRON, officeotron)
+if test -z $OFFICEOTRON; then
+AC_MSG_ERROR([officeotron is not found in PATH, but required by 
--with-export-validation])
+fi
 else
 AC_MSG_RESULT([no])
 fi
commit b49abbbd9d0107bef93adde32a1b51c78b6df469
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Apr 1 09:15:41 2015 +0200

MSVC 2013 doesn't define __cplusplus = 201103L

...but does support std::remove_reference

Change-Id: I4a702efdea9aad91cee32aca08da755e482e4b88

diff --git a/include/cppu/unotype.hxx b/include/cppu/unotype.hxx
index 7c4d377..4c7e5a7 100644
--- a/include/cppu/unotype.hxx
+++ b/include/cppu/unotype.hxx
@@ -22,7 +22,7 @@
 
 #include sal/config.h
 
-#if __cplusplus = 201103L
+#if defined LIBO_INTERNAL_ONLY
 #include type_traits
 #endif
 
@@ -269,7 +269,7 @@ template typename T  class UnoType {
 public:
 static inline ::com::sun::star::uno::Type const  get() {
 using namespace ::cppu::detail;
-#if __cplusplus = 201103L
+#if defined LIBO_INTERNAL_ONLY
 typedef typename std::remove_referenceT::type T1;
 // for certain uses of UnoTypedecltype(x)
 #else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac

[Michael Stahl]

 configure.ac |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 242ed97d9a74a08363e1306452bba20f06d673e4
Author: Michael Stahl mst...@redhat.com
Date:   Tue Mar 3 23:46:15 2015 +0100

configure: update supported --with-windows-sdk values

Change-Id: I3589214b540232d84ad86c67991065f7d376c94b

diff --git a/configure.ac b/configure.ac
index 2b664ac..6c3dbfc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2027,14 +2027,14 @@ AC_ARG_WITH(visual-studio,
 ,)
 
 AC_ARG_WITH(windows-sdk,
-AS_HELP_STRING([--with-windows-sdk=6.0(A)/7.0(A)/7.1(A)/8.0(A)],
+AS_HELP_STRING([--with-windows-sdk=7.1(A)/8.0(A)/8.1(A)],
 [Specify which Windows SDK, or Windows Kit, version to use
  in case the one that came with the selected Visual Studio
  is not what you want for some reason. Note that not all compiler/SDK
  combinations are supported. The intent is that this option should not
  be needed.])
 [
-  Usage: 
--with-windows-sdk=6.0(A)/7.0(A)/7.1(A)/8.0(A)
+  Usage: --with-windows-sdk=7.1(A)/8.0(A)/8.1(A)
 ],
 ,)
 
@@ -5088,7 +5088,7 @@ find_winsdk_version()
 
 # Why we look for them in this particular order I don't know. But OTOH I
 case $1 in
-6.0*|7.*)
+7.*)
 reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v${1}/InstallationFolder
 if test -n $regvalue; then
 winsdktest=$regvalue
commit c503d3780fd095cc94103bf0f89b662c446b3b2b
Author: Michael Stahl mst...@redhat.com
Date:   Tue Mar 3 23:33:48 2015 +0100

configure: properly check for Windows SDK 8.1A

Due to the wildcard checking for it will actually attempt to check for the
SDK 8.0, which fails with Visual Studio 2013 because its SDK 8.0 apparently
lacks a midl.exe, so configure fails.

Change-Id: Ib0e61a3a999d6a2ebe16645225fc9838dab3bdb1

diff --git a/configure.ac b/configure.ac
index e7e7f47..2b664ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5096,7 +5096,7 @@ find_winsdk_version()
 return
 fi
 ;;
-8.1)
+8.1|8.1A)
 reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows 
Kits/Installed Roots/KitsRoot81
 if test -n $regvalue; then
 winsdktest=$regvalue
@@ -5104,7 +5104,7 @@ find_winsdk_version()
 return
 fi
 ;;
-8.*)
+8.0|8.0A)
 reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows 
Kits/Installed Roots/KitsRoot
 if test -n $regvalue; then
 winsdktest=$regvalue
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac solenv/bin

[Jan Holesovsky]

 configure.ac  |4 
 solenv/bin/native-code.py |   10 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 4ed53dffa64670fafe298826c7901f7b436dfab9
Author: Jan Holesovsky ke...@collabora.com
Date:   Tue Feb 17 15:24:41 2015 +0100

android: No need to include the entire libfrmlo.a, add just the used 
services.

Made sure that ooo108922-1.doc and fields.doc are still loading.

Change-Id: If009c25be1776eba77a397efb2eae820838ac053

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 0d4bdc0..929eafb 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -33,6 +33,7 @@ core_factory_list = [
 (libhyphenlo.a, hyphen_component_getFactory),
 (libi18npoollo.a, i18npool_component_getFactory),
 (libi18nsearchlo.a, i18nsearch_component_getFactory),
+(libinvocadaptlo.a, invocadapt_component_getFactory),
 (liblnglo.a, lng_component_getFactory),
 (liblnthlo.a, lnth_component_getFactory),
 (liblocalebe1lo.a, localebe1_component_getFactory),
@@ -57,6 +58,7 @@ core_factory_list = [
 (libxsec_xmlsec.a, xsec_xmlsec_component_getFactory, #ifndef 
ANDROID),
 (libxstor.a, xstor_component_getFactory),
 (libcanvasfactorylo.a, canvasfactory_component_getFactory),
+(libvbaeventslo.a, vbaevents_component_getFactory),
 (libvclcanvaslo.a, vclcanvas_component_getFactory),
 (libmtfrendererlo.a, mtfrenderer_component_getFactory),
 ]
@@ -88,6 +90,12 @@ core_constructor_list = [
 # dbaccess/util/dba.component
 com_sun_star_comp_dba_ORowSet_get_implementation,
 # forms/util/frm.component
+com_sun_star_form_OCheckBoxControl_get_implementation,
+com_sun_star_form_OCheckBoxModel_get_implementation,
+com_sun_star_form_OComboBoxControl_get_implementation,
+com_sun_star_form_OComboBoxModel_get_implementation,
+com_sun_star_form_ODateControl_get_implementation,
+com_sun_star_form_ODateModel_get_implementation,
 com_sun_star_comp_forms_ODatabaseForm_get_implementation,
 com_sun_star_form_OFormsCollection_get_implementation,
 # framework/util/fwk.component
@@ -145,6 +153,7 @@ core_constructor_list = [
 # stoc/source/inspect/introspection.component
 com_sun_star_comp_stoc_Introspection_get_implementation,
 # toolkit/util/tk.component
+stardiv_Toolkit_StdTabController_get_implementation,
 stardiv_Toolkit_UnoCheckBoxControl_get_implementation,
 stardiv_Toolkit_UnoComboBoxControl_get_implementation,
 stardiv_Toolkit_UnoControlCheckBoxModel_get_implementation,
@@ -198,7 +207,6 @@ draw_constructor_list = [
 ]
 
 writer_factory_list = [
-(libfrmlo.a, frm_component_getFactory),
 (libsblo.a, sb_component_getFactory, #if HAVE_FEATURE_SCRIPTING),
 (libswdlo.a, swd_component_getFactory),
 (libswlo.a, sw_component_getFactory),
commit a7a5ba76f43f62c73ed35281178559bdda709ba7
Author: Jan Holesovsky ke...@collabora.com
Date:   Tue Feb 17 13:24:00 2015 +0100

android: Better check for package name when debugging.

Change-Id: Iad29aa8cc47220e5aa33a4991a0c0d265d107152

diff --git a/configure.ac b/configure.ac
index 1051d20..2329ae7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12347,6 +12347,10 @@ if echo $host_os | grep -q linux-android ; then
 
 AC_MSG_RESULT([not set, using $ANDROID_PACKAGE_NAME])
 else
+if test -n $ENABLE_DEBUG -a $with_android_package_name != 
org.libreoffice ; then
+AC_MSG_ERROR([The package name must be set
+to org.libreoffice when debugging, please avoid --with-android-package-name.])
+fi
 ANDROID_PACKAGE_NAME=$with_android_package_name
 AC_MSG_RESULT([$ANDROID_PACKAGE_NAME])
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac external/libmwaw

[David Tardon]

 configure.ac   
  |2 
 
external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch
 |   99 ++
 
external/libmwaw/0002-ClarisWors-AppleWorks-spreadsheet-Oops-correct-of-a-.patch
 |   31 +++
 external/libmwaw/UnpackedTarball_libmwaw.mk
  |5 
 4 files changed, 136 insertions(+), 1 deletion(-)

New commits:
commit c075fc1b39c7d8389cd960ccde7295d011105ae6
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 6 17:02:01 2015 +0100

build requires libmwaw 0.3.4 now

Change-Id: Ia129961bc429514b70e4bb508a76424e4df83289

diff --git a/configure.ac b/configure.ac
index 5dbe640..df3b179 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7535,7 +7535,7 @@ 
libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 dnl ===
 dnl Check for system libmwaw
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 = 0.3.3])
+libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 = 0.3.4])
 
 dnl ===
 dnl Check for system libpagemaker
commit 2a8f6a8a81c568d9ad73838072d287ac4927649f
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 6 17:01:30 2015 +0100

fdo#88098 ClarisWorks: import empty starting lines/columns

Change-Id: Ibe4d5be4df874336de7ae387d210deff0a927b38

diff --git 
a/external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch
 
b/external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch
new file mode 100644
index 000..0d79446
--- /dev/null
+++ 
b/external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch
@@ -0,0 +1,99 @@
+From c092ac823e50083c04464565365ddd4af71f8c89 Mon Sep 17 00:00:00 2001
+From: osnola alo...@loria.fr
+Date: Tue, 6 Jan 2015 15:39:54 +0100
+Subject: [PATCH 1/2] ClarisWorks/AppleWorks[spreadsheet]: do not remove first
+ empty rows and/or columns in the main spreadsheet   + if we remove some first
+ rows/columns in a embedded spreadsheet, update the cells present in
+ formula...
+
+---
+ src/lib/ClarisWksDbaseContent.cxx | 29 +
+ src/lib/ClarisWksDbaseContent.hxx |  3 ++-
+ src/lib/ClarisWksSpreadsheet.cxx  |  5 +
+ 3 files changed, 36 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/ClarisWksDbaseContent.cxx 
b/src/lib/ClarisWksDbaseContent.cxx
+index 7226af1..ea15544 100644
+--- a/src/lib/ClarisWksDbaseContent.cxx
 b/src/lib/ClarisWksDbaseContent.cxx
+@@ -1393,4 +1393,33 @@ bool ClarisWksDbaseContent::readFormula(Vec2i const 
cPos, long endPos, std::vec
+ 
+   return true;
+ }
++
++
++//
++
++void ClarisWksDbaseContent::Record::updateFormulaCells(Vec2i const 
removeDelta)
++{
++  if (m_content.m_contentType!=MWAWCellContent::C_FORMULA)
++return;
++  std::vectorMWAWCellContent::FormulaInstruction 
formula=m_content.m_formula;
++  for (size_t i=0; iformula.size(); ++i) {
++MWAWCellContent::FormulaInstruction instr=formula[i];
++int numCell=instr.m_type==MWAWCellContent::FormulaInstruction::F_Cell ? 1 
:
++instr.m_type==MWAWCellContent::FormulaInstruction::F_CellList 
? 2 : 0;
++for (int c=0; cnumCell; ++c) {
++  instr.m_position[c]-=removeDelta;
++  if (instr.m_position[c][0]0 || instr.m_position[c][1]0) {
++static bool first=true;
++if (first) {
++  MWAW_DEBUG_MSG((ClarisWksDbaseContent::Record::updateFormulaCells: 
some cell's positions are bad, remove formula\n));
++  first=false;
++  // revert to the basic cell type
++  m_content.m_contentType=m_valueType;
++  return;
++}
++  }
++}
++  }
++}
++
+ // vim: set filetype=cpp tabstop=2 shiftwidth=2 cindent autoindent 
smartindent noexpandtab:
+diff --git a/src/lib/ClarisWksDbaseContent.hxx 
b/src/lib/ClarisWksDbaseContent.hxx
+index 4894d31..8a40b31 100644
+--- a/src/lib/ClarisWksDbaseContent.hxx
 b/src/lib/ClarisWksDbaseContent.hxx
+@@ -83,7 +83,8 @@ public:
+   m_content(), m_valueType(MWAWCellContent::C_UNKNOWN), 
m_hasNaNValue(false), m_backgroundColor(MWAWColor::white()), m_font(3,9), 
m_borders(0)
+ {
+ }
+-
++//! update the formula cell (removing delta to each position)
++void updateFormulaCells(Vec2i const removeDelta);
+ //! the style if known
+ int m_style;
+ //! the format
+diff --git a/src/lib/ClarisWksSpreadsheet.cxx 
b/src/lib/ClarisWksSpreadsheet.cxx
+index c6b9f3d..60eb293 100644
+--- a/src/lib/ClarisWksSpreadsheet.cxx
 b/src/lib/ClarisWksSpreadsheet.cxx
+@@ -455,6 +455,8 @@ bool ClarisWksSpreadsheet::sendSpreadsheet(int zId, 
MWAWListenerPtr listener)
+ 

[Libreoffice-commits] core.git: 2 commits - configure.ac download.lst external/librevenge external/libwpd external/libwpg RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk |   70 ++-
 configure.ac  |6 
 download.lst  |4 
 external/librevenge/ExternalPackage_librevenge.mk |2 
 external/libwpd/ExternalPackage_libwpd.mk |   22 ++
 external/libwpd/ExternalProject_libwpd.mk |4 
 external/libwpd/Library_wpd.mk|  204 ++
 external/libwpd/Module_libwpd.mk  |   16 +
 external/libwpg/ExternalPackage_libwpg.mk |   22 ++
 external/libwpg/ExternalProject_libwpg.mk |4 
 external/libwpg/Library_wpg.mk|   46 
 external/libwpg/Module_libwpg.mk  |   16 +
 12 files changed, 398 insertions(+), 18 deletions(-)

New commits:
commit a84f0aa8c30d744fdee5e36ad91fb8689ea2757c
Author: David Tardon dtar...@redhat.com
Date:   Wed Dec 24 14:41:49 2014 +0100

upload librevenge 0.0.2

Change-Id: Ie12b7ec9630d45e23fb11f12d2d4955855ae34cc

diff --git a/download.lst b/download.lst
index fc2941a..819eb04 100644
--- a/download.lst
+++ b/download.lst
@@ -129,8 +129,8 @@ export PYTHON_TARBALL := Python-3.3.5.tgz
 export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
 export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
 export REDLAND_TARBALL := 
32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
-export REVENGE_MD5SUM := 69c367c6b0a360411965a1c409a0b6c1
-export REVENGE_TARBALL := librevenge-0.0.1.tar.bz2
+export REVENGE_MD5SUM := 2d4183bf17aea1a71842468a71a68c47
+export REVENGE_TARBALL := librevenge-0.0.2.tar.bz2
 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 export SERF_MD5SUM := 4f8e76c9c6567aee1d66aba49f76a58b
 export SERF_TARBALL := serf-1.2.1.tar.bz2
diff --git a/external/librevenge/ExternalPackage_librevenge.mk 
b/external/librevenge/ExternalPackage_librevenge.mk
index 2df2110..9766bfb 100644
--- a/external/librevenge/ExternalPackage_librevenge.mk
+++ b/external/librevenge/ExternalPackage_librevenge.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/libreven
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.dll,src/lib/.libs/librevenge-0.0.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call 
gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.so.0,src/lib/.libs/librevenge-0.0.so.0.0.1))
+$(eval $(call 
gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.so.0,src/lib/.libs/librevenge-0.0.so.0.0.2))
 endif
 
 # vim: set noet sw=4 ts=4:
commit c868a0c772a980dcc3045315c1e6f97f1433e88d
Author: David Tardon dtar...@redhat.com
Date:   Tue Dec 23 18:37:54 2014 +0100

build bundled libwpd and libwpg as shared libs

Change-Id: I7a00dfaa3252e2a0ab145ef8a4355f9bd14570da

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3b6d490..6360652a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2001,22 +2001,54 @@ gb_ExternalProject__use_wpd :=
 
 else # !SYSTEM_WPD
 
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
+   wpd \
+))
+
+define gb_LinkTarget__use_wpd
+$(call gb_LinkTarget_set_include,$(1),\
+   $(WPD_CFLAGS) \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_use_libraries,$(1),\
+   wpd \
+)
+
+endef
+
+define gb_ExternalProject__use_wpd
+$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call 
gb_Library_get_target,wpd)
+
+endef
+
+else # !MSC
+
+$(eval $(call gb_Helper_register_packages_for_install,ooo, \
+   libwpd \
+))
+
 define gb_LinkTarget__use_wpd
+$(call gb_LinkTarget_use_package,$(1),libwpd)
+
 $(call gb_LinkTarget_set_include,$(1),\
$(WPD_CFLAGS) \
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,libwpd)/src/lib/.libs/libwpd-0.10$(gb_StaticLibrary_PLAINEXT)
 \
+   $(WPD_LIBS) \
 )
-$(call gb_LinkTarget_use_external_project,$(1),libwpd)
 
 endef
+
 define gb_ExternalProject__use_wpd
-$(call gb_ExternalProject_use_external_project,$(1),libwpd)
+$(call gb_ExternalProject_use_package,$(1),libwpd)
 
 endef
 
+endif # MSC
+
 endif # SYSTEM_WPD
 
 
@@ -2034,22 +2066,44 @@ gb_ExternalProject__use_wpg :=
 
 else # !SYSTEM_WPG
 
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
+   wpg \
+))
+
 define gb_LinkTarget__use_wpg
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,libwpg)/inc \
$$(INCLUDE) \
 )
-$(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,libwpg)/src/lib/.libs/libwpg-0.3$(gb_StaticLibrary_PLAINEXT)
 \
+$(call gb_LinkTarget_use_libraries,$(1),\
+   wpg \
 )
-$(call gb_LinkTarget_use_external_project,$(1),libwpg)
 
 endef
-define gb_ExternalProject__use_wpg
-$(call 

[Libreoffice-commits] core.git: 2 commits - configure.ac

[Tor Lillqvist]

 configure.ac |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 564fe23374fa544c34875da0dd695cb8a939f0f2
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 18 14:44:18 2014 +0200

Improve documentation how to build the Win32 make

Change-Id: If47512f4a5893e21318f062301a0fd6fcf121cfc

diff --git a/configure.ac b/configure.ac
index f9bd9d0..021c7de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12839,10 +12839,11 @@ place yourself in a working directory of you choice.
  [go to Start menu, click All Programs, click Visual Studio 2013, click 
Visual Studio Tools, double-click VS2013 x86 Native Tools Command Prompt or 
VS2013 x64 Native Tools Comand Prompt]
  set PATH=%PATH%;C:\Cygwin\bin
  [or Cygwin64, if that is what you have]
- cd .../path/to/make_git
+ cd path-to-make-repor-you-cloned-above
  build_w32.bat --without-guile
 
-should result in a WinRel/gnumake.exe
+should result in a WinRel/gnumake.exe.
+Copy it to to the Cygwin /opt/lo/bin directory as make.exe
 
 Then re-run autogen.sh
 
commit ff926b84508e500fd8b1deda0a7304f0026f6c8c
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 18 14:38:45 2014 +0200

Adapt instructions to VS2013 and 64-bit Cygwin

Change-Id: Ie6b7ccd3e3a6d459cb44e4d545ceaf4eb26c06bb

diff --git a/configure.ac b/configure.ac
index c7cd156..f9bd9d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12836,8 +12836,9 @@ place yourself in a working directory of you choice.
 
  git clone git://git.savannah.gnu.org/make.git
 
- [go to Start menu, click on VS2012 x86 Native Tools Command Prompt]
+ [go to Start menu, click All Programs, click Visual Studio 2013, click 
Visual Studio Tools, double-click VS2013 x86 Native Tools Command Prompt or 
VS2013 x64 Native Tools Comand Prompt]
  set PATH=%PATH%;C:\Cygwin\bin
+ [or Cygwin64, if that is what you have]
  cd .../path/to/make_git
  build_w32.bat --without-guile
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac xmlhelp/source

[Jan Holesovsky]

 configure.ac  |4 ++--
 xmlhelp/source/cxxhelp/provider/databases.cxx |   15 +++
 2 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 3de1e67e06a2ca43badf55e9d4b7aa3a21ef4edc
Author: Jan Holesovsky ke...@collabora.com
Date:   Thu Dec 4 10:13:36 2014 +0100

images: Remove 'Crystal' from the default image sets.

Change-Id: I90f10ea437fba65aced8a53f7b81d450a6ebd447

diff --git a/configure.ac b/configure.ac
index 17d0de4..b6ae6db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1474,7 +1474,7 @@ AC_ARG_WITH(galleries,
 AC_ARG_WITH(theme,
 AS_HELP_STRING([--with-theme=theme1 theme2...],
 [Choose which themes to include. By default those themes with an '*' 
are included.
- Possible choices: *breeze, *crystal, *galaxy, *hicontrast, human, 
industrial, *oxygen, *sifr, *tango, *tango_testing.]),
+ Possible choices: *breeze, crystal, *galaxy, *hicontrast, human, 
industrial, *oxygen, *sifr, *tango, *tango_testing.]),
 ,)
 
 AC_ARG_WITH(helppack-integration,
@@ -11375,7 +11375,7 @@ dnl 
===
 AC_MSG_CHECKING([which themes to include])
 # if none given use default subset of available themes
 if test x$with_theme = x -o x$with_theme = xyes; then
-with_theme=breeze crystal galaxy hicontrast oxygen sifr tango
+with_theme=breeze galaxy hicontrast oxygen sifr tango
 test -z $ENABLE_RELEASE_BUILD  with_theme=$with_theme tango_testing
 fi
 
commit 8c2e25b3768013a19ef2371e5d7867a86226df0d
Author: Jan Holesovsky ke...@collabora.com
Date:   Thu Dec 4 10:13:14 2014 +0100

images: Tango is the most complete theme.

Change-Id: I211d21b09223dfacac18e879993b0f0943b94741

diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx 
b/xmlhelp/source/cxxhelp/provider/databases.cxx
index b7c2014..a6c8d3e 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -276,14 +276,13 @@ OString Databases::getImagesZipFileURL()
 {
 if ( aSymbolsStyleName.equalsAscii(auto) )
 {
-OUString const  env = 
Application::GetDesktopEnvironment();
-if ( env.equalsIgnoreAsciiCase(tde) ||
- env.equalsIgnoreAsciiCase(kde) )
-aSymbolsStyleName = crystal;
-else if ( env.equalsIgnoreAsciiCase(kde4) )
-aSymbolsStyleName = oxygen;
-else
-aSymbolsStyleName = tango;
+// with the layered images*.zip, tango is the most
+// complete theme, so show that one
+// FIXME instead of using a general vnd.sun.star.zip://
+// for imgrepos, we should have some vnd.sun.star.image://
+// so that we don't have to re-open the stream for every
+// image in the help
+aSymbolsStyleName = tango;
 }
 OUString aZipName = images_ + aSymbolsStyleName + .zip;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac download.lst external/clcc external/Module_external.mk Makefile.fetch RepositoryExternal.mk Repository.mk sc/CppunitTest_sc_opencl_test.mk sc/C

[Tor Lillqvist]

 Makefile.fetch  |1 
 Repository.mk   |1 
 RepositoryExternal.mk   |   11 
 configure.ac|1 
 download.lst|2 
 external/Module_external.mk |1 
 external/clcc/Library_clew.mk   |   35 
 external/clcc/Makefile  |7 
 external/clcc/Module_clcc.mk|   17 
 external/clcc/UnpackedTarball_clcc.mk   |   25 
 external/clcc/clew-non-static.patch |   52 
 sc/CppunitTest_sc_opencl_test.mk|7 
 sc/CppunitTest_sc_ucalc.mk  |8 
 sc/Library_sc.mk|   15 
 sc/source/core/inc/clcc/clew.h  | 1316 
 sc/source/core/inc/openclwrapper.hxx|2 
 sc/source/core/opencl/clcc/clew.cxx |  324 -
 sc/source/core/opencl/opbase.hxx|2 
 sc/source/core/opencl/opencl_device_selection.h |2 
 vcl/workben/vcldemo.cxx |   11 
 20 files changed, 166 insertions(+), 1674 deletions(-)

New commits:
commit 4ccf97ee849c94ea4d941f332dd3f93701d8abf7
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Nov 25 20:05:32 2014 +0200

Fix C2864: only static const integral data members can be initialized within

Change-Id: I01f66eb78e357780f35cfd1df6722301cc5753b2

diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 51474bc..706daf5 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -74,6 +74,10 @@ class DemoRenderer
 };
 struct RegionRenderer {
 public:
+RegionRenderer() :
+sumTime(0),
+countTime(0)
+{ }
 virtual ~RegionRenderer() {}
 virtual OUString getName() = 0;
 virtual sal_uInt16 getAccelerator() = 0;
@@ -85,13 +89,13 @@ class DemoRenderer
 virtual sal_uInt16 getAccelerator() SAL_OVERRIDE \
 { return key; }
 
-double sumTime = 0;
-int countTime = 0;
+double sumTime;
+int countTime;
 };
 
 std::vector RegionRenderer *  maRenderers;
 sal_Int32  mnSelectedRenderer;
-sal_Int32  iterCount = 0;
+sal_Int32  iterCount;
 
 void InitRenderers();
 
@@ -99,6 +103,7 @@ public:
 DemoRenderer() : mnSegmentsX(4)
, mnSegmentsY(3)
, mnSelectedRenderer(-1)
+   , iterCount(0)
 #if FIXME_BOUNCE_BUTTON
, mpButton(NULL)
, mpButtonWin(NULL)
commit a7a79ee92d5663248abdc3f6d1476e28c1abda6a
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Nov 25 13:29:44 2014 +0200

Move clew into a library of its own

Change-Id: Ifb7e86b078bd549506a9cc1b9ce9fc22fffc5eec

diff --git a/Makefile.fetch b/Makefile.fetch
index 7aee66a..84e5f80 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -115,6 +115,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,CAIRO,CAIRO_TARBALL) \
$(call fetch_Optional,CAIRO,PIXMAN_TARBALL) \
$(call fetch_Optional,CDR,CDR_TARBALL) \
+   $(call fetch_Optional,CLCC,CLCC_TARBALL) \
$(call fetch_Optional,CLUCENE,CLUCENE_TARBALL) \
$(call fetch_Optional,CMIS,CMIS_TARBALL) \
$(call fetch_Optional,COINMP,COINMP_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index 0e0dffc..9078590 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -316,6 +316,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
chartcore \
chartcontroller \
chartopengl \
+   $(call gb_Helper_optional,CLCC,clew) \
$(if $(filter $(OS),WNT),,cmdmail) \
cppcanvas \
configmgr \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 47f6e90..fb3a1a4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -279,6 +279,17 @@ endef
 
 endif # SYSTEM_GLEW
 
+define gb_LinkTarget__use_clew
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,clcc)/src \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_use_libraries,$(1),\
+   clew \
+)
+
+endef
+
 define gb_LinkTarget__use_iconv
 $(call gb_LinkTarget_add_libs,$(1),-liconv)
 
diff --git a/configure.ac b/configure.ac
index 7f1e4b0..92a2d1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10264,6 +10264,7 @@ dnl =
 ENABLE_OPENCL=
 if test $_os != iOS -a $_os != Android; then
 ENABLE_OPENCL=TRUE
+BUILD_TYPE=$BUILD_TYPE CLCC
 AC_DEFINE(HAVE_FEATURE_OPENCL)
 fi
 AC_SUBST(ENABLE_OPENCL)
diff --git a/download.lst b/download.lst
index cf66c2b..fd8197af 100644
--- a/download.lst
+++ b/download.lst
@@ -20,6 +20,8 @@ export BSH_TARBALL := 

[Libreoffice-commits] core.git: 2 commits - configure.ac solenv/gbuild

[Luboš Luňák]

 configure.ac   |4 
 solenv/gbuild/platform/com_GCC_defs.mk |4 
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 71a9c492b8ac7d9f33a92327d43efcb0e4617243
Author: Luboš Luňák l.lu...@collabora.com
Date:   Mon Nov 10 12:29:10 2014 +0100

force --std=gnu89 for clang (and gcc), properly

This implements 3a4860a751980b566b44d57cde188292df5e8726 in the proper 
place.

Change-Id: I7b60602933819561d0bff5e72dcd5ee8986f63c0

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 1b2ceeb..b6d9735 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -107,6 +107,10 @@ gb_CXX03FLAGS := -std=gnu++98 -pedantic-errors 
-Wno-long-long \
 -Wno-variadic-macros -Wno-non-virtual-dtor -Wno-deprecated-declarations
 endif
 
+# On Windows MSVC only supports C90 so force gnu89 (especially in clang) to
+# to catch potential gnu89/C90 incompatibilities locally.
+gb_CFLAGS_COMMON += -std=gnu89
+
 ifeq ($(ENABLE_LTO),TRUE)
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
 gb_LTOFLAGS := -flto
commit 74a2fb369c9ca7b3b423723926626fb0760abb29
Author: Luboš Luňák l.lu...@collabora.com
Date:   Mon Nov 10 12:22:01 2014 +0100

Revert Force --std=gnu89 for clang.

Explictly passing any CFLAGS to configure overrides (=disables) CFLAGS that
would be used by default. So if this sets CFLAGS to just --std=gnu89, .c 
files
will never be built with optimization or debuginfo.

This reverts commit 3a4860a751980b566b44d57cde188292df5e8726.

diff --git a/configure.ac b/configure.ac
index b1fada1..f47b06a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3190,10 +3190,6 @@ if test $GCC = yes; then
 AC_MSG_RESULT([Clang $CLANG_FULL_VERSION, $CLANGVER])
 AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)
 fi
-
-# On Windows MSVC only supports C90 so force gnu89 (especially in clang) to
-# to catch potential gnu89/C90 incompatibilities locally.
-CFLAGS=$CFLAGS -std=gnu89
 fi
 AC_SUBST(COM_GCC_IS_CLANG)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac solenv/bin

[David Tardon]

 configure.ac  |5 +
 solenv/bin/modules/par2script/work.pm |5 +
 2 files changed, 10 insertions(+)

New commits:
commit 76d2d78ac48c0ec7fcdc27c841d0777cab732464
Author: David Tardon dtar...@redhat.com
Date:   Sat Nov 1 10:14:16 2014 +0100

fdo#85633 filter out empty file records

Change-Id: I9f96cf3e059d444c52ce81b37cf5f69157c2888d

diff --git a/solenv/bin/modules/par2script/work.pm 
b/solenv/bin/modules/par2script/work.pm
index 9c03078..8003785 100644
--- a/solenv/bin/modules/par2script/work.pm
+++ b/solenv/bin/modules/par2script/work.pm
@@ -187,6 +187,11 @@ sub collect_definitions
 if ( $oneitem eq Directory ) { if ( $itemkey =~ DosName ) { 
$itemkey =~ s/DosName/HostName/; } }
 if (( $oneitem eq Directory ) || ( $oneitem eq File ) || ( 
$oneitem eq Unixlink )) { if ( $itemvalue eq PD_PROGDIR ) { $itemvalue = 
PREDEFINED_PROGDIR; }}
 if (( $itemkey eq Styles )  ( $itemvalue =~ /^\s*(\w+)(\s*\;\s*)$/ 
)) { $itemvalue = ($1)$2; }
+elsif ( $itemkey eq Files ) # filter out empty file records, as they 
mess up assignment to modules
+{
+$itemvalue =~ /^\(([^)]*)\)$/;
+$itemvalue = '(' . join( ',', grep( !/^$/, split( ',', $1 ) ) ) . 
')';
+}
 
 $oneitemhash{$itemkey} = $itemvalue;
 }
commit 7f5672bb14956d589fd257067b9eebef3c28e421
Author: David Tardon dtar...@redhat.com
Date:   Thu Oct 30 09:58:46 2014 +0100

system libgltf conflicts with dbgutil too

Change-Id: I326d62077b556501d0a98794bca4b00f4bcfc369

diff --git a/configure.ac b/configure.ac
index e39ce6b..84505ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3753,6 +3753,11 @@ if test -n $enable_dbgutil -a $enable_dbgutil != 
no; then
 else
 with_system_libcmis=no
 fi
+if test $with_system_libgltf = yes; then
+AC_MSG_ERROR([--with-system-libgltf conflicts with --enable-dbgutil])
+else
+with_system_libgltf=no
+fi
 if test $enable_win_mozab_driver = yes; then
 AC_MSG_ERROR([--enable-win-mozab-driver conflicts with 
--enable-dbgutil])
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac desktop/unx

[Michael Stahl]

 configure.ac|   12 ++--
 desktop/unx/source/file_image_unx.c |6 --
 2 files changed, 6 insertions(+), 12 deletions(-)

New commits:
commit da4a5fa517a7379da84bf7d514eafe2c721246d3
Author: Michael Stahl mst...@redhat.com
Date:   Thu Oct 9 21:04:15 2014 +0200

configure: let's default to GStreamer 1.0

Support was added 2 years ago, it is probably more likely to be
installed than 0.10 now.

Change-Id: Ia2e36725f50f96889eb602468840dde9259c2b90

diff --git a/configure.ac b/configure.ac
index 7da6486..e5e6143 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1208,14 +1208,14 @@ AC_ARG_ENABLE(randr-link,
 ,enable_randr_link=yes)
 
 AC_ARG_ENABLE(gstreamer,
-AS_HELP_STRING([--enable-gstreamer],
-[Enable building with the new gstreamer 1.0 avmedia backend.]),
-,enable_gstreamer=no)
+AS_HELP_STRING([--disable-gstreamer],
+[Disable building with the new gstreamer 1.0 avmedia backend.]),
+,enable_gstreamer=yes)
 
 AC_ARG_ENABLE(gstreamer-0-10,
-AS_HELP_STRING([--disable-gstreamer-0-10],
-[Disable building the gstreamer avmedia backend.]),
-,enable_gstreamer_0_10=yes)
+AS_HELP_STRING([--enable-gstreamer-0-10],
+[Enable building the gstreamer 0.10 avmedia backend.]),
+,enable_gstreamer_0_10=no)
 
 AC_ARG_ENABLE(vlc,
 AS_HELP_STRING([--enable-vlc],
commit 2e69b60cc2abb8e0a6773e101c03050c57a12ca3
Author: Michael Stahl mst...@redhat.com
Date:   Thu Oct 9 20:41:11 2014 +0200

desktop: -Werror=unused-macros

The documented feature test macro is _BSD_SOURCE, and anyway, feature
test macros must be defined before the first libc header is included, so
this one is evidently useless.

Change-Id: Ib4b2db0c6151c2f3df322992b189257f5dd0ea22

diff --git a/desktop/unx/source/file_image_unx.c 
b/desktop/unx/source/file_image_unx.c
index 89df91e..f1320cc 100644
--- a/desktop/unx/source/file_image_unx.c
+++ b/desktop/unx/source/file_image_unx.c
@@ -24,12 +24,6 @@
 #include errno.h
 #include fcntl.h
 
-#if defined(LINUX)
-#  ifndef __USE_BSD
-#define __USE_BSD /* madvise, MADV_WILLNEED */
-#  endif
-#endif /* Linux */
-
 #include sys/mman.h
 #include sys/stat.h
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac connectivity/source include/connectivity

[Lionel Elie Mamane]

 configure.ac|   20 +-
 connectivity/source/commontools/TSkipDeletedSet.cxx |8 +++
 connectivity/source/drivers/calc/CTable.cxx |8 +++
 connectivity/source/drivers/dbase/DTable.cxx|8 +++
 connectivity/source/drivers/file/FResultSet.cxx |   22 ++--
 connectivity/source/drivers/flat/ETable.cxx |   10 -
 connectivity/source/drivers/odbc/OResultSet.cxx |   12 +-
 connectivity/source/inc/TResultSetHelper.hxx|7 +++---
 connectivity/source/inc/odbc/OFunctiondefs.hxx  |6 +
 connectivity/source/parse/sqlbison.y|2 -
 connectivity/source/parse/sqliterator.cxx   |4 +--
 include/connectivity/IParseContext.hxx  |5 ++--
 12 files changed, 65 insertions(+), 47 deletions(-)

New commits:
commit 314c469c93f0ac139f64f742d3fd89e587f42970
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Sep 16 12:25:29 2014 +0200

try Use system ODBC on MS Windows unless specifically overriden again

Now that Noel has a working pattch for system ODBC on MS Windows

Change-Id: I11abb53486e45d9c7058c42011df41b5fad0fcde

diff --git a/configure.ac b/configure.ac
index a0b6ed5..823fcdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1822,7 +1822,7 @@ AC_ARG_WITH(libbase-jar,
 AC_ARG_WITH(system-odbc,
 AS_HELP_STRING([--with-system-odbc],
 [Use the odbc headers already on system.]),,
-[with_system_odbc=$with_system_headers])
+[with_system_odbc=auto])
 
 AC_ARG_WITH(system-sane,
 AS_HELP_STRING([--with-system-sane],
@@ -8598,7 +8598,7 @@ dnl 
===
 dnl Check for system odbc
 dnl ===
 AC_MSG_CHECKING([which odbc headers to use])
-if test $with_system_odbc = yes ; then
+if test $with_system_odbc = yes -o '(' $with_system_headers = yes -a 
$with_system_odbc = auto ')' -o '(' $_os = WINNT -a  
$with_system_odbc != no ')'; then
 AC_MSG_RESULT([external])
 SYSTEM_ODBC_HEADERS=TRUE
 
commit ac10225762ce2c242d21126b5730b1d60f0150ed
Author: Noel Grandin n...@peralex.com
Date:   Thu Sep 18 10:04:20 2014 +0300

implement --with-system-odbc on windows

Change-Id: I1757b9ce74277b1c11533f41caeafaf9b88658ef

diff --git a/configure.ac b/configure.ac
index c4367d9..a0b6ed5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2783,7 +2783,6 @@ if test $_os = Darwin; then
 ;;
 esac
 
-# If no CC and CXX environment vars, try to guess where the compiler is
 LIBTOOL=libtool
 INSTALL_NAME_TOOL=install_name_tool
 if test -z $save_CC; then
@@ -8603,8 +8602,19 @@ if test $with_system_odbc = yes ; then
 AC_MSG_RESULT([external])
 SYSTEM_ODBC_HEADERS=TRUE
 
-AC_CHECK_HEADER(sqlext.h, [],
-  [AC_MSG_ERROR(odbc not found. install odbc)], [])
+if test $build_os = cygwin; then
+save_CPPFLAGS=$CPPFLAGS
+find_winsdk
+PathFormat $winsdktest
+CPPFLAGS=$CPPFLAGS -I$formatted_path/include/um 
-I$formatted_path/include -I$formatted_path/include/shared
+AC_CHECK_HEADER(sqlext.h, [],
+[AC_MSG_ERROR(odbc not found. install odbc)],
+[#include windows.h])
+CPPFLAGS=$save_CPPFLAGS
+else
+AC_CHECK_HEADER(sqlext.h, [],
+[AC_MSG_ERROR(odbc not found. install odbc)],[])
+fi
 elif test $enable_database_connectivity != yes; then
 AC_MSG_RESULT([none])
 else
diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx 
b/connectivity/source/commontools/TSkipDeletedSet.cxx
index 563d545..cd98dd3 100644
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -45,7 +45,7 @@ bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement 
_eCursorPosition, s
 
 switch (_eCursorPosition)
 {
-case IResultSetHelper::ABSOLUTE:
+case IResultSetHelper::ABSOLUTE1:
 return moveAbsolute(_nOffset,_bRetrieveData);
 case IResultSetHelper::FIRST:   // set the movement 
when positioning failed
 eDelPosition = IResultSetHelper::NEXT;
@@ -55,7 +55,7 @@ bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement 
_eCursorPosition, s
 eDelPosition = IResultSetHelper::PRIOR; // last row is invalid so 
position before
 nDelOffset = 1;
 break;
-case IResultSetHelper::RELATIVE:
+case IResultSetHelper::RELATIVE1:
 eDelPosition = (_nOffset = 0) ? IResultSetHelper::NEXT : 
IResultSetHelper::PRIOR;
 break;
 default:
@@ -107,7 +107,7 @@ bool 
OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPosition, s
 }
 return bDataFound;
 }
-else if (_eCursorPosition != IResultSetHelper::RELATIVE)
+else if (_eCursorPosition != 

[Libreoffice-commits] core.git: 2 commits - configure.ac .gitignore Makefile.in Repository.mk sal/Library_sal.mk scp2/source ure/Module_ure.mk ure/Package_builddir_install.mk ure/source

[Tor Lillqvist]

 .gitignore  |1 -
 Makefile.in |3 +--
 Repository.mk   |1 -
 configure.ac|6 ++
 sal/Library_sal.mk  |1 -
 scp2/source/ooo/ure.scp |2 +-
 ure/Module_ure.mk   |1 -
 ure/Package_builddir_install.mk |   18 --
 ure/source/unorc.in |   23 ---
 9 files changed, 4 insertions(+), 52 deletions(-)

New commits:
commit 332f6a5f997677a3468c47a7b7d5b7c448809293
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Sep 17 17:39:10 2014 +0300

The URE unorc is now set up in instsetoo_native/CustomTarget_setup.mk

So no need to expand it at configure time in ure/source/unorc, and no need 
to
handle the related builddir!=srcdir complications.

Change-Id: Ifa34d25fab9ad2da13ed039bf6c5921b0fb58703

diff --git a/.gitignore b/.gitignore
index a273e0b..b7ebd03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,6 @@
 /config_build.mk
 /configure
 /lo.xcent
-/ure/source/unorc
 /Makefile
 /NEWS
 /TODO
diff --git a/Makefile.in b/Makefile.in
index a2271c0..9f5dd1a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -169,8 +169,7 @@ distclean : clean compilerplugins-clean
 $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
 $(BUILDDIR)/ios/lo.xcconfig \
 $(BUILDDIR)/lo.xcent \
-$(BUILDDIR)/sysui/desktop/macosx/Info.plist \
-$(BUILDDIR)/ure/source/unorc
+$(BUILDDIR)/sysui/desktop/macosx/Info.plist
find $(SRCDIR)/solenv/gdb -name *.pyc -exec rm {} \;
 
 #
diff --git a/Repository.mk b/Repository.mk
index 707a0c1..69ef8ec 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -733,7 +733,6 @@ endif
 
 $(eval $(call gb_Helper_register_packages_for_install,ure,\
ure_install \
-   ure_builddir_install \
$(if $(ENABLE_JAVA),\
jvmfwk_javavendors \
jvmfwk_jreproperties \
diff --git a/configure.ac b/configure.ac
index c423df9..23a1f20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4443,8 +4443,7 @@ if test $cross_compiling = yes; then
 instsetoo_native/util/openoffice.lst.in \
 config_host/*.in \
 sysui/desktop/macosx/Info.plist.in \
-ios/lo.xcconfig.in \
-ure/source/unorc.in) \
+ios/lo.xcconfig.in) \
 | (cd CONF-FOR-BUILD  tar xf -)
 cp configure CONF-FOR-BUILD
 test -d config_build  cp -p config_build/*.h CONF-FOR-BUILD/config_host 
2/dev/null
@@ -12770,8 +12769,7 @@ AC_CONFIG_FILES([config_host.mk
  lo.xcent
  instsetoo_native/util/openoffice.lst
  sysui/desktop/macosx/Info.plist
- ios/lo.xcconfig
- ure/source/unorc])
+ ios/lo.xcconfig])
 AC_CONFIG_HEADERS([config_host/config_buildid.h])
 AC_CONFIG_HEADERS([config_host/config_clang.h])
 AC_CONFIG_HEADERS([config_host/config_eot.h])
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 77d4176..e5c02c2 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,sal,\
 # need the ure-link symlink to exist in INSTDIR so it's possible to link sal
 # FIXME: this creates cyclic dependency between ure and sal modules
 $(eval $(call gb_Library_use_package,sal,ure_install))
-$(eval $(call gb_Library_use_package,sal,ure_builddir_install))
 
 $(eval $(call gb_Library_use_libraries,sal,\
$(if $(filter $(OS),ANDROID), \
diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk
index 4d8c2c0..88cbc71 100644
--- a/ure/Module_ure.mk
+++ b/ure/Module_ure.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,ure))
 
 $(eval $(call gb_Module_add_targets,ure,\
Package_install \
-   Package_builddir_install \
Rdb_ure \
 ))
 
diff --git a/ure/Package_builddir_install.mk b/ure/Package_builddir_install.mk
deleted file mode 100644
index 49defbc..000
--- a/ure/Package_builddir_install.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,ure_builddir_install,$(BUILDDIR)/ure/source))
-
-ifneq ($(CROSS_COMPILING),)
-$(eval $(call 
gb_Package_add_files,ure_builddir_install,$(LIBO_URE_ETC_FOLDER),\
-   $(if $(filter unorc,$(call gb_Helper_get_rcfile,uno)),$(call 
gb_Helper_get_rcfile,uno)) \
-))
-endif
-
-# vim:set noet sw=4 ts=4:
diff --git a/ure/source/unorc.in b/ure/source/unorc.in
deleted file mode 100644
index bc0ecbe..000
--- a/ure/source/unorc.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of 

[Libreoffice-commits] core.git: 2 commits - configure.ac

[Lionel Elie Mamane]

 configure.ac |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b553b534575b2ef8e9dab96819c133414c4a0dc8
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Sep 11 09:40:22 2014 +0200

untabify

Change-Id: I6a1abc2839de2c7b8508f7edabeec8016e67ba5c

diff --git a/configure.ac b/configure.ac
index d8bcb80..5b5ad1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10510,10 +10510,10 @@ if test x$enable_gltf != xno -a $_os != iOS -a 
$_os != Android; then
 AC_MSG_RESULT([yes])
 AC_DEFINE(HAVE_FEATURE_GLTF,1)
 if test $with_system_libgltf = yes; then
-   SYSTEM_LIBGLTF=TRUE
-   PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.0 = 0.0.1] )
+SYSTEM_LIBGLTF=TRUE
+PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.0 = 0.0.1] )
 else
-   BUILD_TYPE=$BUILD_TYPE LIBGLTF
+BUILD_TYPE=$BUILD_TYPE LIBGLTF
 fi
 else
 AC_MSG_RESULT([no])
commit 7860feb6ed1c8c2c60945a5c0b33595077228561
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Sep 11 09:39:47 2014 +0200

system-gltf should follow system-libs

Change-Id: I123b6dd56c21cdecd218152396f8cb8366ef53b2

diff --git a/configure.ac b/configure.ac
index 561a15b..d8bcb80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1608,7 +1608,7 @@ AC_ARG_WITH(system-jpeg,
 AC_ARG_WITH(system-libgltf,
 AS_HELP_STRING([--with-system-libgltf],
 [Use libgltf already on system.]),,
-[with_system_libgltf=auto])
+[with_system_libgltf=$with_system_libs])
 
 AC_ARG_WITH(system-clucene,
 AS_HELP_STRING([--with-system-clucene],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac scripting/java

[rbuj]

 configure.ac   
 |   26 ---
 scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java  
 |2 
 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java  
 |   79 +-
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
 |3 
 4 files changed, 44 insertions(+), 66 deletions(-)

New commits:
commit 1fba1feac46d808ce801e44f1f29234f7fb3a31f
Author: rbuj robert@gmail.com
Date:   Sun Sep 7 11:49:23 2014 +0200

scripting: the assigned value is never used

Change-Id: I61dcf285ecc6d0affdb949ca03d686f96601d884
Reviewed-on: https://gerrit.libreoffice.org/11319
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git 
a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java 
b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
index 0f48814..075ab66 100644
--- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
+++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
@@ -187,7 +187,7 @@ public class UCBStreamHandler extends URLStreamHandler {
 private InputStream getFileStreamFromJarStream(String file, InputStream is)
 throws IOException
 {
-ZipEntry entry = null;
+ZipEntry entry;
 
 ZipInputStream zis = new ZipInputStream(is);
 
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java 
b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index 963178d..b49a526 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -361,54 +361,55 @@ public abstract class ScriptProvider
 public ScriptMetaData  getScriptData( /*IN*/String scriptURI ) throws 
ScriptFrameworkErrorException
 
 {
-ParsedScriptUri details = null;
 try
 {
-details = m_container.parseScriptUri( scriptURI );
-ScriptMetaData scriptData = m_container.findScript( details );
-if ( scriptData == null )
+ParsedScriptUri details = m_container.parseScriptUri( scriptURI );
+try
 {
-throw new ScriptFrameworkErrorException( details.function +  
does not exist,
-null, details.function, language, 
ScriptFrameworkErrorType.NO_SUCH_SCRIPT );
+ScriptMetaData scriptData = m_container.findScript(details);
+if (scriptData == null)
+{
+throw new ScriptFrameworkErrorException(details.function + 
 does not exist,
+null, details.function, language, 
ScriptFrameworkErrorType.NO_SUCH_SCRIPT);
+}
+return scriptData;
+}
+catch (com.sun.star.container.NoSuchElementException nse)
+{
+ScriptFrameworkErrorException e2
+= new ScriptFrameworkErrorException(
+nse.getMessage(), null, details.function, 
language,
+ScriptFrameworkErrorType.NO_SUCH_SCRIPT);
+e2.initCause(nse);
+throw e2;
+}
+catch (com.sun.star.lang.WrappedTargetException wta)
+{
+// TODO specify the correct error Type
+Exception wrapped = (Exception) wta.TargetException;
+String message = wta.getMessage();
+if (wrapped != null)
+{
+message = wrapped.getMessage();
+}
+ScriptFrameworkErrorException e2
+= new ScriptFrameworkErrorException(
+message, null, details.function, language,
+ScriptFrameworkErrorType.UNKNOWN);
+e2.initCause(wta);
+throw e2;
 }
-return scriptData;
-}
-catch (  com.sun.star.lang.IllegalArgumentException ila )
-{
-// TODO specify the correct error Type
-ScriptFrameworkErrorException e2 =
-new ScriptFrameworkErrorException(
-ila.getMessage(), null, scriptURI, language,
-ScriptFrameworkErrorType.UNKNOWN );
-e2.initCause( ila );
-throw e2;
-}
-catch ( com.sun.star.container.NoSuchElementException nse )
-{
-ScriptFrameworkErrorException e2 =
-new ScriptFrameworkErrorException(
-nse.getMessage(), null, details.function, language,
-ScriptFrameworkErrorType.NO_SUCH_SCRIPT );
-e2.initCause( 

[Libreoffice-commits] core.git: 2 commits - configure.ac cui/source jvmfwk/plugins

[Caolán McNamara]

 configure.ac |2 +-
 cui/source/customize/cfg.cxx |4 ++--
 cui/source/customize/cfg.hrc |1 -
 cui/source/customize/cfg.src |6 ++
 cui/source/inc/cuires.hrc|2 ++
 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx |6 +-
 6 files changed, 8 insertions(+), 13 deletions(-)

New commits:
commit 632e4095ad92196480ad82cfa1f106c4c08ae1cc
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Aug 21 10:14:06 2014 +0100

openjdk appears to use ppc64/server/libjvm.so and not 
ppc64le/server/libjvm.so

Change-Id: Iff9e2e0ac9921b0d9d36a49fdcd2323d5dd124ee

diff --git a/configure.ac b/configure.ac
index ac3051d..5304644 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7223,7 +7223,7 @@ then
 powerpc)
 my_java_arch=ppc
 ;;
-powerpc64)
+powerpc64*)
 my_java_arch=ppc64
 ;;
 x86_64)
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx 
b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
index fee2430..25baaee5 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
@@ -40,11 +40,7 @@ namespace jfw_plugin
 #elif defined INTEL
 #define JFW_PLUGIN_ARCH i386
 #elif defined POWERPC64
-#ifdef OSL_BIGENDIAN
-#  define JFW_PLUGIN_ARCH ppc64
-#else
-#  define JFW_PLUGIN_ARCH ppc64le
-#endif
+#define JFW_PLUGIN_ARCH ppc64
 #elif defined POWERPC
 #define JFW_PLUGIN_ARCH ppc
 #elif defined MIPS
commit 24e76b6506a309c5564cf46dc23df06993a002c7
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Aug 21 10:04:53 2014 +0100

QueryBox QBX_CONFIRM_DELETE_TOOLBAR - MessageDialog + string

Change-Id: If03a966ab6519d1335903b7d76cb44c38113a4a3

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 79dba76..21fced9 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2995,8 +2995,8 @@ bool SvxToolbarConfigPage::DeleteSelectedContent()
 if ( m_pContentsListBox-GetEntryCount() == 0 
  GetTopLevelSelection()-IsDeletable() )
 {
-QueryBox qbox( this,
-CUI_RES( QBX_CONFIRM_DELETE_TOOLBAR ) );
+MessageDialog qbox(this,
+CUI_RES(RID_SXVSTR_CONFIRM_DELETE_TOOLBAR), 
VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO);
 
 if ( qbox.Execute() == RET_YES )
 {
diff --git a/cui/source/customize/cfg.hrc b/cui/source/customize/cfg.hrc
index 44d8f87..5fc6d73 100644
--- a/cui/source/customize/cfg.hrc
+++ b/cui/source/customize/cfg.hrc
@@ -38,6 +38,5 @@
 #define MODIFY_TOOLBAR_CONTENT (61 + CFG_OFFSET)
 
 #define QBX_CONFIRM_RESTORE_DEFAULT (66 + CFG_OFFSET)
-#define QBX_CONFIRM_DELETE_TOOLBAR (67 + CFG_OFFSET)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index a61a82c..08f1c72 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -217,11 +217,9 @@ String RID_SVXSTR_TOOLBAR_NAME
 Text [ en-US ] = Toolbar Name ;
 };
 
-QueryBox QBX_CONFIRM_DELETE_TOOLBAR
+String RID_SXVSTR_CONFIRM_DELETE_TOOLBAR
 {
-Message [ en-US ] = There are no more commands on the toolbar. Do you 
want to delete the toolbar?;
-BUTTONS = WB_YES_NO ;
-DEFBUTTON = WB_DEF_NO ;
+Text [ en-US ] = There are no more commands on the toolbar. Do you want 
to delete the toolbar?;
 };
 
 /* Translators: Do not translate %SAVE IN SELECTION% It is a placeholder
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index a948b27..b0e48e5 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -408,6 +408,8 @@
 #define RID_SVXSTR_NORESULTS(RID_SVX_START + 
1281)
 #define RID_SVXSTR_APPLYPERSONA (RID_SVX_START + 
1282)
 
+#define RID_SXVSTR_CONFIRM_DELETE_TOOLBAR   (RID_SVX_START + 
1283)
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac

[Tor Lillqvist]

 configure.ac |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a4f4edb344805d1687333d1d7f46b4fde3f8d2c6
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Aug 14 14:28:07 2014 +0300

Rename misleadingly named variable

Change-Id: I48c7e2d29c16b61b71ef72a0a45792c968c0fa0f

diff --git a/configure.ac b/configure.ac
index 831ab32..e20f112 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3114,7 +3114,7 @@ if test $_os = iOS; then
 
 xcode_developer=`xcode-select -print-path`
 
-pref_sdk_ver=7.1
+current_sdk_ver=7.1
 for sdkver in 8.0 7.1 7.0 6.1 6.0; do
 
t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
 if test -d $t; then
@@ -3125,7 +3125,7 @@ if test $_os = iOS; then
 done
 
 if test -z $sysroot; then
-AC_MSG_ERROR([Could not find iOS SDK, expected something like 
$xcode_developer/Platforms/$platform.platform/Developer/SDKs/${platform}${pref_sdk_ver}])
+AC_MSG_ERROR([Could not find iOS SDK, expected something like 
$xcode_developer/Platforms/$platform.platform/Developer/SDKs/${platform}${current_sdk_ver}])
 fi
 
 AC_MSG_RESULT($sysroot)
commit fd56de496e2dbb4834ec4a5926f07e1c7d8a5d3f
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Aug 13 21:42:43 2014 +0300

Look also for iOS SDK 8.0

Change-Id: I0587e395f6b4833953618b1a0ac1e201a1f79b61

diff --git a/configure.ac b/configure.ac
index ff89d60..831ab32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3114,8 +3114,8 @@ if test $_os = iOS; then
 
 xcode_developer=`xcode-select -print-path`
 
-pref_sdk_ver=7.0
-for sdkver in 7.1 7.0 6.1 6.0; do
+pref_sdk_ver=7.1
+for sdkver in 8.0 7.1 7.0 6.1 6.0; do
 
t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
 if test -d $t; then
 ios_sdk=$sdkver
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac odk/docs

[Michael Stahl]

 configure.ac  |   53 --
 odk/docs/install.html |   12 +--
 2 files changed, 7 insertions(+), 58 deletions(-)

New commits:
commit 4c0eb74307b613aefce4b181817cf137c4517c8a
Author: Michael Stahl mst...@redhat.com
Date:   Fri Aug 8 13:04:36 2014 +0200

configure: SunStudio is not a (supported) C++ compiler

Change-Id: I65d5f499b2948f9e57c47d262a2d6e5e8cbcf8da

diff --git a/configure.ac b/configure.ac
index 38cb6bd..dc9f86a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2711,32 +2711,6 @@ else
 AC_MSG_RESULT([no])
 fi
 
-dnl ===
-dnl  Test the Solaris compiler version
-dnl ===
-if test $_os = SunOS; then
-if test $CC = cc; then
-AC_PATH_PROGS(_cc, cc)
-COMPATH=`echo $_cc | $SED -n s/\/bin\/cc//p`
-AC_MSG_CHECKING([the SunStudio C/C++ compiler version])
-dnl cc -V outputs to standard error
-_sunstudio_string=`$CC -V 21 | grep '^cc' | $SED -e 's/.* C //'`
-_sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
-_sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
-if test $_sunstudio_major != 5; then
-AC_MSG_ERROR([found version $_sunstudio_version, use version 
5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])
-else
-_sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 
5) print true; else if ($2 == 7) print true; else if ($2 == 8) print 
true; else if ($2 == 9) print true; else print false }'`
-if test $_sunstudio_minor = false; then
-AC_MSG_ERROR([found version $_sunstudio_version, use version 
5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])
-else
-dnl compiler will do
-AC_MSG_RESULT([checked])
-fi
-fi
-fi
-fi
-
 
 dnl ===
 dnl Check OS X SDK and compiler
@@ -5596,16 +5570,7 @@ if test $_os != WINNT -o $WITH_MINGW = yes; then
 AC_PROG_CXXCPP
 
 dnl Check whether there's a C pre-processor.
-dnl ===
-dnl When using SunStudio compiler, there is a bug with the cc
-dnl preprocessor, so use CC preprocessor as the cc preprocessor
-dnl See Issuezilla #445.
-dnl ===
-if test $_os = SunOS; then
-CPP=$CXXCPP
-else
-AC_PROG_CPP
-fi
+AC_PROG_CPP
 fi
 
 
@@ -5906,22 +5871,6 @@ if test $WITH_MINGW = yes; then
 [AC_MSG_RESULT(no)])
 fi
 
-dnl ===
-dnl Extra checking for the SunOS compiler
-dnl ===
-if test $_os = SunOS; then
-dnl SunStudio C++ compiler packaged with SunStudio C compiler
-if test $CC = cc; then
-AC_MSG_CHECKING([SunStudio C++ Compiler])
-if test $CXX != CC; then
-AC_MSG_WARN([SunStudio C++ was not found])
-add_warning SunStudio C++ was not found
-else
-AC_MSG_RESULT([checked])
-fi
-fi
-fi
-
 dnl *
 dnl Testing for exception handling - dwarf2 or sjlj exceptions...
 dnl *
commit 3e2ae631ecd84342c7f29f0fd3effd6e635ed89e
Author: Michael Stahl mst...@redhat.com
Date:   Fri Aug 8 13:01:17 2014 +0200

odk: outdated documentation

Change-Id: I7e675a544729a7e1763d69888d1ad721c70df77c

diff --git a/odk/docs/install.html b/odk/docs/install.html
index 13425da..e29b30a 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -74,7 +74,7 @@
   tdbJDK (1.5 or higher)/b/td
   td class=content80
  pA JDK is necessary for developing Java components or 
applications. An appropriate Java SDK can be found on a target=_blank 
href=http://java.sun.com/products; title=link to the Java SDK download page 
(online)http://java.sun.com/products/a./p
- pRecommendation is to use Java 6 excepting for Mac OS 
because initially Mac OS supported a 64bit version of Java 6 only./p
+ pRecommendation is to use Java 7 or later for 64bit, and 
Java 6 for 32bit./p
  pbNote/b: The Java compiler is 
buoptional/u/b!/p/td
   /tr
  tr valign=middle
@@ -88,16 +88,16 @@
  exists:
  table class=table4
  tr
- td class=cell15Solaris/td
- td class=cell85Sun Studio 8 (20070730)/td
+ td class=cell15Linux/td
+ td class=cell80GNU C++ compiler, gcc version 4.1 or 
later/td
  /tr
 

[Libreoffice-commits] core.git: 2 commits - configure.ac sal/rtl

[Tor Lillqvist]

 configure.ac|   14 +++---
 sal/rtl/strtmpl.cxx |1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit a1ff2bb9a881da6fa6ea148c0b06e7f23392f5de
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Jul 28 09:45:06 2014 +0300

Include algorithm for std::min

Change-Id: I012027c38a6d2b06a4bb0cb53743d350b124ccf4

diff --git a/sal/rtl/strtmpl.cxx b/sal/rtl/strtmpl.cxx
index 57c98e2..c50309e 100644
--- a/sal/rtl/strtmpl.cxx
+++ b/sal/rtl/strtmpl.cxx
@@ -22,6 +22,7 @@
 /* String-Class*/
 /* === */
 
+#include algorithm
 #include cassert
 #include limits
 
commit 0f89f655c0b08dbeba90c587078e803c0db6c4f9
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Jul 28 09:22:29 2014 +0300

It's called GNU Make, not gnumake

Change-Id: I54900e077d5325fb6bfad84a2afa37f3adf551bb

diff --git a/configure.ac b/configure.ac
index 20049b3..5ef2401 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,9 +183,9 @@ cd $BUILDDIR
 x_Cygwin=[\#]
 
 dnl ===
-dnl Search all the common names for GNU make
+dnl Search all the common names for GNU Make
 dnl ===
-AC_MSG_CHECKING([for GNU make])
+AC_MSG_CHECKING([for GNU Make])
 
 # try to use our own make if it is available and GNUMAKE was not already 
defined
 if test -z $GNUMAKE; then
@@ -215,10 +215,10 @@ for a in $MAKE $GNUMAKE make gmake gnumake; do
 done
 AC_MSG_RESULT($GNUMAKE)
 if test -z $GNUMAKE; then
-AC_MSG_ERROR([not found. install GNU make.])
+AC_MSG_ERROR([not found. install GNU Make.])
 else
 if test $GNUMAKE_WIN_NATIVE = TRUE ; then
-AC_MSG_NOTICE([Using a native Win32 gnumake version.])
+AC_MSG_NOTICE([Using a native Win32 GNU Make version.])
 fi
 fi
 
@@ -5020,7 +5020,7 @@ AC_SUBST(ENABLE_PCH)
 
 TAB=`printf '\t'`
 
-AC_MSG_CHECKING([the GNU make version])
+AC_MSG_CHECKING([the GNU Make version])
 _make_version=`$GNUMAKE --version | grep GNU | $GREP -v GPL | $SED -e 
's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`
 _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*1+\$2*100+\$3 
}'`
 if test $_make_longver -ge 038200; then
@@ -5041,7 +5041,7 @@ elif test $_make_longver -ge 038100; then
 elif test $SHA1SUM = openssl; then
 SHA1SUM=openssl sha1
 fi
-AC_MSG_CHECKING([for GNU make bug 20033])
+AC_MSG_CHECKING([for GNU Make bug 20033])
 TESTGMAKEBUG20033=`mktemp -d tmp.XX`
 $SED -e s/TAB/$TAB/g  $TESTGMAKEBUG20033/Makefile  EOF
 A := \$(wildcard *.a)
@@ -5081,7 +5081,7 @@ else
 fi
 
 # find if gnumake support file function
-AC_MSG_CHECKING([whether GNU make supports the 'file' function])
+AC_MSG_CHECKING([whether GNU Make supports the 'file' function])
 TESTGMAKEFILEFUNC=`mktemp -d -t tst.XX`
 if test $GNUMAKE_WIN_NATIVE = TRUE ; then
 TESTGMAKEFILEFUNC=`cygpath -m $TESTGMAKEFILEFUNC`
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac sw/source

[Michael Stahl]

 configure.ac |4 +++-
 sw/source/core/fields/ddefld.cxx |3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3935ff3b33404bb859335b2bdbea42e583546bcd
Author: Michael Stahl mst...@redhat.com
Date:   Tue May 27 20:52:17 2014 +0200

configure: don't check JVM bit-ness when cross compiling

Change-Id: Icf3a58257c8c8e90d7e9d38f167a9b9f80d4bf32

diff --git a/configure.ac b/configure.ac
index 4130928..c5508a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6836,7 +6836,9 @@ if test $ENABLE_JAVA != ; then
 else
 AC_MSG_RESULT([no])
 fi
-else # ? not sure if it's valid for all OS, and all JVMs?
+elif test $cross_compiling != yes; then
+# at least 2 reasons to check: officebean needs to link -ljawt,
+# and libjpipe.so needs to be loaded by java to run JunitTests.
 case $CPUNAME in
 AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64)
 if test -f $JAVAINTERPRETER -a `$JAVAINTERPRETER -version 
21 | $GREP -i 64-bit` =  /dev/null; then
commit 747bcdc14386978f2a98a452e52c8dcc2459d319
Author: Michael Stahl mst...@redhat.com
Date:   Tue May 27 20:30:19 2014 +0200

fdo#78332: sw: fix separators in SwDDEFieldType::PutValue()

Setting 3 separators instead of 2 does not work.

(regression from 263153842741d7ce21cc0bf1c5296a55a1138024)

Change-Id: Id0b4649404b8a49a7f89a237c46106bce4e146ff

diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index f6dbf1b..d947ceb 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -366,7 +366,8 @@ bool SwDDEFieldType::PutValue( const uno::Any rVal, 
sal_uInt16 nWhichId )
 {
 rVal = sToken;
 }
-sNewCmd += sToken + OUString(sfx2::cTokenSeparator);
+sNewCmd += (i  2)
+? sToken + OUString(sfx2::cTokenSeparator) : sToken;
 }
 SetCmd( sNewCmd );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac postprocess/Rdb_services.mk RepositoryModule_host.mk

[Tor Lillqvist]

 RepositoryModule_host.mk|2 +-
 configure.ac|2 +-
 postprocess/Rdb_services.mk |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 21e2f5b0b1bc86c5032242ee3505f8e07b54affa
Author: Tor Lillqvist t...@collabora.com
Date:   Wed May 7 13:52:47 2014 +0300

No fpicker needed for non-DESKTOP surely?

Sure, not a lot of code, but best to not even compile it, to catch
eventual usage attempts.

Change-Id: I7462ea9a5fbe6080fcec2f424d1a1b80ad0afe21

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index a7e176e..bc456b9 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
filter \
$(call gb_Helper_optional,DBCONNECTIVITY,forms) \
formula \
-   fpicker \
+   $(call gb_Helper_optional,DESKTOP,fpicker) \
framework \
$(call gb_Helper_optional,DESKTOP,helpcompiler) \
$(call gb_Helper_optional,HELP,helpcontent2) \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 15ca776..3acd027 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Rdb_add_components,services,\
filter/source/xsltdialog/xsltdlg \
filter/source/xsltfilter/xsltfilter \
formula/util/for \
-   fpicker/source/office/fps_office \
+   $(call gb_Helper_optional,DESKTOP,fpicker/source/office/fps_office) \
framework/util/fwk \
framework/util/fwl \
framework/util/fwm \
commit 171d001a89e70cb08b389ad58f1c9683c1adefa8
Author: Tor Lillqvist t...@collabora.com
Date:   Wed May 7 13:06:18 2014 +0300

Build libgltf (and freetype) for iOS, too

They won't be used for now, but just to enforce portability of the
libgltf code a bit.

Change-Id: Ie5d2b9125eb0f4a2e432dcb8b55d5f494a5ed34d

diff --git a/configure.ac b/configure.ac
index 7520ea9..682aee6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10397,7 +10397,7 @@ dnl 
===
 
 ENABLE_GLTF=
 AC_MSG_CHECKING([whether to enable glTF support])
-if test $_os != iOS -a  x$enable_gltf != xno; then
+if test x$enable_gltf != xno; then
 ENABLE_GLTF=TRUE
 AC_MSG_RESULT([yes])
 BUILD_TYPE=$BUILD_TYPE LIBGLTF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac Repository.mk

[Rene Engelhard]

 Repository.mk |2 +-
 configure.ac  |4 
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 18cea6b8f8a928f8aad95c3c724f3163009c62c8
Author: Rene Engelhard r...@debian.org
Date:   Mon Apr 21 00:16:48 2014 +0200

fix reportbuilder*jar install; it's reportbuilder, not rhino

Change-Id: I8b64b384b8f959c48e01bee8034c2fb046df75b0

diff --git a/Repository.mk b/Repository.mk
index e8412a2..d009288 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -660,7 +660,7 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \
xmerge \
 ))
 
-$(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
+$(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder, \
reportbuilder \
reportbuilderwizard \
 ))
commit aa16cd40066236a34542a472b2be55a2b8ba50f0
Author: Rene Engelhard r...@debian.org
Date:   Mon Apr 21 00:15:54 2014 +0200

fix --disable-coinmp

we need a AC_ARG_ENABLE for it

Change-Id: Iafdbcbb56674c6813c9b3601aab9d5832c7e2977

diff --git a/configure.ac b/configure.ac
index 595eaf8..209975c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -815,6 +815,10 @@ AC_ARG_ENABLE(lpsolve,
 AS_HELP_STRING([--disable-lpsolve],
 [Disable compilation of the lp solve solver ])
 )
+AC_ARG_ENABLE(coinmp,
+AS_HELP_STRING([--disable-coinmp],
+[Disable compilation of the CoinMP solver ])
+)
 
 AC_ARG_ENABLE(pdfimport,
 AS_HELP_STRING([--disable-pdfimport],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac dbaccess/source

[Tor Lillqvist]

 configure.ac  |8 ++--
 dbaccess/source/core/dataaccess/commanddefinition.cxx |7 +++
 dbaccess/source/core/dataaccess/databasedocument.cxx  |7 ++-
 dbaccess/source/core/dataaccess/datasource.cxx|7 ++-
 dbaccess/source/core/inc/services.hxx |   16 ++--
 dbaccess/source/filter/xml/dbloader2.cxx  |5 +
 dbaccess/source/ui/browser/unodatbr.cxx   |   12 ++--
 7 files changed, 38 insertions(+), 24 deletions(-)

New commits:
commit 77be5e9064134fa0b559537433d57b6c0c646fa5
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 16 09:56:08 2014 +0300

Update experimental hacks for using Clang from the NDK

Change-Id: Id8fd8ca3c53fe97caa00a2d1c80b73387a4be2bc

diff --git a/configure.ac b/configure.ac
index cbc7199..05a2931 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,7 +223,9 @@ AC_ARG_WITH(android-ndk-toolchain-version,
 AS_HELP_STRING([--with-android-ndk-toolchain-version],
 [Specify which toolchain version to use, of those present in the
 Android NDK you are using. Mandatory if the NDK used has several
-toolchain versions for the host architecture you are building for.]), 
,)
+toolchain versions for the host architecture you are building for.
+Possible values are 4.6, 4.8, clang3.3 and clang3.4. Only 4.8 has been
+tested for real...]), ,)
 
 AC_ARG_WITH(android-sdk,
 AS_HELP_STRING([--with-android-sdk],
@@ -268,12 +270,14 @@ if test -n $with_android_ndk; then
 
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-$with_android_ndk_toolchain_version
 ANDROID_COMPILER_DIR=$ANDROID_BINUTILS_DIR
 ;;
-clang3.1|clang3.2)
+clang3.3|clang3.4)
 AC_MSG_WARN([Building with the Clang tool-chain is known to break in 
the bridges module, fix that please])
 
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-4.6
 
ANDROID_COMPILER_DIR=$ANDROID_NDK_HOME/toolchains/llvm-${with_android_ndk_toolchain_version#clang}
 ANDROID_USING_CLANG=true
 ;;
+*)
+AC_MSG_ERROR([Unrecognized value for the 
--with-android-ndk-toolchain-version option])
 esac
 
 if test ! -d $ANDROID_BINUTILS_DIR; then
commit e616c346d433dffd52fd483d8cfb3c4e5ec4169e
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 16 09:51:47 2014 +0300

WaE: Unreferenced function definition [loplugin:unreffun]

Work around a slight confusion in the Clang plugin when used with Clang
3.2. Put these 'extern C' function definitions consistenly outside
namespaces, as they are declared in the header.

Change-Id: Iccee41dfe0776f382e677b109009a95fb806a12c

diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx 
b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 8efc222..14a527e 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -38,15 +38,14 @@ using namespace ::osl;
 using namespace ::comphelper;
 using namespace ::cppu;
 
-namespace dbaccess
-{
-
 // OCommandDefinition
 extern C void SAL_CALL createRegistryInfo_OCommandDefinition()
 {
-static ::dba::OAutoRegistration OCommandDefinition  aAutoRegistration;
+static ::dba::OAutoRegistration ::dbaccess::OCommandDefinition  
aAutoRegistration;
 }
 
+namespace dbaccess
+{
 
 void OCommandDefinition::registerProperties()
 {
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 9270176..6a181bb 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -146,13 +146,18 @@ bool ViewMonitor::onSetCurrentController( const 
Reference XController  _rxCon
 return bLoadFinished;
 }
 
+} // namespace dbaccess
+
 // ODatabaseDocument
 
 extern C void SAL_CALL createRegistryInfo_ODatabaseDocument()
 {
-static ::dba::OAutoRegistration ODatabaseDocument  aAutoRegistration;
+static ::dba::OAutoRegistration ::dbaccess::ODatabaseDocument  
aAutoRegistration;
 }
 
+namespace dbaccess
+{
+
 ODatabaseDocument::ODatabaseDocument(const 
::rtl::ReferenceODatabaseModelImpl _pImpl )
 :ModelDependentComponent( _pImpl )
 ,ODatabaseDocument_OfficeDocument( getMutex() )
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx 
b/dbaccess/source/core/dataaccess/datasource.cxx
index 3d65363..c1b5ba5 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -475,13 +475,18 @@ namespace
 };
 }
 
+} // namespace dbaccess
+
 // ODatabaseContext
 
 extern C void SAL_CALL createRegistryInfo_ODatabaseSource()
 {
-static ::dba::OAutoRegistration ODatabaseSource  aAutoRegistration;
+static ::dba::OAutoRegistration 

[Libreoffice-commits] core.git: 2 commits - configure.ac

[Tor Lillqvist]

 configure.ac |   40 
 1 file changed, 20 insertions(+), 20 deletions(-)

New commits:
commit 44405c95b63fcd4b8b594c47106a7491424cbc40
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 2 17:12:09 2014 +0300

We use four column indentation steps in this file

Change-Id: I52898b460669ce7afaaeef4d28f36883eb20effa

diff --git a/configure.ac b/configure.ac
index c4b86ff..3726dfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5402,23 +5402,23 @@ if test $GXX = yes; then
 
 dnl see https://code.google.com/p/android/issues/detail?id=41770
 if test $_gpp_majmin -ge 401; then
-glibcxx_threads=no
-AC_LANG_PUSH([C++])
-AC_REQUIRE_CPP
-AC_MSG_CHECKING([whether $CXX is broken with boost.thread])
-AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
-#include bits/c++config.h]],[[
-#if !defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
- !defined(_GLIBCXX__PTHREADS) \
- !defined(_GLIBCXX_HAS_GTHREADS)
-choke me
-#endif
-]])],[AC_MSG_RESULT([yes])
-glibcxx_threads=yes],[AC_MSG_RESULT([no])])
-AC_LANG_POP([C++])
-if test $glibcxx_threads = yes; then
-  BOOST_CXXFLAGS=-D_GLIBCXX_HAS_GTHREADS
-fi
+glibcxx_threads=no
+AC_LANG_PUSH([C++])
+AC_REQUIRE_CPP
+AC_MSG_CHECKING([whether $CXX is broken with boost.thread])
+AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
+#include bits/c++config.h]],[[
+#if !defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
+ !defined(_GLIBCXX__PTHREADS) \
+ !defined(_GLIBCXX_HAS_GTHREADS)
+choke me
+#endif
+]])],[AC_MSG_RESULT([yes])
+glibcxx_threads=yes],[AC_MSG_RESULT([no])])
+AC_LANG_POP([C++])
+if test $glibcxx_threads = yes; then
+  BOOST_CXXFLAGS=-D_GLIBCXX_HAS_GTHREADS
+fi
  fi
 fi
 AC_SUBST(BOOST_CXXFLAGS)
commit 3ec4b907991d62155801b42acff9d09417fe66ed
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 2 17:08:16 2014 +0300

Fix g++ version test

Change-Id: I03bb06ddda9f8d54fae926004f5cf55cf5846833

diff --git a/configure.ac b/configure.ac
index cebff52..c4b86ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5394,14 +5394,14 @@ if test $GXX = yes; then
 _gpp_version=`$CXX -dumpversion`
 _gpp_majmin=`echo $_gpp_version | $AWK -F. '{ print \$1*100+\$2 }'`
 
-if test $_gpp_majmin -lt 410; then
-AC_MSG_ERROR([You need to use GNU C++ compiler version = 4.1 to build 
LibreOffice.])
+if test $_gpp_majmin -lt 401; then
+AC_MSG_ERROR([You need to use GNU C++ compiler version = 4.1 to build 
LibreOffice, you have $_gpp_version.])
 else
 AC_MSG_RESULT([checked (g++ $_gpp_version)])
 fi
 
 dnl see https://code.google.com/p/android/issues/detail?id=41770
-if test $_gpp_majmin -ge 410; then
+if test $_gpp_majmin -ge 401; then
 glibcxx_threads=no
 AC_LANG_PUSH([C++])
 AC_REQUIRE_CPP
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac RepositoryExternal.mk

[Stephan Bergmann]

 RepositoryExternal.mk |2 +-
 configure.ac  |   15 ++-
 2 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 4999a73991e6995e8d307c7653bfbf29a15573ec
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Mar 19 11:24:57 2014 +0100

--enable-python=fully-internal to force PYTHON_FOR_BUILD=

(for testing purposes, mainly)

Change-Id: I50d3c92b9ac0cc9dda55b7340f657acb74f675f6

diff --git a/configure.ac b/configure.ac
index f372fe03..89a8166 100644
--- a/configure.ac
+++ b/configure.ac
@@ -950,10 +950,11 @@ AC_ARG_ENABLE(crashdump,
 [Enable the crashdump feature.]))
 
 AC_ARG_ENABLE(python,
-AS_HELP_STRING([--enable-python=no/auto/system/internal],
+AS_HELP_STRING([--enable-python=no/auto/system/internal/fully-internal],
 [Enables or disables Python support at run-time and build-time.
- Also specifies what Python to use. 'auto' is the
- default.]))
+ Also specifies what Python to use. 'auto' is the default.
+ 'fully-internal' even forces the internal version for uses of Python
+ during the build (for testing purposes, mainly).]))
 
 AC_ARG_ENABLE(gtk,
 AS_HELP_STRING([--disable-gtk],
@@ -7819,7 +7820,7 @@ AC_SUBST(XMLLINT)
 # Optionally user can pass an option to configure, i. e.
 # ./configure PYTHON=/usr/bin/python
 # =
-if test $build_os != cygwin; then
+if test $build_os != cygwin -a $enable_python != fully-internal; then
 # This allows a lack of system python with no error, we use internal one 
in that case.
 AM_PATH_PYTHON([2.5],, [:])
 # Clean PYTHON_VERSION checked below if cross-compiling
@@ -7854,7 +7855,7 @@ no|disable)
 dnl (When cross-compiling to Windows from Linux using the mingw32-cross
 dnl compiler from OBS, use mingw32-python from OBS, and ditto for other
 dnl MinGW cross-compilation setups.)
-AC_MSG_RESULT([internal])
+AC_MSG_RESULT([fully internal])
 enable_python=internal
 elif test $cross_compiling = yes; then
 AC_MSG_RESULT([system])
@@ -7876,6 +7877,10 @@ no|disable)
 internal)
 AC_MSG_RESULT([internal])
 ;;
+fully-internal)
+AC_MSG_RESULT([fully internal])
+enable_python=internal
+;;
 system)
 AC_MSG_RESULT([system])
 ;;
commit 233610f1245685a3f27cf9633c93568bd1d300da
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Mar 19 11:24:13 2014 +0100

gbuild: More crude hacking to fix over-evaluation of gb_Python_PRECOMMAND

...in the spirit of 3e70e26cbc96667e2968cd325737053bf8bffb78 gbuild: fix 
over-
evaluation in gb_ExternalExecutable__set_internal

Change-Id: I3d5859bd3437cc050250e66d723d3dee3056ef46

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a1fbcda..809a110 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3491,7 +3491,7 @@ $(call 
gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_
 else
 
 $(call 
gb_ExternalExecutable_set_internal,python,$(INSTROOT)/$(LIBO_BIN_FOLDER)/$(if 
$(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin))
-$(call gb_ExternalExecutable_set_precommand,python,$(gb_Python_PRECOMMAND))
+$(call gb_ExternalExecutable_set_precommand,python,$(subst 
$$,,$(gb_Python_PRECOMMAND)))
 $(call gb_ExternalExecutable_add_dependencies,python,$(call 
gb_Package_get_target_for_build,python3))
 
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac framework/source idl/inc idl/source

[Matúš Kukan]

 configure.ac   |2 +-
 framework/source/services/autorecovery.cxx |8 +---
 idl/inc/database.hxx   |2 ++
 idl/source/objects/types.cxx   |   24 ++--
 idl/source/prj/database.cxx|1 +
 5 files changed, 31 insertions(+), 6 deletions(-)

New commits:
commit 4f4d9c06355b64ae30e0c100be0ca55d01c16885
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Mon Mar 17 11:36:31 2014 +0100

Avoid duplicate symbols in libmerged for Windows too.

This is working version of fc27a685d466dc380a8b68cd48f47db632ed3693

Change-Id: I48e861b5b7692ea051edf52d7ad9cc54ca989e22

diff --git a/configure.ac b/configure.ac
index cbe3f3b..f372fe03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12461,11 +12461,11 @@ if test -n $enable_mergelibs -a $enable_mergelibs 
!= no; then
 if test $enable_mergelibs = all; then
 MERGELIBS=ALL
 URELIBS=TRUE
+AC_DEFINE(STATIC_LINKING)
 else
 MERGELIBS=CORE
 fi
 AC_MSG_RESULT([yes])
-AC_DEFINE(STATIC_LINKING)
 else
 AC_MSG_RESULT([no])
 fi
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 15e87f2..f9abfd2 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -81,6 +81,8 @@ protected:
 aIFaceName = OString();
 }
 public:
+OUString sSlotMapFile;
+
 explicit SvIdlDataBase( const SvCommand rCmd );
 ~SvIdlDataBase();
 static sal_Bool IsBinaryFormat( SvStream  rInStm );
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 1797fa2..265be88 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1398,7 +1398,7 @@ sal_uLong SvMetaType::MakeSfx( OStringBuffer rAttrArray )
 }
 
 void SvMetaType::WriteSfxItem(
-const OString rItemName, SvIdlDataBase , SvStream  rOutStm )
+const OString rItemName, SvIdlDataBase rBase, SvStream rOutStm )
 {
 WriteStars( rOutStm );
 OStringBuffer aVarName( a);
@@ -1411,14 +1411,34 @@ void SvMetaType::WriteSfxItem(
 OString::number(nAttrCount));
 aTypeName.append(aAttrCount);
 
-rOutStm.WriteCharPtr( extern  ).WriteCharPtr( aTypeName.getStr() )
+bool bExport = false, bReturn = false;
+// these are exported from sfx library
+if (rItemName == SfxBoolItem ||
+rItemName == SfxStringItem ||
+rItemName == SfxUInt16Item ||
+rItemName == SfxUInt32Item ||
+rItemName == SfxVoidItem)
+{
+bExport = true;
+if (!rBase.sSlotMapFile.endsWith(sfxslots.hxx))
+bReturn = true;
+}
+
+rOutStm.WriteCharPtr( extern  );
+if (bExport)
+rOutStm.WriteCharPtr( SFX2_DLLPUBLIC  );
+rOutStm.WriteCharPtr( aTypeName.getStr() )
.WriteCharPtr( aVarName.getStr() ).WriteChar( ';' )  endl;
+if (bReturn)
+return;
 
 // write the implementation part
 rOutStm.WriteCharPtr( #ifdef SFX_TYPEMAP )  endl;
 rOutStm.WriteCharPtr( #if !defined(_WIN32)  
((defined(DISABLE_DYNLOADING)  (defined(ANDROID) || defined(IOS))) || 
STATIC_LINKING) )  endl;
 rOutStm.WriteCharPtr( __attribute__((__weak__)) )  endl;
 rOutStm.WriteCharPtr( #endif )  endl;
+if (bExport)
+rOutStm.WriteCharPtr( SFX2_DLLPUBLIC  );
 rOutStm.WriteCharPtr( aTypeName.getStr() ).WriteCharPtr( aVarName.getStr() 
)
.WriteCharPtr(  =  )  endl;
 rOutStm.WriteChar( '{' )  endl;
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 3ac165d..04f351c 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -34,6 +34,7 @@ SvIdlDataBase::SvIdlDataBase( const SvCommand rCmd )
 , aPersStream( *IDLAPP-pClassMgr, NULL )
 , pIdTable( NULL )
 {
+sSlotMapFile = rCmd.aSlotMapFile;
 }
 
 SvIdlDataBase::~SvIdlDataBase()
commit ef87ff6680f79362a431db6e7ef2f40cfc576219
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Fri Mar 14 09:42:02 2014 +0100

fdo#51819: autorecovery: fix saving password in protected documents.

Thanks to s...@mailinator.com for the idea.

Change-Id: Ib79abafe3d4d3ba21f7914aeb284d86ce662824c

diff --git a/framework/source/services/autorecovery.cxx 
b/framework/source/services/autorecovery.cxx
index 980e92b..4ebd694 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -3233,9 +3233,11 @@ void AutoRecovery::implts_saveOneDoc(const OUString
 // if the document was loaded with a password, it should be
 // stored with password
 utl::MediaDescriptor lNewArgs;
-OUString sPassword = 
lOldArgs.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PASSWORD(), 
OUString());
-if (!sPassword.isEmpty())
-lNewArgs[utl::MediaDescriptor::PROP_PASSWORD()] = sPassword;
+css::uno::Sequence css::beans::NamedValue  aEncryptionData =
+

[Libreoffice-commits] core.git: 2 commits - configure.ac

[Tor Lillqvist]

 configure.ac |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 2044aef13b163e8ba977013c152e919271ac4352
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Feb 20 11:18:56 2014 +0200

Don't bother mentioning the Tru64 'setld' package format

Change-Id: I2a9707c70637fe5bae5d16fd45e9603318d5d82f

diff --git a/configure.ac b/configure.ac
index f506ecf..1c4ba06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1402,7 +1402,7 @@ AC_ARG_WITH(package-format,
 [Specify package format(s) for LibreOffice installation sets. The
  implicit --without-package-format leads to no installation sets being
  generated. Possible values: aix, archive, bsd, deb, dmg,
- installed, msi, native, osx, pkg, portable, rpm, and setld.
+ installed, msi, native, osx, pkg, portable, and rpm.
  Example: --with-package-format='deb rpm']),
 ,)
 
@@ -4451,7 +4451,7 @@ AC_MSG_CHECKING([which package format to use])
 if test -n $with_package_format -a $with_package_format != no; then
 for i in $with_package_format; do
 case $i in
-aix | bsd | deb | osx | pkg | rpm | setld | native | portable | 
archive | dmg | installed | msi)
+aix | bsd | deb | osx | pkg | rpm | native | portable | archive | dmg 
| installed | msi)
 ;;
 *)
 AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
@@ -4461,7 +4461,6 @@ deb - Debian software distribution
 osx - MacOS X software distribution
 pkg - Solaris software distribution
 rpm - RedHat software distribution
-setld - Tru64 (setld) software distribution
 native - Native software distribution for the platform
 portable - Portable software distribution
 
@@ -7256,7 +7255,7 @@ if test $enable_epm = yes; then
 else
 for i in $PKGFORMAT; do
 case $i in
-aix | bsd | deb | osx | pkg | rpm | setld | native | portable)
+aix | bsd | deb | osx | pkg | rpm | native | portable)
 AC_MSG_ERROR(
 [--with-package-format='$PKGFORMAT' requires --enable-epm])
 ;;
commit 26eb80ac7a1fa0ce56a0137e6243625c91b4c580
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Feb 20 11:18:04 2014 +0200

Don't bother mentioning the IRIX 'inst' and 'tardist' package formats

Change-Id: I11c2f7fa72a1bc8a2c621ed928dc33a8410f1eee

diff --git a/configure.ac b/configure.ac
index 4f71d15..f506ecf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1401,8 +1401,8 @@ AC_ARG_WITH(package-format,
 AS_HELP_STRING([--with-package-format],
 [Specify package format(s) for LibreOffice installation sets. The
  implicit --without-package-format leads to no installation sets being
- generated. Possible values: aix, archive, bsd, deb, dmg, inst,
- installed, msi, native, osx, pkg, portable, rpm, setld, and tardist.
+ generated. Possible values: aix, archive, bsd, deb, dmg,
+ installed, msi, native, osx, pkg, portable, rpm, and setld.
  Example: --with-package-format='deb rpm']),
 ,)
 
@@ -4451,14 +4451,13 @@ AC_MSG_CHECKING([which package format to use])
 if test -n $with_package_format -a $with_package_format != no; then
 for i in $with_package_format; do
 case $i in
-aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | 
portable | archive | dmg | installed | msi)
+aix | bsd | deb | osx | pkg | rpm | setld | native | portable | 
archive | dmg | installed | msi)
 ;;
 *)
 AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
 aix - AIX software distribution
 bsd - FreeBSD, NetBSD, or OpenBSD software distribution
 deb - Debian software distribution
-inst or tardist - IRIX software distribution
 osx - MacOS X software distribution
 pkg - Solaris software distribution
 rpm - RedHat software distribution
@@ -7257,7 +7256,7 @@ if test $enable_epm = yes; then
 else
 for i in $PKGFORMAT; do
 case $i in
-aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | 
portable)
+aix | bsd | deb | osx | pkg | rpm | setld | native | portable)
 AC_MSG_ERROR(
 [--with-package-format='$PKGFORMAT' requires --enable-epm])
 ;;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac ucb/source vcl/unx

[Stephan Bergmann]

 configure.ac  |3 +++
 ucb/source/ucp/gio/gio_mount.cxx  |7 +++
 vcl/unx/gtk/window/gloactiongroup.cxx |   14 ++
 vcl/unx/gtk/window/glomenu.cxx|7 +++
 4 files changed, 31 insertions(+)

New commits:
commit 8313f68355a7f1f51e930c74f215d823ff086457
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jan 13 18:13:58 2014 +0100

Work around G_DEFINE_TYPE -Werror,-Wunused-function

At least G_DEFINE_TYPE from glib2-devel-2.38.2-2.fc20.x86_64
/usr/include/glib-2.0/gobject/gtype.h defines unsed *_get_instance_private
functions.

Change-Id: I47211b6451d9699c7b8741555f3ad11a09e411bf

diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx
index 30c97e2..6d7bc63 100644
--- a/ucb/source/ucp/gio/gio_mount.cxx
+++ b/ucb/source/ucp/gio/gio_mount.cxx
@@ -22,7 +22,14 @@
 #include stdio.h
 #include string.h
 
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE  HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored -Wunused-function
+#endif
 G_DEFINE_TYPE (OOoMountOperation, ooo_mount_operation, G_TYPE_MOUNT_OPERATION);
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE  HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic pop
+#endif
 
 static void ooo_mount_operation_ask_password (GMountOperation   *op,
 const char *message, const char *default_user, const char *default_domain,
diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx 
b/vcl/unx/gtk/window/gloactiongroup.cxx
index 19187a6..00ce933 100644
--- a/vcl/unx/gtk/window/gloactiongroup.cxx
+++ b/vcl/unx/gtk/window/gloactiongroup.cxx
@@ -40,7 +40,14 @@ struct _GLOAction
 typedef GObjectClass GLOActionClass;
 typedef struct _GLOAction GLOAction;
 
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE  HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored -Wunused-function
+#endif
 G_DEFINE_TYPE (GLOAction, g_lo_action, G_TYPE_OBJECT);
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE  HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic pop
+#endif
 
 GLOAction*
 g_lo_action_new (void)
@@ -100,10 +107,17 @@ struct _GLOActionGroupPrivate
 
 static void g_lo_action_group_iface_init (GActionGroupInterface *);
 
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE  HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored -Wunused-function
+#endif
 G_DEFINE_TYPE_WITH_CODE (GLOActionGroup,
 g_lo_action_group, G_TYPE_OBJECT,
 G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_GROUP,
g_lo_action_group_iface_init));
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE  HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic pop
+#endif
 
 static gchar **
 g_lo_action_group_list_actions (GActionGroup *group)
diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx
index 8227fb1..e012aa0 100644
--- a/vcl/unx/gtk/window/glomenu.cxx
+++ b/vcl/unx/gtk/window/glomenu.cxx
@@ -25,7 +25,14 @@ struct _GLOMenu
 
 typedef GMenuModelClass GLOMenuClass;
 
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE  HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored -Wunused-function
+#endif
 G_DEFINE_TYPE (GLOMenu, g_lo_menu, G_TYPE_MENU_MODEL);
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE  HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic pop
+#endif
 
 struct item
 {
commit 21470348109ab7b91d2147535d72728736c5b43d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jan 13 18:05:27 2014 +0100

Filter out GCC-ism for Clang

At least mariadb-5.5.34-2.fc20.x86_64 mysql_config --cflags somewhat
unhelpfully includes GCC-specific -fstack-protector-strong which at least 
Clang
trunk towards 3.5 does not understand.

Change-Id: Ic38104323b6d9275384effdf21d1885c0720edb0

diff --git a/configure.ac b/configure.ac
index 65fb0e8..5491132 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8257,6 +8257,9 @@ if test $ENABLE_MARIADBC = TRUE; then
 fi
 AC_MSG_CHECKING([for MariaDB Client library])
 MARIADB_CFLAGS=`$MARIADBCONFIG --cflags`
+if test $COM_GCC_IS_CLANG = TRUE; then
+MARIADB_CFLAGS=$(printf '%s' $MARIADB_CFLAGS | sed -e 
s/-fstack-protector-strong//)
+fi
 MARIADB_LIBS=`$MARIADBCONFIG --libs_r`
 AC_MSG_RESULT([includes '$MARIADB_CFLAGS', libraries '$MARIADB_LIBS'])
 AC_MSG_CHECKING([whether to bundle the MySQL/MariaDB client library])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac cppu/source

[Tor Lillqvist]

 configure.ac  |2 +-
 cppu/source/uno/lbmap.cxx |6 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 5ad06dbf643f20c706c24da7431a05c4def644f2
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 26 18:45:30 2013 +0200

WaE: unused function 'setNegativeBridge'

Change-Id: I251f93f421972f8e5ab346af29152cebc17ab875

diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 4f281ba..6fb589e 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -313,7 +313,9 @@ static inline OUString getBridgeName(
 aBridgeName.append( EnvDcp::getTypeName(rTo.getTypeName()) );
 return aBridgeName.makeStringAndClear();
 }
-//==
+
+#ifndef DISABLE_DYNLOADING
+
 static inline void setNegativeBridge( const OUString  rBridgeName )
 SAL_THROW(())
 {
@@ -322,6 +324,8 @@ static inline void setNegativeBridge( const OUString  
rBridgeName )
 rData.aNegativeLibs.insert( rBridgeName );
 }
 
+#endif
+
 #ifdef DISABLE_DYNLOADING
 
 static uno_ext_getMappingFunc selectMapFunc( const OUString  rBridgeName )
commit 403d5ed5b85ab1dc30a1f84d8624be56aa47d8f2
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 26 18:18:10 2013 +0200

Accept also the iOS 7.1 SDK

Change-Id: I1e93d23be2f7738062f419680872b94d2ccdcc8c

diff --git a/configure.ac b/configure.ac
index 0792f6e..12c6ad6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2952,7 +2952,7 @@ if test $_os = iOS; then
 xcode_developer=`xcode-select -print-path`
 
 pref_sdk_ver=7.0
-for sdkver in 7.0 6.1 6.0; do
+for sdkver in 7.1 7.0 6.1 6.0; do
 
t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
 if test -d $t; then
 ios_sdk=$sdkver
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac include/unotools unotools/source vcl/source vcl/unx

[Stephan Bergmann]

 configure.ac|5 
 include/unotools/configitem.hxx |   15 +-
 unotools/source/config/configitem.cxx   |  107 --
 unotools/source/config/syslocaleoptions.cxx |  165 +---
 vcl/source/gdi/configsettings.cxx   |6 -
 vcl/unx/generic/dtrans/config.cxx   |   45 +++
 6 files changed, 136 insertions(+), 207 deletions(-)

New commits:
commit 380007d64716fc93fa265133eaa264132a242768
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Nov 20 23:39:21 2013 +0100

Elide utl::ConfigItem_Impl

...and utl::ConfigItem::IsValidConfigMgr is always true.

Change-Id: I37e295729c3d0ae12719f0ae6f5a5628c58d0b9f

diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index 99aeae9..9f3c86c 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -62,7 +62,6 @@ namespace utl
 
 class ConfigChangeListener_Impl;
 class ConfigManager;
-struct ConfigItem_Impl;
 
 class UNOTOOLS_DLLPUBLIC ConfigItem : public ConfigurationBroadcaster
 {
@@ -74,9 +73,11 @@ namespace utl
 m_xHierarchyAccess;
 com::sun::star::uno::Reference 
com::sun::star::util::XChangesListener 
 xChangeLstnr;
-ConfigItem_Impl*pImpl;
+sal_Int16 m_nMode;
+bool m_bIsModified;
+bool m_bEnableInternalNotification;
+sal_Int16 m_nInValueChange;
 
-ConfigItem();//
 voidRemoveChangesListener();
 voidCallNotify(
 const com::sun::star::uno::SequenceOUString 
aPropertyNames);
@@ -165,18 +166,14 @@ namespace utl
 
 const OUString GetSubTreeName() const {return sSubTree;}
 
-sal_BoolIsModified() const;
+bool IsModified() const;
 
 /** writes the changed values into the sub tree. Always called in 
the Dtor of the derived class.  */
 virtual voidCommit()=0;
 
-sal_BoolIsInValueChange() const;
+bool IsInValueChange() const;
 
 sal_Int16   GetMode() const;
-
-/** checks if the configuration manager used by this item is valid.
-*/
-sal_BoolIsValidConfigMgr() const;
 };
 }//namespace utl
 #endif // INCLUDED_UNOTOOLS_CONFIGITEM_HXX
diff --git a/unotools/source/config/configitem.cxx 
b/unotools/source/config/configitem.cxx
index 4119983..d3127c8 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -91,23 +91,6 @@ namespace utl{
 //XEventListener
 virtual void SAL_CALL disposing( const EventObject Source ) 
throw(RuntimeException);
 };
-
-struct ConfigItem_Impl
-{
-utl::ConfigManager* pManager;
-   sal_Int16nMode;
-sal_BoolbIsModified;
-sal_BoolbEnableInternalNotification;
-
-sal_Int16   nInValueChange;
-ConfigItem_Impl() :
-pManager(0),
-nMode(0),
-bIsModified(sal_False),
-bEnableInternalNotification(sal_False),
-nInValueChange(0)
-{}
-};
 }
 
 class ValueCounter_Impl
@@ -124,28 +107,6 @@ public:
 }
 };
 
-namespace
-{
-// helper to achieve exception - safe handling of an Item under 
construction
-template class TYP
-class AutoDeleter // : Noncopyable
-{
-TYP* m_pItem;
-public:
-AutoDeleter(TYP * pItem)
-: m_pItem(pItem)
-{
-}
-
-~AutoDeleter()
-{
-delete m_pItem;
-}
-
-void keep() { m_pItem = 0; }
-};
-}
-
 ConfigChangeListener_Impl::ConfigChangeListener_Impl(
  ConfigItem rItem, const Sequence OUString  rNames) :
 pParent(rItem),
@@ -206,33 +167,21 @@ void ConfigChangeListener_Impl::disposing( const 
EventObject /*rSource*/ ) thro
 
 ConfigItem::ConfigItem(const OUString rSubTree, sal_Int16 nSetMode ) :
 sSubTree(rSubTree),
-pImpl(new ConfigItem_Impl)
+m_nMode(nSetMode),
+m_bIsModified(false),
+m_bEnableInternalNotification(false),
+m_nInValueChange(0)
 {
-AutoDeleterConfigItem_Impl aNewImpl(pImpl);
-
-pImpl-pManager = ConfigManager::getConfigManager();
-pImpl-nMode = nSetMode;
 if(0 != (nSetModeCONFIG_MODE_RELEASE_TREE))
-pImpl-pManager-addConfigItem(*this);
+ConfigManager::getConfigManager().addConfigItem(*this);
 else
-m_xHierarchyAccess = pImpl-pManager-addConfigItem(*this);
-
-aNewImpl.keep();
-}
-
-sal_Bool ConfigItem::IsValidConfigMgr() const
-{
-return pImpl-pManager != 0;
+m_xHierarchyAccess = 
ConfigManager::getConfigManager().addConfigItem(*this);
 }
 
 

[Libreoffice-commits] core.git: 2 commits - configure.ac oox/source

[Michael Stahl]

 configure.ac |   10 +++---
 oox/source/crypto/CryptTools.cxx |2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 133d59adf744b2279a7d59071ca834ac766b9719
Author: Michael Stahl mst...@redhat.com
Date:   Fri Nov 1 12:17:32 2013 +0100

configure: build oox with NSS backend by default

Because NSS libraries are dynamic and OpenSSL static, using NSS saves
1.5 MB in the oox library [even though it's not as 1337 apparently]:

-rwxrwxr-x. 1 ms ms  8889575  2. Nov 13:45 libooxlo.so.nss
-rwxrwxr-x. 1 ms ms  7773576  2. Nov 13:45 libooxlo.so.nss.stripped
-rwxrwxr-x. 1 ms ms 10340276  2. Nov 13:37 libooxlo.so.openssl
-rwxrwxr-x. 1 ms ms  9042216  2. Nov 13:37 libooxlo.so.openssl.stripped

Change-Id: I387496ae364acb1286d753d52f04924631136750

diff --git a/configure.ac b/configure.ac
index 99209b6..1c569af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8785,13 +8785,9 @@ nss - Mozilla's Network Security Services (NSS)
 ;;
 esac
 else
-if test $enable_openssl = yes; then
-AC_DEFINE(USE_TLS_OPENSSL)
-TLS=OPENSSL
-else
-AC_DEFINE(USE_TLS_NSS)
-TLS=NSS
-fi
+# default to using NSS, it results in smaller oox lib
+AC_DEFINE(USE_TLS_NSS)
+TLS=NSS
 fi
 AC_MSG_RESULT([$TLS])
 AC_SUBST(TLS)
commit 2ff7b04c1b205b14dc1bace1e90ee62d26db9643
Author: Michael Stahl mst...@redhat.com
Date:   Mon Nov 4 21:50:21 2013 +0100

oox: use proper integer type when calling PK11_DigestFinal

Change-Id: I5ff79c55446bd9f3e350fb128793ffef51be843f

diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index a2a7573..6c46297 100644
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -236,7 +236,7 @@ bool sha512(vectorsal_uInt8 output, vectorsal_uInt8 
input)
 if (status != SECSuccess)
 return false;
 
-sal_uInt32 outputLength = 0;
+unsigned int outputLength = 0;
 
 status = PK11_DigestFinal(mContext, output[0], outputLength, 
SHA512_LENGTH);
 if (status != SECSuccess || outputLength != SHA512_LENGTH)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac download.lst external/libmwaw filter/Configuration_filter.mk filter/source RepositoryExternal.mk writerperfect/source

[David Tardon]

 RepositoryExternal.mk|2 
 configure.ac |2 
 download.lst |4 
 external/libmwaw/ExternalProject_libmwaw.mk  |1 
 filter/Configuration_filter.mk   |6 
 filter/source/config/fragments/filters/Beagle_Works.xcu  |   29 
 filter/source/config/fragments/filters/Great_Works.xcu   |   29 
 filter/source/config/fragments/filters/MacDoc.xcu|   29 
 filter/source/config/fragments/types/writer_Beagle_Works.xcu |   29 
 filter/source/config/fragments/types/writer_Great_Works.xcu  |   29 
 filter/source/config/fragments/types/writer_MacDoc.xcu   |   29 
 writerperfect/source/writer/MWAWImportFilter.cxx |  833 ---
 12 files changed, 215 insertions(+), 807 deletions(-)

New commits:
commit 0cdd8a4f17a80b55c54c1f287c1f10bd7fa4307c
Author: David Tardon dtar...@redhat.com
Date:   Sun Nov 3 10:02:58 2013 +0100

add config. for formats newly supported by libmwaw

Change-Id: I19cc5b13adf1c0d8cf26abbc9f4254ae89a970fc

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 269866b..7102e27 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -304,14 +304,17 @@ $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter
writer_StarOffice_XML_Writer \
writer_WordPerfect_Document \
writer_MS_Works_Document \
+   writer_Beagle_Works \
writer_ClarisWorks \
writer_DocMaker \
writer_eDoc_Document \
writer_FullWrite_Professional \
+   writer_Great_Works \
writer_HanMac_Word_K \
writer_LightWayText \
writer_Mac_Word \
writer_Mac_Works \
+   writer_MacDoc \
writer_MacWrite \
writer_MacWritePro \
writer_Mariner_Write \
@@ -350,14 +353,17 @@ $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi
StarOffice_XML__Writer_ \
WordPerfect \
MS_Works \
+   Beagle_Works \
ClarisWorks \
DocMaker \
eDoc_Document \
FullWrite_Professional \
+   Great_Works \
HanMac_Word_K \
LightWayText \
Mac_Word \
Mac_Works \
+   MacDoc \
MacWrite \
MacWritePro \
Mariner_Write \
diff --git a/filter/source/config/fragments/filters/Beagle_Works.xcu 
b/filter/source/config/fragments/filters/Beagle_Works.xcu
new file mode 100644
index 000..f1cab85
--- /dev/null
+++ b/filter/source/config/fragments/filters/Beagle_Works.xcu
@@ -0,0 +1,29 @@
+!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+--
+
+node oor:name=Beagle Works oor:op=replace
+prop oor:name=Flags
+valueIMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED/value
+/prop
+prop oor:name=FilterService
+valuecom.sun.star.comp.Writer.MWAWImportFilter/value
+/prop
+prop oor:name=UIName
+value xml:lang=x-defaultBeagle Works Document/value
+/prop
+prop oor:name=FileFormatVersion
+value0/value
+/prop
+prop oor:name=Type
+valuewriter_Beagle_Works/value
+/prop
+prop oor:name=DocumentService
+valuecom.sun.star.text.TextDocument/value
+/prop
+/node
diff --git a/filter/source/config/fragments/filters/Great_Works.xcu 
b/filter/source/config/fragments/filters/Great_Works.xcu
new file mode 100644
index 000..6090504
--- /dev/null
+++ b/filter/source/config/fragments/filters/Great_Works.xcu
@@ -0,0 +1,29 @@
+!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+--
+
+node oor:name=Great Works oor:op=replace
+prop oor:name=Flags
+valueIMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED/value
+/prop
+prop oor:name=FilterService
+valuecom.sun.star.comp.Writer.MWAWImportFilter/value
+/prop
+prop oor:name=UIName
+value xml:lang=x-defaultGreat Works Document/value
+/prop
+prop oor:name=FileFormatVersion
+value0/value
+/prop
+prop oor:name=Type
+valuewriter_Great_Works/value
+/prop
+prop oor:name=DocumentService
+valuecom.sun.star.text.TextDocument/value
+/prop
+/node
diff --git a/filter/source/config/fragments/filters/MacDoc.xcu 
b/filter/source/config/fragments/filters/MacDoc.xcu
new file mode 100644
index 000..70ce7d2
--- /dev/null
+++ b/filter/source/config/fragments/filters/MacDoc.xcu
@@ -0,0 +1,29 @@
+!--
+ * This 

[Libreoffice-commits] core.git: 2 commits - configure.ac external/cppunit RepositoryModule_build.mk

[Tor Lillqvist]

 RepositoryModule_build.mk   |3 --
 configure.ac|4 ++-
 external/cppunit/UnpackedTarball_cppunit.mk |9 ---
 external/cppunit/android.patch  |   33 
 external/cppunit/ios.patch  |   18 ---
 5 files changed, 3 insertions(+), 64 deletions(-)

New commits:
commit 2b8b417401577156c39d5cdd86985ae55c6e03a9
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Oct 17 22:42:42 2013 +0300

We don't use cppunit when cross-compiling

Change-Id: I8ff723233546d9becd001ab54a7df5ad98223f90

diff --git a/configure.ac b/configure.ac
index d8a26e9..efbebc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7772,7 +7772,9 @@ fi
 dnl ===
 dnl Check for system cppunit
 dnl ===
-libo_CHECK_SYSTEM_MODULE([cppunit],[CPPUNIT],[cppunit = 1.12.0])
+if test $cross_compiling != yes; then
+libo_CHECK_SYSTEM_MODULE([cppunit],[CPPUNIT],[cppunit = 1.12.0])
+fi
 
 dnl ===
 dnl Check whether freetype is available
diff --git a/external/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
index e1a77a5..5898a88 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -16,15 +16,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/unix.patch \
external/cppunit/wundef.patch \
 ))
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
-   external/cppunit/android.patch \
-))
-else ifeq ($(OS),IOS)
-$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
-   external/cppunit/ios.patch \
-))
-endif
 ifeq ($(DISABLE_DYNLOADING),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/disable-dynloading.patch \
diff --git a/external/cppunit/android.patch b/external/cppunit/android.patch
deleted file mode 100644
index 59ae451..000
--- a/external/cppunit/android.patch
+++ /dev/null
@@ -1,33 +0,0 @@
 misc/cppunit-1.13.1/config/ltmain.sh
-+++ misc/build/cppunit-1.13.1/config/ltmain.sh
-@@ -3228,6 +3228,12 @@
-   fi
-   else
- 
-+  # Force no versioning suffix for Android thanks to silly
-+  # apkbuilder which doesn't add extra native libs unless their
-+  # name ends with .so
-+
-+  version_type=none
-+
-   # Parse the version information argument.
-   save_ifs=$IFS; IFS=':'
-   set dummy $vinfo 0 0 0
 misc/cppunit-1.13.1/src/cppunit/UnixDynamicLibraryManager.cpp
-+++ misc/build/cppunit-1.13.1/src/cppunit/UnixDynamicLibraryManager.cpp
-@@ -13,7 +13,15 @@
- DynamicLibraryManager::LibraryHandle 
- DynamicLibraryManager::doLoadLibrary( const std::string libraryName )
- {
-+#ifdef __ANDROID__
-+  // Use our enhanced dlopen() wrapper, see sal/osl/android/jni/lo-wrapper.c
-+  void *(*lo_dlopen)(const char *) = (void *(*)(const char *)) dlsym( 
RTLD_DEFAULT, lo_dlopen );
-+  if (lo_dlopen == NULL)
-+return NULL;
-+  return (*lo_dlopen)( libraryName.c_str() );
-+#else
-   return ::dlopen( libraryName.c_str(), RTLD_NOW | RTLD_GLOBAL );
-+#endif
- }
- 
- 
diff --git a/external/cppunit/ios.patch b/external/cppunit/ios.patch
deleted file mode 100644
index d7e355c..000
--- a/external/cppunit/ios.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 misc/cppunit-1.13.1/configure
-+++ misc/cppunit-1.13.1/configure
-@@ -23273,7 +23273,7 @@
-   { $as_echo $as_me:${as_lineno-$LINENO}: result: creating 
$ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP 
defines 5
- $as_echo creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for 
$ac_prefix_conf_INP defines 6; }
-   if test -f $ac_prefix_conf_INP ; then
--$as_dirname -- /* automatically generated */ ||
-+$as_dirname -- '/* automatically generated */' ||
- $as_expr X/* automatically generated */ : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-X/* automatically generated */ : 'X\(//\)[^/]' \| \
-X/* automatically generated */ : 'X\(//\)$' \| \
-@@ -23318,5 +23318,5 @@
-   else
- as_fn_error $? input file $ac_prefix_conf_IN does not exist, skip 
generating $ac_prefix_conf_OUT $LINENO 5
-   fi
--  rm -f conftest.*
-+  rm -f -r conftest.*
- fi
commit 04aaf0a52ff692e340d4acd47c4ddf5857b12df2
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Oct 17 22:38:23 2013 +0300

These are handled in external/Module_external.mk

Change-Id: I1d1fbef457a34f730c9a83c5580fd56a0bed455c

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 92ab57e..22bc481 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -55,9 +55,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
unotools \
ure \
xmlreader \
-   $(call gb_Helper_optional,BOOST,boost) \
-   

[Libreoffice-commits] core.git: 2 commits - configure.ac sc/Module_sc.mk sc/source

[Tor Lillqvist]

 configure.ac |1 -
 sc/Module_sc.mk  |2 +-
 sc/source/core/tool/formulagroup.cxx |   10 --
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit ff3b823ef4b867263711703fab596584314e4f58
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Oct 9 16:54:11 2013 +0300

Fix for !HAVE_FEATURE_OPENCL

Change-Id: I98cc2819e5de88cdce235735518b64193610fdc6

diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index 21edd7e..96ae83e 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include config_features.h
+
 #include formulagroup.hxx
 #include document.hxx
 #include formulacell.hxx
@@ -17,7 +19,6 @@
 
 #include formula/vectortoken.hxx
 #include rtl/bootstrap.hxx
-#include config_features.h
 
 #include vector
 #include boost/unordered_map.hpp
@@ -422,6 +423,7 @@ void FormulaGroupInterpreter::switchOpenCLDevice(const 
OUString rDeviceId, bool
 msInstance = new sc::FormulaGroupInterpreterSoftware();
 return;
 }
+#if HAVE_FEATURE_OPENCL
 #ifndef DISABLE_DYNLOADING
 osl::Module* pModule = getOpenCLModule();
 if (!pModule)
@@ -439,12 +441,14 @@ void FormulaGroupInterpreter::switchOpenCLDevice(const 
OUString rDeviceId, bool
 if(!bSuccess)
 return;
 #endif
+#else
+(void) bAutoSelect;
+#endif
 
 delete msInstance;
 msInstance = NULL;
 
 #if HAVE_FEATURE_OPENCL
-
 if ( ScInterpreter::GetGlobalConfig().mbOpenCLEnabled )
 {
 #ifdef DISABLE_DYNLOADING
@@ -469,6 +473,7 @@ void FormulaGroupInterpreter::compileOpenCLKernels()
 // OpenCL is not enabled.
 return;
 
+#if HAVE_FEATURE_OPENCL
 #ifndef DISABLE_DYNLOADING
 osl::Module* pModule = getOpenCLModule();
 if (!pModule)
@@ -482,6 +487,7 @@ void FormulaGroupInterpreter::compileOpenCLKernels()
 #else
 ::compileOpenCLKernels(rConfig.maOpenCLDevice);
 #endif
+#endif
 }
 
 void FormulaGroupInterpreter::generateRPNCode(ScDocument rDoc, const 
ScAddress rPos, ScTokenArray rCode)
commit d9c5452a15510b81edc59605ca234b8f61d478e7
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Oct 9 16:33:59 2013 +0300

ENABLE_OPENCL should be TRUE or empty

Should make the Android tinderboxes happy.

Change-Id: Idf33106514a1d0e34566d76d97d689e7543eda3c

diff --git a/configure.ac b/configure.ac
index c936949..f6c0c01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10330,7 +10330,6 @@ if test $_os != iOS -a $_os != Android -a 
x$enable_opencl != xno; then
 else
 AC_MSG_RESULT([no])
 enable_opencl=no
-ENABLE_OPENCL=FALSE
 fi
 
 AC_SUBST(ENABLE_OPENCL)
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 6522862..0fae42d 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Module_add_targets,sc,\
UIConfig_scalc \
 ))
 
-ifeq ($(ENABLE_OPENCL),TRUE)
+ifneq (,$(ENABLE_OPENCL))
 $(eval $(call gb_Module_add_targets,sc,\
Library_scopencl \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac solenv/gbuild

[Matúš Kukan]

 configure.ac |3 ---
 solenv/gbuild/Package.mk |2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit dbea75feea1622cbe746486e0faa9308874dc88e
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Sep 18 14:26:17 2013 +0200

make dependency on directory order-only

Change-Id: I800a7c1ea7ae48252a22ab1dc848fdc5e6f6b3b9

diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 595ad85..ed0f3ba 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -136,7 +136,7 @@ define gb_Package_add_symbolic_link
 $(call gb_Package__check,$(1))
 $(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_symbolic_link 
requires 3 arguments))
 $(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2)
-$$(gb_Package_OUTDIR_$(1))/$(2) : $$(dir $$(gb_Package_OUTDIR_$(1))/$(2)).dir
+$$(gb_Package_OUTDIR_$(1))/$(2) :| $$(dir $$(gb_Package_OUTDIR_$(1))/$(2)).dir
rm -f $$@  ln -s $(3) $$@
 
 $(call gb_Package_get_target,$(1)) : FILES += $$(gb_Package_OUTDIR_$(1))/$(2)
commit 6a66cfe6aab8298cf5bc7c1a870bafcee9dd2146
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Sep 18 09:22:28 2013 +0200

remove unused EXEEXT_FOR_BUILD

Change-Id: I6ac851e3ba418bb681f69f5417c74688776498be

diff --git a/configure.ac b/configure.ac
index 0bcbfae..880732e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,11 +164,9 @@ BUILDDIR=`pwd`
 cd $srcdir
 SRC_ROOT=`pwd`
 cd $BUILDDIR
-EXEEXT_FOR_BUILD=
 x_Cygwin=[\#]
 
 if test $build_os = cygwin; then
-EXEEXT_FOR_BUILD=.exe
 PathFormat $SRC_ROOT
 SRC_ROOT=$formatted_path
 PathFormat $BUILDDIR
@@ -178,7 +176,6 @@ fi
 
 AC_SUBST(SRC_ROOT)
 AC_SUBST(BUILDDIR)
-AC_SUBST(EXEEXT_FOR_BUILD)
 AC_SUBST(x_Cygwin)
 AC_DEFINE_UNQUOTED(SRCDIR,$SRC_ROOT)
 AC_DEFINE_UNQUOTED(BUILDDIR,$BUILDDIR)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk scp2/source setup_native/Module_setup_native.mk

[Matúš Kukan]

 configure.ac   |1 -
 scp2/InstallScript_setup_osl.mk|2 +-
 scp2/Module_scp2.mk|2 +-
 scp2/source/activex/file_activex.scp   |4 
 scp2/source/activex/module_activex.scp |4 
 setup_native/Module_setup_native.mk|2 +-
 6 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit b6fc0ac84ce68586393784713693cc6b658a2785
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Sep 17 20:28:13 2013 +0200

remove WITH_ACTIVEX_COMPONENT

Change-Id: I3320b3ce3307598a479dfac5b120e85441c670dc

diff --git a/configure.ac b/configure.ac
index bf78f35..fda58df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3065,7 +3065,6 @@ if test $_os = WINNT -a $WITH_MINGW != yes; then
 AC_MSG_CHECKING([whether to use ActiveX])
 if test $enable_activex = yes -o $enable_activex = ; then
 DISABLE_ACTIVEX=
-SCPDEFS=$SCPDEFS -DWITH_ACTIVEX_COMPONENT
 AC_MSG_RESULT([yes])
 else
 DISABLE_ACTIVEX=TRUE
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index 72c789d..75f2a8c2 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
scp2/writer \
scp2/xsltfilter \
$(if $(filter WNT,$(OS)),\
-   scp2/activex \
+   $(if $(DISABLE_ACTIVEX),,scp2/activex) \
scp2/quickstart \
scp2/windows \
$(if $(filter MSC,$(COM)),\
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index bd30477..05911c5 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
InstallScript_sdkoo \
) \
$(if $(filter WNT,$(OS)),\
-   InstallModule_activex \
+   $(if $(DISABLE_ACTIVEX),,InstallModule_activex) \
InstallModule_quickstart \
InstallModule_windows \
$(if $(filter MSC,$(COM)),\
diff --git a/scp2/source/activex/file_activex.scp 
b/scp2/source/activex/file_activex.scp
index c710aba..e6864b8 100644
--- a/scp2/source/activex/file_activex.scp
+++ b/scp2/source/activex/file_activex.scp
@@ -18,8 +18,6 @@
 
 #include macros.inc
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 File gid_File_Lib_Soactivex
 LIB_FILE_BODY;
 Styles = (PACKED);
@@ -36,5 +34,3 @@ End
ComponentCondition = VersionNT64;
End
 #endif
-
-#endif // WITH_ACTIVEX_COMPONENT
diff --git a/scp2/source/activex/module_activex.scp 
b/scp2/source/activex/module_activex.scp
index 78b8954..e56ced7 100644
--- a/scp2/source/activex/module_activex.scp
+++ b/scp2/source/activex/module_activex.scp
@@ -19,8 +19,6 @@
 #include macros.inc
 #include AutoInstall/activexbinarytable
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 Module gid_Module_Optional_Activexcontrol
 PackageInfo = packinfo_office.txt;
 MOD_NAME_DESC ( MODULE_OPTIONAL_ACTIVEXCONTROL );
@@ -33,5 +31,3 @@ Module gid_Module_Optional_Activexcontrol
 gid_File_Lib_Soactivex64,
 gid_File_Lib_Regpatchactivex_Msi);
 End
-
-#endif // WITH_ACTIVEX_COMPONENT
commit f3464f5e0918152d8ff1552ed4932523990b2b79
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date:   Sun Sep 15 23:02:25 2013 +0700

no need for Library_regactivex in --disable-activex build

as stated on Repository.mk

Change-Id: Id88c9d1eae27754f10246004ac8d8ae6326ae143

diff --git a/setup_native/Module_setup_native.mk 
b/setup_native/Module_setup_native.mk
index b74ac08..3daff3f 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Module_add_targets,setup_native,\
 Library_instooofiltmsi \
Library_qslnkmsi \
Library_reg4allmsdoc \
-   Library_regactivex \
+   $(if $(DISABLE_ACTIVEX),,Library_regactivex) \
Library_regpatchactivex \
Library_sdqsmsi \
Library_sellangmsi \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits