[Libreoffice-commits] core.git: sc/inc sc/source

[Kohei Yoshida]

 sc/inc/column.hxx                     |    2 +-
 sc/inc/document.hxx                   |    2 +-
 sc/inc/table.hxx                      |    2 +-
 sc/source/core/data/column2.cxx       |    8 ++++----
 sc/source/core/data/document.cxx      |    4 ++--
 sc/source/core/data/table1.cxx        |    4 ++--
 sc/source/ui/view/gridwin_dbgutil.cxx |    6 ++----
 7 files changed, 13 insertions(+), 15 deletions(-)

New commits:
commit 79258677f04c59d194bbfd032230c7a2fc4fea80
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Sat Nov 12 17:38:25 2016 -0500

    Renaming due to the fact that it now dumps non-formula blocks too.
    
    Change-Id: I9d06786a93bab2f0ed0d179df8edf9b5d8128bf6

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 22aaf6a..5539f82 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 8b46126..44092fd 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 70c42c8..e984c2e 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 22d911f..b11a297 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<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
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 3116357..604ae04 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -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
 
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 9df67e8..7e1b403 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 afd385b..904c850 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: */