sfx2/source/appl/appinit.cxx | 9 ++++++++- sw/source/uibase/misc/redlndlg.cxx | 9 ++++++--- 2 files changed, 14 insertions(+), 4 deletions(-)
New commits: commit 1edf6d83bbd30273979154020fd54cecc4256765 Author: Noel Grandin <[email protected]> AuthorDate: Fri Sep 19 11:10:30 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Sep 29 16:56:20 2025 +0200 tdf#166483 special char dialog not available with mergedlibs build Change-Id: I08cc1fe82845cfea82150e332b0ea0ad597f6cda Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191189 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 9f4304ff2dbb706a1160afd347e538e615e1290f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191191 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> (cherry picked from commit d3def5d2894170c5832418b5008896c5ad3b82bf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191196 Reviewed-by: Ilmari Lauhakangas <[email protected]> Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Xisco Fauli <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 76f9b0fc75c6..2356099ecc88 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -148,7 +148,14 @@ static OUString SfxGetSpecialCharsForEdit(weld::Widget* pParent, const vcl::Font PFunc_getSpecialCharsForEdit pfunc = nullptr; #ifndef DISABLE_DYNLOADING osl::Module aMod; - aMod.loadRelative(&thisModule, SVLIBRARY("cui")); + aMod.loadRelative( + &thisModule, +#if ENABLE_MERGELIBS + SVLIBRARY("merged") +#else + SVLIBRARY("cui") +#endif + ); // get symbol pfunc = reinterpret_cast<PFunc_getSpecialCharsForEdit>(aMod.getFunctionSymbol("GetSpecialCharsForEdit")); commit a77849455d13fb21079aa58b6c5a7b1d5c73d781 Author: Justin Luth <[email protected]> AuthorDate: Thu Sep 18 08:16:47 2025 -0400 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Sep 29 16:56:10 2025 +0200 tdf#168377 sw: avoid crash in redlndlg - index out of range Everywhere else GetRedlinePos() is used it is checked against SwRedlineTable::npos to identify a valid index position. Change-Id: I46a52a9c7aadab4b1690562c0ba32027cd2dcd2f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191121 Tested-by: Jenkins Reviewed-by: Justin Luth <[email protected]> (cherry picked from commit c920581dc81e553a07d0cd27f5d218df39811b6d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191137 Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit d24e8a20907bf3e861dad93456d0dea891c3b320) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191167 Reviewed-by: Ilmari Lauhakangas <[email protected]> Tested-by: Xisco Fauli <[email protected]> Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 327d73e5e284..d43e7ac0af98 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -1117,10 +1117,13 @@ void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept ) if ( !bSelect && !bAccept && !m_bOnlyFormatedRedlines ) { SwRedlineTable::size_type nPosition = GetRedlinePos(rEntry); - const SwRangeRedline& rRedln = pSh->GetRedline(nPosition); + if (nPosition != SwRedlineTable::npos) + { + const SwRangeRedline& rRedln = pSh->GetRedline(nPosition); - if( RedlineType::Format == rRedln.GetType() ) - bIsNotFormatted = false; + if (RedlineType::Format == rRedln.GetType()) + bIsNotFormatted = false; + } } if (!pData->bDisabled && bIsNotFormatted)
