This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch Pilot-Pirx-patch-1
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 2bd4cdeaa365aaca2b451014bd581a3c1f3792d1
Merge: afc83f5fcb 6b7c93d1f1
Author: mseidel <msei...@apache.org>
AuthorDate: Mon May 6 22:38:37 2024 +0200
Merge branch 'trunk' into Pilot-Pirx-patch-1
README.md | 2 +-
main/LICENSE | 125 -----
main/NOTICE | 10 +-
main/README | 2 +-
main/RepositoryExternal.mk | 17 +-
main/RepositoryFixes.mk | 4 +-
.../accessibility/standard/vclxaccessiblebox.hxx | 4 +-
.../source/cairo/cairo_spritecanvashelper.cxx | 2 +-
.../source/directx/dx_spritecanvashelper.cxx | 2 +-
main/canvas/source/vcl/spritecanvashelper.cxx | 2 +-
main/crashrep/source/unx/main.cxx | 4 +-
main/curl/curl-bundled_openssl.patch | 35 +-
main/curl/curl-wnt.patch | 26 +-
main/curl/makefile.mk | 19 +-
main/curl/prj/d.lst | 10 +-
main/dbaccess/prj/dbu.xml | 6 +-
main/dbaccess/source/core/api/RowSetBase.hxx | 2 +-
main/dbaccess/source/ui/inc/JoinController.hxx | 4 +-
.../res/commandimagelist/lch_spacepara1.png | Bin 315 -> 315 bytes
.../res/commandimagelist/lch_spacepara15.png | Bin 315 -> 315 bytes
main/editeng/inc/editeng/AccessibleContextBase.hxx | 2 +-
main/extensions.lst | 4 +-
main/external_deps.lst | 19 +-
.../xslt/export/wordml/ooo2wordml_border.xsl | 4 +-
.../source/xslt/import/wordml/wordml2ooo_field.xsl | 2 +-
main/forms/source/component/ImageControl.cxx | 2 +-
main/forms/source/misc/limitedformats.cxx | 2 +-
.../source/win32/filepicker/VistaFilePicker.hxx | 2 +-
.../source/uielement/recentfilesmenucontroller.cxx | 470 ++++++++---------
.../sun/star/lib/util/AsynchronousFinalizer.java | 2 +-
main/jvmfwk/inc/jvmfwk/framework.h | 2 +-
.../IllegalAccessibleComponentStateException.idl | 2 +-
main/oox/source/core/filterdetect.cxx | 2 +-
main/openssl/makefile.mk | 94 ++--
main/openssl/openssl.patch | 214 ++------
main/openssl/openssllnx.patch | 25 -
main/openssl/opensslunx.patch | 17 +
main/openssl/prj/d.lst | 13 +-
main/python/python-2.7.18-msvs9.patch | 579 +++++++++++----------
main/redland/raptor/makefile.mk | 1 +
main/redland/raptor/raptor2-2.0.15.patch | 65 +++
main/registry/inc/registry/reflwrit.hxx | 2 +-
main/rsc/doku/feinkonz.43/rsc.odt | Bin 0 -> 34354 bytes
main/rsc/doku/feinkonz.43/rscerror.odt | Bin 0 -> 19338 bytes
main/rsc/doku/feinkonz.43/rscinst.odt | Bin 0 -> 32344 bytes
main/rsc/doku/schriftw.16/change.odt | Bin 0 -> 15705 bytes
main/sal/inc/rtl/bootstrap.h | 2 +-
main/sc/addin/datefunc/dfa.cl | 6 +-
main/sc/source/ui/inc/fieldwnd.hxx | 2 +-
main/sc/source/ui/unoobj/shapeuno.cxx | 4 +-
main/scp2/source/ooo/file_library_ooo.scp | 8 +-
main/sd/source/ui/inc/fupoor.hxx | 2 +-
main/sd/source/ui/slideshow/slideshowimpl.cxx | 23 +-
main/sd/source/ui/view/ToolBarManager.cxx | 2 +-
main/sfx2/source/inc/statcach.hxx | 71 +--
main/shell/qa/zip/testimpl/testzipimpl.cxx | 18 +-
main/shell/qa/zip/testimpl/testzipimpl.hxx | 13 +-
main/shell/qa/zip/ziptest.cxx | 2 -
main/sw/source/core/access/accportions.cxx | 2 +-
main/sw/source/core/text/redlnitr.cxx | 127 +++--
main/sw/source/core/unocore/unodraw.cxx | 4 +-
main/sw/source/filter/html/parcss1.hxx | 76 ++-
main/sw/source/filter/ww8/rtfexport.hxx | 245 +++++----
main/sw/source/ui/table/chartins.src | 2 -
main/sw/source/ui/table/colwd.src | 2 -
main/sw/source/ui/table/convert.src | 143 +++--
main/sw/source/ui/table/instable.src | 2 -
main/sw/source/ui/table/mergetbl.src | 2 -
main/sw/source/ui/table/rowht.src | 2 -
main/sw/source/ui/table/splittbl.src | 88 +---
main/sw/source/ui/table/table.src | 2 -
main/sw/source/ui/table/tabledlg.src | 2 -
main/sw/source/ui/table/tautofmt.src | 2 -
main/toolkit/source/awt/vclxtoolkit.cxx | 4 +-
main/toolkit/source/awt/vclxwindow1.cxx | 2 +-
main/tools/source/fsys/dirent.cxx | 22 +-
main/ucb/source/ucp/webdav/CurlSession.cxx | 197 ++++---
main/ucb/source/ucp/webdav/CurlSession.hxx | 14 +-
main/vcl/source/window/dockmgr.cxx | 4 +-
.../qa/documents/docx/tables/~$sted-tables3.docx | Bin 162 -> 0 bytes
.../mscrypt/securityenvironment_mscryptimpl.hxx | 4 +-
.../mscrypt/xmlsecuritycontext_mscryptimpl.hxx | 2 +-
.../xmlsec/nss/securityenvironment_nssimpl.hxx | 4 +-
.../xmlsec/nss/xmlsecuritycontext_nssimpl.hxx | 2 +-
84 files changed, 1335 insertions(+), 1575 deletions(-)
