This is an automated email from the ASF dual-hosted git repository. leginee pushed a commit to branch fix-cosmetic-md in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 2a815b2d2215d6ca972740ff76e79e90356ca33e Author: Peter Kovacs <[email protected]> AuthorDate: Sun Jun 21 07:39:43 2026 +0200 fix AOO-trunk cosmetic table definition added test string to spell checker. --- .github/linters/codespell.txt | 1 + AOO-trunk.md | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/linters/codespell.txt b/.github/linters/codespell.txt index fb7742cce1..1e0f75bc57 100644 --- a/.github/linters/codespell.txt +++ b/.github/linters/codespell.txt @@ -8,6 +8,7 @@ aassignment aassignments aautomatic abandone +abd abl abou abour diff --git a/AOO-trunk.md b/AOO-trunk.md index 3b75cd6934..34e7574d55 100644 --- a/AOO-trunk.md +++ b/AOO-trunk.md @@ -9,7 +9,7 @@ ## 1. Summary | | trunk | AOO42X | -|---|---|---| +| --- | --- | --- | | Branch tip | `9d1a529d5e` | `4ccec83d37` | | Tip commit subject | *Fix crash, uninitialized-return, and buffer bugs…* | *(same)* | | Common ancestor | `a341bc611d` (2019-01-09) | (same) | @@ -79,7 +79,7 @@ ### Functional AOO42X-only commits — all verified present in trunk | AOO42X commit | Verified in trunk as | -|---|---| +| --- | --- | | WebDAV provider serf/apr → curl (`9646dec`) | `51ba086bf1` (+ follow-ups `e469ab6`, `f7b97bf`, `88ba7bc`…) | | OpenSSL built as dynamic library (`e350def`) | `8eb9a7e66a`, `0ca5b4b7b8` | | editeng 32-bit paragraph indices (PR #164) | `d5edfd0976` + full series; `GetParagraphCount()` returns `sal_uInt32` on both | @@ -108,7 +108,7 @@ depend on the Python-3 or Win64 baseline. ### 3a. Recommended cherry-picks (bug fixes) | Area | trunk commit(s) | What it fixes | Risk | -|---|---|---|---| +| --- | --- | --- | --- | | **Calc / MS Excel 2003 XML import** | ~~`d10bb11432`~~ | Importing references to **columns 677–702** (and beyond) was wrong: the old XSLT used a `÷26 − 1` scheme instead of base-26² (676). Touches `spreadsheetml2ooo.xsl`. | Low — isolated XSLT + test doc | | **Calc / Excel 2003 XML export** | ~~`b045a72b`~~, `3714104178`, `50f8b0f2cf` | Use the correct `of:`/`ooow:` namespace and R1C1 form when exporting ODF formulas to Excel 2003 XML; allow exporting ODF <1.2 formulas. | Low–medium | | **Win64 portability — file handles** | `5a41e572de` | `SvStream::GetFileHandle()` returns `sal_uInt32` capped at 32 bits; widen to support 64-bit Windows. (`tools/inc/tools/stream.hxx`, `strmunx.cxx`) | Low (also benefits non-Win64) | @@ -127,14 +127,14 @@ depend on the Python-3 or Win64 baseline. ### 3b. Build-system / infrastructure (cherry-pick only if AOO42X wants the same CI) | Area | trunk commit(s) | Notes | -|---|---|---| +| --- | --- | --- | | **gbuild port** of `pyuno`, `ure`, `packimages`, `apple_remote`, `qadevOOo`, `test`, `testgraphical` | `1c25f25`, `453cfdf`, `147182f`, `e2cbcf0`, `62e2780`, `19ee18f`… | Large; trunk migrated dmake→gbuild for these modules. AOO42X already received the pyuno/ure `.mk` files via merge, but the **JUnit/Ant test migration in `qadevOOo` is the single largest divergence** (2310 files): trunk moved tests into `test/testuno` + JUnit; AOO42X keeps the legacy `qadevOOo/objdsc` CSV-driven framew [...] | **pre-commit hooks + GitHub Actions linter** | `cc42a29`, `4ae038e`, `819addb`, `ffa4afe`, `98279f3` | trunk's `.pre-commit-config.yaml`, codespell word-list, `actions/checkout@v6`, `actions/cache@v5`. AOO42X already backported an equivalent set (`f30d168 Backport pre-commit and CI configuration from trunk`). | ### 3c. NOT suitable for cherry-pick (intentional baseline / release-policy decisions) | Item | trunk | AOO42X | Why not | -|---|---|---|---| +| --- | --- | --- | --- | | **Python 3.10 baseline** | `PYMAJOR=3 / 3.10.18` | `PYMAJOR=2 / 2.7.18` | AOO42X **explicitly reverted** the Py3.10 change (`08fafdc14b`) to keep the 4.2.x release on Python 2.7. Cherry-picking would change the shipped runtime. | | **Native Win64 UNO C++ bridge** (`msvc_win64_x86-64/`) | full directory present | directory **absent** | A whole new architecture target (`b146d3b`, `b7f28a5`, `4844d31`, `2cf0c06`, `d35e03c`, `8a51f61`…). New platform support belongs in a feature release, not a maintenance branch. | | Boost / `-std=gnu++98` Clang build tweaks (`8ef8ad0`) | applied | n/a | Tied to trunk's toolchain modernization. |
