external/openssl/configurable-z-option.patch.0 | 2 +-
external/openssl/openssl-no-multilib.patch.0 | 4 ++--
external/openssl/opensslios.patch | 12 ------------
sc/source/ui/docshell/impex.cxx | 2 +-
4 files changed, 4 insertions(+), 16 deletions(-)
New commits:
commit 47309195f661f744a6faaac40a12127e4f30b9d2
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Nov 6 18:53:14 2022 +0900
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Nov 16 13:13:50 2022 +0100
external/openssl: fix and remove some patches
* configurable-z-option.patch.0, openssl-no-multilib.patch.0: fix patch
coverage
* opensslios.patch: remove this patch as it is not used.
Change-Id: Iaa23e5bb9ca9d63f5ca7451d02726ad24211f078
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142349
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 983f68e3f5e8bb5c1ac2618fc49f4b01b3de5c0c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142678
Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/external/openssl/configurable-z-option.patch.0
b/external/openssl/configurable-z-option.patch.0
index 3dcf49dc81a6..99d46f75410d 100644
--- a/external/openssl/configurable-z-option.patch.0
+++ b/external/openssl/configurable-z-option.patch.0
@@ -18,7 +18,7 @@
asflags => "/Cp /coff /c /Cx",
asoutflag => "/Fo",
perlasm_scheme => "win32" };
-@@ -1231,10 +1231,10 @@
+@@ -1252,10 +1252,10 @@
"UNICODE", "_UNICODE",
"_CRT_SECURE_NO_DEPRECATE",
"_WINSOCK_DEPRECATED_NO_WARNINGS"),
diff --git a/external/openssl/openssl-no-multilib.patch.0
b/external/openssl/openssl-no-multilib.patch.0
index 07c45318ac25..3d0083ed4793 100644
--- a/external/openssl/openssl-no-multilib.patch.0
+++ b/external/openssl/openssl-no-multilib.patch.0
@@ -17,7 +17,7 @@
# [no-]zlib [don't] compile support for zlib compression.
# zlib-dynamic Like "zlib", but the zlib library is expected to be a shared
# library and will be loaded in run-time by the OpenSSL library.
-@@ -383,6 +384,7 @@
+@@ -393,6 +394,7 @@
"mdc2",
"msan",
"multiblock",
@@ -25,7 +25,7 @@
"nextprotoneg",
"pinshared",
"ocb",
-@@ -1754,6 +1756,10 @@
+@@ -1770,6 +1772,10 @@
if (-f catfile($srcdir, "test", $_, "build.info"));
}
diff --git a/external/openssl/opensslios.patch
b/external/openssl/opensslios.patch
deleted file mode 100644
index 28af92dd473b..000000000000
--- a/external/openssl/opensslios.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- misc/openssl-0.9.8v/Configure
-+++ build/openssl-0.9.8v/Configure
-@@ -530,6 +530,9 @@
- # iPhoneOS/iOS
- "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK)
-fomit-frame-pointer
-fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR
RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC
-fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-
-+##### iOS in the LibreOffice case
-+"ios-aarch64","clang:-O3 -fomit-frame-pointer
-DL_ENDIAN:::IOS::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:${aarch64_asm}:::::",
-+
- ##### A/UX
- "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK
DES_UNROLL BF_PTR:::",
-
commit 271b5d979a5b498c3e44b031af7dc3002355a0fd
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Thu Nov 10 20:40:44 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Nov 16 13:13:38 2022 +0100
Resolves: tdf#151947 Merging separators must not scan for field end
Regression introduced with
commit cf777cfcb22647b1f2d6ace307fbcc4f6d2cca30
CommitDate: Sun Oct 2 17:07:06 2022 +0200
Resolves: tdf#125110 tdf#151211 Disentangle the convoluted
CSV/TSV-clip import
a copy-paste replacement logic error.
Change-Id: Ibd699a4edfa9f88da26d888afa8567ee34e78a5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142572
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 5db9d8356c8fdc732942357cd2171ba27eda8647)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142528
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 3be11884ca72..3f80f88ef9b6 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1924,7 +1924,7 @@ const sal_Unicode*
ScImportExport::ScanNextFieldFromString( const sal_Unicode* p
}
if ( bMergeSeps ) // skip following delimiters
{
- while (!lcl_isFieldEnd( *p, pSeps))
+ while (*p && ScGlobal::UnicodeStrChr( pSeps, *p))
p++;
}
return p;
