Visitar URL original
[pull] master from LibreOffice:master by pull[bot] · Pull Request #6 · chenlong622/LibreOffice · GitHub
Skip to content

[pull] master from LibreOffice:master - #6

Merged
pull[bot] merged 33 commits into
chenlong622:masterfrom
LibreOffice:master
Aug 18, 2025
Merged

pull[bot] merged 33 commits into
chenlong622:masterfrom
LibreOffice:master

Conversation

@pull

@pull pull Bot commented Aug 18, 2025 •

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.3)

Can you help keep this open source service alive? 💖 Please sponsor : )

chrissherlock and others added 30 commits August 18, 2025 07:58
Change-Id: Iac7dfec9622e60f0dc2ac0082ee8935077e3b5ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189697
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
Change-Id: Ib07104a594269ea8017ae7e8e27120c36a289718
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189321
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
See tdf#94879 for motivation.

Change-Id: Id8d461b1cbb4fd9e0a80bd621aebeac21e68a24f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189838
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
to test this run
  SAL_USE_VCLPLUGIN=gen make vcl.check

this went wrong with
    commit 088a7c7
    Author: Noel Grandin <noelgrandin@gmail.com>
    Date:   Tue Sep 24 16:18:11 2024 +0200
    remove alpha device from OutputDevice

Sadly this does not fix any of the rendering
issues with the gen backend, because raw X11
cannot handle alpha at all. Fixing the rendering
issues would likely require using the XRender
API.

Change-Id: I35f35036e180d3ab76be337bc9fec0d98777ab22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189827
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Change-Id: I765d5959c4edfcd326c3bce453ddc97c1aeae889
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189830
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
This reverts commit 5b06420.

Reason for revert:
Let's use https://gerrit.libreoffice.org/c/core/+/189732 instead.
This reportedly doesn't cause tdf#167994.

Change-Id: I47014b0419362d54c75b13ccb299f64ed9e29b4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189837
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
To resolve this issue, several things were necessary.

- Add a Boolean attribute m_bAskPassword to the data source's Model implementation (i.e., the ModelImpl.hxx file)

- Modify the connectWithCompletion() procedure of the data source (i.e., the datasource.cxx file) that Base calls each time an ODB file is first opened. When opening the connection, it will verify that the connection is indeed made by the user provided by the data source. If this is not the case, the m_bAskPassword attribute of the model will be set to true.

- If this first connection is successful, the DataBaseContext (i.e., the databasecontext.cxx file) will attempt to cache the data source's properties, and if the m_bAskPassword attribute of the model is true, the Password property of the data source will not be cached.

Now if you connect with a user other than the one proposed by default, your password will be constantly requested after disconnecting and reconnecting or until the odb file is saved.

Change-Id: I40960c04fb84604c018374743a735676f556e2b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189732
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
So it is not needed to write the number of elements in the array,
as this is done by the compiler.

This is similar to frozen::make_* functions (or better, those
functions are similar to to_array).

Change-Id: Ie589607fae0326ac8a01ebaee2e1b1cbec35bfdc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189322
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Jenkins
While https://learn.microsoft.com/en-us/windows/win32/msi/template-summary
says that the value should be Arm64 for aarch64, the installsets created
by the baseline fail to install/produce error 1620 on installation

So keep claiming it would be an x86_64 installation.

Change-Id: I4e0717ef5c0a8584b918d3d94187cb84d1c07a11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189604
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Change-Id: Icbe3f0bb9433cfcf08efd28bc4eab1ba82efab74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189850
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Change-Id: I745dc8415936e4140be1dcbd76f0b2c626af48eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189698
Reviewed-by: Michael Stahl <michael.stahl@collabora.com>
Tested-by: Jenkins
Load the bugdoc, save as ODF, open the ODF, revert the format redline,
the font size should go from 36pt (new direct format) to 24pt (old
direct format), but it goes to 12pt (doc default).

What happens is that the format redline specifies the old direct format
via <text:format-change loext:style-name="..."> (referring to an
automatic character style), but this was not handled on import.

Fix the problem by:
1) Handling the new attribute in
   XMLChangedRegionImportContext::createFastChildContext()
2) Looking up the already imported autostyle for the style name in
   XMLChangedRegionImportContext::SetChangeInfo()
3) Creating a matching SwRedlineExtraData_FormatColl in
   XMLRedlineImportHelper::InsertIntoDocument() when the format redline
   is created in sw/ core.

Note that this means we have two autostyle names at play, the first is
T<number> and the second is effectively a pointer address as a string,
like 3cb7b270; FindAutoCharStyle() mapping from the first to the second.
Unfortunately both are just string references to the already imported
autostyle.

Change-Id: Ib0f18bad223f4320afe5aaa11ea713e610f6c029
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189845
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
This will eventually assert in SwTabPortion::Paint():

  sal/rtl/strtmpl.hxx:801: void rtl::str::new_WithLength(rtl_tString**, sal_Int32): Assertion `nLen >= 0' failed.

Also move a comment from its current misleading position (this one is
using TAB_OVER_SPACING).

Change-Id: I0a8b347f7467fcd7176b75a5a7e5e672ad5e13d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189382
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 3bfa151)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189682
Reviewed-by: Michael Stahl <michael.stahl@collabora.com>
Tested-by: Jenkins
if there was no result found don't misleadingly warn that it's of the
wrong type

Change-Id: I647c847e68a6ac7ca93f7fc860a8e376acce06e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189853
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
Usee rtl::isAsciiAlphanumeric and also foreach loop.

Change-Id: Ie4a494e32cacc36740ee2aa2ae58956c6a40776b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189313
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
So we test all possibilities.

Change-Id: If2f4712b0bac41d11d845c21a3917ed3fb0b41d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189816
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Jenkins
Change-Id: I9c96006ffa9497005d538e6eb5fbae0c69878b68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189164
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Change-Id: I5cb42e562aec04ec2226324a69ebd30697a55e91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189842
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Change-Id: I500e942be3638978fa47684c431e2165b692a1dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189856
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Change-Id: I7d5b878357560e0275fcf8d892f3619456b8062b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189851
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Jenkins
and

cid#1659880 Division or modulo by float zero

drop the default arguments, they are always explicitly set
except for one single case.

Change-Id: I1fce4e7f6ff5c9421c40628e0b6a1e291650e51c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189862
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
DBUS_LIBS contains -L/usr/lib64/pkgconfig/../../lib64 which eventually
causes link failure:
  desktop/source/lib/init.cxx:6451: error: undefined reference to 'ublock_getCode_77'

Reportedly realpath(1) is available even on macOS now so use it to
resolve these paths.

Change-Id: I754447ad23982918d6f8e80f839112db22b75205
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189864
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@collabora.com>
While https://learn.microsoft.com/en-us/windows/win32/msi/template-summary
says that the value should be Arm64 for aarch64, the installsets created
by the baseline fail to install/produce error 1620 on installation.
The missing bit was that for that to work properly the msi summary
information table must be at least schema version 500.

That is mentioned here:
https://learn.microsoft.com/en-us/windows/win32/msi/using-64-bit-windows-installer-packages

Thanks a lot to Mike Kaganski for that pointer

Change-Id: I5fc84f877c6af98c78107ff99920def7053a3950
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189868
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
 #0  0x00007fca2fa09df2 in std::__shared_ptr<svl::IndexedStyleSheets, (__gnu_cxx::_Lock_policy)2>::get (this=<optimized out>)
     at /opt/rh/devtoolset-12/root/usr/include/c++/12/bits/shared_ptr_base.h:1665
 #1  std::__shared_ptr_access<svl::IndexedStyleSheets, (__gnu_cxx::_Lock_policy)2, false, false>::_M_get (this=<optimized out>)
     at /opt/rh/devtoolset-12/root/usr/include/c++/12/bits/shared_ptr_base.h:1363
 #2  std::__shared_ptr_access<svl::IndexedStyleSheets, (__gnu_cxx::_Lock_policy)2, false, false>::operator-> (
     this=<optimized out>) at /opt/rh/devtoolset-12/root/usr/include/c++/12/bits/shared_ptr_base.h:1357
 #3  SfxStyleSheetIterator::Find(rtl::OUString const&) () at svl/source/items/style.cxx:525
 #4  0x00007fca2fa0b406 in SfxStyleSheetBasePool::Find(rtl::OUString const&, SfxStyleFamily, SfxStyleSearchBits) [clone .localalias] () at svl/source/items/style.cxx:722
 #5  0x00007fca1f228c76 in oox::xls::CellStyle::createCellStyle() ()
     at include/unotools/resmgr.hxx:41
 #6  0x00007fca1f229c11 in oox::xls::CellStyleBuffer::createCellStyle (
     rxCellStyle=std::shared_ptr<oox::xls::CellStyle> (use count 3, weak count 0) = {...})
     at sc/source/filter/oox/stylesbuffer.cxx:2804
 #7  oox::xls::CellStyleBuffer::getDefaultStyleName (this=0x3c4ea458)
     at sc/source/filter/oox/stylesbuffer.cxx:2759
 #8  oox::xls::StylesBuffer::getDefaultStyleName (this=0x3c4ea350)
     at sc/source/filter/oox/stylesbuffer.cxx:3008
 #9  0x00007fca1f26c762 in oox::xls::WorksheetGlobals::initializeWorksheetImport() ()
     at sc/source/filter/oox/worksheethelper.cxx:923
 #10 0x00007fca1f26c7dd in oox::xls::WorksheetHelper::initializeWorksheetImport (this=this@entry=0x3c594168)
     at sc/source/filter/oox/worksheethelper.cxx:1614
 #11 0x00007fca1f262e34 in oox::xls::WorksheetFragment::initializeImport() ()
    at sc/source/filter/oox/worksheetfragment.cxx:616

Change-Id: I5bc25e361da17b811af4e552ca74b4becf0181ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189832
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
Change-Id: I74cd5c9a82976e5cfb31fe622db543e8133bfee1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189863
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
After cc93fa1 the function handles
viewShell being null so no need to fail an assert if it is null.

Change-Id: Ie7d398f300e5eb695ae249291b9b8611dddc6423
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189865
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
this was a little confusing, because the bibisect pointed at one commit,
but it was actually an earlier commit which had the bug.
It just happened that the later commit made more active use of the code
from the earlier commit.

The bug was mostly in CanvasCairoExtractBitmapData, which was, I think,
largely unused before
    commit 088a7c7
    Author: Noel Grandin <noelgrandin@gmail.com>
    Date:   Tue Sep 24 16:18:11 2024 +0200
    remove alpha device from OutputDevice

At which point some of the optimised paths in slideshow stopped
triggering as often (which is a different issue which will need
resolving)

Also, CanvasCairoExtractBitmapData was largely wrong,
returning unpremultipled data when cairo
wants premultiplied data, and returning 4-byte RGBA when the calling
code was going to tell cairo that the format was 3-byte RGBA.

So anyhow, things now work better, and the CanvasCairoExtractBitmapData
method is considerably smaller and simpler.

Change-Id: I7d668ae08f4caf8dd0d5561a2d94e23e767216d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189867
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Change-Id: Ib20826876a687a2736422e6e442340a870ba393f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189667
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Change-Id: I3ec74308d177bd0a338b346fbbdcf37a27f2cf28
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189871
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
Change-Id: I58883f0223a28f3ea887c37e2a86a3c31ff88546
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188749
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
Gabor Kelemen and others added 3 commits August 18, 2025 20:19
Change-Id: Ie3bcad1a6653350ae10ed69371138d3d413a51e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188750
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
Change-Id: I2f0920df37ba14918e1325983309f9b77c8792cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188751
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
* Update translations from branch 'master'
  to 4d74cfca3b6909a06ca35b63b5810460157251a3
  - update translations for master
    
    and force-fix errors using pocheck
    
    Change-Id: I3a9a155a5a44fbf27119c7044cc7f223e6c43255
@pull pull Bot locked and limited conversation to collaborators Aug 18, 2025
@pull pull Bot added the ⤵️ pull label Aug 18, 2025
@pull
pull Bot merged commit 2169bf5 into chenlong622:master Aug 18, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.