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

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

commit 397fe7d8c49e5402883ab156d8c8f8d8c47040d0
Merge: 81517dc06a 53217c3536
Author: mseidel <msei...@apache.org>
AuthorDate: Wed Feb 14 16:39:20 2024 +0100

    Merge branch 'trunk' into Pilot-Pirx-nss

 .gitignore                                         |  10 +-
 main/Module_ooo.mk                                 |   2 -
 main/Repository.mk                                 |  18 +-
 main/autodoc/Executable_autodoc.mk                 |  25 +-
 main/{cosv => autodoc}/inc/cosv/bstream.hxx        |   0
 main/{cosv => autodoc}/inc/cosv/comdline.hxx       |   0
 main/{cosv => autodoc}/inc/cosv/comfunc.hxx        |   0
 main/{cosv => autodoc}/inc/cosv/commandline.hxx    |   0
 main/{cosv => autodoc}/inc/cosv/csv_env.hxx        |   0
 main/{cosv => autodoc}/inc/cosv/csv_ostream.hxx    |   0
 main/{cosv => autodoc}/inc/cosv/csv_precomp.h      |   0
 main/{cosv => autodoc}/inc/cosv/datetime.hxx       |   0
 main/{cosv => autodoc}/inc/cosv/dirchain.hxx       |   0
 main/{cosv => autodoc}/inc/cosv/file.hxx           |   0
 main/{cosv => autodoc}/inc/cosv/mbstream.hxx       |   0
 main/{cosv => autodoc}/inc/cosv/openclose.hxx      |   0
 main/{cosv => autodoc}/inc/cosv/persist.hxx        |   0
 main/{cosv => autodoc}/inc/cosv/ploc.hxx           |   0
 main/{cosv => autodoc}/inc/cosv/ploc_dir.hxx       |   0
 main/{cosv => autodoc}/inc/cosv/plocroot.hxx       |   0
 main/{cosv => autodoc}/inc/cosv/std_outp.hxx       |   0
 main/{cosv => autodoc}/inc/cosv/str_types.hxx      |   0
 main/{cosv => autodoc}/inc/cosv/streamstr.hxx      |   0
 main/{cosv => autodoc}/inc/cosv/string.hxx         |   0
 main/{cosv => autodoc}/inc/cosv/stringdata.hxx     |   0
 main/{cosv => autodoc}/inc/cosv/tpl/dyn.hxx        |   0
 main/{cosv => autodoc}/inc/cosv/tpl/funcall.hxx    |   0
 main/{cosv => autodoc}/inc/cosv/tpl/processor.hxx  |   0
 main/{cosv => autodoc}/inc/cosv/tpl/range.hxx      |   0
 main/{cosv => autodoc}/inc/cosv/tpl/swelist.hxx    |   0
 main/{cosv => autodoc}/inc/cosv/tpl/tpltools.hxx   |   0
 main/{cosv => autodoc}/inc/cosv/tpl/vvector.hxx    |   0
 main/{cosv => autodoc}/inc/cosv/x.hxx              |   0
 main/{udm => autodoc}/inc/udm/html/htmlitem.hxx    |   0
 main/{udm => autodoc}/inc/udm/xml/xmlitem.hxx      |   0
 main/autodoc/prj/build.lst                         |   2 +-
 .../source/cosv}/comphelp/badcast.cxx              |   0
 .../source => autodoc/source/cosv}/fullcpp.mk      |   0
 .../source => autodoc/source/cosv}/inc/precomp.h   |   0
 .../source/cosv}/service/comdline.cxx              |   0
 .../source/cosv}/service/comfunc.cxx               |   0
 .../source/cosv}/service/commandline.cxx           |   0
 .../source/cosv}/service/csv_ostream.cxx           |   0
 .../source/cosv}/service/datetime.cxx              |   0
 .../source/cosv}/service/std_outp.cxx              |   0
 .../source/cosv}/storage/dirchain.cxx              |   0
 .../source/cosv}/storage/file.cxx                  |   0
 .../source/cosv}/storage/mbstream.cxx              |   0
 .../source/cosv}/storage/persist.cxx               |   0
 .../source/cosv}/storage/ploc.cxx                  |   0
 .../source/cosv}/storage/ploc_dir.cxx              |   0
 .../source/cosv}/storage/plocroot.cxx              |   0
 .../source/cosv}/strings/str_types.cxx             |   0
 .../source/cosv}/strings/streamstr.cxx             |   0
 .../source/cosv}/strings/string.cxx                |   0
 .../source/cosv}/unittest/file_ut.cxx              |   0
 .../source/cosv}/unittest/makefile.mk              |   0
 .../source/cosv}/unittest/string_ut.cxx            |   0
 .../source => autodoc/source/cosv}/unittest/ut.hxx |   0
 .../source/cosv}/unittest/ut_main.cxx              |   0
 .../source/udm}/html/htmlitem.cxx                  |   0
 .../source => autodoc/source/udm}/inc/precomp.h    |   0
 .../source/udm}/unittest/makefile.mk               |   0
 .../source/udm}/unittest/test.cxx                  |   0
 .../source => autodoc/source/udm}/xml/xmlitem.cxx  |   0
 main/avmedia/source/framework/mediacontrol.src     |   8 +-
 main/cosv/Makefile                                 |  32 --
 main/cosv/Module_cosv.mk                           |  32 --
 main/cosv/Package_inc.mk                           |  54 ---
 main/cosv/StaticLibrary_cosv.mk                    |  63 ---
 main/cosv/prj/build.lst                            |   4 -
 main/cosv/prj/d.lst                                |   0
 main/cosv/prj/makefile.mk                          |  44 --
 main/crashrep/source/all/crashrep.ulf              | 103 +----
 main/dbaccess/source/ui/tabledesign/table.src      |  72 +--
 main/extensions/source/dbpilots/commonpagesdbp.src |   4 +-
 .../source/text/sbasic/shared/00000002.xhp         |  33 +-
 .../source/text/sbasic/shared/01/06130100.xhp      |  20 +-
 .../source/text/sbasic/shared/01020200.xhp         |  12 +-
 .../source/text/sbasic/shared/01030100.xhp         |  12 +-
 .../source/text/sbasic/shared/02/11050000.xhp      |  10 +-
 .../source/text/sbasic/shared/02/11060000.xhp      |  10 +-
 .../source/text/sbasic/shared/02/11070000.xhp      |   8 +-
 .../source/text/sbasic/shared/02/11080000.xhp      |  10 +-
 .../source/text/sbasic/shared/03020302.xhp         |  21 +-
 .../source/text/sbasic/shared/03020304.xhp         |  23 +-
 .../source/text/sbasic/shared/03020410.xhp         |  21 +-
 .../source/text/sbasic/shared/03020411.xhp         | 101 ++---
 .../source/text/sbasic/shared/03030107.xhp         |  25 +-
 .../source/text/sbasic/shared/03030108.xhp         |  23 +-
 .../source/text/sbasic/shared/03030301.xhp         |  21 +-
 .../source/text/sbasic/shared/03050300.xhp         |  19 +-
 .../source/text/sbasic/shared/03080802.xhp         |  25 +-
 .../source/text/sbasic/shared/03090103.xhp         |  16 +-
 .../source/text/sbasic/shared/03090409.xhp         |  27 +-
 .../source/text/sbasic/shared/03103100.xhp         |  27 +-
 .../source/text/sbasic/shared/03103200.xhp         |  24 +-
 .../source/text/sbasic/shared/03103400.xhp         |  20 +-
 .../source/text/sbasic/shared/03103450.xhp         |  20 +-
 .../source/text/sbasic/shared/03104000.xhp         |  19 +-
 .../source/text/sbasic/shared/03104100.xhp         |  18 +-
 .../source/text/sbasic/shared/03104200.xhp         |  23 +-
 .../source/text/sbasic/shared/03104300.xhp         |  21 +-
 .../source/text/sbasic/shared/03104400.xhp         |  26 +-
 .../source/text/sbasic/shared/03120315.xhp         |  22 +-
 .../source/text/sbasic/shared/03130000.xhp         |   4 +-
 .../source/text/sbasic/shared/03131000.xhp         |  24 +-
 .../source/text/sbasic/shared/03131700.xhp         |  20 +-
 .../source/text/sbasic/shared/main0601.xhp         |  10 +-
 .../helpcontent2/source/text/scalc/01/03070000.xhp |   8 +-
 .../helpcontent2/source/text/scalc/01/03100000.xhp |  14 +-
 .../helpcontent2/source/text/scalc/01/04060104.xhp | 116 ++---
 .../helpcontent2/source/text/scalc/01/04070000.xhp |  12 +-
 .../helpcontent2/source/text/scalc/01/05020000.xhp |   8 +-
 .../helpcontent2/source/text/scalc/01/05030200.xhp |  12 +-
 .../helpcontent2/source/text/scalc/01/05050000.xhp |  10 +-
 .../helpcontent2/source/text/scalc/01/05050300.xhp |   8 +-
 .../helpcontent2/source/text/scalc/01/06030100.xhp |   8 +-
 .../helpcontent2/source/text/scalc/01/06030900.xhp |  10 +-
 .../helpcontent2/source/text/scalc/01/12040300.xhp |  10 +-
 .../helpcontent2/source/text/scalc/01/12080000.xhp |   8 +-
 .../helpcontent2/source/text/scalc/01/12080300.xhp |  16 +-
 .../source/text/scalc/01/func_eastersunday.xhp     |  21 +-
 .../source/text/scalc/01/func_hour.xhp             |  21 +-
 .../source/text/scalc/01/func_networkdays.xhp      |  23 +-
 .../source/text/scalc/01/func_weekday.xhp          |  28 +-
 .../source/text/scalc/01/func_weeknum.xhp          |  24 +-
 .../source/text/scalc/01/func_workday.xhp          |  23 +-
 .../helpcontent2/source/text/scalc/02/10050000.xhp |   8 +-
 .../source/text/scalc/guide/database_sort.xhp      |   5 +-
 .../source/text/scalc/guide/fraction_enter.xhp     |  10 +-
 .../source/text/scalc/guide/table_view.xhp         |  10 +-
 .../source/text/scalc/guide/text_wrap.xhp          |  12 +-
 .../source/text/shared/01/01010200.xhp             |  10 +-
 .../source/text/shared/01/01010302.xhp             |  14 +-
 .../source/text/shared/01/01020103.xhp             |  16 +-
 .../source/text/shared/01/01100000.xhp             |   8 +-
 .../source/text/shared/01/02090000.xhp             |   8 +-
 .../source/text/shared/01/02230300.xhp             |   8 +-
 .../source/text/shared/01/03110000.xhp             |   8 +-
 .../source/text/shared/01/03990000.xhp             |   6 +-
 .../source/text/shared/01/04060000.xhp             |  10 +-
 .../source/text/shared/01/04150000.xhp             |  10 +-
 .../source/text/shared/01/04160300.xhp             |   4 +-
 .../source/text/shared/01/04160500.xhp             |   6 +-
 .../source/text/shared/01/04180100.xhp             |   8 +-
 .../source/text/shared/01/05020000.xhp             |   8 +-
 .../source/text/shared/01/05070100.xhp             |   8 +-
 .../source/text/shared/01/05100100.xhp             |  16 +-
 .../source/text/shared/01/05120600.xhp             |  10 +-
 .../source/text/shared/01/05260000.xhp             |   6 +-
 .../source/text/shared/01/05290300.xhp             |  10 +-
 .../source/text/shared/01/06010500.xhp             |   6 +-
 .../source/text/shared/01/06050100.xhp             |   8 +-
 .../source/text/shared/01/06130001.xhp             |   4 +-
 .../source/text/shared/01/06130500.xhp             |  18 +-
 .../source/text/shared/01/06150210.xhp             |  12 +-
 .../source/text/shared/02/01170400.xhp             |  10 +-
 .../source/text/shared/02/01170902.xhp             |  14 +-
 .../source/text/shared/02/01171000.xhp             |  10 +-
 .../source/text/shared/02/01220000.xhp             |   8 +-
 .../source/text/shared/02/02030000.xhp             |  12 +-
 .../source/text/shared/02/03110000.xhp             |   8 +-
 .../source/text/shared/02/03120000.xhp             |   8 +-
 .../source/text/shared/02/03140000.xhp             |  10 +-
 .../source/text/shared/02/05020000.xhp             |   8 +-
 .../source/text/shared/02/05090000.xhp             |  10 +-
 .../source/text/shared/02/07070100.xhp             |  10 +-
 .../source/text/shared/02/09030000.xhp             |   8 +-
 .../source/text/shared/02/09050000.xhp             |  12 +-
 .../source/text/shared/02/10030000.xhp             |   8 +-
 .../source/text/shared/02/10040000.xhp             |   8 +-
 .../source/text/shared/02/12010000.xhp             |  10 +-
 .../source/text/shared/02/12050000.xhp             |  14 +-
 .../source/text/shared/02/12110000.xhp             |  10 +-
 .../source/text/shared/02/12130000.xhp             |  10 +-
 .../source/text/shared/02/12140000.xhp             |   8 +-
 .../source/text/shared/02/14010000.xhp             |   8 +-
 .../source/text/shared/02/24100000.xhp             |   8 +-
 .../source/text/shared/autopi/01040100.xhp         |   6 +-
 .../source/text/shared/autopi/01050500.xhp         |  14 +-
 .../source/text/shared/autopi/01090000.xhp         |   6 +-
 .../source/text/shared/autopi/01100150.xhp         |  10 +-
 .../source/text/shared/autopi/01110500.xhp         |  18 +-
 .../source/text/shared/autopi/01120300.xhp         |  14 +-
 .../text/shared/explorer/database/05000001.xhp     |  10 +-
 .../text/shared/explorer/database/05030000.xhp     |  12 +-
 .../text/shared/explorer/database/11000002.xhp     |  12 +-
 .../source/text/shared/guide/email.xhp             |  12 +-
 .../source/text/shared/guide/lineend_define.xhp    |  14 +-
 .../source/text/shared/guide/navigator.xhp         |  10 +-
 .../source/text/shared/guide/redlining_protect.xhp |   8 +-
 main/helpcontent2/source/text/shared/main0214.xhp  |  10 +-
 .../source/text/shared/optionen/01010000.xhp       |   6 +-
 .../source/text/shared/optionen/01060401.xhp       |  16 +-
 .../source/text/simpress/00/00000405.xhp           |  20 +-
 .../source/text/simpress/01/02130000.xhp           |  10 +-
 .../source/text/simpress/01/03090000.xhp           |   8 +-
 .../source/text/simpress/01/04010000.xhp           |   8 +-
 .../source/text/simpress/01/04030100.xhp           |   8 +-
 .../source/text/simpress/02/13030000.xhp           |   6 +-
 .../source/text/simpress/02/13090000.xhp           |   7 +-
 .../source/text/simpress/guide/vectorize.xhp       |  14 +-
 .../helpcontent2/source/text/simpress/main0202.xhp |  14 +-
 .../helpcontent2/source/text/simpress/main0209.xhp |  18 +-
 .../helpcontent2/source/text/smath/00/00000004.xhp | 155 +++----
 .../helpcontent2/source/text/smath/01/03090100.xhp |  94 ++--
 .../helpcontent2/source/text/smath/01/03090200.xhp | 104 ++---
 .../helpcontent2/source/text/smath/01/03090300.xhp |  72 +--
 .../helpcontent2/source/text/smath/01/03090400.xhp | 112 ++---
 .../helpcontent2/source/text/smath/01/03090500.xhp | 100 ++--
 .../helpcontent2/source/text/smath/01/03090600.xhp | 116 ++---
 .../helpcontent2/source/text/smath/01/03090700.xhp |  96 ++--
 .../helpcontent2/source/text/smath/01/03090800.xhp | 100 ++--
 .../helpcontent2/source/text/smath/01/03090908.xhp |   2 +-
 .../helpcontent2/source/text/smath/01/03091501.xhp |  54 +--
 .../helpcontent2/source/text/smath/01/03091502.xhp |  56 +--
 .../helpcontent2/source/text/smath/01/03091504.xhp |  58 +--
 .../helpcontent2/source/text/smath/01/03091506.xhp |  52 +--
 .../helpcontent2/source/text/smath/01/03091508.xhp |  62 +--
 .../helpcontent2/source/text/smath/01/03091600.xhp | 124 ++---
 .../helpcontent2/source/text/smath/01/05030000.xhp | 154 +++----
 .../source/text/swriter/01/01160400.xhp            |  12 +-
 .../source/text/swriter/01/02120100.xhp            |  16 +-
 .../source/text/swriter/01/03090000.xhp            |  10 +-
 .../source/text/swriter/01/03140000.xhp            |  10 +-
 .../source/text/swriter/01/04020200.xhp            |  14 +-
 .../source/text/swriter/01/04090000.xhp            |   8 +-
 .../source/text/swriter/01/04090100.xhp            |  14 +-
 .../source/text/swriter/01/04120217.xhp            |  15 +-
 .../source/text/swriter/01/04210000.xhp            |  10 +-
 .../source/text/swriter/01/04220000.xhp            |  12 +-
 .../source/text/swriter/01/04230000.xhp            |  12 +-
 .../source/text/swriter/01/05060000.xhp            |  10 +-
 .../source/text/swriter/01/05110100.xhp            |  14 +-
 .../source/text/swriter/01/05120100.xhp            |  14 +-
 .../source/text/swriter/01/05130004.xhp            |   6 +-
 .../source/text/swriter/01/05150100.xhp            |  10 +-
 .../source/text/swriter/02/02110000.xhp            |   8 +-
 .../source/text/swriter/02/04090000.xhp            |   6 +-
 .../source/text/swriter/02/04100000.xhp            |   6 +-
 .../source/text/swriter/02/04250000.xhp            |  11 +-
 .../source/text/swriter/02/08080000.xhp            |   8 +-
 .../source/text/swriter/02/18030200.xhp            |   6 +-
 .../text/swriter/guide/calculate_intable.xhp       |  16 +-
 .../source/text/swriter/guide/captions_numbers.xhp |  24 +-
 .../source/text/swriter/guide/fields_date.xhp      |  12 +-
 .../source/text/swriter/guide/fields_enter.xhp     |  14 +-
 .../text/swriter/guide/insert_tab_innumbering.xhp  |   8 +-
 .../text/swriter/guide/nonprintable_text.xhp       |  12 +-
 .../text/swriter/guide/references_modify.xhp       |  12 +-
 .../source/text/swriter/guide/text_emphasize.xhp   |  11 +-
 .../source/text/swriter/guide/words_count.xhp      |   6 +-
 main/helpcontent2/source/text/swriter/main0200.xhp |   4 +-
 main/helpcontent2/source/text/swriter/main0208.xhp |   6 +-
 main/i18npool/source/localedata/data/sv_SE.xml     |  12 +-
 main/l10ntools/source/helpmerge.cxx                |   7 +-
 main/sc/source/ui/src/scfuncs.src                  |   2 +-
 .../source/ui/animations/CustomAnimationPane.src   |   4 +-
 main/sfx2/source/doc/doc.src                       |   4 +-
 main/sfx2/source/doc/sfxbasemodel.cxx              |  50 +-
 main/solenv/inc/libs.mk                            |   4 -
 main/sot/inc/sot/formats.hxx                       |   3 +-
 main/sot/source/base/exchange.cxx                  |   1 +
 main/starmath/source/smres.src                     |   6 +-
 main/svtools/Executable_bmp.mk                     |  65 ---
 main/svtools/Executable_bmpsum.mk                  |  61 ---
 main/svtools/Executable_g2g.mk                     |  68 ---
 main/svtools/Module_svtools.mk                     |  13 +-
 main/svtools/bmpmaker/bmp.cxx                      | 244 ----------
 main/svtools/bmpmaker/bmp.hrc                      |  40 --
 main/svtools/bmpmaker/bmp.src                      | 120 -----
 main/svtools/bmpmaker/bmpcore.cxx                  | 418 -----------------
 main/svtools/bmpmaker/bmpcore.hxx                  |  93 ----
 main/svtools/bmpmaker/bmpsum.cxx                   | 501 ---------------------
 main/svtools/bmpmaker/g2g.cxx                      | 247 ----------
 main/svtools/source/dialogs/filedlg2.src           |  52 +--
 main/svtools/source/misc/transfer.cxx              |  33 +-
 main/svx/source/form/datanavi.src                  |   2 +-
 main/svx/source/sidebar/area/AreaPropertyPanel.src |  12 +-
 .../sidebar/graphic/GraphicPropertyPanel.src       | 190 ++++----
 main/svx/source/stbctrls/stbctrls.src              |  44 +-
 main/sw/source/ui/frmdlg/frmpage.src               |   4 +-
 main/sw/source/ui/ribbar/conarc.cxx                |  59 +--
 main/sw/source/ui/ribbar/concustomshape.cxx        |  53 +--
 main/sw/source/ui/ribbar/conform.cxx               |  83 ++--
 main/sw/source/ui/ribbar/conpoly.cxx               |  38 +-
 main/sw/source/ui/ribbar/conrect.cxx               |  81 ++--
 main/toolkit/src2xml/include.lst                   |   6 +-
 main/toolkit/src2xml/src.lst                       |   1 -
 main/ucb/source/ucp/webdav/CurlSession.cxx         |  11 +
 main/udm/Makefile                                  |  32 --
 main/udm/Module_udm.mk                             |  31 --
 main/udm/Package_inc.mk                            |  27 --
 main/udm/StaticLibrary_udm.mk                      |  47 --
 main/udm/prj/build.lst                             |   2 -
 main/udm/prj/d.lst                                 |   0
 main/udm/prj/makefile.mk                           |  44 --
 main/udm/util/makefile.mk                          |  50 --
 299 files changed, 2240 insertions(+), 4831 deletions(-)


Reply via email to