diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 22aaf6aea055..5539f82d5fcc 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -663,7 +663,7 @@ public: sc::TableValues& rValues, sc::StartListeningContext& rStartCxt, sc::EndListeningContext& rEndCxt ); #if DUMP_COLUMN_STORAGE - void DumpFormulaGroups() const; + void DumpColumnStorage() const; #endif SCSIZE GetPatternCount() const; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 8b4612636ee2..44092fd69006 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -2281,7 +2281,7 @@ public: void DeleteBroadcasters( sc::ColumnBlockPosition& rBlockPos, const ScAddress& rTopPos, SCROW nLength ); #if DUMP_COLUMN_STORAGE - SC_DLLPUBLIC void DumpFormulaGroups( SCTAB nTab, SCCOL nCol ) const; + SC_DLLPUBLIC void DumpColumnStorage( SCTAB nTab, SCCOL nCol ) const; #endif #if DEBUG_AREA_BROADCASTER diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 70c42c84e4b3..e984c2ee7ccc 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -966,7 +966,7 @@ public: void finalizeOutlineImport(); #if DUMP_COLUMN_STORAGE - void DumpFormulaGroups( SCCOL nCol ) const; + void DumpColumnStorage( SCCOL nCol ) const; #endif /** Replace behaves differently to the Search; adjust the rCol and rRow accordingly. diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 22d911fbf21d..b11a297e3b5c 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -1569,11 +1569,11 @@ namespace { #define DUMP_FORMULA_RESULTS 0 -struct FormulaGroupDumper : std::unary_function +struct ColumnStorageDumper : std::unary_function { const ScDocument* mpDoc; - FormulaGroupDumper( const ScDocument* pDoc ) : mpDoc(pDoc) {} + ColumnStorageDumper( const ScDocument* pDoc ) : mpDoc(pDoc) {} void operator() (const sc::CellStoreType::value_type& rNode) const { @@ -1679,10 +1679,10 @@ struct FormulaGroupDumper : std::unary_functionDumpFormulaGroups(nCol); + pTab->DumpColumnStorage(nCol); } #endif diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 9df67e8ccd2b..7e1b403e9062 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -2266,12 +2266,12 @@ void ScTable::SetFormulaResults( } #if DUMP_COLUMN_STORAGE -void ScTable::DumpFormulaGroups( SCCOL nCol ) const +void ScTable::DumpColumnStorage( SCCOL nCol ) const { if (!ValidCol(nCol)) return; - aCol[nCol].DumpFormulaGroups(); + aCol[nCol].DumpColumnStorage(); } #endif diff --git a/sc/source/ui/view/gridwin_dbgutil.cxx b/sc/source/ui/view/gridwin_dbgutil.cxx index afd385b9b299..904c850755ee 100644 --- a/sc/source/ui/view/gridwin_dbgutil.cxx +++ b/sc/source/ui/view/gridwin_dbgutil.cxx @@ -116,11 +116,9 @@ void ScGridWindow::dumpColumnCellStorage() { // Get the current cursor position. ScAddress aCurPos = pViewData->GetCurPos(); - ScDocument* pDoc = pViewData->GetDocument(); - // TODO : Perhaps we should dump the whole structure, not just the formula - // groups. - pDoc->DumpFormulaGroups(aCurPos.Tab(), aCurPos.Col()); + ScDocument* pDoc = pViewData->GetDocument(); + pDoc->DumpColumnStorage(aCurPos.Tab(), aCurPos.Col()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */