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 8099ef3aab8050d1b456ede24c274bb91551b0fe
Merge: fb07fa6f3a bfc1a96ad2
Author: mseidel <msei...@apache.org>
AuthorDate: Wed Dec 4 19:23:44 2024 +0100

    Merge branch 'trunk' into Pilot-Pirx-wizard

 main/bridges/Library_cpp_uno.mk                    |   4 +
 .../source/cpp_uno/gcc3_freebsd_powerpc64/call.s   | 500 +++++++++++++++++++++
 .../cpp_uno/gcc3_freebsd_powerpc64/cpp2uno.cxx     | 141 +++---
 .../cpp_uno/gcc3_freebsd_powerpc64/makefile.mk     |   7 +-
 .../cpp_uno/gcc3_freebsd_powerpc64/share.hxx       |  62 ++-
 .../cpp_uno/gcc3_freebsd_powerpc64/uno2cpp.cxx     | 247 +++++++---
 main/cui/source/dialogs/colorpicker.src            |   8 +-
 .../dbaccess/source/core/api/FilteredContainer.cxx |   6 +-
 .../source/core/dataaccess/databasedocument.cxx    |   2 +-
 main/dbaccess/source/ui/dlg/admincontrols.src      |   2 +-
 main/dbaccess/source/ui/dlg/directsql.src          | 107 +++--
 main/dbaccess/source/ui/inc/localresaccess.hxx     |   2 +-
 main/default_images/framework/res/logo.png         | Bin 695 -> 0 bytes
 main/filter/source/config/cache/filterfactory.cxx  |   2 +-
 main/framework/source/services/backingcomp.cxx     |  65 ++-
 main/framework/source/services/backingwindow.cxx   | 170 +++----
 main/framework/source/services/desktop.cxx         | 124 ++---
 main/framework/source/services/fwk_services.src    |  26 +-
 .../source/text/sbasic/shared/03020305.xhp         |  18 +-
 .../source/text/sbasic/shared/03020402.xhp         |  23 +-
 .../source/text/sbasic/shared/03020406.xhp         |  26 +-
 .../source/text/sbasic/shared/03020413.xhp         |  31 +-
 .../source/text/sbasic/shared/03030106.xhp         |  31 +-
 .../source/text/sbasic/shared/03030201.xhp         |  32 +-
 .../source/text/sbasic/shared/03030202.xhp         |  32 +-
 .../source/text/sbasic/shared/03070100.xhp         |  38 +-
 .../source/text/sbasic/shared/03070300.xhp         |  38 +-
 .../source/text/sbasic/shared/03070400.xhp         |  38 +-
 .../source/text/sbasic/shared/03090407.xhp         |  29 +-
 .../source/text/sbasic/shared/03100300.xhp         |  29 +-
 .../source/text/sbasic/shared/03102300.xhp         |  33 +-
 .../source/text/sbasic/shared/03102700.xhp         |  33 +-
 .../source/text/sbasic/shared/03120302.xhp         |  33 +-
 .../source/text/sbasic/shared/03120310.xhp         |  35 +-
 .../helpcontent2/source/text/scalc/01/02140500.xhp |  18 +-
 .../helpcontent2/source/text/scalc/01/05040200.xhp |  12 +-
 .../helpcontent2/source/text/scalc/01/12090100.xhp |  22 +-
 .../helpcontent2/source/text/scalc/01/12090101.xhp |  22 +-
 .../helpcontent2/source/text/scalc/01/12120200.xhp |  20 +-
 .../helpcontent2/source/text/scalc/02/18020000.xhp |  16 +-
 .../source/text/scalc/guide/database_define.xhp    |  13 +-
 .../source/text/scalc/guide/edit_multitables.xhp   |   8 +-
 .../source/text/scalc/guide/filters.xhp            |  11 +-
 .../source/text/scalc/guide/multi_tables.xhp       |   8 +-
 .../source/text/scalc/guide/print_exact.xhp        |  14 +-
 .../source/text/shared/00/01020000.xhp             |  16 +-
 .../source/text/shared/01/01100100.xhp             |  20 +-
 .../source/text/shared/01/02010000.xhp             |  18 +-
 .../source/text/shared/01/04150200.xhp             |  16 +-
 .../source/text/shared/01/05010000.xhp             |  11 +-
 .../source/text/shared/01/05250000.xhp             |   8 +-
 .../source/text/shared/02/01230000.xhp             |   8 +-
 .../source/text/shared/02/02130000.xhp             |  10 +-
 .../source/text/shared/02/07070000.xhp             |  11 +-
 .../source/text/shared/02/09010000.xhp             |  20 +-
 .../source/text/shared/02/12030000.xhp             |  16 +-
 .../source/text/shared/02/12090000.xhp             |  15 +-
 .../source/text/shared/02/13020000.xhp             |  40 +-
 .../source/text/shared/02/20040000.xhp             |  22 +-
 .../source/text/shared/05/00000130.xhp             |  14 +-
 .../source/text/shared/autopi/01000000.xhp         |  16 +-
 .../source/text/shared/autopi/01050400.xhp         |  20 +-
 .../source/text/shared/autopi/01170400.xhp         |   8 +-
 .../text/shared/explorer/database/04000000.xhp     |  20 +-
 main/helpcontent2/source/text/shared/guide/ctl.xhp |  28 +-
 .../source/text/shared/guide/data_addressbook.xhp  |   2 +-
 .../source/text/shared/guide/hyperlink_search.xhp  |  16 +-
 .../source/text/shared/guide/integratinguno.xhp    |  14 +-
 .../source/text/shared/optionen/01110100.xhp       |  16 +-
 .../source/text/shared/optionen/01130200.xhp       |  14 +-
 .../source/text/swriter/01/01160300.xhp            |  13 +-
 .../source/text/swriter/01/04020000.xhp            |  14 +-
 .../source/text/swriter/01/05150300.xhp            |  18 +-
 .../source/text/swriter/guide/auto_off.xhp         |  46 +-
 .../source/text/swriter/guide/autotext.xhp         |  57 ++-
 .../source/text/swriter/guide/border_object.xhp    |  29 +-
 .../text/swriter/guide/calculate_clipboard.xhp     |   9 +-
 .../source/text/swriter/guide/captions.xhp         |  26 +-
 .../source/text/swriter/guide/even_odd_sdw.xhp     |  26 +-
 .../source/text/swriter/guide/indices_multidoc.xhp |  11 +-
 .../source/text/swriter/guide/load_styles.xhp      |  15 +-
 .../text/swriter/guide/removing_line_breaks.xhp    |  19 +-
 .../source/text/swriter/guide/text_centervert.xhp  |  19 +-
 main/helpcontent2/source/text/swriter/main0101.xhp |  16 +-
 .../plugins/sunmajor/pluginlib/sunversion.cxx      |   7 +-
 .../com/sun/star/tooling/converter/GSIReader.java  |   2 +-
 main/libxmlsec/xmlsec1-nssmangleciphers.patch      |   3 +-
 .../schema/org/openoffice/TypeDetection/Types.xcs  |   2 +-
 .../schema/org/openoffice/TypeDetection/UISort.xcs |   2 +-
 .../classic/classic_images.tar.gz                  | Bin 1389829 -> 1379762 
bytes
 main/reportdesign/source/ui/dlg/CondFormat.src     | 357 ++++++++-------
 main/reportdesign/source/ui/dlg/DateTime.src       | 106 ++---
 main/sal/osl/unx/signal.c                          |   7 +
 main/sal/osl/unx/system.c                          |   1 +
 main/solenv/gbuild/platform/freebsd.mk             |  28 +-
 main/solenv/inc/unxfbsdi.mk                        |  11 +-
 main/solenv/inc/unxfbsdp.mk                        |  31 ++
 main/svtools/inc/svtools/localresaccess.hxx        |   2 +-
 .../inc/svx/sdr/contact/viewcontactofsdrobj.hxx    |   2 +-
 .../inc/svx/sdr/contact/viewcontactofsdrpage.hxx   |   2 +-
 main/sw/source/core/access/accdoc.hxx              |   2 +-
 main/sw/source/ui/uiview/viewcoll.cxx              |  19 +-
 main/sw/source/ui/uiview/viewdlg.cxx               |  21 +-
 main/sw/source/ui/uiview/viewdlg2.cxx              | 122 +++--
 main/sw/source/ui/uiview/viewfunc.hxx              |  22 +-
 main/testtools/source/bridgetest/makefile.mk       |   2 +-
 main/ucbhelper/source/client/proxydecider.cxx      |   2 +-
 107 files changed, 2135 insertions(+), 1473 deletions(-)

Reply via email to