sc/inc/document.hxx | 5 +++-- sc/inc/table.hxx | 8 ++++---- sc/source/core/data/document10.cxx | 19 +++++-------------- sc/source/ui/docshell/SheetViewOperationsTester.cxx | 2 +- sc/source/ui/view/viewfun3.cxx | 4 ++-- sc/source/ui/view/viewfunc.cxx | 4 ++-- 6 files changed, 17 insertions(+), 25 deletions(-)
New commits: commit a819480a30237ce27b2bce6d3522b147a1354dcd Author: Tomaž Vajngerl <[email protected]> AuthorDate: Fri Oct 10 15:21:31 2025 +0900 Commit: Miklos Vajna <[email protected]> CommitDate: Fri Oct 10 16:20:24 2025 +0200 sc: rename IsSheetView to IsSheetViewHolder To make it more clear what is being refered - IsSheetViewHolder is a sheet / table that holds the data for a sheet view, but the table should never be used directly. Change-Id: I8fe1d252b37389660ba4f010229fa60b2ef29da3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192145 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 840419e498af..c487a5f81216 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -2416,8 +2416,9 @@ public: bool HasSheetViews(SCTAB nTab) const; SC_DLLPUBLIC std::shared_ptr<sc::SheetViewManager> GetSheetViewManager(SCTAB nTable); - bool IsSheetView(SCTAB nTab) const; - void SetSheetView(SCTAB nTab, bool bSheetView); + + /** Is a holder of the sheet view data */ + SC_DLLPUBLIC bool IsSheetViewHolder(SCTAB nTab) const; private: ScDocument(const ScDocument& r) = delete; diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 1fd37b9958b6..487fc3c62d14 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -255,7 +255,7 @@ private: bool mbForceBreaks:1; bool mbTotalsRowBelow:1; - bool mbIsSheetView : 1 = false; + bool mbIsSheetViewHolder : 1 = false; /** this is touched from formula group threading context */ std::atomic<bool> bStreamValid; @@ -1199,11 +1199,11 @@ public: std::shared_ptr<sc::SheetViewManager> const& GetSheetViewManager() const; - bool IsSheetView() const { return mbIsSheetView; } + bool IsSheetViewHolder() const { return mbIsSheetViewHolder; } - void SetSheetView(bool bValue) + void SetSheetViewHolder(bool bValue) { - mbIsSheetView = bValue; + mbIsSheetViewHolder = bValue; } private: diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx index b01f1cd04e28..523e28780dcd 100644 --- a/sc/source/core/data/document10.cxx +++ b/sc/source/core/data/document10.cxx @@ -1115,24 +1115,15 @@ sc::BroadcasterState ScDocument::GetBroadcasterState() const return aState; } -bool ScDocument::IsSheetView(SCTAB nTab) const +bool ScDocument::IsSheetViewHolder(SCTAB nTab) const { if (ScTable const* pTable = FetchTable(nTab)) { - return pTable->IsSheetView(); + return pTable->IsSheetViewHolder(); } return false; } -void ScDocument::SetSheetView(SCTAB nTab, bool bSheetView) -{ - if (ScTable* pTable = FetchTable(nTab)) - { - pTable->SetSheetView(bSheetView); - } -} - - std::pair<sc::SheetViewID, SCTAB> ScDocument::CreateNewSheetView(SCTAB nTab) { if (ScTable* pTable = FetchTable(nTab)) @@ -1144,7 +1135,7 @@ std::pair<sc::SheetViewID, SCTAB> ScDocument::CreateNewSheetView(SCTAB nTab) { auto nSheetViewID = pTable->GetSheetViewManager()->create(pSheetViewTable); pSheetViewTable->SetVisible(false); - pSheetViewTable->SetSheetView(true); + pSheetViewTable->SetSheetViewHolder(true); return { nSheetViewID, nSheetViewTab }; } } @@ -1165,7 +1156,7 @@ std::shared_ptr<sc::SheetViewManager> ScDocument::GetSheetViewManager(SCTAB nTab { if (ScTable* pTable = FetchTable(nTable)) { - if (!pTable->IsSheetView()) + if (!pTable->IsSheetViewHolder()) return pTable->GetSheetViewManager(); } return {}; @@ -1175,7 +1166,7 @@ SCTAB ScDocument::GetSheetViewNumber(SCTAB nTab, sc::SheetViewID nID) { if (ScTable* pMainSheet = FetchTable(nTab)) { - if (pMainSheet->IsSheetView() || nID == sc::DefaultSheetViewID) + if (pMainSheet->IsSheetViewHolder() || nID == sc::DefaultSheetViewID) return nTab; std::shared_ptr<sc::SheetView> pView = pMainSheet->GetSheetViewManager()->get(nID); diff --git a/sc/source/ui/docshell/SheetViewOperationsTester.cxx b/sc/source/ui/docshell/SheetViewOperationsTester.cxx index 94dc4154118d..6b5469159173 100644 --- a/sc/source/ui/docshell/SheetViewOperationsTester.cxx +++ b/sc/source/ui/docshell/SheetViewOperationsTester.cxx @@ -142,7 +142,7 @@ bool SheetViewOperationsTester::check(Operation eOperation) const SCTAB nTab = mpViewData->GetTabNumber(); // Never allow direct changes to the data holder sheet of the sheet view. - if (rDocument.IsSheetView(nTab)) + if (rDocument.IsSheetViewHolder(nTab)) return false; sc::SheetViewID nSheetViewID = mpViewData->GetSheetViewID(); diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 5fc76486eaed..829a7f10c4bc 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -2102,7 +2102,7 @@ void ScViewFunc::RemoveCurrentSheetView() ScDocument& rDocument = GetViewData().GetDocument(); SCTAB nTab = GetViewData().GetTabNumber(); - if (rDocument.IsSheetView(nTab)) + if (rDocument.IsSheetViewHolder(nTab)) return; auto pSheetManager = rDocument.GetSheetViewManager(nTab); @@ -2141,7 +2141,7 @@ void ScViewFunc::SelectSheetView(sc::SheetViewID nSelectSheetViewID) { SCTAB nTab = GetViewData().GetTabNumber(); - if (GetViewData().GetDocument().IsSheetView(nTab)) + if (GetViewData().GetDocument().IsSheetViewHolder(nTab)) return; sc::SheetViewID nSheetViewID = GetViewData().GetSheetViewID(); diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 4cdab0ed60ae..e61fec76d6c6 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -811,7 +811,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, { SCTAB nSelectedTab = aMark.GetFirstSelected(); applyFormulaToCell(*this, nCol, nRow, nTab, rString, pData, xModificator, aMark, bMatrixExpand, bRecord, bNumFmtChanged); - if (!rDoc.IsSheetView(nSelectedTab)) + if (!rDoc.IsSheetViewHolder(nSelectedTab)) { auto pManager = rDoc.GetSheetViewManager(nSelectedTab); @@ -837,7 +837,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, { for (const auto& rTab : aMark) { - if (!rDoc.IsSheetView(rTab)) + if (!rDoc.IsSheetViewHolder(rTab)) { auto pManager = rDoc.GetSheetViewManager(rTab); for (auto const& pSheetView : pManager->getSheetViews())
