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

Let's hook up the pivot table dumper code to Ctrl-Shift-F8 as well.

Browse Source 
It dumps the pivot data if the cursor is over a pivot table output,
else it dumps the column storage info.

Change-Id: I403e381be3f64d139f8bfaca7e477742a65dde9c
This commit is contained in:
Kohei Yoshida
2016-11-12 18:58:17 -05:00
parent 73e21792ef
commit e8ccf9a2e3
18 changed files with 68 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sc/inc/calcmacros.hxx
View File

@@ -16,13 +16,19 @@
#define DEBUG_AREA_BROADCASTER 0 #define DEBUG_AREA_BROADCASTER 0
#define DUMP_COLUMN_STORAGE 0 #define DUMP_COLUMN_STORAGE 0
#define DUMP_PIVOT_TABLE 0
#ifdef DBG_UTIL #ifdef DBG_UTIL
#undef DUMP_COLUMN_STORAGE #undef DUMP_COLUMN_STORAGE
#define DUMP_COLUMN_STORAGE 1 #define DUMP_COLUMN_STORAGE 1
#undef DUMP_PIVOT_TABLE
#define DUMP_PIVOT_TABLE 1
#endif #endif
#if DEBUG_PIVOT_TABLE || DUMP_COLUMN_STORAGE || DEBUG_COLUMN_STORAGE || DEBUG_FORMULA_COMPILER || DEBUG_AREA_BROADCASTER #if DUMP_PIVOT_TABLE || DEBUG_PIVOT_TABLE || \
DUMP_COLUMN_STORAGE || DEBUG_COLUMN_STORAGE || \
DEBUG_FORMULA_COMPILER || \
DEBUG_AREA_BROADCASTER
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <cstdio> #include <cstdio>

2
sc/inc/dpcache.hxx
View File

@@ -198,7 +198,7 @@ public:
ScDPCache(ScDocument* pDoc); ScDPCache(ScDocument* pDoc);
~ScDPCache(); ~ScDPCache();
#if DEBUG_PIVOT_TABLE #if DUMP_PIVOT_TABLE
void Dump() const; void Dump() const;
#endif #endif

2
sc/inc/dpfilteredcache.hxx
View File

@@ -142,7 +142,7 @@ public:
void clear(); void clear();
bool empty() const; bool empty() const;
#if DEBUG_PIVOT_TABLE #if DUMP_PIVOT_TABLE
void dumpRowFlag(const RowFlagType& rFlag) const; void dumpRowFlag(const RowFlagType& rFlag) const;
void dump() const; void dump() const;
#endif #endif

4
sc/inc/dpgroup.hxx
View File

@@ -179,8 +179,8 @@ public:
virtual bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, virtual bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
const ScDPItemData& rSecondData, long nSecondIndex ) const override; const ScDPItemData& rSecondData, long nSecondIndex ) const override;
#if DEBUG_PIVOT_TABLE #if DUMP_PIVOT_TABLE
virtual void Dump() const; virtual void Dump() const override;
#endif #endif
}; };

2
sc/inc/dpnumgroupinfo.hxx
View File

@@ -27,7 +27,7 @@ struct ScDPNumGroupInfo
SC_DLLPUBLIC ScDPNumGroupInfo(); SC_DLLPUBLIC ScDPNumGroupInfo();
SC_DLLPUBLIC ScDPNumGroupInfo(const ScDPNumGroupInfo& r); SC_DLLPUBLIC ScDPNumGroupInfo(const ScDPNumGroupInfo& r);
#if DEBUG_PIVOT_TABLE #if DUMP_PIVOT_TABLE
void Dump() const; void Dump() const;
#endif #endif
}; };

3
sc/inc/dpobject.hxx
View File

@@ -251,7 +251,8 @@ public:
static bool IsOrientationAllowed( sal_uInt16 nOrient, sal_Int32 nDimFlags ); static bool IsOrientationAllowed( sal_uInt16 nOrient, sal_Int32 nDimFlags );
#if DEBUG_PIVOT_TABLE #if DUMP_PIVOT_TABLE
void Dump() const;
void DumpCache() const; void DumpCache() const;
#endif #endif
}; };

4
sc/inc/dpsdbtab.hxx
View File

@@ -77,6 +77,10 @@ public:
virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) override; virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) override;
virtual const ScDPFilteredCache& GetCacheTable() const override; virtual const ScDPFilteredCache& GetCacheTable() const override;
virtual void ReloadCacheTable() override; virtual void ReloadCacheTable() override;
#if DUMP_PIVOT_TABLE
virtual void Dump() const override;
#endif
}; };
#endif #endif

4
sc/inc/dpshttab.hxx
View File

@@ -119,6 +119,10 @@ public:
virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) override; virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) override;
virtual const ScDPFilteredCache& GetCacheTable() const override; virtual const ScDPFilteredCache& GetCacheTable() const override;
virtual void ReloadCacheTable() override; virtual void ReloadCacheTable() override;
#if DUMP_PIVOT_TABLE
virtual void Dump() const override;
#endif
}; };
#endif #endif

2
sc/inc/dptabdat.hxx
View File

@@ -142,7 +142,7 @@ public:
virtual long GetSourceDim( long nDim ); virtual long GetSourceDim( long nDim );
virtual long Compare( long nDim, long nDataId1, long nDataId2); virtual long Compare( long nDim, long nDataId1, long nDataId2);
#if DEBUG_PIVOT_TABLE #if DUMP_PIVOT_TABLE
virtual void Dump() const; virtual void Dump() const;
#endif #endif

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

@@ -37,7 +37,7 @@
#include <svl/zforlist.hxx> #include <svl/zforlist.hxx>
#include <o3tl/make_unique.hxx> #include <o3tl/make_unique.hxx>
#if DEBUG_PIVOT_TABLE #if DUMP_PIVOT_TABLE
#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp> #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
#endif #endif
@@ -1211,7 +1211,7 @@ SCROW ScDPCache::GetOrder(long /*nDim*/, SCROW nIndex)
} }
#if DEBUG_PIVOT_TABLE #if DUMP_PIVOT_TABLE
namespace { namespace {

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

@@ -406,9 +406,7 @@ bool ScDPFilteredCache::isRowQualified(sal_Int32 nRow, const vector<Criterion>&
return true; return true;
} }
#if DEBUG_PIVOT_TABLE #if DUMP_PIVOT_TABLE
using std::cout;
using std::endl;
void ScDPFilteredCache::dumpRowFlag(const RowFlagType& rFlag) const void ScDPFilteredCache::dumpRowFlag(const RowFlagType& rFlag) const
{ {

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

@@ -1038,9 +1038,7 @@ long ScDPGroupTableData::Compare(long nDim, long nDataId1, long nDataId2)
return ScDPItemData::Compare( *GetMemberById(nDim, nDataId1),*GetMemberById(nDim, nDataId2) ); return ScDPItemData::Compare( *GetMemberById(nDim, nDataId1),*GetMemberById(nDim, nDataId2) );
} }
#if DEBUG_PIVOT_TABLE #if DUMP_PIVOT_TABLE
using std::cout;
using std::endl;
void ScDPGroupTableData::Dump() const void ScDPGroupTableData::Dump() const
{ {

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

@@ -26,9 +26,7 @@ ScDPNumGroupInfo::ScDPNumGroupInfo(const ScDPNumGroupInfo& r) :
mfStart(r.mfStart), mfStart(r.mfStart),
mfEnd(r.mfEnd), mfStep(r.mfStep) {} mfEnd(r.mfEnd), mfStep(r.mfStep) {}
#if DEBUG_PIVOT_TABLE #if DUMP_PIVOT_TABLE
using std::cout;
using std::endl;
void ScDPNumGroupInfo::Dump() const void ScDPNumGroupInfo::Dump() const
{ {

11
sc/source/core/data/dpobject.cxx
View File

@@ -2880,7 +2880,16 @@ uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPS
return xRet; return xRet;
} }
#if DEBUG_PIVOT_TABLE #if DUMP_PIVOT_TABLE
void ScDPObject::Dump() const
{
if (!mpTableData)
return;
mpTableData->Dump();
}
void ScDPObject::DumpCache() const void ScDPObject::DumpCache() const
{ {
if (!mpTableData) if (!mpTableData)

9
sc/source/core/data/dpsdbtab.cxx
View File

@@ -159,4 +159,13 @@ void ScDatabaseDPData::ReloadCacheTable()
CreateCacheTable(); CreateCacheTable();
} }
#if DUMP_PIVOT_TABLE
void ScDatabaseDPData::Dump() const
{
// TODO : Implement this.
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

9
sc/source/core/data/dpshttab.cxx
View File

@@ -209,6 +209,15 @@ void ScSheetDPData::ReloadCacheTable()
CreateCacheTable(); CreateCacheTable();
} }
#if DUMP_PIVOT_TABLE
void ScSheetDPData::Dump() const
{
// TODO : Implement this.
}
#endif
ScSheetSourceDesc::ScSheetSourceDesc(ScDocument* pDoc) : ScSheetSourceDesc::ScSheetSourceDesc(ScDocument* pDoc) :
mpDoc(pDoc) {} mpDoc(pDoc) {}

2
sc/source/core/data/dptabdat.cxx
View File

@@ -293,7 +293,7 @@ long ScDPTableData::Compare( long nDim, long nDataId1, long nDataId2)
return -1; return -1;
} }
#if DEBUG_PIVOT_TABLE #if DUMP_PIVOT_TABLE
void ScDPTableData::Dump() const void ScDPTableData::Dump() const
{ {
} }

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

@@ -17,6 +17,7 @@
#include "patattr.hxx" #include "patattr.hxx"
#include <svl/poolitem.hxx> #include <svl/poolitem.hxx>
#include "userdat.hxx" #include "userdat.hxx"
#include <dpobject.hxx>
namespace { namespace {
@@ -118,6 +119,16 @@ void ScGridWindow::dumpColumnCellStorage()
ScAddress aCurPos = pViewData->GetCurPos(); ScAddress aCurPos = pViewData->GetCurPos();
ScDocument* pDoc = pViewData->GetDocument(); ScDocument* pDoc = pViewData->GetDocument();
const ScDPObject* pDP = pDoc->GetDPAtCursor(aCurPos.Col(), aCurPos.Row(), aCurPos.Tab());
if (pDP)
{
// Dump the pivot table info if the cursor is over a pivot table.
pDP->Dump();
pDP->DumpCache();
return;
}
// Dump the column cell storage info.
pDoc->DumpColumnStorage(aCurPos.Tab(), aCurPos.Col()); pDoc->DumpColumnStorage(aCurPos.Tab(), aCurPos.Col());
} }