sc/inc/SheetViewManager.hxx | 6 -- sc/inc/document.hxx | 2 sc/inc/sc.hrc | 4 - sc/qa/unit/tiledrendering/SheetViewTest.cxx | 72 ---------------------------- sc/sdi/scalc.sdi | 36 -------------- sc/sdi/tabvwsh.sdi | 2 sc/source/core/data/SheetViewManager.cxx | 66 ------------------------- sc/source/ui/inc/viewfunc.hxx | 8 --- sc/source/ui/view/tabvwsh3.cxx | 6 -- sc/source/ui/view/tabvwsha.cxx | 2 sc/source/ui/view/viewfun3.cxx | 13 ----- 11 files changed, 3 insertions(+), 214 deletions(-)
New commits: commit 1edf345a0f7e74fd58a3feb1f01f246b6a4ab9ad Author: Tomaž Vajngerl <[email protected]> AuthorDate: Mon Mar 2 13:17:23 2026 +0900 Commit: Miklos Vajna <[email protected]> CommitDate: Tue Mar 3 09:11:31 2026 +0100 sc: Remove code to move to the next / previous sheet view This is not used anymore as we have the combo-box now to select which sheet view to switch to. Change-Id: Ie2d556ed2ee25d2dcda31e2d5ec9c5017d937901 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200753 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sc/inc/SheetViewManager.hxx b/sc/inc/SheetViewManager.hxx index d57efa328068..35efcb6207a3 100644 --- a/sc/inc/SheetViewManager.hxx +++ b/sc/inc/SheetViewManager.hxx @@ -121,12 +121,6 @@ public: /** Returns a range that iterates only over valid (non-null) sheet views. */ SheetViewRange iterateValidSheetViews() const { return SheetViewRange(maViews); } - /** Calculate the next sheet view ID from the current ID. */ - SheetViewID getNextSheetView(SheetViewID nID); - - /** Calculate the previous sheet view ID from the current ID. */ - SheetViewID getPreviousSheetView(SheetViewID nID); - void unsyncAllSheetViews(); static OUString defaultViewName(); diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 5bf596cf71cc..9809d5d03b78 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -2441,7 +2441,7 @@ public: SC_DLLPUBLIC SCTAB GetDefaultViewTableNumber(SCTAB nTab) const; /** Returns the sheet view ID for a given tab. */ - sc::SheetViewID GetTableSheetViewID(SCTAB nTab) const; + SC_DLLPUBLIC sc::SheetViewID GetTableSheetViewID(SCTAB nTab) const; private: ScDocument(const ScDocument& r) = delete; diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index aca0e1d07f50..62726acdab6b 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -287,8 +287,8 @@ class SvxZoomSliderItem; #define FID_TOGGLEFORMULA (VIEW_MENU_START + 10) #define FID_NEW_SHEET_VIEW (VIEW_MENU_START + 11) #define FID_REMOVE_SHEET_VIEW (VIEW_MENU_START + 12) -#define FID_SWITCH_TO_NEXT_SHEET_VIEW (VIEW_MENU_START + 13) -#define FID_SWITCH_TO_PREVIOUS_SHEET_VIEW (VIEW_MENU_START + 14) +// FREE (VIEW_MENU_START + 13) +// FREE (VIEW_MENU_START + 14) #define FID_EXIT_SHEET_VIEW (VIEW_MENU_START + 15) #define FID_SELECT_SHEET_VIEW (VIEW_MENU_START + 16) #define FID_CURRENT_SHEET_VIEW TypedWhichId<SfxInt32Item>(VIEW_MENU_START + 17) diff --git a/sc/qa/unit/tiledrendering/SheetViewTest.cxx b/sc/qa/unit/tiledrendering/SheetViewTest.cxx index 81f76a5f9c59..f6adb6ec61f9 100644 --- a/sc/qa/unit/tiledrendering/SheetViewTest.cxx +++ b/sc/qa/unit/tiledrendering/SheetViewTest.cxx @@ -559,78 +559,6 @@ CPPUNIT_TEST_FIXTURE(SheetViewTest, testSheetViewOperationRestrictions_SheetView CPPUNIT_ASSERT_EQUAL(true, pSheetView2->isSynced()); } -CPPUNIT_TEST_FIXTURE(SheetViewTest, testSheetViewManager) -{ - sc::SheetViewID nNonExistingID = 99; - - // Empty - sc::SheetViewManager maSheetViewManager; - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, - maSheetViewManager.getNextSheetView(sc::DefaultSheetViewID)); - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, - maSheetViewManager.getNextSheetView(0)); // First non existing - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, - maSheetViewManager.getNextSheetView(1)); // Next non existing - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, - maSheetViewManager.getNextSheetView(nNonExistingID)); - CPPUNIT_ASSERT_EQUAL(sc::InvalidSheetViewID, - maSheetViewManager.getNextSheetView(sc::InvalidSheetViewID)); - CPPUNIT_ASSERT_EQUAL(sc::InvalidSheetViewID, maSheetViewManager.getNextSheetView(-99)); - - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, - maSheetViewManager.getPreviousSheetView(sc::DefaultSheetViewID)); - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, - maSheetViewManager.getPreviousSheetView(0)); // First non existing - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, - maSheetViewManager.getPreviousSheetView(1)); // Next non existing - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, - maSheetViewManager.getPreviousSheetView(nNonExistingID)); - CPPUNIT_ASSERT_EQUAL(sc::InvalidSheetViewID, - maSheetViewManager.getPreviousSheetView(sc::InvalidSheetViewID)); - CPPUNIT_ASSERT_EQUAL(sc::InvalidSheetViewID, maSheetViewManager.getPreviousSheetView(-99)); - - // Add ID 1 - auto nID1 = maSheetViewManager.create(nullptr); - CPPUNIT_ASSERT(maSheetViewManager.get(nID1)); - - CPPUNIT_ASSERT_EQUAL(nID1, maSheetViewManager.getNextSheetView(sc::DefaultSheetViewID)); - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, maSheetViewManager.getNextSheetView(nID1)); - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, - maSheetViewManager.getNextSheetView(nNonExistingID)); - CPPUNIT_ASSERT_EQUAL(sc::InvalidSheetViewID, - maSheetViewManager.getNextSheetView(sc::InvalidSheetViewID)); - CPPUNIT_ASSERT_EQUAL(sc::InvalidSheetViewID, maSheetViewManager.getNextSheetView(-99)); - - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, maSheetViewManager.getPreviousSheetView(nID1)); - CPPUNIT_ASSERT_EQUAL(nID1, maSheetViewManager.getPreviousSheetView(sc::DefaultSheetViewID)); - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, - maSheetViewManager.getPreviousSheetView(nNonExistingID)); - CPPUNIT_ASSERT_EQUAL(sc::InvalidSheetViewID, - maSheetViewManager.getPreviousSheetView(sc::InvalidSheetViewID)); - CPPUNIT_ASSERT_EQUAL(sc::InvalidSheetViewID, maSheetViewManager.getPreviousSheetView(-99)); - - // Add ID 2 - auto nID2 = maSheetViewManager.create(nullptr); - CPPUNIT_ASSERT(maSheetViewManager.get(nID2)); - CPPUNIT_ASSERT_EQUAL(nID1, maSheetViewManager.getNextSheetView(sc::DefaultSheetViewID)); - CPPUNIT_ASSERT_EQUAL(nID2, maSheetViewManager.getNextSheetView(nID1)); - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, maSheetViewManager.getNextSheetView(nID2)); - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, - maSheetViewManager.getNextSheetView(nNonExistingID)); - CPPUNIT_ASSERT_EQUAL(sc::InvalidSheetViewID, - maSheetViewManager.getNextSheetView(sc::InvalidSheetViewID)); - CPPUNIT_ASSERT_EQUAL(sc::InvalidSheetViewID, maSheetViewManager.getNextSheetView(-99)); - - CPPUNIT_ASSERT_EQUAL(nID2, maSheetViewManager.getPreviousSheetView(sc::DefaultSheetViewID)); - CPPUNIT_ASSERT_EQUAL(nID1, maSheetViewManager.getPreviousSheetView(nID2)); - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, maSheetViewManager.getPreviousSheetView(nID1)); - CPPUNIT_ASSERT_EQUAL(sc::DefaultSheetViewID, - maSheetViewManager.getPreviousSheetView(nNonExistingID)); - CPPUNIT_ASSERT_EQUAL(sc::InvalidSheetViewID, - maSheetViewManager.getPreviousSheetView(sc::InvalidSheetViewID)); - CPPUNIT_ASSERT_EQUAL(sc::InvalidSheetViewID, maSheetViewManager.getPreviousSheetView(-99)); -} - CPPUNIT_TEST_FIXTURE(SheetViewTest, testCheckIfSheetViewIsSavedInDocument_ODF) { // Check if sheet view holder table is saved into the ODF document diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 48a3e25425ec..e81d361c30af 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -6104,42 +6104,6 @@ SfxBoolItem RemoveSheetView FID_REMOVE_SHEET_VIEW GroupId = SfxGroupId::View ] -SfxBoolItem SwitchToNextSheetView FID_SWITCH_TO_NEXT_SHEET_VIEW -[ - /* flags */ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - /* config */ - AccelConfig = TRUE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = SfxGroupId::View -] - -SfxBoolItem SwitchToPreviousSheetView FID_SWITCH_TO_PREVIOUS_SHEET_VIEW -[ - /* flags */ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - /* config */ - AccelConfig = TRUE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = SfxGroupId::View -] - SfxBoolItem SelectSheetView FID_SELECT_SHEET_VIEW [ /* flags */ diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi index 234f4953ce13..38644a2ed760 100644 --- a/sc/sdi/tabvwsh.sdi +++ b/sc/sdi/tabvwsh.sdi @@ -179,8 +179,6 @@ interface TableEditView FID_TOGGLEFORMULA [ ExecMethod = Execute; StateMethod = GetState; ] FID_NEW_SHEET_VIEW [ ExecMethod = Execute; StateMethod = GetState; ] FID_REMOVE_SHEET_VIEW [ ExecMethod = Execute; StateMethod = GetState; ] - FID_SWITCH_TO_NEXT_SHEET_VIEW [ ExecMethod = Execute; StateMethod = GetState; ] - FID_SWITCH_TO_PREVIOUS_SHEET_VIEW [ ExecMethod = Execute; StateMethod = GetState; ] FID_EXIT_SHEET_VIEW [ ExecMethod = Execute; StateMethod = GetState; ] FID_SELECT_SHEET_VIEW [ ExecMethod = Execute; StateMethod = GetState; ] FID_CURRENT_SHEET_VIEW [ ExecMethod = Execute; StateMethod = GetState; ] diff --git a/sc/source/core/data/SheetViewManager.cxx b/sc/source/core/data/SheetViewManager.cxx index 879bb9b66166..754e01103e7a 100644 --- a/sc/source/core/data/SheetViewManager.cxx +++ b/sc/source/core/data/SheetViewManager.cxx @@ -58,72 +58,6 @@ std::shared_ptr<SheetView> SheetViewManager::get(SheetViewID nID) const return std::shared_ptr<SheetView>(); } -/// Calculate the next existing sheet view to use. -SheetViewID SheetViewManager::getNextSheetView(SheetViewID nID) -{ - if (nID != DefaultSheetViewID && nID < 0) - return InvalidSheetViewID; - - if (maViews.empty()) - return DefaultSheetViewID; - - // Set to max, so we prevent the for loop to run - sal_Int32 startIndex = std::numeric_limits<sal_Int32>::max(); - - // Start with first index and search for the first sheet view in for loop. - if (nID == DefaultSheetViewID) - { - startIndex = 0; - } - // If we assume currnet ID is valid, so set the start to current + 1 to search - // for then next valid sheet view in the for loop. - else if (isValidSheetViewID(nID)) - { - startIndex = sal_Int32(nID) + 1; - } - - for (sal_Int32 nIndex = startIndex; nIndex < sal_Int32(maViews.size()); ++nIndex) - { - if (maViews[nIndex]) - return SheetViewID(nIndex); - } - - return DefaultSheetViewID; -} - -/// Calculate the previous existing sheet view to use. -SheetViewID SheetViewManager::getPreviousSheetView(SheetViewID nID) -{ - if (nID != DefaultSheetViewID && nID < 0) - return InvalidSheetViewID; - - if (maViews.empty()) - return DefaultSheetViewID; - - // Set to -1, so we prevent the for loop to run - sal_Int32 startIndex = -1; - - // Start with first index and search for the first sheet view in for loop. - if (nID == DefaultSheetViewID) - { - startIndex = sal_Int32(maViews.size()) - 1; - } - // If we assume currnet ID is valid, so set the start to current + 1 to search - // for then next valid sheet view in the for loop. - else if (isValidSheetViewID(nID)) - { - startIndex = sal_Int32(nID) - 1; - } - - for (sal_Int32 nIndex = startIndex; nIndex >= 0; --nIndex) - { - if (maViews[nIndex]) - return SheetViewID(nIndex); - } - - return DefaultSheetViewID; -} - void SheetViewManager::unsyncAllSheetViews() { for (auto& rSheetView : iterateValidSheetViews()) diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 23a3a9eef6f6..81bb6230e7d5 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -70,13 +70,6 @@ struct ScDataFormFragment namespace sc { -/** Direction of searching for the sheet view to switch to relative to the current sheet view. */ -enum class SwitchSheetViewDirection -{ - Next, - Previous -}; - } class ScViewFunc : public ScTabView @@ -369,7 +362,6 @@ public: // SheetView methods void MakeNewSheetView(); void RemoveCurrentSheetView(); - void SwitchSheetView(sc::SwitchSheetViewDirection eDirection); void ExitSheetView(); // Switch to default view void SelectSheetView(sc::SheetViewID nSelectSheetViewID); diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 3fce5f2718fc..472fe2021f50 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -1057,12 +1057,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case FID_REMOVE_SHEET_VIEW: RemoveCurrentSheetView(); break; - case FID_SWITCH_TO_NEXT_SHEET_VIEW: - SwitchSheetView(sc::SwitchSheetViewDirection::Next); - break; - case FID_SWITCH_TO_PREVIOUS_SHEET_VIEW: - SwitchSheetView(sc::SwitchSheetViewDirection::Previous); - break; case FID_EXIT_SHEET_VIEW: ExitSheetView(); break; diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index b0ba187d2d2c..edce540ba2da 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -398,8 +398,6 @@ void ScTabViewShell::GetState( SfxItemSet& rSet ) case FID_NEW_SHEET_VIEW: case FID_REMOVE_SHEET_VIEW: - case FID_SWITCH_TO_NEXT_SHEET_VIEW: - case FID_SWITCH_TO_PREVIOUS_SHEET_VIEW: case FID_SELECT_SHEET_VIEW: case FID_EXIT_SHEET_VIEW: { diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 2b405aa0915b..da3a8cedd130 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -2133,19 +2133,6 @@ void ScViewFunc::RemoveCurrentSheetView() SheetViewChanged(); } -void ScViewFunc::SwitchSheetView(sc::SwitchSheetViewDirection eDirection) -{ - ScDocument& rDocument = GetViewData().GetDocument(); - SCTAB nTab = GetViewData().GetDefaultViewTab(); - auto pSheetManager = rDocument.GetSheetViewManager(nTab); - sc::SheetViewID nSheetViewID = GetViewData().GetSheetViewID(); - - sc::SheetViewID nSwitchSheetViewID = eDirection == sc::SwitchSheetViewDirection::Next - ? pSheetManager->getNextSheetView(nSheetViewID) - : pSheetManager->getPreviousSheetView(nSheetViewID); - SelectSheetView(nSwitchSheetViewID); -} - void ScViewFunc::ExitSheetView() { SelectSheetView(sc::DefaultSheetViewID);
