From 88e20bce592399c1908eacdbfee8d230bff00f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= Date: Tue, 8 Jul 2025 00:00:30 +0200 Subject: [PATCH] sc: no need for TableContainer typedef MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I409aa6257aca389aef643716372b277b4353fbed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187740 Reviewed-by: Tomaž Vajngerl Tested-by: Jenkins --- sc/inc/document.hxx | 5 ++--- sc/source/core/data/document.cxx | 4 ++-- sc/source/core/data/document10.cxx | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index d06114ac7e30..e327dc4efd4f 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -353,7 +353,6 @@ friend class sc::EditTextIterator; friend struct ScMutationGuard; friend struct ScMutationDisable; - typedef std::vector TableContainer; public: enum class HardRecalcState @@ -403,7 +402,7 @@ private: std::unique_ptr pValidationList; // validity sal_uInt32 mnLastValidationListMax = 0; SvNumberFormatterIndexTable* pFormatExchangeList; // for application of number formats - TableContainer maTabs; + std::vector maTabs; rtl::Reference mxSheetLimits; std::vector maTabNames; // for undo document, we need the information tab name <-> index mutable std::unique_ptr pRangeName; @@ -649,7 +648,7 @@ public: SC_DLLPUBLIC sal_uInt64 GetFormulaGroupCount() const; // all cells sal_uInt64 GetCodeCount() const; // RPN-Code in formulas DECL_LINK( GetUserDefinedColor, sal_uInt16, Color* ); - // number formatter + public: SC_DLLPUBLIC ScDocument( ScDocumentMode eMode = SCDOCMODE_DOCUMENT, ScDocShell* pDocShell = nullptr ); diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 169312550f1d..97cff73ddd7a 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -2682,7 +2682,7 @@ void ScDocument::CopyBlockFromClip( sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, SCCOL nDx, SCROW nDy ) { - TableContainer& rClipTabs = rCxt.getClipDoc()->maTabs; + std::vector& rClipTabs = rCxt.getClipDoc()->maTabs; SCTAB nTabEnd = rCxt.getTabEnd(); SCTAB nClipTab = 0; for (SCTAB i = rCxt.getTabStart(); i <= nTabEnd && i < GetTableCount(); i++) @@ -2788,7 +2788,7 @@ SCROW ScDocument::CopyNonFilteredFromClip(sc::CopyFromClipContext& rCxt, SCCOL n // filtered state is taken from first used table in clipboard (as in GetClipArea) SCTAB nFlagTab = 0; - TableContainer& rClipTabs = rCxt.getClipDoc()->maTabs; + std::vector& rClipTabs = rCxt.getClipDoc()->maTabs; while ( nFlagTab < static_cast(rClipTabs.size()) && !rClipTabs[nFlagTab] ) ++nFlagTab; diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx index 4c6527304a7e..0ae557e49ea1 100644 --- a/sc/source/core/data/document10.cxx +++ b/sc/source/core/data/document10.cxx @@ -59,7 +59,7 @@ void ScDocument::DeleteBeforeCopyFromClip( sc::CopyFromClipContext& rCxt, const ScMarkData& rMark, sc::ColumnSpanSet& rBroadcastSpans ) { SCTAB nClipTab = 0; - const TableContainer& rClipTabs = rCxt.getClipDoc()->maTabs; + std::vector const& rClipTabs = rCxt.getClipDoc()->maTabs; SCTAB nClipTabCount = rClipTabs.size(); for (SCTAB nTab = rCxt.getTabStart(); nTab <= rCxt.getTabEnd(); ++nTab)