core.git: Branch 'distro/collabora/co-24.04' - 2 commits - sc/source sw/source

[Rashesh (via logerrit)]

 sc/source/ui/app/inputwin.cxx     |    5 +++--
 sw/source/uibase/lingu/olmenu.cxx |   12 ++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit e780531973aac14b47a359b0b93c5f75311eb99b
Author:     Rashesh <rashesh.pa...@collabora.com>
AuthorDate: Sun May 25 13:11:59 2025 +0530
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon May 26 14:03:06 2025 +0200

    tdf#166689: sw: only hide "Add To Dictionary" option when using LOKit
    
    Change-Id: I49be5595dc2fa01ddb10d4a280448a1449eab04d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185743
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
    Tested-by: Julien Nabet <serval2...@yahoo.fr>
    (cherry picked from commit b7b0cbfafeb9d5b7d49a71cbaea7fd8419be68c5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185772

diff --git a/sw/source/uibase/lingu/olmenu.cxx 
b/sw/source/uibase/lingu/olmenu.cxx
index 4557608545f0..ab1ad20d52d8 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -363,8 +363,16 @@ SwSpellPopup::SwSpellPopup(
     }
 
     sal_uInt16 nDiff = nItemId - MN_DICTIONARIES_START;
-    m_xPopupMenu->EnableItem(m_nAddMenuId, nDiff > 2);
-    m_xPopupMenu->EnableItem(m_nAddId, nDiff == 2);
+    if (comphelper::LibreOfficeKit::isActive())
+    {
+        m_xPopupMenu->EnableItem(m_nAddMenuId, nDiff > 2);
+        m_xPopupMenu->EnableItem(m_nAddId, nDiff == 2);
+    }
+    else
+    {
+        m_xPopupMenu->EnableItem(m_nAddMenuId, nDiff > 1);
+        m_xPopupMenu->EnableItem(m_nAddId, nDiff == 1);
+    }
 
     //ADD NEW LANGUAGE MENU ITEM
 
commit cbd95c34a8cc56c4073387c2bee44a827eb52880
Author:     Rashesh <rashesh.pa...@collabora.com>
AuthorDate: Sun May 25 14:40:02 2025 +0530
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon May 26 14:02:57 2025 +0200

    tdf#166674: sc: fix "Name box" remain switched to "Last Used Function List"
    
    Change-Id: I68f46ec54c9a2b6cdaa04b27d02f3c01ebd4f2b4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185747
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    (cherry picked from commit 86579c2f816e8b77c75c17f25bda47a2312f23da)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185777

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 7379cc0a9695..ecaf22fcb222 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2306,13 +2306,14 @@ void ScPosWnd::SetFormulaMode( bool bSet )
 {
     if ( bSet != bFormulaMode )
     {
-        bFormulaMode = bSet;
 
         if ( bSet )
             FillFunctions();
         else
             FillRangeNames();
 
+        bFormulaMode = bSet;
+
         HideTip();
     }
 }
@@ -2363,7 +2364,7 @@ void ScPosWnd::FillRangeNames(bool initialize)
         }
     }
 
-    if (aSet == aRangeNames && !initialize)
+    if (!bFormulaMode && !initialize && aSet == aRangeNames)
         return;
 
     aRangeNames = aSet;