sc/qa/unit/subsequent_filters_test4.cxx | 6 ++--- sc/qa/unit/ucalc_sort.cxx | 36 ++++++++++++++++---------------- sc/source/ui/docshell/dbdocfun.cxx | 7 ++---- sc/source/ui/inc/dbdocfun.hxx | 3 -- sc/source/ui/unoobj/cellsuno.cxx | 2 - sc/source/ui/view/dbfunc.cxx | 2 - 6 files changed, 27 insertions(+), 29 deletions(-)
New commits: commit 194bcf945ff7bfea50328cb7a90aeb00a0d74249 Author: Tomaž Vajngerl <[email protected]> AuthorDate: Fri Jan 23 17:53:44 2026 +0900 Commit: Miklos Vajna <[email protected]> CommitDate: Wed Jan 28 08:54:32 2026 +0100 sc: just rename ScDBDocFunc::Sort to SortTab Rename, so it better reflects what it does and it is easier to differentiate it aganst other Sort methods. Change-Id: I4cada3fabac21334c99d706bd837b6b99e73096f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197923 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sc/qa/unit/subsequent_filters_test4.cxx b/sc/qa/unit/subsequent_filters_test4.cxx index d8f11d5a3493..71f5dc6fafd0 100644 --- a/sc/qa/unit/subsequent_filters_test4.cxx +++ b/sc/qa/unit/subsequent_filters_test4.cxx @@ -1752,7 +1752,7 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testSortWithSharedFormulasODS) // Do the sorting. This should not crash. ScDocShell* pDocSh = getScDocShell(); ScDBDocFunc aFunc(*pDocSh); - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); // After the sort, E2:E16 should be shared. @@ -1802,7 +1802,7 @@ void testSortWithSheetExternalReferencesODS_Impl(ScDocShell& rDocSh, SCROW nRow1 // Do the sorting. ScDBDocFunc aFunc(rDocSh); - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); rDoc.CalcAll(); @@ -1922,7 +1922,7 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testSortWithFormattingXLS) ScDocShell* pDocSh = getScDocShell(); ScDBDocFunc aFunc(*pDocSh); // Without the fix, sort would crash. - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); } diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx index b1178bc29303..75297fd12e2e 100644 --- a/sc/qa/unit/ucalc_sort.cxx +++ b/sc/qa/unit/ucalc_sort.cxx @@ -178,7 +178,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortHorizontal) aSortData.maKeyState[0].nField = 0; aSortData.maKeyState[0].bAscending = true; aSortData.maKeyState[0].aColorSortMode = ScColorSortMode::None; - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); { @@ -246,7 +246,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortHorizontalWholeColumn) aSortData.maKeyState[0].nField = 0; aSortData.maKeyState[0].bAscending = true; aSortData.maKeyState[0].aColorSortMode = ScColorSortMode::None; - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); // Check the sort result. @@ -310,7 +310,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortSingleRow) aSortData.maKeyState[0].aColorSortMode = ScColorSortMode::None; // Do the sorting. This should not crash. - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); // Another test case - single row horizontal sort with header column. @@ -333,7 +333,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortSingleRow) aSortData.nCol1 = 0; aSortData.nCol2 = 6; aSortData.bByRow = false; - bSorted = aFunc.Sort(0, aSortData, true, true, true); + bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); // Check the result. @@ -680,7 +680,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortWithCellFormats) aSortData.maKeyState[0].nField = 0; aSortData.maKeyState[0].bAscending = true; aSortData.maKeyState[0].aColorSortMode = ScColorSortMode::None; - bool bSorted = aFunc.Sort(0, aSortData, true, false, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, false, true); CPPUNIT_ASSERT(bSorted); // Check the sort result. @@ -750,7 +750,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortRefUpdate) aSortData.maKeyState[0].nField = 0; aSortData.maKeyState[0].bAscending = true; aSortData.maKeyState[0].aColorSortMode = ScColorSortMode::None; - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); double aSorted[] = { 0.0, 1.0, 4.0, 14.0, 29.0, 36.0, 78.0, 98.0, 99.0 }; @@ -828,7 +828,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortRefUpdate) // Turn off reference update on sort. SortTypeSetter::changeTo(false); - bSorted = aFunc.Sort(0, aSortData, true, true, true); + bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); // Check the sort result again. @@ -902,7 +902,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortRefUpdate2) aSortData.maKeyState[0].nField = 0; aSortData.maKeyState[0].bAscending = true; aSortData.maKeyState[0].aColorSortMode = ScColorSortMode::None; - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); // Check the sort result in column A. @@ -988,7 +988,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortRefUpdate3) aSortData.maKeyState[0].nField = 0; aSortData.maKeyState[0].bAscending = true; aSortData.maKeyState[0].aColorSortMode = ScColorSortMode::None; - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); // Check the sorted values. @@ -1121,7 +1121,7 @@ void TestSort::testSortRefUpdate4_Impl() m_pDoc->SetAnonymousDBData( 0, std::unique_ptr<ScDBData>(new ScDBData( STR_DB_LOCAL_NONAME, aSortRange.aStart.Tab(), aSortData.nCol1, aSortData.nRow1, aSortData.nCol2, aSortData.nRow2))); - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); // Check the sorted values. @@ -1193,7 +1193,7 @@ void TestSort::testSortRefUpdate4_Impl() m_pDoc->SetAnonymousDBData( 0, std::unique_ptr<ScDBData>(new ScDBData( STR_DB_LOCAL_NONAME, aSortRange.aStart.Tab(), aSortData.nCol1, aSortData.nRow1, aSortData.nCol2, aSortData.nRow2))); - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); // Check the sorted values. @@ -1295,7 +1295,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortRefUpdate5) aSortData.maKeyState[0].nField = 0; // Date aSortData.maKeyState[0].bAscending = true; // ascending aSortData.maKeyState[0].aColorSortMode = ScColorSortMode::None; - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); // Check the sorted values. @@ -1391,7 +1391,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortRefUpdate6) aSortData.maKeyState[0].nField = 0; aSortData.maKeyState[0].bAscending = true; aSortData.maKeyState[0].aColorSortMode = ScColorSortMode::None; - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); { @@ -1528,7 +1528,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortBroadcaster) aSortData.maKeyState[0].nField = 0; aSortData.maKeyState[0].bAscending = false; aSortData.maKeyState[0].aColorSortMode = ScColorSortMode::None; - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); { @@ -1626,7 +1626,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortBroadcaster) aSortData.maKeyState[0].nField = 0; aSortData.maKeyState[0].bAscending = false; aSortData.maKeyState[0].aColorSortMode = ScColorSortMode::None; - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); { @@ -1730,7 +1730,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortBroadcastBroadcaster) aSortData.maKeyState[0].nField = 0; aSortData.maKeyState[0].bAscending = false; aSortData.maKeyState[0].aColorSortMode = ScColorSortMode::None; - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); { @@ -1801,7 +1801,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortOutOfPlaceResult) aSortData.maKeyState[0].nField = 0; aSortData.maKeyState[0].bAscending = true; aSortData.maKeyState[0].aColorSortMode = ScColorSortMode::None; - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); // Source data still intact. @@ -1878,7 +1878,7 @@ CPPUNIT_TEST_FIXTURE(TestSort, testSortPartialFormulaGroup) aSortData.maKeyState[0].nField = 0; aSortData.maKeyState[0].bAscending = true; aSortData.maKeyState[0].aColorSortMode = ScColorSortMode::None; - bool bSorted = aFunc.Sort(0, aSortData, true, true, true); + bool bSorted = aFunc.SortTab(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); m_pDoc->CalcAll(); // just in case... diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 49fc1f2d1808..3ce7476563d4 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -542,7 +542,7 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bApi, bool bIsUnnamed, if (bSort) { pDBData->GetSortParam( aSortParam ); // range may have changed - (void)Sort( nTab, aSortParam, false, false, bApi ); + (void)SortTab( nTab, aSortParam, false, false, bApi ); } if (bQuery) { @@ -608,8 +608,7 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bApi, bool bIsUnnamed, return bDone; } -bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, - bool bRecord, bool bPaint, bool bApi ) +bool ScDBDocFunc::SortTab(SCTAB nTab, const ScSortParam& rSortParam, bool bRecord, bool bPaint, bool bApi ) { ScDocShellModificator aModificator( rDocShell ); @@ -1320,7 +1319,7 @@ void ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, ScSortParam aOldSort; pDBData->GetSortParam( aOldSort ); ScSortParam aSortParam( aNewParam, aOldSort ); - Sort( nTab, aSortParam, false, false, bApi ); + SortTab(nTab, aSortParam, false, false, bApi); } bSuccess = rDoc.DoSubTotals( nTab, aNewParam ); diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx index 910a5130b7e3..27e113f9cc89 100644 --- a/sc/source/ui/inc/dbdocfun.hxx +++ b/sc/source/ui/inc/dbdocfun.hxx @@ -65,8 +65,7 @@ public: static void ShowInBeamer( const ScImportParam& rParam, const SfxViewFrame* pFrame ); - SC_DLLPUBLIC bool Sort( - SCTAB nTab, const ScSortParam& rSortParam, bool bRecord, bool bPaint, bool bApi ); + SC_DLLPUBLIC bool SortTab(SCTAB nTab, const ScSortParam& rSortParam, bool bRecord, bool bPaint, bool bApi); SC_DLLPUBLIC bool Query( SCTAB nTab, const ScQueryParam& rQueryParam, const ScRange* pAdvSource, bool bRecord, bool bApi ); diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 053e41dc9716..53bac2422571 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -5353,7 +5353,7 @@ void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& a pDocSh->GetDBData( aRange, SC_DB_MAKE, ScGetDBSelection::ForceMark ); // if needed create area ScDBDocFunc aFunc(*pDocSh); // area must be created - (void)aFunc.Sort( nTab, aParam, true, true, true ); + (void)aFunc.SortTab(nTab, aParam, true, true, true); } // XFilterable diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 8692bd1152bf..0e89d2971140 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -215,7 +215,7 @@ void ScDBFunc::Sort( const ScSortParam& rSortParam, bool bRecord, bool bPaint ) ScDocShell* pDocSh = GetViewData().GetDocShell(); SCTAB nTab = GetViewData().CurrentTabForData(); ScDBDocFunc aDBDocFunc( *pDocSh ); - bool bSuccess = aDBDocFunc.Sort( nTab, rSortParam, bRecord, bPaint, false ); + bool bSuccess = aDBDocFunc.SortTab(nTab, rSortParam, bRecord, bPaint, false); if ( bSuccess && !rSortParam.bInplace ) { // mark target
