This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch Pilot-Pirx-wizard in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit fb07fa6f3a9e4558f22456a0e9e81853995a9ab9 Merge: 0d12b22268 3de750101e Author: mseidel <msei...@apache.org> AuthorDate: Mon Nov 11 19:25:18 2024 +0100 Merge branch 'trunk' into Pilot-Pirx-wizard .../source/bonobowrappermaker/corbamaker.cxx | 78 ++- .../source/bonobowrappermaker/corbaoptions.cxx | 64 ++- .../source/bonobowrappermaker/corbatype.cxx | 559 ++++++++++--------- main/dbaccess/source/core/resource/strings.src | 148 +++--- main/dbaccess/source/ui/dlg/admincontrols.src | 188 +++---- main/dbaccess/source/ui/dlg/dbadmin2.src | 85 ++- main/dbaccess/source/ui/misc/dbumiscres.src | 40 +- main/default_images/framework/res/backing.png | Bin 16596 -> 16444 bytes main/default_images/framework/res/backing_hc.png | Bin 16632 -> 16228 bytes .../default_images/framework/res/backing_right.png | Bin 7899 -> 7725 bytes .../framework/res/backing_right_hc.png | Bin 7958 -> 7475 bytes .../framework/res/backing_rtl_left.png | Bin 14004 -> 13863 bytes .../framework/res/backing_rtl_left_hc.png | Bin 14027 -> 13641 bytes .../framework/res/backing_rtl_right.png | Bin 7887 -> 7725 bytes .../framework/res/backing_rtl_right_hc.png | Bin 7953 -> 7475 bytes .../default_images/framework/res/backing_space.png | Bin 335 -> 294 bytes .../framework/res/backing_space_hc.png | Bin 325 -> 284 bytes main/default_images/framework/res/beta/backing.png | Bin 18726 -> 18635 bytes .../framework/res/beta/backing_hc.png | Bin 18746 -> 18398 bytes .../framework/res/beta/backing_rtl_left.png | Bin 15894 -> 15787 bytes .../framework/res/beta/backing_rtl_left_hc.png | Bin 15920 -> 15519 bytes main/default_images/framework/res/dev/backing.png | Bin 19061 -> 18964 bytes .../framework/res/dev/backing_hc.png | Bin 19095 -> 18970 bytes .../framework/res/dev/backing_rtl_left.png | Bin 16068 -> 15939 bytes .../framework/res/dev/backing_rtl_left_hc.png | Bin 16026 -> 15784 bytes main/desktop/source/deployment/misc/dp_misc.src | 18 +- main/desktop/source/inc/exithelper.hxx | 20 +- main/extensions.lst | 6 +- main/external_deps.lst | 6 +- main/filter/source/xsltdialog/xmlfileview.src | 49 +- main/formula/source/ui/dlg/parawin.src | 168 +++--- main/framework/source/classes/resource.src | 16 +- main/framework/source/services/backingwindow.hxx | 235 ++++---- .../source/text/sbasic/shared/01020500.xhp | 20 +- .../source/text/sbasic/shared/03020408.xhp | 26 +- .../source/text/sbasic/shared/03020415.xhp | 28 +- .../source/text/sbasic/shared/03080401.xhp | 30 +- .../source/text/sbasic/shared/03100400.xhp | 28 +- .../source/text/sbasic/shared/03100900.xhp | 31 +- .../source/text/sbasic/shared/03102600.xhp | 30 +- .../source/text/sbasic/shared/03104600.xhp | 30 +- .../source/text/sbasic/shared/03120104.xhp | 29 +- .../source/text/sbasic/shared/03130800.xhp | 30 +- .../source/text/sbasic/shared/03132200.xhp | 26 +- .../helpcontent2/source/text/scalc/01/04060100.xhp | 36 +- .../helpcontent2/source/text/scalc/01/04060116.xhp | 590 +++++++++------------ .../helpcontent2/source/text/scalc/01/12070100.xhp | 24 +- .../source/text/scalc/guide/datapilot_tipps.xhp | 10 +- main/helpcontent2/source/text/scalc/main0106.xhp | 14 +- .../source/text/shared/00/00000210.xhp | 18 +- .../source/text/shared/01/01050000.xhp | 16 +- .../source/text/shared/01/04140000.xhp | 16 +- .../source/text/shared/01/05030000.xhp | 6 +- .../source/text/shared/01/05200100.xhp | 2 +- .../source/text/shared/01/05230400.xhp | 20 +- .../source/text/shared/01/05340100.xhp | 15 +- .../source/text/shared/01/05340200.xhp | 14 +- .../source/text/shared/02/01110000.xhp | 6 +- .../source/text/shared/02/06050000.xhp | 8 +- .../source/text/shared/02/06060000.xhp | 8 +- .../source/text/shared/02/06110000.xhp | 10 +- .../source/text/shared/autopi/01020100.xhp | 6 +- .../source/text/shared/autopi/01040300.xhp | 6 +- .../source/text/shared/autopi/01110000.xhp | 22 +- .../text/shared/explorer/database/05000002.xhp | 28 +- .../text/shared/explorer/database/05000003.xhp | 20 +- .../source/text/shared/guide/workfolder.xhp | 15 +- .../source/text/swriter/01/02110000.xhp | 8 +- .../source/text/swriter/guide/autocorr_except.xhp | 15 +- .../source/text/swriter/guide/calculate.xhp | 10 +- .../text/swriter/guide/calculate_multitable.xhp | 17 +- .../source/text/swriter/guide/dragdroptext.xhp | 11 +- .../text/swriter/guide/insert_graphic_scan.xhp | 12 +- .../source/text/swriter/guide/number_date_conv.xhp | 12 +- .../source/text/swriter/guide/print_small.xhp | 17 +- .../source/text/swriter/guide/printer_tray.xhp | 20 +- .../source/text/swriter/guide/send2html.xhp | 14 +- .../source/text/swriter/guide/shortcut_writing.xhp | 14 +- .../source/text/swriter/guide/subscript.xhp | 14 +- .../source/text/swriter/guide/template_create.xhp | 19 +- main/icu/createmak.cfg | 43 +- main/icu/createmak.pl | 77 ++- main/icu/createmakWin64.cfg | 9 +- main/icu/icu-darwin.patch | 14 + main/icu/icu-win-icutu-dll-version.patch | 40 ++ main/icu/icu-win-layout.patch | 11 + main/icu/icu4c-4_2_1-src.patch | 230 ++++++++ main/icu/icuversion.mk | 2 +- main/icu/makefile.mk | 11 +- main/icu/prj/d.lst | 10 +- main/l10ntools/inc/treeconfig.hxx | 43 +- .../source/filter/xml/xmlCondPrtExpr.cxx | 31 +- main/reportdesign/source/ui/dlg/Navigator.src | 110 ++-- main/sal/osl/os2/pipe.cxx | 116 ++-- main/sal/qa/rtl/logfile/rtl_logfile.cxx | 33 +- main/sc/source/ui/src/globstr.src | 8 +- main/scp2/source/canvas/vclcanvas.scp | 12 +- main/sd/source/filter/html/pubdlg.src | 166 +++--- main/sd/source/ui/unoidl/unocpres.cxx | 16 +- main/svtools/workben/unodialog/roadmapskeleton.src | 76 +-- .../source/sdr/overlay/overlaymanagerbuffered.cxx | 265 +++++---- main/sw/source/core/doc/docdesc.cxx | 114 ++-- main/sw/source/core/doc/docedt.cxx | 208 ++++---- main/sw/source/ui/config/mailconfigpage.src | 92 ++-- .../source/ui/dbui/customizeaddresslistdialog.src | 258 +++++---- main/sw/source/ui/dbui/mailmergechildwindow.src | 3 +- main/sw/source/ui/fmtui/tmpdlg.src | 22 - main/sw/source/ui/misc/glossary.src | 6 +- main/sw/source/ui/utlui/navipi.src | 3 - main/sw/source/ui/wrtsh/wrtsh.src | 23 +- .../star/beans/TolerantPropertySetResultType.idl | 53 +- main/unotools/inc/unotools/loghelper.hxx | 12 +- main/unoxml/source/xpath/xpathapi.cxx | 4 +- main/vos/inc/vos/refobj.hxx | 19 +- main/writerfilter/source/ooxml/RefAndPointer.hxx | 15 +- .../source/fvt/uno/sc/data/AdvanceFilter.java | 2 +- .../source/fvt/uno/sc/formula/TestFormulaDocs.java | 2 +- .../source/fvt/uno/sw/frame/FrameWrapType.java | 4 +- .../ParagraphNumberingAndBulletCharacterStyle.java | 8 +- .../fvt/uno/sw/puretext/CharacterUnderline.java | 48 +- 120 files changed, 2740 insertions(+), 2560 deletions(-)