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 de5e588867087e85853ba4b275ba0ca2182467f4 Merge: aeedbfba25 c80bf67b75 Author: mseidel <[email protected]> AuthorDate: Sat Dec 28 20:29:45 2024 +0100 Merge branch 'trunk' into Pilot-Pirx-wizard main/cppu/inc/typelib/typedescription.h | 2 +- .../source/ext/macromigration/migrationengine.cxx | 4 +- .../source/templates/layout/lang/uk/lyt-aqua.otp | Bin 0 -> 40293 bytes .../templates/layout/lang/uk/lyt-blackandwhite.otp | Bin 0 -> 218536 bytes .../templates/layout/lang/uk/lyt-bluegrey.otp | Bin 0 -> 316246 bytes .../templates/layout/lang/uk/lyt-bluelinesgrad.otp | Bin 0 -> 62454 bytes .../templates/layout/lang/uk/lyt-bluetitledown.otp | Bin 0 -> 90367 bytes .../source/templates/layout/lang/uk/lyt-book.otp | Bin 0 -> 1207594 bytes .../source/templates/layout/lang/uk/lyt-brown.otp | Bin 0 -> 71726 bytes .../templates/layout/lang/uk/lyt-charglow.otp | Bin 0 -> 98389 bytes .../source/templates/layout/lang/uk/lyt-cool.otp | Bin 0 -> 10052 bytes .../templates/layout/lang/uk/lyt-darkblue.otp | Bin 0 -> 10429 bytes .../source/templates/layout/lang/uk/lyt-forest.otp | Bin 0 -> 712233 bytes .../source/templates/layout/lang/uk/lyt-frepa.otp | Bin 0 -> 84718 bytes .../templates/layout/lang/uk/lyt-glacier.otp | Bin 0 -> 643406 bytes .../layout/lang/uk/lyt-greengradlines.otp | Bin 0 -> 86970 bytes .../templates/layout/lang/uk/lyt-keyboard.otp | Bin 0 -> 508701 bytes .../templates/layout/lang/uk/lyt-movwaves.otp | Bin 0 -> 68190 bytes .../templates/layout/lang/uk/lyt-numdark.otp | Bin 0 -> 360335 bytes .../source/templates/layout/lang/uk/lyt-ocean.otp | Bin 0 -> 19337 bytes .../templates/layout/lang/uk/lyt-organic.otp | Bin 0 -> 74146 bytes .../source/templates/layout/lang/uk/lyt-paper.otp | Bin 0 -> 748737 bytes .../templates/layout/lang/uk/lyt-rededges.otp | Bin 0 -> 536314 bytes .../templates/layout/lang/uk/lyt-roundedrect.otp | Bin 0 -> 155041 bytes .../templates/layout/lang/uk/lyt-sunrise.otp | Bin 0 -> 133250 bytes .../templates/layout/lang/uk/lyt-techpoly.otp | Bin 0 -> 341459 bytes .../source/templates/layout/lang/uk/lyt-tunnel.otp | Bin 0 -> 59350 bytes .../source/templates/layout/lang/uk/lyt-water.otp | Bin 0 -> 498496 bytes .../source/templates/layout/lang/uk/lyt-wine.otp | Bin 0 -> 641335 bytes .../source/text/sbasic/shared/03080102.xhp | 49 ++++++++++----------- .../source/text/sbasic/shared/03101100.xhp | 46 +++++++++---------- main/helpcontent2/source/text/scalc/main0205.xhp | 28 ++++++------ .../source/text/shared/02/03130000.xhp | 15 +++---- .../text/shared/explorer/database/11080000.xhp | 32 +++++++------- .../source/text/shared/guide/activex.xhp | 32 +++++++------- .../source/text/swriter/01/05090200.xhp | 32 +++++++------- .../text/swriter/guide/conditional_text2.xhp | 20 ++++----- main/helpcontent2/source/text/swriter/main0104.xhp | 36 +++++++-------- main/helpcontent2/source/text/swriter/main0503.xhp | 44 +++++++++--------- .../src/main/java/ifc/beans/_XPropertyAccess.java | 24 +++++----- .../main/java/ifc/beans/_XPropertyContainer.java | 6 +-- .../src/main/java/ifc/view/_XFormLayerAccess.java | 10 ++--- main/sw/source/ui/vba/vbaselection.cxx | 2 +- main/ucb/source/ucp/tdoc/tdoc_content.cxx | 6 +-- 44 files changed, 191 insertions(+), 197 deletions(-)
