This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch Pilot-Pirx-iconset
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 9864701e2d0e5426db792d39789161a0f7a5c8b6
Merge: 9105c1b8bc 96178715f4
Author: mseidel <msei...@apache.org>
AuthorDate: Thu Jun 13 01:40:34 2024 +0200

    Merge branch 'trunk' into Pilot-Pirx-iconset

 main/comphelper/source/misc/accessiblewrapper.cxx  |   4 +-
 main/dbaccess/source/ui/app/AppTitleWindow.hxx     |   2 +-
 main/drawinglayer/source/tools/converters.cxx      |   2 +-
 main/extensions.lst                                |   4 +
 main/extensions/source/update/check/updatehdl.src  |   8 +-
 main/filter/source/msfilter/msocximex.cxx          |   2 +-
 .../import/spreadsheetml/spreadsheetml2ooo.xsl     |  10 +--
 .../classic/classic_images.tar.gz                  | Bin 1364891 -> 1364926 
bytes
 .../main/java/complex/unoapi/CheckModuleAPI.java   |  10 +--
 .../main/java/ifc/frame/_XDispatchRecorder.java    |   2 +-
 .../src/main/java/lib/MultiMethodTest.java         |   2 +-
 main/sal/qa/libs2test.txt                          |   2 +-
 main/sal/qa/osl/file/osl_File.cxx                  |  12 +--
 main/sal/qa/osl/module/osl_Module.cxx              |   2 +-
 main/sal/qa/osl/socket/osl_Socket.cxx              |  10 +--
 main/sal/qa/osl/socket/osl_Socket2.cxx             |   2 +-
 .../ui/slidesorter/cache/SlsCacheCompactor.hxx     |   2 +-
 main/svgio/source/svgreader/svgnode.cxx            |  64 +++++++-------
 main/svl/JunitTest_svl_complex.mk                  |   2 +
 .../numberformatter/NumberFormatterUnitTest.java   |  92 +++++++++++++++++++++
 main/svl/source/numbers/zforfind.cxx               |  61 +++++++-------
 main/sw/source/ui/utlui/gloslst.src                |  68 ++++-----------
 main/sw/source/ui/utlui/unotools.src               |  89 +++++++-------------
 main/sw/source/ui/utlui/utlui.src                  |  57 ++++++-------
 main/sw/source/ui/utlui/zoomctrl.cxx               |  22 ++---
 .../com/sun/star/wizards/web/TOCPreview.java       |   2 +-
 main/xmloff/source/script/XMLEventExport.cxx       |   4 +-
 27 files changed, 282 insertions(+), 255 deletions(-)

Reply via email to