include/o3tl/lru_map.hxx | 4 ++-- sc/source/ui/inc/gridwin.hxx | 2 ++ sc/source/ui/view/cellsh1.cxx | 2 +- sc/source/ui/view/gridwin.cxx | 6 ++++++ 4 files changed, 11 insertions(+), 3 deletions(-)
New commits: commit 32abb1a1d0345656770bafc976c3de56142abc5d Author: Caolán McNamara <[email protected]> AuthorDate: Thu Dec 21 14:32:34 2023 +0000 Commit: Andras Timar <[email protected]> CommitDate: Wed Jan 17 11:55:24 2024 +0100 std::list::size() can still be implemented as std::distance() seen with Red Hat Developer Toolset 10 https: //github.com/CollaboraOnline/online/issues/6893#issuecomment-1866342284 Change-Id: I4a0e8ad028126dded678e971a6261d6725a6b06c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161129 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx index 7e046fd1dbda..447cfcdaac86 100644 --- a/include/o3tl/lru_map.hxx +++ b/include/o3tl/lru_map.hxx @@ -116,7 +116,7 @@ private: else { // This must leave at least one item (it's called from insert). - while (this->mCurrentSize > mMaxSize && mLruList.size() > 1) + while (this->mCurrentSize > mMaxSize && mLruMap.size() > 1) removeOldestItem(); } } @@ -127,7 +127,7 @@ private: if constexpr (!std::is_void_v<ValueSize>) { // This must leave at least one item (it's called from insert). - while (this->mCurrentSize > mMaxSize && mLruList.size() > 1) + while (this->mCurrentSize > mMaxSize && mLruMap.size() > 1) removeOldestItem(); } } commit e19a919c69cb2ebf5f0e00ae13872bdc45c20f49 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Dec 19 15:37:08 2023 +0000 Commit: Andras Timar <[email protected]> CommitDate: Wed Jan 17 11:55:09 2024 +0100 split ScGridWindow::UpdateFormulas into two parts a) figures out what might need to redraw b) triggers redraws on that Change-Id: Ib6e1d8d0785cc629fd2cfb0cfdc4ad43897fd4f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161012 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index b86331d6f96e..f7a64cafb86b 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -321,6 +321,8 @@ class SAL_DLLPUBLIC_RTTI ScGridWindow : public vcl::DocWindow, public DropTarget void SetupInitialPageBreaks(const ScDocument& rDoc, SCTAB nTab); DECL_DLLPRIVATE_LINK(InitiatePageBreaksTimer, Timer*, void); + void UpdateFormulaRange(SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2); + protected: virtual void PrePaint(vcl::RenderContext& rRenderContext) override; virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index cdba90d8d436..5b8e03bcf467 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -5090,6 +5090,7 @@ void ScGridWindow::UpdateFormulas(SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2) if ( comphelper::LibreOfficeKit::isActive() ) { ScTabViewShell* pViewShell = mrViewData.GetViewShell(); + if (nX1 < 0) nX1 = pViewShell->GetLOKStartHeaderCol() + 1; if (nY1 < 0) @@ -5109,6 +5110,11 @@ void ScGridWindow::UpdateFormulas(SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2) nY2 = nY1 + mrViewData.VisibleCellsY( eVWhich ); } + UpdateFormulaRange(nX1, nY1, nX2, nY2); +} + +void ScGridWindow::UpdateFormulaRange(SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2) +{ if (nX2 < nX1) nX2 = nX1; if (nY2 < nY1) nY2 = nY1; commit 62b0edad81aefaafa16cc1bbb2c4cab0dcd5460a Author: Caolán McNamara <[email protected]> AuthorDate: Tue Dec 12 16:40:31 2023 +0000 Commit: Andras Timar <[email protected]> CommitDate: Wed Jan 17 11:53:06 2024 +0100 add a notifier for the "Edit Existing Cond Formats" warning dialog otherwise in --enable-dbgutil this assert with: vcl::Window::SetLOKNotifier(vcl::Window * const this, const vcl::ILibreOfficeKitNotifier * pNotifier, bool bParent) (vcl/source/window/window.cxx:3193) libmergedlo.so!Dialog::ImplStartExecute(Dialog * const this) (vcl/source/window/dialog.cxx:940) libmergedlo.so!Dialog::StartExecuteAsync(Dialog * const this, VclAbstractDialog::AsyncContext & rCtx) (vcl/source/window/dialog.cxx:1111) ... libsclo.so!ScCellShell::ExecuteEdit(ScCellShell * const this, SfxRequest & rReq) (sc/source/ui/view/cellsh1.cxx:2352) Change-Id: I8be89a1e5d7fa2498118bad7a94ed6aad743095b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160634 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index cd6aafe975bd..4907b6b50c05 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2389,7 +2389,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { std::shared_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(pTabViewShell->GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, - ScResId(STR_EDIT_EXISTING_COND_FORMATS))); + ScResId(STR_EDIT_EXISTING_COND_FORMATS), pTabViewShell)); xQueryBox->set_default_response(RET_YES); xQueryBox->runAsync(xQueryBox, [this, nIndex, nSlot, aPos, pTabViewShell] (int nResult) { sal_uInt32 nNewIndex = nIndex;
