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 9c927fc83ba2ef4d01d687a4d523605d44e92e5f Merge: de5e588867 b426ac2b2f Author: mseidel <[email protected]> AuthorDate: Fri Jan 3 19:24:41 2025 +0100 Merge branch 'trunk' into Pilot-Pirx-wizard README.md | 2 +- main/LICENSE | 2 +- main/LICENSE_ALv2 | 2 +- main/NOTICE | 2 +- main/automation/source/server/recorder.cxx | 26 +- .../unix/com_sun_star_beans_LocalOfficeWindow.c | 8 - .../com_sun_star_comp_beans_LocalOfficeWindow.c | 8 - .../win32/com_sun_star_beans_LocalOfficeWindow.c | 8 - .../com_sun_star_comp_beans_LocalOfficeWindow.c | 8 - main/cppu/source/uno/copy.hxx | 2 +- main/cui/source/dialogs/about.cxx | 2 +- main/cui/source/dialogs/hltpbase.cxx | 2 +- main/cui/source/inc/hltpbase.hxx | 2 +- main/cui/source/options/fontsubs.hxx | 12 - .../drawinglayer/processor2d/baseprocessor2d.hxx | 2 +- main/editeng/source/misc/unolingu.cxx | 6 +- main/extensions.lst | 4 +- .../source/ole/unoconversionutilities.hxx | 8 +- main/extras/source/autotext/lang/de/standard.bau | Bin 53243 -> 54971 bytes .../extras/source/autotext/lang/en-US/standard.bau | Bin 65545 -> 68196 bytes main/extras/source/autotext/lang/fr/standard.bau | Bin 55368 -> 55332 bytes main/extras/source/autotext/lang/pt/standard.bau | Bin 74286 -> 74251 bytes main/extras/source/autotext/lang/uk/standard.bau | Bin 65545 -> 68196 bytes .../source/templates/layout/lang/uk/lyt-aqua.otp | Bin 40293 -> 39642 bytes .../templates/layout/lang/uk/lyt-blackandwhite.otp | Bin 218536 -> 217329 bytes .../templates/layout/lang/uk/lyt-bluegrey.otp | Bin 316246 -> 314908 bytes .../templates/layout/lang/uk/lyt-bluelinesgrad.otp | Bin 62454 -> 61464 bytes .../templates/layout/lang/uk/lyt-bluetitledown.otp | Bin 90367 -> 89283 bytes .../source/templates/layout/lang/uk/lyt-book.otp | Bin 1207594 -> 1207021 bytes .../source/templates/layout/lang/uk/lyt-brown.otp | Bin 71726 -> 69333 bytes .../templates/layout/lang/uk/lyt-charglow.otp | Bin 98389 -> 97776 bytes .../source/templates/layout/lang/uk/lyt-cool.otp | Bin 10052 -> 0 bytes .../templates/layout/lang/uk/lyt-darkblue.otp | Bin 10429 -> 0 bytes .../source/templates/layout/lang/uk/lyt-forest.otp | Bin 712233 -> 711553 bytes .../source/templates/layout/lang/uk/lyt-frepa.otp | Bin 84718 -> 83457 bytes .../templates/layout/lang/uk/lyt-glacier.otp | Bin 643406 -> 642479 bytes .../layout/lang/uk/lyt-greengradlines.otp | Bin 86970 -> 85305 bytes .../templates/layout/lang/uk/lyt-keyboard.otp | Bin 508701 -> 507810 bytes .../templates/layout/lang/uk/lyt-movwaves.otp | Bin 68190 -> 66942 bytes .../templates/layout/lang/uk/lyt-numdark.otp | Bin 360335 -> 359451 bytes .../source/templates/layout/lang/uk/lyt-ocean.otp | Bin 19337 -> 18462 bytes .../templates/layout/lang/uk/lyt-organic.otp | Bin 74146 -> 73576 bytes .../source/templates/layout/lang/uk/lyt-paper.otp | Bin 748737 -> 747171 bytes .../templates/layout/lang/uk/lyt-rededges.otp | Bin 536314 -> 534404 bytes .../templates/layout/lang/uk/lyt-roundedrect.otp | Bin 155041 -> 153897 bytes .../templates/layout/lang/uk/lyt-sunrise.otp | Bin 133250 -> 131285 bytes .../templates/layout/lang/uk/lyt-techpoly.otp | Bin 341459 -> 340799 bytes .../source/templates/layout/lang/uk/lyt-tunnel.otp | Bin 59350 -> 58505 bytes .../source/templates/layout/lang/uk/lyt-water.otp | Bin 498496 -> 497285 bytes .../source/templates/layout/lang/uk/lyt-wine.otp | Bin 641335 -> 640207 bytes main/filter/source/pdf/pdffilter.hxx | 10 - .../win32/filepicker/VistaFilePickerImpl.hxx | 2 +- .../framework/inc/classes/protocolhandlercache.hxx | 2 +- main/framework/source/services/dispatchhelper.cxx | 2 +- main/framework/source/services/frame.cxx | 2 +- .../source/text/sbasic/shared/01170100.xhp | 36 +- .../source/text/sbasic/shared/03050100.xhp | 44 +- .../source/text/sbasic/shared/03060500.xhp | 42 +- .../source/text/sbasic/shared/03090402.xhp | 40 +- .../source/text/sbasic/shared/03102900.xhp | 46 +- .../source/text/sbasic/shared/03120309.xhp | 45 +- .../helpcontent2/source/text/scalc/01/04070300.xhp | 26 +- .../text/scalc/guide/cellstyle_by_formula.xhp | 25 +- .../source/text/scalc/guide/html_doc.xhp | 28 +- .../source/text/shared/00/00000099.xhp | 10 +- .../source/text/shared/01/02220100.xhp | 25 +- .../source/text/shared/01/06140500.xhp | 16 +- .../source/text/shared/02/01170700.xhp | 28 +- .../source/text/shared/02/09070300.xhp | 26 +- .../source/text/shared/autopi/01100300.xhp | 22 +- .../text/shared/explorer/database/11170000.xhp | 28 +- .../text/shared/guide/configure_overview.xhp | 26 +- .../text/shared/guide/copy_drawfunctions.xhp | 20 +- .../source/text/shared/guide/error_report.xhp | 30 +- .../source/text/shared/guide/labels_database.xhp | 11 +- .../source/text/shared/guide/measurement_units.xhp | 16 +- .../source/text/shared/guide/redlining_accept.xhp | 16 +- .../source/text/shared/guide/textmode_change.xhp | 24 +- .../source/text/simpress/guide/layers.xhp | 22 +- .../source/text/simpress/guide/page_copy.xhp | 30 +- .../source/text/swriter/01/04070100.xhp | 24 +- .../text/swriter/guide/calculate_intext2.xhp | 19 +- .../source/text/swriter/guide/sections.xhp | 26 +- .../source/text/swriter/guide/text_capital.xhp | 17 +- .../source/text/swriter/guide/using_thesaurus.xhp | 23 +- main/icu/createmak.cfg | 14 +- main/icu/createmakWin64.cfg | 48 +- main/icu/icu-vcproj-outputdirectory.patch | 147 +++++ main/icu/makefile.mk | 3 +- main/io/test/stm/pumptest.cxx | 14 +- main/l10ntools/source/wtranode.cxx | 17 - .../hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 8 +- .../src/driver_docs/sources/StringDataManager.cls | 2 +- main/odk/docs/install.html | 2 +- main/odk/docs/notsupported.html | 2 +- main/odk/docs/tools.html | 2 +- main/odk/examples/DevelopersGuide/examples.html | 2 +- main/odk/examples/examples.html | 2 +- main/odk/index.html | 2 +- main/odk/source/unowinreg/win/makefile.mk | 3 +- .../source/drawingml/diagram/layoutnodecontext.cxx | 2 +- main/openssl/makefile.mk | 6 +- main/python/python-2.7.18-msvs9-win64.patch | 603 +++++++++++---------- main/sal/inc/rtl/tres.hxx | 21 - main/sal/osl/w32/profile.cxx | 52 -- main/sal/systools/win32/uwinapi/Uwinapi.h | 10 - main/sc/source/filter/excel/xipivot.cxx | 2 +- main/sc/source/filter/inc/ftools.hxx | 12 +- main/sc/source/filter/xml/xmlimprt.cxx | 20 - .../source/packinfo/packinfo_brand.txt | 16 +- .../source/packinfo/packinfo_office.txt | 118 ++-- .../source/packinfo/packinfo_office_lang.txt | 22 +- .../source/packinfo/packinfo_sdkoo.txt | 2 +- main/setup_native/source/packinfo/packinfo_ure.txt | 4 +- .../source/win32/nsis/downloadtemplate.nsi | 2 +- main/sfx2/inc/sfx2/htmlmode.hxx | 19 - main/solenv/bin/modules/installer/setupscript.pm | 2 +- main/solenv/inc/version.lst | 2 +- main/solenv/inc/wntmscx.mk | 7 +- main/solenv/src/version.c | 4 - .../inc/svgio/svgreader/svgstyleattributes.hxx | 2 +- main/svx/inc/svx/htmlmode.hxx | 19 - main/sw/source/core/access/accmap.cxx | 2 +- main/sw/source/core/doc/notxtfrm.cxx | 2 +- main/sw/source/core/unocore/unodraw.cxx | 2 +- main/sw/source/ui/inc/condedit.hxx | 16 - main/sw/source/ui/inc/glshell.hxx | 21 - main/sw/source/ui/inc/srcview.hxx | 21 - main/vcl/inc/unx/salbmp.h | 44 -- main/vcl/inc/vcl/gdimetafiletools.hxx | 2 +- main/vcl/inc/vcl/outdev.hxx | 2 +- main/vcl/unx/generic/dtrans/X11_selection.cxx | 2 +- .../sxc/pexcel/records/formula/FormulaHelper.java | 8 +- .../xml/xslt/DocumentDeserializerImpl.java | 2 +- .../converter/xml/xslt/DocumentSerializerImpl.java | 2 +- main/xmloff/inc/xmloff/shapeexport.hxx | 2 +- main/xmloff/source/draw/shapeimport.cxx | 2 +- main/xmloff/source/style/impastp1.cxx | 4 +- main/xmloff/source/style/impastp4.cxx | 2 +- main/xmloff/source/style/xmlstyle.cxx | 4 +- 140 files changed, 1059 insertions(+), 1211 deletions(-)
