configure.ac | 2 +- sd/source/ui/unoidl/unomodel.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 121c4a825ef572da0f6eba43b450a10361345007 Author: Henry Castro <[email protected]> AuthorDate: Fri Oct 10 08:35:28 2025 -0400 Commit: Andras Timar <[email protected]> CommitDate: Tue Oct 21 12:32:45 2025 +0200 sd: ensure non-empty text objects Change-Id: I289db4bb5ee2c494d88f737bac8141b2385afda9 Signed-off-by: Henry Castro <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192166 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 7889431fa898..bed2fbbba4b0 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -4708,7 +4708,7 @@ OString SdXImpressDocument::getPresentationInfo(bool bAllyState) const { pItObj = pNotesPage->GetObj(nNote); - if (pItObj && + if (pItObj && pItObj->HasText() && (pItObj->GetObjIdentifier() == SdrObjKind::Text || pItObj->GetObjIdentifier() == SdrObjKind::TitleText || pItObj->GetObjIdentifier() == SdrObjKind::OutlineText)) commit a0121119948a9a89f4c699cd4550f9ddb2ec577a Author: Andras Timar <[email protected]> AuthorDate: Wed Oct 15 19:14:40 2025 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed Oct 15 19:14:40 2025 +0200 Bump version to 25.04.6.2 Change-Id: I028999564175ed68ca522054331da69d2319a840 diff --git a/configure.ac b/configure.ac index b7533ae55163..3120fcae6abc 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[25.04.6.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[25.04.6.2],[],[],[https://collaboraoffice.com/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
