include/sal/log-areas.dox | 2 - sc/inc/SheetView.hxx | 2 - sc/qa/unit/tiledrendering/SheetViewTest.cxx | 22 ++++++++-------- sc/source/ui/docshell/SheetViewOperationsTester.cxx | 2 - sc/source/ui/inc/operation/SetNormalStringOperation.hxx | 2 - sc/source/ui/operation/DeleteContentOperation.cxx | 3 -- sc/source/ui/view/viewfunc.cxx | 2 - 7 files changed, 17 insertions(+), 18 deletions(-)
New commits: commit 3b02d9b8a7a93ab0af6dcfd132e44d7f23561f88 Author: Tomaž Vajngerl <[email protected]> AuthorDate: Tue Feb 17 18:00:55 2026 +0900 Commit: Miklos Vajna <[email protected]> CommitDate: Wed Feb 18 09:38:26 2026 +0100 sc: Sheet view sync - Code review fixes Change-Id: Ia5ffa2de76859c5b9673a6ab51910e27c5a6b3cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199522 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 34219680d237..6c6e6345f766 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -151,7 +151,7 @@ certain functionality. @li @c sc.lok.poshelper @li @c sc.opencl - OpenCL-related stuff in general @li @c sc.opencl.source - Generated OpenCL source code -@li @c sc.op +@li @c sc.op - Calc operations @li @c sc.orcus @li @c sc.orcus.autofilter @li @c sc.orcus.condformat diff --git a/sc/inc/SheetView.hxx b/sc/inc/SheetView.hxx index 6fde48e9b171..03e4c87acb90 100644 --- a/sc/inc/SheetView.hxx +++ b/sc/inc/SheetView.hxx @@ -108,7 +108,7 @@ public: // Last used sort parameters - std::optional<ScSortParam> const& getSortPram() { return moSortParam; } + std::optional<ScSortParam> const& getSortParam() { return moSortParam; } /// Remember last used sort parameters when sheet view was sorted. void setSortParam(ScSortParam const& rSortParam) { moSortParam = rSortParam; } diff --git a/sc/qa/unit/tiledrendering/SheetViewTest.cxx b/sc/qa/unit/tiledrendering/SheetViewTest.cxx index b5f8d2eeb1fb..c5aaeb7f1b34 100644 --- a/sc/qa/unit/tiledrendering/SheetViewTest.cxx +++ b/sc/qa/unit/tiledrendering/SheetViewTest.cxx @@ -166,41 +166,41 @@ class SyncTest : public SheetViewTest public: void tearDown() override { - maSheetView = std::nullopt; - maDefaultView = std::nullopt; + moSheetView = std::nullopt; + moDefaultView = std::nullopt; SheetViewTest::tearDown(); } protected: - std::optional<ScTestViewCallback> maSheetView; - std::optional<ScTestViewCallback> maDefaultView; + std::optional<ScTestViewCallback> moSheetView; + std::optional<ScTestViewCallback> moDefaultView; ScTabViewShell* mpTabViewSheetView = nullptr; ScTabViewShell* mpTabViewDefaultView = nullptr; void setupViews() { - maSheetView.emplace(); - mpTabViewSheetView = maSheetView->getTabViewShell(); + moSheetView.emplace(); + mpTabViewSheetView = moSheetView->getTabViewShell(); SfxLokHelper::createView(); Scheduler::ProcessEventsToIdle(); - maDefaultView.emplace(); - mpTabViewDefaultView = maDefaultView->getTabViewShell(); + moDefaultView.emplace(); + mpTabViewDefaultView = moDefaultView->getTabViewShell(); CPPUNIT_ASSERT(mpTabViewSheetView != mpTabViewDefaultView); - CPPUNIT_ASSERT(maSheetView->getViewID() != maDefaultView->getViewID()); + CPPUNIT_ASSERT(moSheetView->getViewID() != moDefaultView->getViewID()); } void switchToSheetView() { - SfxLokHelper::setView(maSheetView->getViewID()); + SfxLokHelper::setView(moSheetView->getViewID()); Scheduler::ProcessEventsToIdle(); } void switchToDefaultView() { - SfxLokHelper::setView(maDefaultView->getViewID()); + SfxLokHelper::setView(moDefaultView->getViewID()); Scheduler::ProcessEventsToIdle(); } }; diff --git a/sc/source/ui/docshell/SheetViewOperationsTester.cxx b/sc/source/ui/docshell/SheetViewOperationsTester.cxx index 5e2ddaa2783c..82b5e38c735b 100644 --- a/sc/source/ui/docshell/SheetViewOperationsTester.cxx +++ b/sc/source/ui/docshell/SheetViewOperationsTester.cxx @@ -91,7 +91,7 @@ void SheetViewOperationsTester::sync() rDocument.Reorder(aReorderParameters); } - auto const& oSortParam = pSheetView->getSortPram(); + auto const& oSortParam = pSheetView->getSortParam(); if (oSortParam) { // We need to reset the sort order for the sheet view as we will sort again diff --git a/sc/source/ui/inc/operation/SetNormalStringOperation.hxx b/sc/source/ui/inc/operation/SetNormalStringOperation.hxx index f255122c0159..18dbb7aa2a15 100644 --- a/sc/source/ui/inc/operation/SetNormalStringOperation.hxx +++ b/sc/source/ui/inc/operation/SetNormalStringOperation.hxx @@ -27,7 +27,7 @@ private: ScDocShell& mrDocShell; ScAddress const& mrPosition; OUString const& mrText; - bool mbIsNumberFormatSet; + bool mbIsNumberFormatSet = false; bool runImplementation() override; diff --git a/sc/source/ui/operation/DeleteContentOperation.cxx b/sc/source/ui/operation/DeleteContentOperation.cxx index f269d49d523a..5981a5a0c66c 100644 --- a/sc/source/ui/operation/DeleteContentOperation.cxx +++ b/sc/source/ui/operation/DeleteContentOperation.cxx @@ -40,8 +40,6 @@ bool DeleteContentOperation::runImplementation() return false; } - ScMarkData aMultiMark = convertMark(mrMark); - ScDocument& rDoc = mrDocShell.GetDocument(); if (mbRecord && !rDoc.IsUndoEnabled()) @@ -57,6 +55,7 @@ bool DeleteContentOperation::runImplementation() return false; } + ScMarkData aMultiMark = convertMark(mrMark); aMultiMark.SetMarking(false); // for MarkToMulti ScDocumentUniquePtr pUndoDoc; diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 716d36b8a3a1..bc6145d5ad0b 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -815,7 +815,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, { for (const auto& rTab : aMark) { - applyText(*this, nCol, nRow, rTab, rString, bNumFmtChanged); + applyText(*this, nCol, nRow, rTab, rString, bNumFmtChanged); } performAutoFormatAndUpdate(rString, aMark, nCol, nRow, nTab, bNumFmtChanged, bRecord, xModificator, *this);
