diff options
| -rw-r--r-- | sc/inc/dptabres.hxx | 10 | ||||
| -rw-r--r-- | sc/inc/dptabsrc.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/dptabres.cxx | 12 | ||||
| -rw-r--r-- | sc/source/core/data/dptabsrc.cxx | 6 |
4 files changed, 17 insertions, 13 deletions
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index 112525cabe81..05efe99b9c64 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -185,7 +185,7 @@ public: const ScDPAggData* GetExistingChild() const { return pChild; } ScDPAggData* GetChild(); -#if DEBUG_PIVOT_TABLE +#if DUMP_PIVOT_TABLE void Dump(int nIndent) const; #endif }; @@ -408,7 +408,7 @@ public: void ResetResults(); -#if DEBUG_PIVOT_TABLE +#if DUMP_PIVOT_TABLE void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; void Dump(int nIndent) const; @@ -479,7 +479,7 @@ public: void ResetResults(); -#if DEBUG_PIVOT_TABLE +#if DUMP_PIVOT_TABLE void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; void Dump(int nIndent) const; #endif @@ -577,7 +577,7 @@ public: const ScDPRelativePos* pMemberPos, const OUString* pName, long nRefDimPos, const ScDPRunningTotalState& rRunning ); -#if DEBUG_PIVOT_TABLE +#if DUMP_PIVOT_TABLE void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; void Dump(int nIndent) const; #endif @@ -641,7 +641,7 @@ public: void ResetResults(); -#if DEBUG_PIVOT_TABLE +#if DUMP_PIVOT_TABLE void DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const; void Dump(int nIndent) const; #endif diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 99c23f8f9ccc..3fca6ce07cc7 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -250,7 +250,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; -#if DEBUG_PIVOT_TABLE +#if DUMP_PIVOT_TABLE void DumpResults() const; #endif }; diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index 2d5e72d4c9f6..c6f4edf3829d 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -266,7 +266,7 @@ void ScDPInitState::RemoveMember() namespace { -#if DEBUG_PIVOT_TABLE +#if DUMP_PIVOT_TABLE void lcl_DumpRow( const OUString& rType, const OUString& rName, const ScDPAggData* pAggData, ScDocument* pDoc, ScAddress& rPos ) @@ -643,7 +643,7 @@ void ScDPAggData::Reset() pChild = nullptr; } -#if DEBUG_PIVOT_TABLE +#if DUMP_PIVOT_TABLE void ScDPAggData::Dump(int nIndent) const { std::string aIndent(nIndent*2, ' '); @@ -1763,7 +1763,7 @@ void ScDPResultMember::UpdateRunningTotals( const ScDPResultMember* pRefMember, } } -#if DEBUG_PIVOT_TABLE +#if DUMP_PIVOT_TABLE void ScDPResultMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { lcl_DumpRow( OUString("ScDPResultMember"), GetName(), NULL, pDoc, rPos ); @@ -2625,7 +2625,7 @@ void ScDPDataMember::UpdateRunningTotals( } } -#if DEBUG_PIVOT_TABLE +#if DUMP_PIVOT_TABLE void ScDPDataMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { lcl_DumpRow( OUString("ScDPDataMember"), GetName(), &aAggregate, pDoc, rPos ); @@ -3440,7 +3440,7 @@ ScDPDataMember* ScDPResultDimension::GetColReferenceMember( return pColMember; } -#if DEBUG_PIVOT_TABLE +#if DUMP_PIVOT_TABLE void ScDPResultDimension::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { OUString aDimName = bIsDataLayout ? OUString("(data layout)") : OUString(GetName()); @@ -3820,7 +3820,7 @@ void ScDPDataDimension::UpdateRunningTotals( const ScDPResultDimension* pRefDim, } } -#if DEBUG_PIVOT_TABLE +#if DUMP_PIVOT_TABLE void ScDPDataDimension::DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const { OUString aDimName = bIsDataLayout ? OUString("(data layout)") : OUString("(unknown)"); diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index a0e145ec8aab..2454bdfe36bb 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -976,6 +976,10 @@ void ScDPSource::CreateRes_Impl() ScDPRunningTotalState aRunning( pColResRoot, pRowResRoot ); ScDPRowTotals aTotals; pRowResRoot->UpdateRunningTotals( pColResRoot, pResData->GetRowStartMeasure(), aRunning, aTotals ); + +#if DUMP_PIVOT_TABLE + DumpResults(); +#endif } void ScDPSource::FillLevelList( sal_uInt16 nOrientation, std::vector<ScDPLevel*> &rList ) @@ -1180,7 +1184,7 @@ uno::Any SAL_CALL ScDPSource::getPropertyValue( const OUString& aPropertyName ) return aRet; } -#if DEBUG_PIVOT_TABLE +#if DUMP_PIVOT_TABLE void ScDPSource::DumpResults() const { std::cout << "+++++ column root" << std::endl; |