sc/source/ui/app/inputwin.cxx | 8 ++++----
sc/source/ui/inc/inputwin.hxx | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 0c900b165d4d24c33942e8b59f85243706b93890
Author: Rashesh <rashesh.pa...@collabora.com>
AuthorDate: Thu Dec 19 14:03:52 2024 +0530
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Dec 20 21:30:15 2024 +0100
sc: fix: can't switch focus from font menu back to edit window
- Steps to reproduce:
1. Open Calc
2. Put the cursor in the font selection field, and type
3. Try to move the cursor back to the sheet and to type
Change-Id: I596e5380d38f761a310c2a363389b0b03a0e94ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178787
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
(cherry picked from commit 2c95e7186e053ed5f2e7d8388fbe087fa60636c2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178796
Tested-by: Jenkins
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 32dfb734e7e5..6a753acbd5ab 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2253,7 +2253,7 @@ void ScTextWnd::TextGrabFocus()
// Position window
ScPosWnd::ScPosWnd(vcl::Window* pParent, ScTabViewShell* pViewShell)
- : InterimItemWindow(pParent, u"modules/scalc/ui/posbox.ui"_ustr,
u"PosBox"_ustr, false,
+ : InterimItemWindow(pParent, u"modules/scalc/ui/posbox.ui"_ustr,
u"PosBox"_ustr, true,
reinterpret_cast<sal_uInt64>(pViewShell))
, m_xWidget(m_xBuilder->weld_combo_box(u"pos_window"_ustr))
, m_nAsyncGetFocusId(nullptr)
commit a8bffc1c6a9296294625e75e3ddfb42931d91586
Author: Rashesh <rashesh.pa...@collabora.com>
AuthorDate: Thu Oct 31 17:33:06 2024 +0530
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Dec 20 21:30:09 2024 +0100
sc: fix: unnecessary updates to ScPosWnd when named range are empty
- follow up 115776004c875b3a8a861d070129187c893b136a
Change-Id: I57072d1999e703975a43dc50077698d4b28df461
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175869
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177646
Tested-by: Jenkins
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index feceafffbe2b..32dfb734e7e5 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2270,7 +2270,7 @@ ScPosWnd::ScPosWnd(vcl::Window* pParent, ScTabViewShell*
pViewShell)
m_xWidget->set_size_request(aSize.Width(), -1);
SetSizePixel(m_xContainer->get_preferred_size());
- FillRangeNames();
+ FillRangeNames(true);
StartListening( *SfxGetpApp() ); // For Navigator rangename updates
@@ -2332,7 +2332,7 @@ OUString
ScPosWnd::createLocalRangeName(std::u16string_view rName, std::u16strin
return OUString::Concat(rName) + " (" + rTableName + ")";
}
-void ScPosWnd::FillRangeNames()
+void ScPosWnd::FillRangeNames(bool initialize)
{
std::set<OUString> aSet;
SfxObjectShell* pObjSh = SfxObjectShell::Current();
@@ -2363,7 +2363,7 @@ void ScPosWnd::FillRangeNames()
}
}
- if (aSet == aRangeNames && !aSet.empty())
+ if (aSet == aRangeNames && !initialize)
return;
aRangeNames = aSet;
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 1c5d5b73962f..93c0611cf384 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -194,7 +194,7 @@ private:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
override;
private:
- void FillRangeNames();
+ void FillRangeNames(bool initialize = false);
void FillFunctions();
void DoEnter();
void HideTip();
