This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-nss in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 1eab80f7289bbe0bab87a2bcfadd205c081e3b61 Merge: c6fbdaec42 8298aef599 Author: mseidel <[email protected]> AuthorDate: Tue Jan 23 17:15:47 2024 +0100 Merge branch 'trunk' into Pilot-Pirx-nss main/external_deps.lst | 4 ++-- .../source/text/sbasic/shared/02/11020000.xhp | 8 ++++---- .../source/text/sbasic/shared/02/11030000.xhp | 6 +++--- .../source/text/sbasic/shared/02/11100000.xhp | 8 ++++---- .../source/text/sbasic/shared/02/11110000.xhp | 8 ++++---- .../source/text/sbasic/shared/02/11150000.xhp | 6 +++--- main/helpcontent2/source/text/sbasic/shared/03000000.xhp | 4 ++-- main/helpcontent2/source/text/sbasic/shared/03020000.xhp | 6 +++--- main/helpcontent2/source/text/sbasic/shared/03090400.xhp | 4 ++-- main/helpcontent2/source/text/scalc/01/04010100.xhp | 6 +++--- main/helpcontent2/source/text/scalc/01/05030000.xhp | 8 ++++---- main/helpcontent2/source/text/scalc/01/05040000.xhp | 8 ++++---- main/helpcontent2/source/text/scalc/01/12030000.xhp | 6 +++--- main/helpcontent2/source/text/scalc/01/12090000.xhp | 6 +++--- main/helpcontent2/source/text/scalc/01/12100000.xhp | 4 ++-- main/helpcontent2/source/text/scalc/01/12120000.xhp | 4 ++-- .../source/text/scalc/guide/datapilot_deletetable.xhp | 4 ++-- main/helpcontent2/source/text/scalc/main0208.xhp | 4 ++-- main/helpcontent2/source/text/shared/00/00000206.xhp | 10 +++++----- main/helpcontent2/source/text/shared/00/00000409.xhp | 12 ++++++------ main/helpcontent2/source/text/shared/01/01170000.xhp | 6 +++--- main/helpcontent2/source/text/shared/01/02020000.xhp | 4 ++-- main/helpcontent2/source/text/shared/01/02200200.xhp | 8 ++++---- main/helpcontent2/source/text/shared/01/03040000.xhp | 6 +++--- main/helpcontent2/source/text/shared/01/05070400.xhp | 6 +++--- main/helpcontent2/source/text/shared/01/05110100.xhp | 6 +++--- main/helpcontent2/source/text/shared/01/05110200.xhp | 6 +++--- main/helpcontent2/source/text/shared/01/05140100.xhp | 10 +++++----- main/helpcontent2/source/text/shared/01/05210000.xhp | 4 ++-- main/helpcontent2/source/text/shared/01/05230000.xhp | 4 ++-- main/helpcontent2/source/text/shared/01/05250200.xhp | 6 +++--- main/helpcontent2/source/text/shared/01/05250300.xhp | 6 +++--- main/helpcontent2/source/text/shared/01/05260100.xhp | 8 ++++---- main/helpcontent2/source/text/shared/01/05290400.xhp | 8 ++++---- main/helpcontent2/source/text/shared/01/07010000.xhp | 6 +++--- main/helpcontent2/source/text/shared/02/09060000.xhp | 8 ++++---- main/helpcontent2/source/text/shared/02/14020200.xhp | 6 +++--- main/helpcontent2/source/text/shared/02/14040000.xhp | 8 ++++---- main/helpcontent2/source/text/shared/02/14050000.xhp | 6 +++--- main/helpcontent2/source/text/shared/02/20030000.xhp | 8 ++++---- main/helpcontent2/source/text/shared/02/24030000.xhp | 6 +++--- main/helpcontent2/source/text/shared/02/24040000.xhp | 6 +++--- main/helpcontent2/source/text/shared/02/24050000.xhp | 6 +++--- main/helpcontent2/source/text/shared/02/24070000.xhp | 8 ++++---- main/helpcontent2/source/text/shared/05/00000100.xhp | 2 +- .../source/text/shared/autokorr/01000000.xhp | 6 +++--- .../source/text/shared/autokorr/05000000.xhp | 6 +++--- .../source/text/shared/autokorr/06000000.xhp | 6 +++--- .../source/text/shared/autokorr/07000000.xhp | 6 +++--- .../source/text/shared/autokorr/08000000.xhp | 6 +++--- .../source/text/shared/autokorr/10000000.xhp | 6 +++--- main/helpcontent2/source/text/shared/autopi/01120500.xhp | 8 ++++---- main/helpcontent2/source/text/shared/autopi/01170500.xhp | 8 ++++---- .../source/text/shared/guide/redlining_versions.xhp | 8 ++++---- main/helpcontent2/source/text/simpress/01/01180000.xhp | 6 +++--- main/helpcontent2/source/text/simpress/01/04990000.xhp | 6 +++--- main/helpcontent2/source/text/simpress/02/08020000.xhp | 6 +++--- main/helpcontent2/source/text/simpress/02/10130000.xhp | 4 ++-- main/helpcontent2/source/text/simpress/02/13080000.xhp | 8 ++++---- main/helpcontent2/source/text/simpress/02/13100000.xhp | 8 ++++---- .../source/text/simpress/guide/move_object.xhp | 6 +++--- main/helpcontent2/source/text/swriter/01/03080000.xhp | 8 ++++---- main/helpcontent2/source/text/swriter/01/04120216.xhp | 8 ++++---- main/helpcontent2/source/text/swriter/01/04120223.xhp | 6 +++--- main/helpcontent2/source/text/swriter/01/04120225.xhp | 6 +++--- main/helpcontent2/source/text/swriter/01/04120226.xhp | 6 +++--- main/helpcontent2/source/text/swriter/01/04990000.xhp | 6 +++--- main/helpcontent2/source/text/swriter/01/05100300.xhp | 8 ++++---- main/helpcontent2/source/text/swriter/02/04220000.xhp | 8 ++++---- main/helpcontent2/source/text/swriter/02/04240000.xhp | 8 ++++---- main/helpcontent2/source/text/swriter/02/06040000.xhp | 8 ++++---- main/helpcontent2/source/text/swriter/02/10020000.xhp | 6 +++--- main/helpcontent2/source/text/swriter/02/14050000.xhp | 8 ++++---- .../source/text/swriter/guide/insert_graphic.xhp | 4 ++-- .../source/text/swriter/guide/jump2statusbar.xhp | 7 +++---- .../source/text/swriter/guide/printing_order.xhp | 12 ++++++------ main/zlib/make_patched_header.pl | 10 ++++------ main/zlib/makefile.mk | 10 +++++----- main/zlib/{zlib-1.3.patch => zlib-1.3.1.patch} | 16 ++++++++-------- 79 files changed, 265 insertions(+), 268 deletions(-)
