mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renaming due to the fact that it now dumps non-formula blocks too.

Browse Source 
Change-Id: I9d06786a93bab2f0ed0d179df8edf9b5d8128bf6
This commit is contained in:
Kohei Yoshida 2016-11-12 17:38:25 -05:00
parent f20df23ad9
commit 79258677f0
7 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sc/inc/column.hxx
View File

@ -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;

2
sc/inc/document.hxx
View File

@ -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

2
sc/inc/table.hxx
View File

@ -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.

8
sc/source/core/data/column2.cxx
View File

@ -1569,11 +1569,11 @@ namespace {
#define DUMP_FORMULA_RESULTS 0
struct FormulaGroupDumper : std::unary_function<sc::CellStoreType::value_type, void>
struct ColumnStorageDumper : std::unary_function<sc::CellStoreType::value_type, void>
{
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_function<sc::CellStoreType::value_type, v
}
void ScColumn::DumpFormulaGroups() const
void ScColumn::DumpColumnStorage() const
{
cout << "-- table: " << nTab << "; column: " << nCol << endl;
std::for_each(maCells.begin(), maCells.end(), FormulaGroupDumper(pDocument));
std::for_each(maCells.begin(), maCells.end(), ColumnStorageDumper(pDocument));
cout << "--" << endl;
}
#endif

4
sc/source/core/data/document.cxx
View File

@ -2448,13 +2448,13 @@ void ScDocument::DeleteBroadcasters( sc::ColumnBlockPosition& rBlockPos, const S
}
#if DUMP_COLUMN_STORAGE
void ScDocument::DumpFormulaGroups( SCTAB nTab, SCCOL nCol ) const
void ScDocument::DumpColumnStorage( SCTAB nTab, SCCOL nCol ) const
{
const ScTable* pTab = FetchTable(nTab);
if (!pTab)
return;
pTab->DumpFormulaGroups(nCol);
pTab->DumpColumnStorage(nCol);
}
#endif

4
sc/source/core/data/table1.cxx
View File

@ -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

6
sc/source/ui/view/gridwin_dbgutil.cxx
View File

@ -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: */