Set SNAPSHOT for 412m2.
git-svn-id: https://svn.apache.org/repos/asf/openoffice/tags/SNAPSHOT@1707651 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ext_libraries/coinmp/coinmp-1.7.6-clang.patch b/ext_libraries/coinmp/coinmp-1.7.6-clang.patch
index 0e1f6cd..3be51e4 100644
--- a/ext_libraries/coinmp/coinmp-1.7.6-clang.patch
+++ b/ext_libraries/coinmp/coinmp-1.7.6-clang.patch
@@ -1,5 +1,5 @@
---- misc/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp 2011-01-03 23:31:00.000000000 +0000
-+++ misc/build/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp 2015-08-04 23:25:43.468410000 +0000
+--- misc/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp 2011-01-04 00:31:00.000000000 +0100
++++ misc/build/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp 2015-09-28 10:45:02.000000000 +0200
@@ -44,7 +44,11 @@
//-----------------------------------------------------------------------------
@@ -13,3 +13,15 @@
# define CoinSighandler_t_defined
#endif
+@@ -95,7 +99,10 @@
+
+ //-----------------------------------------------------------------------------
+
+-#if defined(__MACH__) && defined(__GNUC__)
++#if defined(__clang__) && !defined(CoinSighandler_t_defined)
++ typedef void(*CoinSighandler_t)(int);
++# define CoinSighandler_t_defined
++#elif defined(__MACH__) && defined(__GNUC__)
+ typedef typeof(SIG_DFL) CoinSighandler_t;
+ # define CoinSighandler_t_defined
+ #endif
diff --git a/extras/l10n/source/it/localize.sdf b/extras/l10n/source/it/localize.sdf
index 087c0ba..ee60083 100644
--- a/extras/l10n/source/it/localize.sdf
+++ b/extras/l10n/source/it/localize.sdf
@@ -1783,7 +1783,7 @@
officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:ToolProtectionDocument ContextLabel 0 it Documento... 20130618 17:22:18
officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:ToolsOptions Label 0 it Opzioni foglio elettronico 20130618 17:22:18
officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:TraceChangeMode Label 0 it Registra modifiche 20130618 17:22:18
-officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:TraceChangeMode ContextLabel 0 it ~Record di dati 20130618 17:22:18
+officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:TraceChangeMode ContextLabel 0 it ~Registra modifiche 20130618 17:22:18
officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:UnderlineDotted Label 0 it Sottolineato: puntato 20130618 17:22:18
officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:UnderlineNone Label 0 it Sottolineato: off 20130618 17:22:18
officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:UnderlineSingle Label 0 it Sottolineato: semplice 20130618 17:22:18
@@ -3938,7 +3938,7 @@
officecfg registry\data\org\openoffice\Office\UI\WriterCommands.xcu 0 value ..WriterCommands.UserInterface.Commands..uno:TextWrap Label 0 it Scorrimento testo... 20130618 17:22:18
officecfg registry\data\org\openoffice\Office\UI\WriterCommands.xcu 0 value ..WriterCommands.UserInterface.Commands..uno:TextWrap ContextLabel 0 it Modifica... 20130618 17:22:18
officecfg registry\data\org\openoffice\Office\UI\WriterCommands.xcu 0 value ..WriterCommands.UserInterface.Commands..uno:ToggleObjectLayer Label 0 it Cambia posizione 20130618 17:22:18
-officecfg registry\data\org\openoffice\Office\UI\WriterCommands.xcu 0 value ..WriterCommands.UserInterface.Commands..uno:TrackChanges Label 0 it ~Record di dati 20130618 17:22:18
+officecfg registry\data\org\openoffice\Office\UI\WriterCommands.xcu 0 value ..WriterCommands.UserInterface.Commands..uno:TrackChanges Label 0 it ~Registra modifiche 20130618 17:22:18
officecfg registry\data\org\openoffice\Office\UI\WriterCommands.xcu 0 value ..WriterCommands.UserInterface.Commands..uno:UnhainFrames Label 0 it Annulla concatenazione 20130618 17:22:18
officecfg registry\data\org\openoffice\Office\UI\WriterCommands.xcu 0 value ..WriterCommands.UserInterface.Commands..uno:UnsetCellsReadOnly Label 0 it Disattiva protezione celle 20130618 17:22:18
officecfg registry\data\org\openoffice\Office\UI\WriterCommands.xcu 0 value ..WriterCommands.UserInterface.Commands..uno:UpdateAll Label 0 it Aggiorna tutto 20130618 17:22:18
diff --git a/main/LICENSE_ALv2 b/main/LICENSE_ALv2
index 7a6a2a3..3a2f450 100644
--- a/main/LICENSE_ALv2
+++ b/main/LICENSE_ALv2
@@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright 2011, 2012, 2013 Apache Software Foundation
+ Copyright 2011, 2012, 2013, 2014, 2015 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/main/configure.in b/main/configure.in
index 5a17fe2..30d99d3 100644
--- a/main/configure.in
+++ b/main/configure.in
@@ -3937,7 +3937,7 @@
else
MACOSX_DEPLOYMENT_TARGET=$sdk_target
- sdk_found=`xcodebuild -showsdks | grep "sdk macosx10.[[789]]" | sed -e "s/.*sdk //" | head -n1`
+ sdk_found=`xcodebuild -showsdks | egrep "sdk macosx10.(7|8|9|10)" | sed -e "s/.*sdk //" | tail -n1`
if test -z "$sdk_found"; then
AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
else
diff --git a/main/cui/source/dialogs/SpellDialog.cxx b/main/cui/source/dialogs/SpellDialog.cxx
index 8d6c1f6..65ae39e 100644
--- a/main/cui/source/dialogs/SpellDialog.cxx
+++ b/main/cui/source/dialogs/SpellDialog.cxx
@@ -787,7 +787,7 @@
//get a new sentence
aSentenceED.SetText(rtl::OUString());
aSentenceED.ResetModified();
- SpellContinue_Impl();
+ SpellContinue_Impl(true);
aIgnorePB.SetText(aIgnoreOnceST);
}
diff --git a/main/cui/source/dialogs/about.cxx b/main/cui/source/dialogs/about.cxx
index 7b5c408..c944f6f 100644
--- a/main/cui/source/dialogs/about.cxx
+++ b/main/cui/source/dialogs/about.cxx
@@ -311,7 +311,7 @@
sbcopyright.appendAscii("Copyright ");
sbcopyright.append((sal_Unicode)0x00a9);
sbcopyright.appendAscii(" ");
- rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2014") );
+ rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2015") );
if (vendor.EqualsAscii("Apache Software Foundation")) {
sbcopyright.append(sYear);
sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
diff --git a/main/extensions.lst b/main/extensions.lst
index e4a5732..736da8f 100644
--- a/main/extensions.lst
+++ b/main/extensions.lst
@@ -39,7 +39,7 @@
# English dictionary
[ language=en.* || language=de || language=it ]
- 045c9cd45d6517c7304e77faeb502776 http://sourceforge.net/projects/aoo-extensions/files/17102/20/dict-en.oxt/download "dict-en.oxt"
+ f5f6aab4cc5d92a34ab13ad15332770c http://sourceforge.net/projects/aoo-extensions/files/17102/21/dict-en.oxt/download "dict-en.oxt"
# English (USA, en_US) dictionary
[ language==nl || language==ru ]
diff --git a/main/external_deps.lst b/main/external_deps.lst
index ba87d08..3d8cf11 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -153,9 +153,9 @@
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
- MD5 = 63ddc5116488985e820075e65fbe6aa4
- name = openssl-0.9.8o.tar.gz
- URL1 = http://www.openssl.org/source/openssl-0.9.8o.tar.gz
+ MD5 = 0a912b6623ac95a8627ea2bd0e0abf1b
+ name = openssl-0.9.8zg.tar.gz
+ URL1 = http://www.openssl.org/source/openssl-0.9.8zg.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
diff --git a/main/openssl/makefile.mk b/main/openssl/makefile.mk
index 1956d8a..116fe01 100644
--- a/main/openssl/makefile.mk
+++ b/main/openssl/makefile.mk
@@ -42,10 +42,10 @@
@echo "openssl disabled...."
.ENDIF
-OPENSSL_NAME=openssl-0.9.8o
+OPENSSL_NAME=openssl-0.9.8zg
TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4
+TARFILE_MD5=0a912b6623ac95a8627ea2bd0e0abf1b
CONFIGURE_DIR=.
CONFIGURE_ACTION=config
@@ -63,8 +63,8 @@
.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \
- libcrypto_OOo_0_9_8o.map \
- libssl_OOo_0_9_8o.map
+ libcrypto_OOo_0_9_8zg.map \
+ libssl_OOo_0_9_8zg.map
.IF "$(CPU)" == "I"
.IF "$(UNAME)" == "GNU/kFreeBSD"
CONFIGURE_ACTION=Configure debian-kfreebsd-i386
@@ -87,8 +87,8 @@
.IF "$(OS)" == "SOLARIS"
PATCH_FILES=opensslsol.patch
ADDITIONAL_FILES:= \
- libcrypto_OOo_0_9_8o.map \
- libssl_OOo_0_9_8o.map
+ libcrypto_OOo_0_9_8zg.map \
+ libssl_OOo_0_9_8zg.map
#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib$$$$$$$$(SHLIBDIRS)_OOo_0_9_8e.map'
# Use BUILD64 when 1 to select new specific 64bit Configurations if necessary
@@ -159,7 +159,7 @@
.ENDIF
.ENDIF
-PATCH_FILES += openssl-0.9.8o-clang.patch
+PATCH_FILES += openssl-0.9.8zg-clang.patch
#set INCLUDE=D:\sol_temp\n\msvc7net3\PlatformSDK\include;D:\sol_temp\n\msvc7net3\include\ && set path=%path%;D:\sol_temp\r\btw\SRC680\perl\bin &&
diff --git a/main/openssl/openssl-0.9.8o-clang.patch b/main/openssl/openssl-0.9.8o-clang.patch
deleted file mode 100644
index 8c0b21a..0000000
--- a/main/openssl/openssl-0.9.8o-clang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/openssl-0.9.8o/crypto/md32_common.h 2010-03-29 13:23:11.000000000 +0200
-+++ misc/build/openssl-0.9.8o/crypto/md32_common.h 2013-03-28 15:47:56.541077176 +0100
-@@ -165,7 +165,7 @@
- asm ( \
- "roll %1,%0" \
- : "=r"(ret) \
-- : "I"(n), "0"(a) \
-+ : "I"(n), "0"((unsigned int)(a)) \
- : "cc"); \
- ret; \
- })
diff --git a/main/openssl/openssl-0.9.8zg-clang.patch b/main/openssl/openssl-0.9.8zg-clang.patch
new file mode 100644
index 0000000..e711a68
--- /dev/null
+++ b/main/openssl/openssl-0.9.8zg-clang.patch
@@ -0,0 +1,11 @@
+--- misc/openssl-0.9.8zg/crypto/md32_common.h 2015-09-20 11:10:48.263008317 -0500
++++ misc/build/openssl-0.9.8zg/crypto/md32_common.h 2015-09-20 11:11:50.047002757 -0500
+@@ -165,7 +165,7 @@
+ asm ( \
+ "roll %1,%0" \
+ : "=r"(ret) \
+- : "I"(n), "0"(a) \
++ : "I"(n), "0"((unsigned int)a) \
+ : "cc"); \
+ ret; \
+ })
diff --git a/main/openssl/openssl.patch b/main/openssl/openssl.patch
index 5d245f4..1061ca5 100644
--- a/main/openssl/openssl.patch
+++ b/main/openssl/openssl.patch
@@ -1,5 +1,5 @@
---- misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000 +0100
-+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100
+--- misc/openssl-0.9.8zg/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000 +0100
++++ misc/build/openssl-0.9.8zg/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100
@@ -2,7 +2,7 @@
/* Contributed to the OpenSSL Project 2004
* by Richard Levitte (richard@levitte.org)
@@ -9,9 +9,9 @@
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
---- misc/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100
-+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100
-@@ -2,7 +2,7 @@
+--- misc/openssl-0.9.8zg/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100
++++ misc/build/openssl-0.9.8zg/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100
+@@ -3,7 +3,7 @@
/* Contributed to the OpenSSL Project 2004
* by Richard Levitte (richard@levitte.org)
*/
@@ -20,8 +20,8 @@
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
---- misc/openssl-0.9.8o/ms/do_ms.bat 2009-07-28 14:51:19.000000000 +0200
-+++ misc/build/openssl-0.9.8o/ms/do_ms.bat 2010-03-26 12:19:19.399047300 +0100
+--- misc/openssl-0.9.8zg/ms/do_ms.bat 2009-07-28 14:51:19.000000000 +0200
++++ misc/build/openssl-0.9.8zg/ms/do_ms.bat 2010-03-26 12:19:19.399047300 +0100
@@ -1,11 +1,11 @@
-perl util\mkfiles.pl >MINFO
@@ -41,8 +41,8 @@
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
+%1 util\mkdef.pl 32 libeay > ms\libeay32.def
+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def
---- misc/openssl-0.9.8o/util/mk1mf.pl 2009-09-20 14:46:42.000000000 +0200
-+++ misc/build/openssl-0.9.8o/util/mk1mf.pl 2010-03-26 12:04:20.977172300 +0100
+--- misc/openssl-0.9.8zg/util/mk1mf.pl 2009-09-20 14:46:42.000000000 +0200
++++ misc/build/openssl-0.9.8zg/util/mk1mf.pl 2010-03-26 12:04:20.977172300 +0100
@@ -128,7 +128,7 @@
$inc_def="outinc";
$tmp_def="tmp";
@@ -73,8 +73,8 @@
#define PLATFORM "$platform"
EOF
printf OUT " #define DATE \"%s\"\n", scalar gmtime();
---- misc/openssl-0.9.8o/util/pl/VC-32.pl 2010-02-04 02:10:24.000000000 +0100
-+++ misc/build/openssl-0.9.8o/util/pl/VC-32.pl 2010-03-26 12:04:20.977172300 +0100
+--- misc/openssl-0.9.8zg/util/pl/VC-32.pl 2010-02-04 02:10:24.000000000 +0100
++++ misc/build/openssl-0.9.8zg/util/pl/VC-32.pl 2010-03-26 12:04:20.977172300 +0100
@@ -32,7 +32,7 @@
$l_flags =~ s/-L(\S+)/\/libpath:$1/g;
diff --git a/main/openssl/openssllnx.patch b/main/openssl/openssllnx.patch
index 449ebce..2b25c98 100644
--- a/main/openssl/openssllnx.patch
+++ b/main/openssl/openssllnx.patch
@@ -1,6 +1,6 @@
---- misc/build/openssl-0.9.8o/Configure-old 2010-04-17 13:51:42.000000000 +0200
-+++ misc/build/openssl-0.9.8o/Configure 2010-04-17 13:52:03.000000000 +0200
-@@ -388,6 +388,9 @@
+--- misc/build/openssl-0.9.8zg/Configure-old 2010-04-17 13:51:42.000000000 +0200
++++ misc/build/openssl-0.9.8zg/Configure 2010-04-17 13:52:03.000000000 +0200
+@@ -392,6 +392,9 @@
"bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -10,8 +10,8 @@
"nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
"nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
---- misc/build/openssl-0.9.8o/Makefile.org 2010-01-27 17:06:36.000000000 +0100
-+++ misc/build/openssl-0.9.8o/Makefile.org 2010-09-20 09:24:00.000000000 +0100
+--- misc/build/openssl-0.9.8zg/Makefile.org 2010-01-27 17:06:36.000000000 +0100
++++ misc/build/openssl-0.9.8zg/Makefile.org 2010-09-20 09:24:00.000000000 +0100
@@ -199,7 +199,7 @@
BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
@@ -21,8 +21,8 @@
AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \
SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)' \
INSTALL_PREFIX='${INSTALL_PREFIX}' \
---- misc/openssl-0.9.8o/config 2009-02-16 09:43:41.000000000 +0100
-+++ misc/build/openssl-0.9.8o/config 2009-03-30 08:59:09.588448000 +0200
+--- misc/openssl-0.9.8zg/config 2009-02-16 09:43:41.000000000 +0100
++++ misc/build/openssl-0.9.8zg/config 2009-03-30 08:59:09.588448000 +0200
@@ -399,27 +399,21 @@
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------
@@ -66,11 +66,11 @@
fi
GCCVER=${GCCVER:-0}
if [ "$SYSTEM" = "HP-UX" ];then
---- misc/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 2010-03-26 15:26:55.958495757 +0100
-+++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 2010-03-26 15:31:38.019501422 +0100
+--- misc/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map 2010-03-26 15:26:55.958495757 +0100
++++ misc/build/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map 2010-03-26 15:31:38.019501422 +0100
@@ -1 +1,3295 @@
-dummy
-+LIBCRYPTO_OOO_0_9_8o {
++libcrypto_OOo_0_9_8zg {
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -1389,7 +1389,7 @@
+KRB5_TKTBODY_free;
+KRB5_TKTBODY_it;
+KRB5_TKTBODY_new;
-+LIBCRYPTO_OOO_0_9_8o;
++libcrypto_OOo_0_9_8zg;
+LONG_it;
+MD2;
+MD2_Final;
@@ -3365,11 +3365,11 @@
+ local:
+ *;
+};
---- misc/openssl-0.9.8o/libssl_OOo_0_9_8o.map 2010-03-26 15:26:55.966057991 +0100
-+++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map 2010-03-26 15:31:58.552966503 +0100
+--- misc/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map 2010-03-26 15:26:55.966057991 +0100
++++ misc/build/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map 2010-03-26 15:31:58.552966503 +0100
@@ -1 +1,445 @@
-dummy
-+LIBSSL_OOO_0_9_8o {
++LIBSSL_OOO_0_9_8zg {
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;
@@ -3382,7 +3382,7 @@
+DTLSv1_method;
+DTLSv1_server_method;
+ERR_load_SSL_strings;
-+LIBSSL_OOO_0_9_8o;
++LIBSSL_OOO_0_9_8zg;
+SSL_CIPHER_description;
+SSL_CIPHER_get_bits;
+SSL_CIPHER_get_name;
diff --git a/main/openssl/opensslmacosx.patch b/main/openssl/opensslmacosx.patch
index 4c99853..828f38c 100644
--- a/main/openssl/opensslmacosx.patch
+++ b/main/openssl/opensslmacosx.patch
@@ -1,7 +1,7 @@
---- misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 2007-10-16 15:44:13.000000000 +0200
+--- misc/build/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map 1970-01-01 01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map 2007-10-16 15:44:13.000000000 +0200
@@ -0,1 +1,3304 @@
-+LIBCRYPTO_OOO_0_9_8o{
++LIBCRYPTO_OOO_0_9_8zg{
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -3304,10 +3304,10 @@
+ local:
+ *;
+};
---- misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map 1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map 2007-10-16 15:44:13.000000000 +0200
+--- misc/build/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map 1970-01-01 01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map 2007-10-16 15:44:13.000000000 +0200
@@ -0,0 +1,442 @@
-+LIBSSL_OOO_0_9_8o{
++LIBSSL_OOO_0_9_8zg{
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;
diff --git a/main/openssl/opensslmingw.patch b/main/openssl/opensslmingw.patch
index 0ea8287..ea89185 100644
--- a/main/openssl/opensslmingw.patch
+++ b/main/openssl/opensslmingw.patch
@@ -1,5 +1,5 @@
---- misc/openssl-0.9.8o/Makefile.shared 2008-09-17 17:56:40.000000000 +0200
-+++ misc/build/openssl-0.9.8o/Makefile.shared 2009-03-30 11:52:53.684538000 +0200
+--- misc/openssl-0.9.8zg/Makefile.shared 2008-09-17 17:56:40.000000000 +0200
++++ misc/build/openssl-0.9.8zg/Makefile.shared 2009-03-30 11:52:53.684538000 +0200
@@ -254,13 +254,17 @@
base=-Wl,--enable-auto-image-base; \
if expr $(PLATFORM) : 'mingw' > /dev/null; then \
@@ -21,8 +21,8 @@
[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
$(LINK_SO_A) || exit 1; \
---- misc/openssl-0.9.8o/e_os2.h 2005-12-19 03:57:07.000000000 +0900
-+++ misc/build/openssl-0.9.8o/e_os2.h 2009-04-04 23:07:15.324250000 +0900
+--- misc/openssl-0.9.8zg/e_os2.h 2005-12-19 03:57:07.000000000 +0900
++++ misc/build/openssl-0.9.8zg/e_os2.h 2009-04-04 23:07:15.324250000 +0900
@@ -264,7 +264,7 @@
# define OPENSSL_IMPLEMENT_GLOBAL(type,name) \
extern type _hide_##name; \
@@ -32,8 +32,8 @@
# define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
# define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
#else
---- misc/openssl-0.9.8o/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200
-+++ misc/build/openssl-0.9.8o/ms/mingw32.bat 2009-03-30 11:54:10.000000000 +0200
+--- misc/openssl-0.9.8zg/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200
++++ misc/build/openssl-0.9.8zg/ms/mingw32.bat 2009-03-30 11:54:10.000000000 +0200
@@ -79,15 +79,41 @@
rem copy ms\tlhelp32.h outinc
@@ -79,8 +79,8 @@
echo Done compiling OpenSSL
:end
---- misc/openssl-0.9.8o/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000 +0200
-+++ misc/build/openssl-0.9.8o/util/pl/Mingw32.pl 2009-03-30 11:55:04.000000000 +0200
+--- misc/openssl-0.9.8zg/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000 +0200
++++ misc/build/openssl-0.9.8zg/util/pl/Mingw32.pl 2009-03-30 11:55:04.000000000 +0200
@@ -6,11 +6,11 @@
$o='/';
$cp='cp';
diff --git a/main/openssl/opensslsol.patch b/main/openssl/opensslsol.patch
index cd2d93a..8bd2558 100644
--- a/main/openssl/opensslsol.patch
+++ b/main/openssl/opensslsol.patch
@@ -1,6 +1,6 @@
---- misc/openssl-0.9.8o/Configure Mon Nov 9 15:14:26 2009
-+++ misc/build/openssl-0.9.8o/Configure Fri Mar 26 16:01:32 2010
-@@ -212,8 +212,8 @@
+--- misc/openssl-0.9.8zg/Configure Mon Nov 9 15:14:26 2009
++++ misc/build/openssl-0.9.8zg/Configure Fri Mar 26 16:01:32 2010
+@@ -213,8 +213,8 @@
"solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### Solaris x86 with Sun C setups
@@ -11,8 +11,8 @@
#### SPARC Solaris with GNU C setups
"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
---- misc/openssl-0.9.8o/Makefile.shared Wed Sep 17 17:56:40 2008
-+++ misc/build/openssl-0.9.8o/Makefile.shared Fri Mar 26 16:04:41 2010
+--- misc/openssl-0.9.8zg/Makefile.shared Wed Sep 17 17:56:40 2008
++++ misc/build/openssl-0.9.8zg/Makefile.shared Fri Mar 26 16:04:41 2010
@@ -93,7 +93,7 @@
LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
@@ -31,8 +31,8 @@
$${SHAREDCMD} $${SHAREDFLAGS} \
-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
---- misc/openssl-0.9.8o/config Tue Mar 9 18:08:24 2010
-+++ misc/build/openssl-0.9.8o/config Fri Mar 26 16:07:55 2010
+--- misc/openssl-0.9.8zg/config Tue Mar 9 18:08:24 2010
++++ misc/build/openssl-0.9.8zg/config Fri Mar 26 16:07:55 2010
@@ -399,28 +399,25 @@
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------
@@ -79,11 +79,11 @@
GCCVER=${GCCVER:-0}
if [ "$SYSTEM" = "HP-UX" ];then
# By default gcc is a ILP32 compiler (with long long == 64).
---- misc/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map Fri Mar 26 16:13:54 2010
-+++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map Fri Mar 26 16:10:09 2010
+--- misc/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map Fri Mar 26 16:13:54 2010
++++ misc/build/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map Fri Mar 26 16:10:09 2010
@@ -1,1 +1,3296 @@
-dummy
-+LIBCRYPTO_OOO_0_9_8o {
++LIBCRYPTO_OOO_0_9_8zg {
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -1402,7 +1402,7 @@
+KRB5_TKTBODY_free;
+KRB5_TKTBODY_it;
+KRB5_TKTBODY_new;
-+LIBCRYPTO_OOO_0_9_8o;
++LIBCRYPTO_OOO_0_9_8zg;
+LONG_it;
+MD2;
+MD2_Final;
@@ -3379,11 +3379,11 @@
+ *;
+};
+
---- misc/openssl-0.9.8o/libssl_OOo_0_9_8o.map Fri Mar 26 16:13:54 2010
-+++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map Fri Mar 26 16:11:27 2010
+--- misc/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map Fri Mar 26 16:13:54 2010
++++ misc/build/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map Fri Mar 26 16:11:27 2010
@@ -1,1 +1,446 @@
-dummy
-+LIBSSL_OOO_0_9_8o {
++LIBSSL_OOO_0_9_8zg {
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;
@@ -3396,7 +3396,7 @@
+DTLSv1_method;
+DTLSv1_server_method;
+ERR_load_SSL_strings;
-+LIBSSL_OOO_0_9_8o;
++LIBSSL_OOO_0_9_8zg;
+SSL_CIPHER_description;
+SSL_CIPHER_get_bits;
+SSL_CIPHER_get_name;
diff --git a/main/openssl/version.mk b/main/openssl/version.mk
index 4b07485..86c5bbd 100644
--- a/main/openssl/version.mk
+++ b/main/openssl/version.mk
@@ -22,8 +22,8 @@
-OPENSSL_VERSION=0.9.8o
+OPENSSL_VERSION=0.9.8zg
.IF "$(OS)" == "SOLARIS"
-OPENSSL_NAME=openssl-0.9.8o
-.ENDIF
\ No newline at end of file
+OPENSSL_NAME=openssl-0.9.8zg
+.ENDIF
diff --git a/main/sal/inc/osl/file.h b/main/sal/inc/osl/file.h
index 93b696a..51cb72a 100644
--- a/main/sal/inc/osl/file.h
+++ b/main/sal/inc/osl/file.h
@@ -132,11 +132,11 @@
osl_File_E_USERS,
osl_File_E_OVERFLOW,
osl_File_E_NOTREADY,
- osl_File_E_LOCKED,
osl_File_E_invalidError, /* unmapped error: always last entry in enum! */
osl_File_E_TIMEDOUT,
osl_File_E_NETWORK,
- osl_File_E_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
+ osl_File_E_FORCE_EQUAL_SIZE,
+ osl_File_E_LOCKED = SAL_MAX_ENUM
} oslFileError;
typedef void *oslDirectory;
diff --git a/main/sal/osl/unx/profile.c b/main/sal/osl/unx/profile.c
index 9ec56f2..2af9990 100644
--- a/main/sal/osl/unx/profile.c
+++ b/main/sal/osl/unx/profile.c
@@ -1526,8 +1526,7 @@
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
- pProfile->m_Lines = (sal_Char **)malloc(pProfile->m_MaxLines * sizeof(sal_Char *));
- memset(pProfile->m_Lines,0,pProfile->m_MaxLines * sizeof(sal_Char *));
+ pProfile->m_Lines = calloc(pProfile->m_MaxLines, sizeof(sal_Char *));
}
else
{
@@ -1568,8 +1567,7 @@
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
- pProfile->m_Lines = (sal_Char **)malloc(pProfile->m_MaxLines * sizeof(sal_Char *));
- memset(pProfile->m_Lines,0,pProfile->m_MaxLines * sizeof(sal_Char *));
+ pProfile->m_Lines = calloc(pProfile->m_MaxLines, sizeof(sal_Char *));
}
else
{
@@ -1743,8 +1741,7 @@
if (pProfile->m_Sections == NULL)
{
pProfile->m_MaxSections = SECTIONS_INI;
- pProfile->m_Sections = (osl_TProfileSection *)malloc(pProfile->m_MaxSections * sizeof(osl_TProfileSection));
- memset(pProfile->m_Sections,0,pProfile->m_MaxSections * sizeof(osl_TProfileSection));
+ pProfile->m_Sections = calloc(pProfile->m_MaxSections, sizeof(osl_TProfileSection));
}
else
{
diff --git a/main/sal/osl/w32/profile.cxx b/main/sal/osl/w32/profile.cxx
index 673cdb3..aff8393 100644
--- a/main/sal/osl/w32/profile.cxx
+++ b/main/sal/osl/w32/profile.cxx
@@ -1584,8 +1584,7 @@
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
- pProfile->m_Lines = (sal_Char **)malloc(pProfile->m_MaxLines * sizeof(sal_Char *));
- memset(pProfile->m_Lines,0,pProfile->m_MaxLines * sizeof(sal_Char *));
+ pProfile->m_Lines = (sal_Char **)calloc(pProfile->m_MaxLines, sizeof(sal_Char *));
}
else
{
@@ -1626,8 +1625,7 @@
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
- pProfile->m_Lines = (sal_Char **)malloc(pProfile->m_MaxLines * sizeof(sal_Char *));
- memset(pProfile->m_Lines,0,pProfile->m_MaxLines * sizeof(sal_Char *));
+ pProfile->m_Lines = (sal_Char **)calloc(pProfile->m_MaxLines, sizeof(sal_Char *));
}
else
{
@@ -1801,8 +1799,7 @@
if (pProfile->m_Sections == NULL)
{
pProfile->m_MaxSections = SECTIONS_INI;
- pProfile->m_Sections = (osl_TProfileSection *)malloc(pProfile->m_MaxSections * sizeof(osl_TProfileSection));
- memset(pProfile->m_Sections,0,pProfile->m_MaxSections * sizeof(osl_TProfileSection));
+ pProfile->m_Sections = (osl_TProfileSection *)calloc(pProfile->m_MaxSections, sizeof(osl_TProfileSection));
}
else
{
diff --git a/main/sc/source/core/data/dociter.cxx b/main/sc/source/core/data/dociter.cxx
index 9417486..f79888b 100644
--- a/main/sc/source/core/data/dociter.cxx
+++ b/main/sc/source/core/data/dociter.cxx
@@ -626,7 +626,17 @@
return sal_True; // gefunden
}
else
- nRow++;
+ {
+ if (mpParam->mbSkipString)
+ ++nRow;
+ else
+ {
+ rValue.maString = ((ScFormulaCell*)pCell)->GetStringData();
+ rValue.mbIsNumber = false;
+ rValue.mnError = ((ScFormulaCell*)pCell)->GetErrCode();
+ return sal_True;
+ }
+ }
}
break;
case CELLTYPE_STRING:
diff --git a/main/sc/source/ui/docshell/docsh4.cxx b/main/sc/source/ui/docshell/docsh4.cxx
index 0d54512..3dd2f2a 100644
--- a/main/sc/source/ui/docshell/docsh4.cxx
+++ b/main/sc/source/ui/docshell/docsh4.cxx
@@ -67,6 +67,7 @@
#include <svl/PasswordHelper.hxx>
#include <svl/documentlockfile.hxx>
#include <svl/sharecontrolfile.hxx>
+#include <unotools/securityoptions.hxx>
#include <comphelper/processfactory.hxx>
#include "docuno.hxx"
@@ -452,12 +453,15 @@
if (nCanUpdate == com::sun::star::document::UpdateDocMode::NO_UPDATE)
nSet = LM_NEVER;
- else if (nCanUpdate == com::sun::star::document::UpdateDocMode::QUIET_UPDATE &&
- nSet == LM_ON_DEMAND)
- nSet = LM_NEVER;
else if (nCanUpdate == com::sun::star::document::UpdateDocMode::FULL_UPDATE)
nSet = LM_ALWAYS;
+ if (nSet == LM_ALWAYS && !(SvtSecurityOptions().GetMacroSecurityLevel() == 0))
+ nSet = LM_ON_DEMAND;
+ if (nCanUpdate == com::sun::star::document::UpdateDocMode::QUIET_UPDATE &&
+ nSet == LM_ON_DEMAND)
+ nSet = LM_NEVER;
+
if(nSet==LM_ON_DEMAND)
{
QueryBox aBox( GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
diff --git a/main/solenv/gbuild/platform/linux.mk b/main/solenv/gbuild/platform/linux.mk
index ed74e12..0a23a43 100644
--- a/main/solenv/gbuild/platform/linux.mk
+++ b/main/solenv/gbuild/platform/linux.mk
@@ -93,7 +93,7 @@
-fmessage-length=0 \
-fno-common \
-fno-strict-aliasing \
- -fno-use-cxa-atexit \
+ -fuse-cxa-atexit \
-fvisibility-inlines-hidden \
-fvisibility=hidden \
-pipe \
diff --git a/main/solenv/inc/minor.mk b/main/solenv/inc/minor.mk
index 99b5484..02c12ec 100644
--- a/main/solenv/inc/minor.mk
+++ b/main/solenv/inc/minor.mk
@@ -19,7 +19,7 @@
#
# *************************************************************
RSCVERSION=412
-RSCREVISION=412m1(Build:9780)
-BUILD=9780
-LAST_MINOR=m1
+RSCREVISION=412m2(Build:9781)
+BUILD=9781
+LAST_MINOR=m2
SOURCEVERSION=AOO412
diff --git a/main/sw/source/core/doc/docnew.cxx b/main/sw/source/core/doc/docnew.cxx
index a46ca8f..6c4afa8 100644
--- a/main/sw/source/core/doc/docnew.cxx
+++ b/main/sw/source/core/doc/docnew.cxx
@@ -118,6 +118,7 @@
#include <sfx2/Metadatable.hxx>
#include <fmtmeta.hxx> // MetaFieldManager
+#include <unotools/securityoptions.hxx>
using namespace ::com::sun::star;
@@ -1002,6 +1003,13 @@
case document::UpdateDocMode::QUIET_UPDATE:bAskUpdate = sal_False; break;
case document::UpdateDocMode::FULL_UPDATE: bAskUpdate = sal_True; break;
}
+ if (nLinkMode == AUTOMATIC && !bAskUpdate)
+ {
+ if (!(SvtSecurityOptions().GetMacroSecurityLevel() == 0))
+ {
+ bAskUpdate = true;
+ }
+ }
if( bUpdate && (bUI || !bAskUpdate) )
{
SfxMedium* pMedium = GetDocShell()->GetMedium();
diff --git a/main/ucb/source/ucp/webdav/webdavcontent.cxx b/main/ucb/source/ucp/webdav/webdavcontent.cxx
index 372e4b5..cf723d0 100644
--- a/main/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/main/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -3091,17 +3091,15 @@
aOwner ));
}
break;
+ case SC_FORBIDDEN:
+ case SC_NOT_IMPLEMENTED:
case SC_METHOD_NOT_ALLOWED:
// this it's not always received, but the RFC4918 (which supersed RFC2518)
// tells about this in:
// http://tools.ietf.org/html/rfc4918#appendix-D.1
// throw exception, will be interpreted by the lock requester (framework)
// it is actually a info, not an error
- throw ucb::InteractiveLockingLockNotAvailableException( e.getData(),
- static_cast< cppu::OWeakObject * >( this ),
- task::InteractionClassification_INFO,
- aURL,
- e.getExtendedError() );
+ return;
break;
//i126305 TODO
//see http://tools.ietf.org/html/rfc4918#section-9.10.6
@@ -3579,12 +3577,18 @@
catch ( DAVException const & e )
{
rResAccess->resetUri();
-
- if ( e.getStatus() == SC_METHOD_NOT_ALLOWED )
+ switch( e.getStatus() )
{
+ // returned errors are part of base http 1.1 RFCs:
+ case SC_FORBIDDEN: // https://tools.ietf.org/html/rfc7231#section-6.5.3
+ case SC_NOT_IMPLEMENTED: // http://tools.ietf.org/html/rfc7231#section-6.6.2
+ case SC_METHOD_NOT_ALLOWED: // http://tools.ietf.org/html/rfc7231#section-6.5.5
// Status SC_METHOD_NOT_ALLOWED is a safe indicator that the
// resource is NON_DAV
eResourceType = NON_DAV;
+ break;
+ default:
+ ;
}
// cancel command execution is case that no user authentication data has been provided.
if ( e.getError() == DAVException::DAV_HTTP_NOAUTH )
diff --git a/main/vcl/unx/gtk/window/gtkframe.cxx b/main/vcl/unx/gtk/window/gtkframe.cxx
index 3e2cd9e..178dad7 100644
--- a/main/vcl/unx/gtk/window/gtkframe.cxx
+++ b/main/vcl/unx/gtk/window/gtkframe.cxx
@@ -3749,18 +3749,26 @@
return uno::Reference<accessibility::XAccessibleEditableText>(xContext, uno::UNO_QUERY);
}
- for (sal_Int32 i = 0; i < xContext->getAccessibleChildCount(); ++i)
- {
- uno::Reference< accessibility::XAccessible > xChild = xContext->getAccessibleChild(i);
- if (!xChild.is())
- continue;
- uno::Reference< accessibility::XAccessibleContext > xChildContext = xChild->getAccessibleContext();
- if (!xChildContext.is())
- continue;
- uno::Reference< accessibility::XAccessibleEditableText > xText = FindFocus(xChildContext);
- if (xText.is())
- return xText;
- }
+ try
+ {
+ for (sal_Int32 i = 0, n = xContext->getAccessibleChildCount(); i < n; ++i)
+ {
+ uno::Reference< accessibility::XAccessible > xChild = xContext->getAccessibleChild(i);
+ if (!xChild.is())
+ continue;
+ uno::Reference< accessibility::XAccessibleContext > xChildContext = xChild->getAccessibleContext();
+ if (!xChildContext.is())
+ continue;
+ uno::Reference< accessibility::XAccessibleEditableText > xText = FindFocus(xChildContext);
+ if (xText.is())
+ return xText;
+ }
+ }
+ catch( lang::IndexOutOfBoundsException & e )
+ {
+ OSL_TRACE( "GtkFrame FindFocus, %s", ::rtl::OUStringToOString(
+ e.Message, RTL_TEXTENCODING_UTF8 ).pData->buffer );
+ }
return uno::Reference< accessibility::XAccessibleEditableText >();
}
